Commit Graph

838 Commits

Author SHA1 Message Date
Laurent Destailleur
7ca9f0022a Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-11-17 10:31:11 +01:00
Laurent Destailleur
73a07ed669 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-04-27 04:49:08 +02:00
Laurent Destailleur
c29a27d79d Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-04-27 04:48:38 +02:00
Laurent Destailleur
90a89d3468 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2024-04-27 04:46:34 +02:00
Laurent Destailleur
56e1412627 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-04-27 04:28:25 +02:00
thomas-Ngr
5129454883
Backport : Fix VAT computation. Fix #28620 (#29493) 2024-04-27 03:45:13 +02:00
Laurent Destailleur
0693fa9149 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-04-24 21:08:18 +02:00
Florian Mortgat
0a2699f6cd
FIX php8: Fatal when empty $tmpvat is an empty string (no silent conversion to '0' when used in arithmetic operations) (#29451) 2024-04-24 15:09:00 +02:00
Laurent Destailleur
a0b26ae7cd FIX Amount of localtaxes in foreign currency was wrong on screen and PDF 2024-03-13 22:04:44 +01:00
Laurent Destailleur
2f340a1a77 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
Conflicts:
	htdocs/accountancy/journal/expensereportsjournal.php
	htdocs/comm/propal/card.php
2023-11-12 23:06:31 +01:00
atm-lena
0946220e9b
Check price base type (#26503)
Co-authored-by: atm-lena <lena.papazian@atm-consulting.fr>
2023-11-09 15:41:39 +01:00
Laurent Destailleur
127de7e7d8 FIX On object validation, ecm index are not updated for uploaded files 2023-11-01 16:17:54 +01:00
Laurent Destailleur
9144293f0b Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-16 06:02:17 +02:00
Laurent Destailleur
48adfe9bcd Fix regression 2023-10-16 05:59:34 +02:00
Laurent Destailleur
0360d61f9c Code comment for develop 2023-10-16 05:51:47 +02:00
Laurent Destailleur
abe3f00b11 Fix regression. Restore old behaviour even if some case are not tested. 2023-10-16 05:15:39 +02:00
Noé Cendrier
a92458ebbc
FIX check tva_tx before comparing price_min_ttc (#25220)
* FIX check tva_tx before comparing price_min_ttc

* better price_ttc comparison for propal, commande, facture lines

* price_ht must be transformed into number before using it for calculating
2023-10-16 04:07:10 +02:00
Laurent Destailleur
8f002a2310 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-09-19 18:14:27 +02:00
Laurent Destailleur
336927ad70 Fix link to create puchase order from sale order 2023-09-19 18:10:47 +02:00
Laurent Destailleur
101ddf2a75 FIX link to create purchase order from sale order 2023-09-19 18:05:57 +02:00
Laurent Destailleur
39dd702145 Fix warning in option WORKFLOW_CAN_CREATE_PURCHASE_ORDER_FROM_SALE_ORDER 2023-09-19 17:59:46 +02:00
Regis Houssin
b6e84b1c74 FIX use urlencode for origin and originid 2023-09-06 10:02:12 +02:00
Regis Houssin
927cc91da4 FIX avoid wrong backtopage url 2023-09-06 06:44:10 +02:00
Laurent Destailleur
888e8d7588 FIX bad balance of TR tag in multicurrency price view 2023-08-23 21:56:02 +02:00
Laurent Destailleur
bdd1d89101 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-08-08 22:08:25 +02:00
Laurent Destailleur
b0e4558e3f Fix #25586 2023-08-08 21:53:52 +02:00
Laurent Destailleur
bef9146bb1 Fix warnings 2023-08-05 12:50:09 +02:00
Laurent Destailleur
86864b4d53 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-07-06 22:22:26 +02:00
Laurent Destailleur
2a9f4da015 FIX #25290 FIX #25287 FIX #25288 2023-07-06 22:02:23 +02:00
Laurent Destailleur
f0ed7b436b Fix for #25290 2023-07-06 20:03:22 +02:00
Laurent Destailleur
8e7d9578ca Typo 2023-07-03 21:57:43 +02:00
Laurent Destailleur
325827531a Close table 2023-07-03 21:14:04 +02:00
Sylvain Legrand
c33d86e1df Extend the IMPORT_LINKED_OBJECT_LINES option to invoices 2023-07-03 07:00:36 +03:00
Laurent Destailleur
d703e01314
Merge pull request #24963 from FliyFly/editcommandeattribute
fixing the total ttc in the multicurrency section
2023-06-07 18:50:37 +02:00
FLIO
819e44fb7c fixing the total ttc in the multicurrency section 2023-06-06 00:12:33 +02:00
Laurent Destailleur
ebdd397d7c
Merge pull request #24779 from FliyFly/editcommandeattribute
New attributes on commande card
2023-05-16 19:42:24 +02:00
FLIO
e93b087012 New attributes on commande card 2023-05-15 23:54:44 +02:00
Laurent Destailleur
c6cb29381e Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-05-11 19:09:19 +02:00
Laurent Destailleur
9674d234ba FIX On company change, we must reuse the company parameters 2023-05-10 22:05:43 +02:00
stickler-ci
13348ede59 Fixing style errors. 2023-05-05 16:22:49 +00:00
NextGestion
e8acd50626 Object line : Prevent adding Free line when the option "MAIN_DISABLE_FREE_LINES" is activated (Proposal, invoice, order, contract) 2023-05-05 17:15:49 +01:00
Francis Appels
cec58e5631 Add missing error message on modify order error. 2023-04-28 10:48:50 +02:00
Laurent Destailleur
f44c97d3c6 Code is using the Universal Filter Syntax 2023-04-27 22:12:23 +02:00
Laurent Destailleur
3065b9ca6a Clean code 2023-04-27 21:15:27 +02:00
Erik van Berkum
ec9fb80c02 fix: typo in constant MAIN_AUTOFILL_DATE_ORDER 2023-04-23 14:55:10 +09:00
Erik van Berkum
20b51db72c Revert "fix: typo in constant MAIN_AUTOFILL_DATE_ORDER"
This reverts commit 9a27d025a7.
2023-04-23 14:54:12 +09:00
Erik van Berkum
dd60d20019 Merge remote-tracking branch 'origin/develop' into develop 2023-04-23 14:52:32 +09:00
Erik van Berkum
9a27d025a7 fix: typo in constant MAIN_AUTOFILL_DATE_ORDER 2023-04-23 14:47:54 +09:00
Laurent Destailleur
9a420b8f41 Clean code 2023-04-18 16:15:27 +02:00
Laurent Destailleur
8e51bf2c55 Debug 18 2023-04-18 14:04:27 +02:00