Commit graph

126990 commits

Author SHA1 Message Date
Laurent Destailleur
98f92b1bbc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-06 00:53:26 +01:00
Laurent Destailleur
fe0eb11d16 Fix missing migration 2023-11-06 00:52:21 +01:00
andreubisquerra
0214df1fbd
fk_entrepot fix (#26465) 2023-11-06 00:36:49 +01:00
Laurent Destailleur
2198335e37 css 2023-11-06 00:35:32 +01:00
Laurent Destailleur
e64d1f6e46 Fix phpcs 2023-11-06 00:16:26 +01:00
Laurent Destailleur
b65d5c8740 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-05 19:52:54 +01:00
Laurent Destailleur
d0ffa9fb91 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-11-05 19:50:41 +01:00
Laurent Destailleur
76b48d43c3 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-11-05 19:49:32 +01:00
Laurent Destailleur
2f24ccaa19 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-11-05 19:48:05 +01:00
Laurent Destailleur
cfe1b17a76 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-11-05 19:47:33 +01:00
Laurent Destailleur
1a2e49cebe Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2023-11-05 19:45:42 +01:00
Laurent Destailleur
51574768f4 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2023-11-05 19:40:07 +01:00
Laurent Destailleur
7b464fa8f0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-11-05 19:39:35 +01:00
Laurent Destailleur
2462daf1ed Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2023-11-05 19:36:01 +01:00
Laurent Destailleur
9c7381601f Backport or better module compatibility 2023-11-05 19:35:34 +01:00
Laurent Destailleur
35a25599e5 FIX Backport memory fix for fatal error when +100000 products 2023-11-05 19:28:04 +01:00
Laurent Destailleur
67f1d4345a Doc 2023-11-05 18:59:47 +01:00
Laurent Destailleur
e47d732145 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-11-05 18:29:57 +01:00
Laurent Destailleur
f9d520b29d Fix warning 2023-11-05 18:27:53 +01:00
Laurent Destailleur
8622ce6601 Debug v19 2023-11-04 18:11:26 +01:00
Laurent Destailleur
78f443e87b Debug v19 2023-11-04 17:05:59 +01:00
Laurent Destailleur
2a2dec2f88 Debug v19 2023-11-04 16:02:24 +01:00
Laurent Destailleur
c0ab3e0dff Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-04 13:10:00 +01:00
Laurent Destailleur
93746a805a Close #321 2023-11-04 13:02:18 +01:00
Florian Mortgat
73524c2f81
[modulebuilder] FIX handling of the $filter parameter in fetchAll() method (#25931)
* FIX handling of the $filter parameter for fetchAll: the previous version can result in invalid SQL

* Remove #[AllowDynamicProperties] attribute from Conf class (cf. PR #25931)

* Ensure sql-building strings are detectably sanitized to avoid PR rejection
2023-11-03 23:01:57 +01:00
thibdrev
51341524a2
fix missing 2 translation keys used in commande/list.php (#26458)
* modify the translation keys in commande/list.php

* create the error translation key in en_US/errors.lang

* create the error translation key in fr_FR/errors.lang
2023-11-03 22:51:51 +01:00
Christophe Battarel
8f54413a69
add hook tabContentCreateSupplierInvoice (#26430)
Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-11-03 20:58:49 +01:00
Christophe Battarel
12ae62b2af
NEW : add hook tabContentViewSupplierInvoice (#26431)
* add hook tabContentViewSupplierInvoice

* wrong hook name

---------

Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-11-03 20:58:33 +01:00
Christophe Battarel
975b49b269
add hook tabContentViewSupplierProposal (#26432)
Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-11-03 20:58:24 +01:00
Christophe Battarel
bd2fe307cd
add hook tabContentCreateSupplierProposal (#26433)
Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-11-03 20:58:15 +01:00
Christophe Battarel
5c3069e51a
add hook tabContentCreateProduct (#26434)
Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-11-03 20:58:04 +01:00
Christophe Battarel
20b99b6a98
add hook tabContentViewProduct (#26435)
Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-11-03 19:59:23 +01:00
Christophe Battarel
fccc2c1824
add hook tabContentEditProduct (#26436)
Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-11-03 19:58:42 +01:00
daraelmin
8605e6b17b
FIX wrong color for pending status (#26443) 2023-11-03 17:05:51 +01:00
thibdrev
0c9610641c
Fix Attributes values shall be ordered by position when retrieved (#26446)
* Fix Attributes values shall be ordered by position when retrieved from the table

The order of attribute values can be modified manually. This is recorded via the "position" key in the table "llx_product_attribute_value".
However, this order is not taken into account when the attribute values are retrieved via the function fetchAllByProductAttribute() from ProductAttributeValue.class.php

* correction d'une coquille
2023-11-03 16:32:31 +01:00
thibdrev
1eb0e66736
fix Rename is not translated because its translation isn't declared (#26447)
`htdocs/compta/bank/releve.php` calls for `$langs->trans("Rename") at line 374 , but this translation doesn't exists: `grep -Rl "Rename=" ./htdocs/langs/`

Also, this translation seems to be called only by `releve.php` (`grep -Rl '$langs->trans("Rename")'`)
2023-11-03 16:31:33 +01:00
thibdrev
3b30a94e43
fix error message ErrorThisBankReceiptIsAlreadyUsed is not translated (#26448)
* fix missing translation for ErrorThisBankReceiptIsAlreadyUsed

* add translation key to fr_FR

* modify error message key in releve.php
2023-11-03 16:30:29 +01:00
Lenin Rivas
1e6788aec6
NEW Manage rate indirect. (#26449)
* Indirect exchange rate

* Indirect exchange rate

* Indirect exchange rate

* Indirect exchange rate
2023-11-03 16:29:40 +01:00
HENRY Florian
a3437c7207
fix: display details quantity in Kit in PDF #26359 (#26454)
* add detail qty in kit displayed in PDF line

* fix: #26359
2023-11-03 16:27:02 +01:00
atm-jonathan
9d03444298
Fix position with this job (#26455)
* FIX list position in job

* add trad position
2023-11-03 16:21:58 +01:00
Laurent Destailleur
99f50e5fa1 Fix comment 2023-11-02 14:12:57 +01:00
Laurent Destailleur
440baec6e7 Debug v19 2023-11-02 02:04:09 +01:00
Laurent Destailleur
534f545ace Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-02 02:00:17 +01:00
Laurent Destailleur
b92d685940 Debug v19 2023-11-02 01:59:51 +01:00
daraelmin
301064afb6 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-11-02 01:36:00 +01:00
daraelmin
2ce3ececfb Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-11-02 01:35:38 +01:00
daraelmin
e2e9a330fa FIX #24367 - membership duration is the default duration adhtype (#26428)
* FIX #24367 - membership duration is the default duration adhtype

* avoid error for old database

* avoid error for old database

* Update paymentok.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-02 01:34:04 +01:00
daraelmin
63ccf17402
FIX #24367 - membership duration is the default duration adhtype (#26428)
* FIX #24367 - membership duration is the default duration adhtype

* avoid error for old database

* avoid error for old database

* Update paymentok.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-02 01:33:46 +01:00
Laurent Destailleur
4a83014c66 Prepare 18.0.3 2023-11-01 23:51:03 +01:00
Laurent Destailleur
8fde7bafdb Prepare 18.0.3 2023-11-01 23:48:09 +01:00