Commit Graph

3789 Commits

Author SHA1 Message Date
Laurent Destailleur
f825d3fda4 Trans 2021-08-28 13:27:55 +02:00
Laurent Destailleur
51a4d7630f Clean code 2021-08-28 00:56:37 +02:00
Laurent Destailleur
2dd91bf312 Clean code 2021-08-27 23:36:06 +02:00
Laurent Destailleur
46d993c9a6 Clean code 2021-08-27 22:42:04 +02:00
Laurent Destailleur
2f225ee7e5 Clean code by adding cast int. 2021-08-27 16:33:03 +02:00
Laurent Destailleur
07ab352877 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/list.php
2021-08-24 16:37:18 +02:00
Laurent Destailleur
8aa262f302
Merge pull request #18453 from aspangaro/14p15
FIX #18353 Invoice list translation issue
2021-08-24 15:29:32 +02:00
Laurent Destailleur
22339a3ed3
Merge pull request #18451 from cfoellmann/PR/form-buttons-function
improve forms - buttonsSaveCreate()
2021-08-24 15:26:03 +02:00
Laurent Destailleur
15da97f1da Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/accountancy/journal/expensereportsjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/compta/facture/card.php
	htdocs/product/price.php
2021-08-24 15:05:14 +02:00
Laurent Destailleur
591059847e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/product/price.php
2021-08-24 15:00:35 +02:00
Laurent Destailleur
8b2c82dd23 Fix position of fields 2021-08-24 14:27:18 +02:00
Alexandre SPANGARO
efb78d7431 FIX Invoice list - Wrong name for column total_tva 2021-08-24 14:22:36 +02:00
Alexandre SPANGARO
7b829bc899 FIX Field already present in SQL request 2021-08-24 14:22:21 +02:00
Laurent Destailleur
4a32788bff
Merge pull request #18463 from aspangaro/14p14
FIX Invoice list - Wrong name for column total_tva
2021-08-24 14:20:57 +02:00
Laurent Destailleur
a6ddc90d5b Fix responsive 2021-08-23 23:53:58 +02:00
Laurent Destailleur
dc006b0ebb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.form.class.php
2021-08-23 19:44:02 +02:00
Laurent Destailleur
8485fee5f9 Cast numeric into on sql request 2021-08-23 19:33:24 +02:00
Laurent Destailleur
d4b5ee6c85 Fix cast into variable into sql request. 2021-08-23 17:41:11 +02:00
Alexandre SPANGARO
56c23b79e0 FIX Invoice list - Wrong name for column total_tva 2021-08-22 14:02:33 +02:00
Alexandre SPANGARO
dd51e24afc FIX Field already present in SQL request 2021-08-22 14:01:29 +02:00
Alexandre SPANGARO
8bdf58b942 FIX #18353 Invoice list translation issue 2021-08-20 21:42:43 +02:00
Christian Foellmann
d706c3b1ec use Forms::buttonsSaveCreate() to generate most of the Save|Cancel forms combination 2021-08-20 14:41:30 +02:00
Laurent Destailleur
95721d36ab
Merge pull request #17687 from FHenry/dev_massaction_paid_custom_invoice
NEW : mass action paid customer invoice
2021-08-17 19:10:49 +02:00
Laurent Destailleur
794db94178
Update list.php 2021-08-17 19:08:55 +02:00
Laurent Destailleur
22e595e572
Merge pull request #18420 from henrynopo/patch-1
Customer Invoice - Multicurrency Remaining to Pay
2021-08-17 15:26:36 +02:00
Laurent Destailleur
92d6ad9597 Removed old simple POS module ('cashdesk' module) 2021-08-17 04:57:53 +02:00
stickler-ci
b92fe38bc0 Fixing style errors. 2021-08-16 01:47:49 +00:00
henrynopo
9a65cbeab7
Customer Invoice - Multicurrency Remaining to Pay
Added the remainder to be paid in multicurrency mode.
2021-08-16 09:39:09 +08:00
Laurent Destailleur
896cdf4845
Update list.php 2021-08-11 22:24:07 +02:00
Laurent Destailleur
f9f1440226
Merge branch 'develop' into salesrepresentativeinorderandinvoicelist 2021-08-11 22:22:26 +02:00
Marc de Lima Lucio
08f21e3fc4 FIX: invoice validation: when checking if any vat rate has a negative amount, prevent false positives with -1E-14 amounts 2021-08-10 10:23:56 +02:00
Laurent Destailleur
0058e32207 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-02 19:03:38 +02:00
Laurent Destailleur
eced1c824a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/core/class/html.form.class.php
	htdocs/projet/tasks/time.php
2021-08-02 18:47:09 +02:00
Laurent Destailleur
d822421e10 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/accountancy/tpl/export_journal.tpl.php
	htdocs/projet/tasks/time.php
2021-08-02 18:31:26 +02:00
Laurent Destailleur
8077fae42e Code comment 2021-08-02 17:56:58 +02:00
Alexandre SPANGARO
262dd1600b FIX: Invoice - Missing button to reopen an abandoned situation invoice 2021-07-29 06:23:12 +02:00
Laurent Destailleur
638a66fbb9 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/main.lang
2021-07-14 14:49:06 +02:00
Laurent Destailleur
b552c6b4fe Fix status color 2021-07-14 14:32:05 +02:00
Laurent Destailleur
d91051488c
Merge pull request #18125 from fr69400/develop
NEW add hookmanager on note pages
2021-07-11 20:25:16 +02:00
stickler-ci
a8752bf097 Fixing style errors. 2021-07-11 07:46:34 +00:00
fr69400
c7ad0a59c9
Update note.php 2021-07-11 09:45:38 +02:00
stickler-ci
4272f93aa4 Fixing style errors. 2021-07-09 16:41:41 +00:00
fr69400
e45d5c1d0d NEW add hookmanager on note pages 2021-07-09 18:36:21 +02:00
Laurent Destailleur
7013f01a41 Fix look and feel v14 2021-07-04 21:14:46 +02:00
Laurent Destailleur
f6efe51032 Fix trouble with product id = -1 2021-07-04 21:02:02 +02:00
Laurent Destailleur
6ae1d192e4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/compta/facture/card.php
2021-07-02 16:14:12 +02:00
Laurent Destailleur
01cf608ef4 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-07-02 16:06:48 +02:00
Laurent Destailleur
a7f850dafb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-07-02 16:05:51 +02:00
Laurent Destailleur
7c2121c439 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/tpl/objectline_edit.tpl.php
2021-06-30 15:06:16 +02:00
Laurent Destailleur
51456741d9 FIX Can't edit replacement invoice
FIX Status of invoice when making a replacement invoice
2021-06-30 12:43:44 +02:00