Laurent Destailleur
dd1f49b4b0
Merge pull request #17794 from atm-quentin/FIX_jointure_cabyprod
...
Fix jointure cabyprod
2021-06-11 19:12:29 +02:00
Laurent Destailleur
756786f717
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/compta/facture/list.php
htdocs/core/class/discount.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/pdf.lib.php
htdocs/core/modules/modFournisseur.class.php
htdocs/fourn/facture/card.php
htdocs/holiday/list.php
htdocs/paybox/admin/paybox.php
htdocs/paypal/admin/paypal.php
htdocs/product/price.php
htdocs/projet/activity/perday.php
htdocs/projet/activity/permonth.php
htdocs/projet/activity/perweek.php
htdocs/stripe/admin/stripe.php
2021-06-11 19:05:05 +02:00
Laurent Destailleur
eefc6ddf83
Fix phpcs
2021-06-11 18:44:01 +02:00
Laurent Destailleur
4cde4f6162
Merge pull request #17875 from OPEN-DSI/new-doactions-hook-on-bank-card
...
NEW do actions hook on bank card
2021-06-11 18:18:06 +02:00
Frédéric FRANCE
86eea2c4fc
Update list.php
2021-06-10 20:55:00 +02:00
Frédéric FRANCE
3f40a65f26
fix warnings
2021-06-10 20:53:29 +02:00
Laurent Destailleur
1bf63c7862
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/core/lib/functions.lib.php
2021-06-10 16:53:09 +02:00
Laurent Destailleur
1950e50c89
Fix test
2021-06-10 16:31:28 +02:00
Laurent Destailleur
c8c9fb7700
FIX #17847
2021-06-10 16:29:30 +02:00
lvessiller
ed53301cec
NEW do actions hook on bank card
2021-06-10 16:18:20 +02:00
Alexandre SPANGARO
08186fdff1
Fix warning - search_societe is already present
2021-06-10 06:28:09 +02:00
Alexandre SPANGARO
b216c81c60
FIX Customer invoice list - Pagination lost search_date_xxx information
2021-06-10 06:22:03 +02:00
Laurent Destailleur
53af424a3d
Fix total tva
2021-06-10 02:12:29 +02:00
Laurent Destailleur
5f925d9e3b
Fix total -> total_ht
2021-06-10 02:10:58 +02:00
Laurent Destailleur
ae6d2ba9b5
Fix missing user creation/modif of template invoice
2021-06-10 01:56:20 +02:00
Laurent Destailleur
4c89a1146c
Fix popup
2021-06-10 01:13:50 +02:00
Laurent Destailleur
9afe8e54a7
Fix
2021-06-10 00:41:15 +02:00
Laurent Destailleur
7b31ef0ff3
Fix warnings
2021-06-10 00:00:49 +02:00
Laurent Destailleur
16f1210e8a
Fix phpcs
2021-06-09 17:51:22 +02:00
Laurent Destailleur
fb46ece906
Fix yogosha 6347
2021-06-09 15:36:47 +02:00
Laurent Destailleur
cfa268e0d3
Fix we must add total vat on cash fence receipts (Ticket Z)
2021-06-09 04:13:57 +02:00
Laurent Destailleur
f17e7a6979
Add more info
2021-06-09 03:54:19 +02:00
Laurent Destailleur
27f803cab0
Fix receipt of cash fence must contains more legal information
2021-06-09 03:35:22 +02:00
Laurent Destailleur
fa4786a3f6
Fix permission
2021-06-08 16:19:21 +02:00
Laurent Destailleur
1aeb91eb9a
FIX entry menus that has been lost in v13
...
Look and feel v14
2021-06-08 13:44:11 +02:00
Frédéric FRANCE
0ea0966b09
Update card.php
2021-06-08 12:01:05 +02:00
Frédéric FRANCE
b1c3a7cf48
avoid fatal error
2021-06-08 10:38:34 +02:00
Gauthier PC portable 024
e64c27e1c3
FIX : need to add payment sum to getlibstatus function in object linked block
2021-06-08 10:27:33 +02:00
Quentin VIAL-GOUTEYRON
2a4f6882c5
Merge branch 'FIX_jointure_cabyprod' of github.com:atm-quentin/dolibarr into FIX_jointure_cabyprod
2021-06-07 10:11:19 +02:00
Quentin VIAL-GOUTEYRON
af913cd29f
remove and
2021-06-07 10:10:42 +02:00
stickler-ci
98aa374185
Fixing style errors.
2021-06-07 08:10:05 +00:00
Quentin VIAL-GOUTEYRON
80af5e2216
keep where but remove join
2021-06-07 10:05:24 +02:00
Alexandre SPANGARO
ffb1b232d4
Fix Withdraw - link is missing in llx_bank_url when the debit is rejected
2021-06-06 21:27:48 +02:00
Alexandre SPANGARO
c1757bdbd8
Remove warning
2021-06-06 06:28:38 +02:00
Alexandre SPANGARO
a92bd31ce1
Fix search_datexxx
2021-06-05 07:39:15 +02:00
Alexandre SPANGARO
6922359114
Merge remote-tracking branch 'upstream/develop' into 14b10
2021-06-05 07:22:38 +02:00
Laurent Destailleur
39adaec7eb
Fix var not found
2021-06-05 01:29:24 +02:00
Laurent Destailleur
2182e7fd54
Look and feel v14
2021-06-04 14:36:52 +02:00
Laurent Destailleur
27018bd4b4
Fix group by
2021-06-04 14:25:32 +02:00
Laurent Destailleur
bcd028c040
Merge pull request #17739 from fbosman/patch-6
...
Update card.php
2021-06-04 12:57:51 +02:00
Laurent Destailleur
8b5922a0df
Update card.php
2021-06-04 12:57:43 +02:00
Laurent Destailleur
43be7cf996
Update card.php
2021-06-04 12:56:40 +02:00
Laurent Destailleur
292d5f6a15
Update card.php
2021-06-04 12:55:03 +02:00
Laurent Destailleur
b674835d89
Merge pull request #17813 from frederic34/patch-25
...
fix warning
2021-06-04 08:39:20 +02:00
Frédéric FRANCE
0b28587e65
fix warnings
2021-06-03 15:28:47 +02:00
Frédéric FRANCE
e83e399cb6
fix warning
2021-06-03 15:19:54 +02:00
Quentin VIAL-GOUTEYRON
b8b30a9af6
wrong where cabyprodserv
2021-06-02 10:53:04 +02:00
Quentin VIAL-GOUTEYRON
89f6b66c2a
wrong join, request too long
2021-06-02 10:32:30 +02:00
Alexandre SPANGARO
3744ccdd28
Look & feel v14
2021-06-01 22:50:55 +02:00
Alexandre SPANGARO
b5904e49a0
NEW Add field date from/to in customer payment list
2021-06-01 22:43:43 +02:00
stickler-ci
dfb2e54750
Fixing style errors.
2021-05-27 14:25:42 +00:00
Frans Bosman
fd2d10d443
Update card.php
2021-05-27 16:23:33 +02:00
stickler-ci
c31530e7ed
Fixing style errors.
2021-05-27 10:24:18 +00:00
Frans Bosman
61753791b4
Update card.php
...
Add Batchinfo on invoice detail lines if hidden feature INCUDE_BATCHINFO_ON_INVOICE is set
2021-05-27 12:20:42 +02:00
Laurent Destailleur
4b47611e23
Debug v14
2021-05-25 21:21:09 +02:00
Laurent Destailleur
cfd035e1de
css
2021-05-20 21:25:36 +02:00
Laurent Destailleur
91f85abb7e
Fix only comment to understand code are allowed
2021-05-20 14:55:37 +02:00
Florian HENRY
d70bbe29b5
fix
2021-05-20 14:03:18 +02:00
Florian HENRY
7a9102ac60
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_massaction_paid_custom_invoice
2021-05-20 14:02:05 +02:00
Florian HENRY
4d7b09ff2a
done
2021-05-20 14:00:43 +02:00
Laurent Destailleur
afd9c09c8f
Merge pull request #17685 from FHenry/dev_fix_search_filter_company_Var
...
fix: change societe by company varaible name in all file
2021-05-20 13:54:01 +02:00
Florian HENRY
5e6d6ccf67
same bug on invoie list
2021-05-20 13:45:52 +02:00
Florian HENRY
7c6ac86d32
ongoing
2021-05-20 13:41:23 +02:00
Florian HENRY
62bc6e9e1f
on going
2021-05-20 13:15:32 +02:00
Florian HENRY
7874be6e37
bad comment remove
2021-05-20 12:48:18 +02:00
Florian HENRY
d93cf0beb7
fix: change societe by company varaible name in all file
2021-05-20 12:36:26 +02:00
Laurent Destailleur
dbd7292cd6
Replace doubleval into floatval
2021-05-20 09:22:55 +02:00
Sylvain Legrand
a3d1b49c65
Error in list when using alias name of thirdparty
2021-05-19 19:08:58 +02:00
Laurent Destailleur
217ee260c2
css
2021-05-19 15:11:47 +02:00
Laurent Destailleur
cf0da5cee7
css
2021-05-19 15:00:44 +02:00
Anthony Berton
c02e3eed6b
checked
2021-05-18 18:45:07 +02:00
Laurent Destailleur
8e39eff180
Look and feel v14
2021-05-18 18:18:00 +02:00
Laurent Destailleur
74f35177ff
Fix group by
2021-05-18 13:20:14 +02:00
Laurent Destailleur
2ef713bd5f
Merge branch 'develop' into look_feel_user_author_list
2021-05-18 12:27:30 +02:00
Laurent Destailleur
a34401aacb
Merge pull request #17646 from aspangaro/14b10
...
FIX Social contrib. - Missing language file
2021-05-18 12:16:14 +02:00
Laurent Destailleur
7b9161ec63
Merge pull request #17644 from bb2a/thirdparty_infos_list
...
Add popup thirdparty info in list
2021-05-18 12:15:51 +02:00
Alexandre SPANGARO
9b0988e7be
FIX Social contrib. - Missing language file
2021-05-18 08:40:28 +02:00
Laurent Destailleur
b6dbe45242
Fix permissions on page to move position of file
2021-05-18 01:58:54 +02:00
Anthony Berton
70a062e2c1
change position
2021-05-17 23:59:42 +02:00
Anthony Berton
6fe9fe330d
delete fetch
2021-05-17 23:54:31 +02:00
Anthony Berton
58db723502
thirdparty info popup list
2021-05-17 23:27:33 +02:00
Anthony Berton
31cd71d8a3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into look_feel_user_author_list
2021-05-17 18:34:41 +02:00
Anthony Berton
68130ec637
Merge branches 'develop' and 'develop' of https://github.com/Dolibarr/dolibarr into salesrepresentativeinorderandinvoicelist
2021-05-17 18:34:20 +02:00
Anthony Berton
09ab930806
sale_representative_order_invoice_list
2021-05-17 18:31:19 +02:00
Anthony Berton
0b7f474dd3
look_feel user author in list
2021-05-17 18:04:21 +02:00
Laurent Destailleur
608e4e8891
Merge pull request #17601 from ptibogxiv/patch-426
...
NEW report contact/adresses on credit note from invoice
2021-05-17 09:12:12 +02:00
Laurent Destailleur
4768729c09
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/core/class/rssparser.class.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/core/tpl/extrafields_list_search_sql.tpl.php
htdocs/expedition/list.php
2021-05-17 07:57:32 +02:00
Laurent Destailleur
6bf66adff0
Fix remove some $_REQUEST
2021-05-17 07:27:02 +02:00
stickler-ci
50d4d28c14
Fixing style errors.
2021-05-14 11:54:50 +00:00
Ferran Marcet
ce6df0ee4a
FIX: Filter of the dates in the lists is lost
2021-05-14 13:50:12 +02:00
stickler-ci
05ea8761a1
Fixing style errors.
2021-05-13 08:28:14 +00:00
ptibogxiv
b9336570ff
NEW report contact/adresses on credit note from invoice
...
keep same contact/adresses from source invoice (ir: usefull for correct notifications)
2021-05-13 10:26:09 +02:00
Laurent Destailleur
ba6e675273
css
2021-05-12 22:21:20 +02:00
Laurent Destailleur
b5a43c8d1d
FIX #17502
2021-05-11 21:31:43 +02:00
Laurent Destailleur
52d4e7e2a8
Merge pull request #17535 from frederic34/uniformizecode
...
uniformize supplier cards
2021-05-11 19:25:26 +02:00
Laurent Destailleur
bccd1b9a41
Update prelevement.php
2021-05-11 19:21:08 +02:00
Frédéric FRANCE
23858f0ab1
fix php8 warning
2021-05-11 18:25:20 +02:00
Frédéric FRANCE
680092cb8a
Merge remote-tracking branch 'upstream/develop' into uniformizecode
2021-05-11 18:09:05 +02:00
Laurent Destailleur
73972bcbd0
More complete log
2021-05-11 10:30:46 +02:00
Frédéric FRANCE
1d38dc11c6
uniformize supplier cards
2021-05-07 21:28:35 +02:00
Laurent Destailleur
907ea1a8bd
Fix sql error
2021-05-07 18:21:11 +02:00
Frédéric FRANCE
7897469963
Update account.class.php
2021-05-06 20:34:45 +02:00
Laurent Destailleur
bd5e141d26
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/mails_templates.php
htdocs/core/actions_linkedfiles.inc.php
htdocs/core/lib/functions.lib.php
htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
htdocs/societe/consumption.php
2021-05-06 17:07:44 +02:00
Laurent Destailleur
7386a223e8
Update account.class.php
2021-05-06 16:38:34 +02:00
Laurent Destailleur
f2e61ff807
Fix substitution into topic
2021-05-04 18:04:09 +02:00
Florian HENRY
c4e0d8da42
FIX: merge thirparty also work for bank URL entry
2021-05-04 17:28:20 +02:00
Laurent Destailleur
526235d020
Fix substitution of mix html/nohtml
...
Fix send email reminder for past due date of invoices
More PHPUnit test
2021-05-04 13:33:18 +02:00
Laurent Destailleur
c82317c8af
Fix missing include
2021-05-04 11:06:24 +02:00
Laurent Destailleur
6e32efdb40
Fix phpcs
2021-05-03 20:22:36 +02:00
Laurent Destailleur
9973085613
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/card.php
htdocs/comm/propal/card.php
htdocs/compta/bank/releve.php
htdocs/compta/paiement/rapport.php
htdocs/core/class/extrafields.class.php
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
htdocs/reception/card.php
htdocs/societe/societecontact.php
2021-05-03 19:36:49 +02:00
Laurent Destailleur
17ea41660f
Merge pull request #17469 from indelog/fix_order_payreport
...
Fix show table of pdf payments repports in file order
2021-05-03 19:19:00 +02:00
Laurent Destailleur
1d2f8b09d9
Update releve.php
2021-05-03 18:55:25 +02:00
WimpyMan
706545081c
FIX #17476 releve.php: Fix SQL statement
...
Single quotes `'` should be uses instead of double quotes `"` for
string values.
2021-05-03 18:29:53 +02:00
Indelog
c18848c944
Fix: simplify code with dol_dir_list()
2021-05-03 17:17:44 +02:00
Indelog
dba9b17275
Fix forgot payment filter on file name
2021-05-03 16:00:14 +02:00
Laurent Destailleur
1c95e2b7c7
FIX #17453
2021-05-03 14:58:29 +02:00
Laurent Destailleur
b22f2dd2c8
Merge pull request #17415 from Hystepik/develo#2
...
Close #17271 : Replacement of 2 graphes in /compta/index.php
2021-05-03 13:56:44 +02:00
Laurent Destailleur
d1f11d2e65
Merge pull request #17429 from fr69400/develop
...
FIX formAddObjectLine cant be overloaded by hook
2021-05-03 13:16:45 +02:00
Indelog
9727768192
Fix show table of pdf payments repports in file order
...
Use scandir() rather opendir() and readdir() to get a sorted list of
files.
2021-05-03 09:46:51 +02:00
Laurent Destailleur
e99355a0c2
Clean html
2021-04-30 15:22:17 +02:00
Laurent Destailleur
5a1f2db024
Clean sql
2021-04-30 10:57:21 +02:00
Laurent Destailleur
8e1ba67928
css
2021-04-29 18:04:10 +02:00
Laurent Destailleur
66103303eb
Fix html tag
2021-04-29 18:02:24 +02:00
fr69400
96baa1ef49
wrong variable name
2021-04-29 17:36:45 +02:00
fr69400
d9e25c61bb
formAddObjectLine cant be overloaded by hook
2021-04-29 15:32:15 +02:00
Laurent Destailleur
655056ed31
Debug v14
2021-04-29 12:10:55 +02:00
lmarcouiller
799d1de830
Update incoice.lib.php and index.php match eldy's requests
2021-04-29 09:31:49 +02:00
Laurent Destailleur
75a8dc28ea
Merge pull request #17261 from aspangaro/14a39
...
Maxi debug of societe/product per entity
2021-04-28 17:06:45 +02:00
Laurent Destailleur
c946e1ad8a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-28 15:25:19 +02:00
Laurent Destailleur
4926ac1e24
Fix make protected method not visible
2021-04-28 15:25:06 +02:00
stickler-ci
762378c044
Fixing style errors.
2021-04-28 11:12:01 +00:00
Gauthier PC portable 024
c25b044da5
FIX : several fixes on salary and vat
2021-04-28 11:56:07 +02:00
lmarcouiller
be22d43c60
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develo#2
2021-04-28 09:24:18 +02:00
Laurent Destailleur
b1d8ca0701
Fix phpcs
2021-04-27 17:45:13 +02:00
lmarcouiller
97633e34f2
Fix : Bug facture.class.php
2021-04-27 16:47:27 +02:00
lmarcouiller
52bf0f0359
Close #17271 : Replament of 2 graph in compta/index.php
2021-04-27 16:02:46 +02:00
Laurent Destailleur
4b204301a9
Enhance logs
2021-04-27 03:25:49 +02:00
Laurent Destailleur
0c1f8b96ef
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-27 02:55:07 +02:00
Laurent Destailleur
0a0b3f414a
Fix phpcs
2021-04-27 02:54:33 +02:00
Laurent Destailleur
ea19747bc6
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-04-27 02:16:16 +02:00
Laurent Destailleur
2e9cf8d00b
Fix phpcs
2021-04-27 02:15:58 +02:00
Laurent Destailleur
c7f38c4cf0
Fix bad var
2021-04-27 02:10:52 +02:00
Laurent Destailleur
098582d7a7
Fix bad merge
2021-04-27 02:09:43 +02:00
Laurent Destailleur
27aa7cdb48
Fix bad merge
2021-04-27 02:08:36 +02:00
Laurent Destailleur
d6cdfcdd8c
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/paiement/card.php
htdocs/compta/paiement/class/paiement.class.php
htdocs/public/members/new.php
2021-04-27 02:07:48 +02:00
Laurent Destailleur
12a4bc64ad
Remove $_REQUEST
2021-04-27 02:01:46 +02:00
Laurent Destailleur
48a50f3b10
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/compta/paiement/card.php
htdocs/compta/paiement/class/paiement.class.php
2021-04-27 01:58:19 +02:00
Laurent Destailleur
804eac55e9
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-04-27 01:46:04 +02:00
Laurent Destailleur
e82965090f
Merge pull request #17395 from Robin-Yann/13-fix-combo-prospect
...
13 fix combo prospect
2021-04-27 01:18:57 +02:00
Laurent Destailleur
efbed70286
Update card.php
2021-04-27 01:17:26 +02:00
Laurent Destailleur
f54d14bfd6
Add method checkValForAPI to clean data from API input
2021-04-27 01:05:14 +02:00
Laurent Destailleur
fde4beb3b6
Merge pull request #17396 from atm-gauthier/fix_disable_delete_if_payments
...
FIX : We must not be able to delete sociale charge, vat or salary if there are payments
2021-04-26 21:08:29 +02:00
Laurent Destailleur
d138e7410b
Clean code
2021-04-26 19:12:23 +02:00
stickler-ci
6387b929cc
Fixing style errors.
2021-04-26 12:30:44 +00:00
Robin-Yann
9fc0416664
Update card.php
2021-04-26 14:28:43 +02:00
Robin-Yann
c1f3626cd7
Update card.php
2021-04-26 14:11:24 +02:00
Alexandre SPANGARO
d95be3e08b
Merge remote-tracking branch 'upstream/develop' into 14a39
2021-04-26 13:53:16 +02:00
Gauthier PC portable 024
ae1586fcc6
FIX : We must not be able to delete sociale charge, vat or salary if there are payments
2021-04-26 10:48:50 +02:00
Laurent Destailleur
c9d6bc70e8
Clean code
2021-04-26 10:22:28 +02:00
Robin-Yann
676067eafc
Update card.php
2021-04-26 10:21:25 +02:00
stickler-ci
ebd3b00016
Fixing style errors.
2021-04-26 07:24:00 +00:00
Robin-Yann
836b811449
Merge branch 'develop' into 13-fix-combo-prospect
2021-04-26 09:21:32 +02:00
Laurent Destailleur
73c482ca64
Fix escape
2021-04-25 19:36:48 +02:00
Laurent Destailleur
a8939377de
Escape string
2021-04-25 19:31:19 +02:00
Laurent Destailleur
389b71bc7e
Clean API
2021-04-25 19:21:48 +02:00
Laurent Destailleur
fd2d317b4a
Fix #yogosha5881
2021-04-25 15:55:36 +02:00
Laurent Destailleur
6c2d9d3b3c
Fix permission to reopen invoice.
2021-04-25 13:17:47 +02:00
Laurent Destailleur
42938ffe31
FIX #yogosha5879
2021-04-24 21:15:09 +02:00
Laurent Destailleur
9f03054fc4
Fix #yogosha5877
2021-04-24 20:52:48 +02:00
Laurent Destailleur
d0cc64479d
Fix protect sql
2021-04-24 20:18:11 +02:00
Laurent Destailleur
48c26fd614
Fix add option INVOICE_DISALLOW_REOPEN to lock problematic feature
2021-04-24 18:43:24 +02:00
Marc de Lima Lucio
ce022ab36c
FIX: payment validation: invoices PDF were no re-generated, make it with correct display options
2021-04-22 15:57:06 +02:00
Marc de Lima Lucio
ee96fb6470
FIX: payment creation: re-generate invoice PDF with correct display options
2021-04-22 15:56:12 +02:00
Alexandre SPANGARO
d27030df3f
Merge remote-tracking branch 'upstream/develop' into 14a39
2021-04-20 04:43:14 +02:00
Alexandre SPANGARO
d66540bf00
Revert "Split mod fournisseur"
...
This reverts commit 78dbf4f7ff .
2021-04-20 04:42:51 +02:00
Laurent Destailleur
4797c137e8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-19 21:12:19 +02:00
Laurent Destailleur
294cf6cc31
Merge pull request #17312 from prietojc/patch-16
...
Update bonprelevement.class.php
2021-04-19 21:12:06 +02:00
Laurent Destailleur
d6df32eee9
Add invoice id into EndToEnd to guarantee unicity of value.
2021-04-19 21:10:53 +02:00
Laurent Destailleur
7988aaf88f
Update bonprelevement.class.php
2021-04-19 21:02:29 +02:00
Laurent Destailleur
61df76dd9a
Fix pb in date format %a %b when using a negative timezone
...
Enhance date management and unit tests.
2021-04-19 12:48:08 +02:00
Laurent Destailleur
23b11491d2
Can filter also on payment mode
2021-04-19 11:11:01 +02:00
JC Prieto
4329b6b99b
Update bonprelevement.class.php
...
Change facture reference by supplier reference
2021-04-19 11:04:50 +02:00
Laurent Destailleur
83b5a325df
Load of template before the loop.
2021-04-19 10:47:12 +02:00
Laurent Destailleur
a74b237a7b
Add a schedule dtask to send reminder by email on date due.
2021-04-19 10:35:19 +02:00
Alexandre SPANGARO
78dbf4f7ff
Split mod fournisseur
2021-04-17 07:49:19 +02:00
Laurent Destailleur
ce9d707040
Merge pull request #17269 from bb2a/picto_massactions
...
Next picto mass actions
2021-04-16 20:40:19 +02:00
Laurent Destailleur
aec2212b44
Merge pull request #17293 from cmfpmatik/cmfpmatik-patch-16042021
...
Update facture list.php
2021-04-16 20:39:23 +02:00
Oarces DEV
593e23220d
Update list.php
...
Add filter for "Bill Short Status Draft" and "Bill Short Status Draft", that they has can be viewed together.
Secretaries appreciate having this overall visibility.
2021-04-16 14:34:23 +02:00
Laurent Destailleur
db5dcd3e52
NEW When a doc file is shared, link is visible from main page of doc.
2021-04-15 17:56:55 +02:00
Laurent Destailleur
f1d55d38ba
Show link to shared file if it exists.
2021-04-15 17:09:15 +02:00
Laurent Destailleur
754b0e9853
Debug v14
2021-04-15 15:30:02 +02:00
Laurent Destailleur
37fa8f4c19
Fix method not found
2021-04-15 15:07:06 +02:00
Laurent Destailleur
bd1aa38c64
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/list.php
2021-04-15 12:04:08 +02:00
Laurent Destailleur
5e2bec9cad
Look and feel v14
2021-04-15 02:09:29 +02:00
Laurent Destailleur
e7d64d073a
Look and feel v14
2021-04-14 23:14:38 +02:00
Anthony Berton
a612831e28
next_change
2021-04-14 14:45:55 +02:00
Laurent Destailleur
9154e07689
Fix picto for tags
2021-04-14 12:33:53 +02:00
Laurent Destailleur
dcf460e248
Use css on img_picto
2021-04-14 12:28:01 +02:00
Anthony Berton
707bf5adca
picto_mass_actions
2021-04-14 10:20:34 +02:00
Alexandre SPANGARO
2f31720896
Maxi debug of societe/product per entity
2021-04-14 04:45:17 +02:00
Laurent Destailleur
4dfc90f8cb
Merge pull request #17256 from OGPayet/fix/ComptaFactureDateClosingOptionPosition
...
fix date closing option position
2021-04-13 23:03:02 +02:00
Laurent Destailleur
358bb87ae2
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/index.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/payments.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/projet/card.php
htdocs/public/payment/newpayment.php
htdocs/societe/list.php
htdocs/ticket/document.php
2021-04-13 20:19:05 +02:00
Pierre Payet
75ed5e45f2
fix date closing option position
2021-04-13 17:21:51 +02:00
Alexandre SPANGARO
44133166de
Merge remote-tracking branch 'upstream/develop' into 14a36
2021-04-12 21:35:03 +02:00
Alexandre SPANGARO
4b9bf40a8f
move include_once to include when it's a tpl
2021-04-12 21:25:58 +02:00
Laurent Destailleur
8a62d97b89
Remove one thousand of useless files
2021-04-12 15:57:16 +02:00
Laurent Destailleur
a68378da3f
Fix #yogosha5840
2021-04-12 10:32:41 +02:00
Laurent Destailleur
97ace5e3bb
Look and feel v14
2021-04-12 10:19:38 +02:00
Alexandre SPANGARO
80995c34b5
FIX Write right on document
2021-04-12 07:13:05 +02:00
Alexandre SPANGARO
80c6458faa
Work on split module fournisseur
2021-04-11 22:25:45 +02:00
Laurent Destailleur
0ab31a8680
Look and feel v14
2021-04-11 13:30:30 +02:00
Laurent Destailleur
2d771704d0
Better suggestion for data after clone of social contribution
2021-04-09 00:36:08 +02:00
Laurent Destailleur
667481acd5
Fix #yogosha5832 - Missin test on permission for /index routes on APIs
2021-04-08 19:05:28 +02:00
Laurent Destailleur
fcc6431896
Merge pull request #17136 from aspangaro/14a35
...
NEW: Add deposit on supplier invoice (& somes ajustments)
2021-04-07 02:51:32 +02:00
Laurent Destailleur
2e862f815a
Fix field total_ht
2021-04-07 00:44:01 +02:00
Laurent Destailleur
e23ddb383e
css
2021-04-06 23:38:52 +02:00
Laurent Destailleur
7c27ab6121
Fix css
2021-04-06 23:35:30 +02:00
Laurent Destailleur
dbc1780817
Merge pull request #16376 from aspangaro/14a22
...
Code enhanced - Standardize field name #14697
2021-04-06 20:01:38 +02:00
Laurent Destailleur
e993d4e244
Merge pull request #17127 from dolibit-ut/patch-230
...
Create index.html
2021-04-06 19:32:24 +02:00
Laurent Destailleur
7c4c2deab3
Merge pull request #17128 from dolibit-ut/patch-231
...
Create index.html
2021-04-06 19:29:01 +02:00
Laurent Destailleur
a774a02452
Merge pull request #17129 from dolibit-ut/patch-232
...
Create index.html
2021-04-06 19:28:27 +02:00
Laurent Destailleur
60f6908d83
Merge pull request #17130 from dolibit-ut/patch-233
...
Create index.html
2021-04-06 19:28:12 +02:00
stickler-ci
1419b75f22
Fixing style errors.
2021-04-06 08:32:27 +00:00
Alexandre SPANGARO
36e4f5aa22
Merge remote-tracking branch 'upstream/develop' into 14a22
2021-04-06 10:29:44 +02:00
Alexandre SPANGARO
82b652df8a
NEW: Add deposit on supplier invoice (& somes ajustments)
2021-04-06 09:15:34 +02:00
UT from dolibit
904dca335a
Create index.html
2021-04-05 20:24:06 +02:00
UT from dolibit
74cbf34d61
Create index.html
2021-04-05 20:22:41 +02:00
UT from dolibit
c35621a2e7
Create index.html
2021-04-05 20:20:10 +02:00
UT from dolibit
888dfdba4a
Create index.html
2021-04-05 20:19:23 +02:00
UT from dolibit
cd556d3dfc
Create index.html
2021-04-05 20:17:45 +02:00
Laurent Destailleur
a3fb8d3e14
Factorize code
2021-04-05 19:34:56 +02:00
Laurent Destailleur
01eec2b919
FIx #yogosha5774
2021-04-05 15:11:28 +02:00
Alexandre SPANGARO
f64d0377c5
Merge remote-tracking branch 'upstream/develop' into 14a22
2021-04-04 06:03:41 +02:00
Laurent Destailleur
231f441876
Look and feel v14
2021-04-03 02:11:16 +02:00
Laurent Destailleur
3fb69f8ec0
Fix report
2021-03-31 21:28:07 +02:00
Laurent Destailleur
0fd36d96f3
Fix report
2021-03-31 21:25:01 +02:00
Laurent Destailleur
2af8b7078c
Fix turnover calculation was wrong. We must include only
2021-03-31 19:50:43 +02:00
Laurent Destailleur
e01b6b6789
FIX filter on date on invoice list
2021-03-31 18:39:59 +02:00
Laurent Destailleur
2e3af575be
Look and feel v14
2021-03-31 18:12:26 +02:00
Laurent Destailleur
27bc05a039
Debug report accountancy
2021-03-31 17:59:42 +02:00
Laurent Destailleur
32f9a04776
FIX Must use the server TZ for accounting report
2021-03-31 17:37:45 +02:00
Laurent Destailleur
cf57826a5e
Trans
2021-03-31 16:57:58 +02:00
Laurent Destailleur
f2f0e4a6fd
css
2021-03-31 16:47:36 +02:00
Laurent Destailleur
d5cc006250
Look and feel v14
2021-03-31 16:45:53 +02:00
Laurent Destailleur
8be7ffb519
Merge pull request #17043 from dolibit-ut/patch-198
...
Update card.php
2021-03-31 13:42:09 +02:00
Laurent Destailleur
7641f7258b
Merge pull request #17044 from aspangaro/14a27
...
FIX: Add a sub table to manage accountancy on product/company
2021-03-31 13:39:17 +02:00
Gauthier PC portable 024
c27c52331a
FIX : default value
2021-03-31 10:34:21 +02:00
Gauthier PC portable 024
19265179ca
FIX : last uniformizations
2021-03-31 10:11:51 +02:00
Alexandre SPANGARO
38d47c184e
FIX: Add a sub table to manage accountancy on product/company
2021-03-30 22:12:57 +02:00
UT from dolibit
ba84a36282
Update card.php
...
$help_url = 'EN:Module_Banks_and_Cash|FR:Module_Banques_et_Caisses|ES:Módulo_Bancos_y_Cajas|DE:Modul_Banken_und_Barbestände';
2021-03-30 22:12:13 +02:00
Laurent Destailleur
47e9f7c458
Merge pull request #17032 from atm-gauthier/fix_develop
...
FIX : several fix after lists uniformization
2021-03-30 19:20:15 +02:00
Laurent Destailleur
fb7cfe6c50
Fix sql error
2021-03-30 19:15:20 +02:00
Laurent Destailleur
3744bc6a7a
FIX #yogosha5746 - next step (work in progress)
2021-03-30 18:17:13 +02:00
Laurent Destailleur
fae3cca494
FIX #yogosha5746 - next step (work in progress)
2021-03-30 17:45:15 +02:00
Gauthier PC portable 024
3259d70e72
FIX : several fix after lists uniformization
2021-03-30 17:23:05 +02:00
Laurent Destailleur
6e422d26f3
FIX #yogosha5746 - next step (wip)
2021-03-30 16:20:18 +02:00
Laurent Destailleur
d61f61ab45
Clean $_GET
2021-03-30 03:55:17 +02:00
Laurent Destailleur
fb84608586
Clean sql
2021-03-30 03:37:54 +02:00
Laurent Destailleur
32bec56529
Using " for html is better
2021-03-29 23:14:42 +02:00
Laurent Destailleur
b702d2b534
Fix CSRF for more GET
2021-03-29 22:58:44 +02:00
Laurent Destailleur
0740633ec8
Update facture-rec.class.php
2021-03-29 20:42:59 +02:00
Laurent Destailleur
a4987c6e4f
Merge branch 'develop' into 14a22
2021-03-29 20:35:35 +02:00
Laurent Destailleur
5bbfe7ed19
Merge pull request #16930 from aspangaro/14a27
...
NEW: Add a sub table to manage accountancy on product/company
2021-03-29 20:11:02 +02:00
Laurent Destailleur
93627012cd
Merge pull request #16995 from atm-gauthier/fix_list_uniformization
...
FIX : display debug if !$conf->banque->enabled
2021-03-29 18:02:58 +02:00
Laurent Destailleur
f4b0723f30
Update list.php
2021-03-29 17:41:19 +02:00
Laurent Destailleur
b732a82c3d
Update list.php
2021-03-29 17:40:36 +02:00
stickler-ci
e1e3bcbf28
Fixing style errors.
2021-03-29 15:26:24 +00:00
Gauthier PC portable 024
139a1ba70d
FIX : if $conf->banque->enabled
2021-03-29 17:22:19 +02:00
Laurent Destailleur
36dfcc0646
Merge pull request #16976 from atm-florianm/NEW_14.0_hooks_on_CA_by_product_report
...
WIP: NEW 14.0 - SQL-altering hooks in the turnover by product report
2021-03-29 17:18:17 +02:00
Gauthier PC portable 024
28620fe8d8
Merge branch 'fix_list_uniformization' of github.com:atm-gauthier/dolibarr into fix_list_uniformization
2021-03-29 16:27:59 +02:00
Gauthier PC portable 024
53ae1f9d5b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_list_uniformization
2021-03-29 16:27:44 +02:00
stickler-ci
caa56729b3
Fixing style errors.
2021-03-29 14:25:36 +00:00
Gauthier PC portable 024
c8e40727c2
FIX : uniformization
2021-03-29 16:22:22 +02:00
Laurent Destailleur
5c2ee240b2
FIX #yogosha5752
2021-03-29 15:59:37 +02:00
Laurent Destailleur
3a4bb69c05
FIX #yogosha5749
2021-03-29 15:32:09 +02:00
Laurent Destailleur
ce1f8289a4
FIX #yogosha5746
2021-03-29 15:07:23 +02:00
Laurent Destailleur
6bc56b7671
Look and feel v14
2021-03-29 13:41:28 +02:00
Laurent Destailleur
b929641fe1
Look and feel v14
2021-03-29 13:00:17 +02:00
Laurent Destailleur
a5d84200dc
Clean code for invoice list
2021-03-28 19:22:04 +02:00
Alexandre SPANGARO
2a1cc04b66
Merge remote-tracking branch 'upstream/develop' into 14a22
2021-03-28 06:16:33 +02:00
Alexandre SPANGARO
22f809c517
Move to _PERENTITY
2021-03-27 05:23:20 +01:00
Alexandre SPANGARO
6422b0a6c0
Merge remote-tracking branch 'upstream/develop' into 14a27
2021-03-27 05:02:55 +01:00
stickler-ci
895c6efc14
Fixing style errors.
2021-03-26 15:26:05 +00:00
Gauthier PC portable 024
f553ad3fc8
FIX : orders columns
2021-03-26 16:14:00 +01:00
Gauthier PC portable 024
3fe1a05f26
FIX : employee must be after label as well as sociale charges list + social charges payments list must use INNER JOIN instead of LEFT JOIN
2021-03-26 10:23:44 +01:00
Gauthier PC portable 024
f5bf26e5d0
Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_list_uniformization
2021-03-26 09:59:27 +01:00
Laurent Destailleur
d9108362ba
War against $_POST
2021-03-25 16:59:47 +01:00
Florian Mortgat
d17256bde5
NEW 14.0 - hook printFieldListTitle for cabyprodserv.php
2021-03-25 16:14:44 +01:00
Florian Mortgat
3c8e15a87c
NEW 14.0 - SQL-altering hooks in the turnover by product report
2021-03-25 15:12:25 +01:00
Laurent Destailleur
663138328e
Merge pull request #16962 from atm-gauthier/fix_autofill_amount_payment_salary
...
FIX : autofill payment salary amount + several fixes
2021-03-25 13:03:38 +01:00
Gauthier PC portable 024
014ae0a8da
FIX : lists uniformization
2021-03-25 11:59:22 +01:00
Gauthier PC portable 024
368bad1943
FIX : autofill payment salary amount + several fixes
2021-03-25 10:39:12 +01:00
Gauthier PC portable 024
155978f2d2
FIX : Must be a left join here to be able to see vat declarations even if no payments are done
2021-03-25 09:29:53 +01:00
Gauthier PC portable 024
a20bb3d66e
Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_special_expense_index
2021-03-25 09:15:42 +01:00
Laurent Destailleur
ce422f514f
Fix title of reports
2021-03-25 00:47:05 +01:00
Laurent Destailleur
eeba9e4d50
Code comment
2021-03-24 21:58:06 +01:00
Laurent Destailleur
21a9779fe2
FIX inconsistency in margin recording with option "Force to sale price"
2021-03-24 21:49:45 +01:00
Laurent Destailleur
047471c220
Remove $_POST war
2021-03-24 19:06:44 +01:00
Gauthier PC portable 024
8ffb40035f
FIX : old query using tva object for payments list
2021-03-24 17:29:16 +01:00
Laurent Destailleur
2d5fbfc105
Fix php8
2021-03-22 23:43:28 +01:00
Laurent Destailleur
146706bafa
Fix label
2021-03-22 19:11:29 +01:00
Laurent Destailleur
ca0a04fb61
Fix missing payment ref
2021-03-22 18:56:02 +01:00
Laurent Destailleur
cce4ebdb8c
Clean code
2021-03-22 18:50:47 +01:00
Laurent Destailleur
f405505e0f
Do not load each invoice of payment for tooltip
2021-03-22 18:34:01 +01:00
Laurent Destailleur
010b084444
Do not load each invoice of payment for tooltip
2021-03-22 18:32:36 +01:00
Laurent Destailleur
5a8d757a30
Add missing data
2021-03-22 18:23:29 +01:00
Laurent Destailleur
5d6fb0cfea
Perf: Enhance performance of VAT report
2021-03-22 18:11:44 +01:00
Laurent Destailleur
897d653144
Debug default date for vat reports
2021-03-22 16:09:18 +01:00
Laurent Destailleur
4ff26bd8c5
Removed deprecated code
2021-03-22 13:39:34 +01:00
Laurent Destailleur
ca1715df96
Add some protection for SQL injection
2021-03-22 13:31:06 +01:00
Laurent Destailleur
6a0e0f4c06
Fix #ygosha5698
2021-03-22 12:10:51 +01:00
Laurent Destailleur
15440917b1
Fix #ygosha5698
2021-03-22 11:30:18 +01:00
stickler-ci
5af4b4673c
Fixing style errors.
2021-03-21 22:12:36 +00:00
Alexandre SPANGARO
0c2ada4299
Merge remote-tracking branch 'upstream/develop' into 14a27
2021-03-21 23:08:01 +01:00
Laurent Destailleur
1c6585f06b
Fix deprecated function
2021-03-21 22:37:24 +01:00
Laurent Destailleur
eeb1c5d884
Replace deprecated code
2021-03-20 21:46:10 +01:00
Laurent Destailleur
f95aa9c6e1
Merge pull request #16612 from atm-adrien/FIX/develop_update_pencil
...
FIX : Update pencil
2021-03-20 19:54:47 +01:00
Laurent Destailleur
e334e83a64
Merge branch 'develop' into 14a22
2021-03-20 13:42:54 +01:00
Laurent Destailleur
d8aa5f5eab
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-20 12:43:07 +01:00
Laurent Destailleur
3d3a7bfd37
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/card.php
htdocs/projet/card.php
htdocs/projet/contact.php
htdocs/projet/element.php
htdocs/projet/tasks.php
htdocs/projet/tasks/comment.php
htdocs/projet/tasks/contact.php
htdocs/projet/tasks/document.php
htdocs/projet/tasks/note.php
htdocs/projet/tasks/task.php
htdocs/projet/tasks/time.php
2021-03-20 12:42:46 +01:00
Laurent Destailleur
7f6044c52e
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/projet/card.php
htdocs/projet/contact.php
htdocs/projet/tasks/comment.php
htdocs/projet/tasks/contact.php
htdocs/projet/tasks/document.php
htdocs/projet/tasks/task.php
2021-03-20 12:18:40 +01:00
Laurent Destailleur
4c811d462c
Merge pull request #16837 from dolibit-ut/patch-129
...
Update document.php
2021-03-20 11:50:20 +01:00
Laurent Destailleur
668519e7f5
Merge pull request #16836 from dolibit-ut/patch-128
...
Update card.php
2021-03-20 11:49:57 +01:00
Laurent Destailleur
827a952dca
Merge pull request #16839 from dolibit-ut/patch-130
...
Update card.php
2021-03-20 11:49:18 +01:00
Laurent Destailleur
3edeb8b4aa
Merge pull request #16840 from dolibit-ut/patch-131
...
Update document.php
2021-03-20 11:49:06 +01:00
Laurent Destailleur
ba6f97acbc
Merge pull request #16865 from frederic34/uniformisecomment
...
uniformise comments to remove nested comments
2021-03-20 11:24:39 +01:00
Laurent Destailleur
11a7420b59
Merge pull request #16877 from frederic34/patch-27
...
fix doxygen
2021-03-20 11:12:33 +01:00
Frédéric FRANCE
3d3715f55d
fix doxygen
2021-03-20 10:37:51 +01:00
Frédéric FRANCE
81c885dbf1
fix doxygen
2021-03-20 10:36:53 +01:00
Frédéric FRANCE
bae1770176
uniformise comments to remove nested comments
2021-03-20 10:00:24 +01:00
Frédéric FRANCE
2de2f1ce4d
fix nested comments for doxygen
2021-03-20 09:02:29 +01:00
Alexandre SPANGARO
17d3b85ec4
Merge remote-tracking branch 'upstream/develop' into 14a27
2021-03-20 07:47:54 +01:00
Alexandre SPANGARO
00e21caa42
NEW: Add a sub table to manage accountancy on product/company
2021-03-20 07:42:16 +01:00
Laurent Destailleur
ae7261c0a7
FIX #yogosha5677
2021-03-19 14:12:08 +01:00
Laurent Destailleur
d83d005284
FIX #yogosha5674
2021-03-19 12:44:59 +01:00
Laurent Destailleur
ebf409f831
FIX #yogosha5668
2021-03-19 12:08:40 +01:00
UT from dolibit
46c23807e9
Update document.php
...
$helpurl -> $help_url
2021-03-19 09:38:33 +01:00
UT from dolibit
b4e929e57f
Update card.php
...
$helpurl -> $help_url
2021-03-19 09:36:49 +01:00
UT from dolibit
6e6609d876
Update document.php
...
$help_url = "EN:Module_Banks_and_Cash|FR:Module_Banques_et_Caisses";
llxHeader("", $title, $help_url);
2021-03-19 09:33:10 +01:00
UT from dolibit
e5f8ca77a9
Update card.php
...
$help_url = "EN:Module_Banks_and_Cash|FR:Module_Banques_et_Caisses";
llxHeader("", $title, $help_url);
2021-03-19 09:30:28 +01:00
Laurent Destailleur
a200f6f6ea
Merge pull request #16785 from frederic34/fixextrafieldsadmin
...
fix php8 warning
2021-03-18 23:08:15 +01:00
Laurent Destailleur
3522af926a
Merge pull request #16799 from AlexisLaurier/addInvoiceListHook
...
invoice list - add new standard hooks
2021-03-18 22:58:18 +01:00
Laurent Destailleur
43494df56c
Merge pull request #16790 from AlexisLaurier/addGetNomUrlToInvoice
...
add invoice getNomUrl hook
2021-03-18 22:57:37 +01:00
Laurent Destailleur
9ba568eb25
Fix security check
2021-03-18 20:57:50 +01:00
Laurent Destailleur
461d748f97
Fix #yogosha235
2021-03-18 20:27:36 +01:00
Alexandre SPANGARO
18d247026d
NEW: Add a sub table to manage product/societe
2021-03-18 17:08:55 +01:00
Alexis LAURIER
5b72193f0d
invoice list - ajust hooks
2021-03-18 17:06:49 +01:00
Alexis LAURIER
ada5d728b5
invoice list - ajust hooks
2021-03-18 17:00:57 +01:00
Alexis LAURIER
06bc999614
Add group by and having hooks on invoice list
2021-03-18 16:51:02 +01:00
Alexis LAURIER
c3f8e0e397
invoice list - add new standard hook
2021-03-18 16:21:54 +01:00