Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-07 01:23:00 +01:00
Code Issues Packages Projects Releases Wiki Activity
123,806 Commits 37 Branches 191 Tags
a69fd2bc0937a313c1d00a705b8da7e4ec3b6de3
Commit Graph

123806 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
thibdrev
a69fd2bc09 Fix PR #26501 (#26515) 2023-11-09 14:52:09 +01:00
HENRY Florian
5a23bb27b0 fix: bad sql on delete discount (#26517) 2023-11-09 14:51:42 +01:00
sonikf
e8b45a1ea9 Fix #26050 #26225 and fiscal year report (backport v 18) (#26474) 2023-11-08 17:27:52 +01:00
Pichi1966
0ec3c5754d FIX Warehouse Global Amounts not displayed (#26478) 
This fix is to repaired the Global Amounts that are not displayed anymore strating from v18.x
 2023-11-07 18:13:14 +01:00
Laurent Destailleur
613aa3b292 Better link 2023-11-07 02:40:30 +01:00
Laurent Destailleur
e94dceb0ef Fix css 18.0.3 2023-11-06 15:25:52 +01:00
Laurent Destailleur
cf3f741d4b Close #26440 2023-11-06 11:02:24 +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
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
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
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
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
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
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
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
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
Francis Appels
d33b273f39 Fix module builder add/edit object foreignkey (#26425) 2023-11-01 14:18:57 +01:00
Laurent Destailleur
70640428dd Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-31 13:02:23 +01:00
atm-adrien
eeca89c75b FIX : HTML in ODT templates (#26181) 
* FIX : HTML does not work on ODT template

* FIX : add replace

* FIX : Backport V18

* FIX : Modif regexp

* FIX : Add encode parameter

* FIX : PR returns
 2023-10-31 12:20:43 +01:00
Florent Poinsaut
caf691d706 FIX #25793 V18.0.1 : Cannot add time spent (#26405) 2023-10-31 12:00:55 +01:00
Laurent Destailleur
0b9795f34c FIX upload of files src_object_type 2023-10-31 11:52:31 +01:00
Laurent Destailleur
85d36ddc58 FIX src_object_id and ttype not filed when uploading a file with API. 2023-10-31 11:52:17 +01:00
Alexandre SPANGARO
ad1c363aa6 FIX Supplier card - VAT Reserve Charge - Undefined function isInEEC() (#26379) 2023-10-27 12:53:03 +02:00
atm-lena
9bfeb5e424 Add Hook "printFieldListFrom" in supplier order list (#26376) 
Co-authored-by: atm-lena <lena.papazian@atm-consulting.fr>
 2023-10-26 17:13:36 +02:00
Lucas Marcouiller
8fa8666735 Fix mysql error in project time (#26375) 
Co-authored-by: Hystepik <lucas.marcouiller@gmail.com>
 2023-10-26 15:47:34 +02:00
Laurent Destailleur
6822afac31 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-26 13:48:33 +02:00
Laurent Destailleur
e080261e25 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-10-26 13:46:17 +02:00
Laurent Destailleur
54ead1cc84 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-10-26 13:45:53 +02:00
Laurent Destailleur
1369867db9 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-10-26 13:45:45 +02:00
Laurent Destailleur
96bac68c3e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-10-26 13:45:11 +02:00
Laurent Destailleur
28ed710324 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-26 13:44:17 +02:00
Laurent Destailleur
ceb7827749 Close #26311 2023-10-26 13:43:58 +02:00
HENRY Florian
3fa18325c6 fix: On Object refrent tab on item, supplier invoice status is not correct (#26348) 2023-10-26 13:31:48 +02:00
daraelmin
2ad04a4446 FIX public subscription page should not display acceptation for public register when it is not enabled (#26354) 
* FIX in public subscription page  author to publish in the public register appear even if not enabled

i

* Fix typo
 2023-10-26 13:15:15 +02:00
Thibault Fiacre
e79f7706ad FIX_add_customer_ref_on_linked_shipment (#26349) 
Adding missing customer reference for shipment on linked object block
 2023-10-26 12:49:55 +02:00
daraelmin
a815c99d53 FIX suggested end for membership can be before subscription start (#26351) 
* Fix wrong debug log

* Fix suggested end for membership can be in the past

MEMBER_SUBSCRIPTION_SUGGEST_END_OF_YEAR and MEMBER_SUBSCRIPTION_SUGGEST_END_OF_MONTH should be based on the subscription start date, not on the creation date

* Fix typo
 2023-10-26 12:48:40 +02:00