Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-20 16:31:51 +01:00
Code Issues Packages Projects Releases Wiki Activity
126,677 Commits 36 Branches 190 Tags
fca403b49bbee1ac7af7f99d34706d44eb8d3afc
Commit Graph

126677 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Laurent Destailleur
5336a4788f Complete trans 2023-11-01 23:46:56 +01:00
Laurent Destailleur
d0d937f2e7 Tool to calculate nb of commits and developers for each version branch 2023-11-01 20:08:01 +01:00
Laurent Destailleur
2e863d7bf2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-01 16:34:37 +01:00
Laurent Destailleur
a1f4c0c635 NEW Enhance github_commits_perversion to get more stats on git commits 2023-11-01 16:34:20 +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
atm-jonathan
f36e8b935c Fix list agenda (#26394) 
* int $nbtotalrecord list agenda

* nbtotal of record should  be number not a string

* ternaire isnumeric $nbtotalofrecords
 2023-11-01 15:58:45 +01:00
ptibogxiv
b3a08fc0c7 Fix v19 look on shipment.php (#26427) 2023-11-01 15:56:51 +01:00
Laurent Destailleur
f9c29489d6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-01 15:52:32 +01:00
Laurent Destailleur
0708f0c53f Add fields to allow batch management into POS module 2023-11-01 15:52:02 +01:00
Laurent Destailleur
0562f89347 Can find a stock id from a couple batch-warehouse 2023-11-01 15:35:29 +01:00
ptibogxiv
2adb0b5213 NEW shipment can include service (for information and invoicing) (#26407) 
* NEW shipment can include service (for information and invoicing)

add an optionnal option for include service on shipment because some business need invoicing only from shipment so actually dont get services on invoice autmatically.

this is a first PR for validation of this secret option before upload other PR

* Update shipment.php

* Update card.php
 2023-11-01 15:02:40 +01:00