Commit Graph

9230 Commits

Author SHA1 Message Date
Laurent Destailleur
2dbf41e058 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-10-17 01:51:37 +02:00
Regis Houssin
f85108b8ac FIX check if category module is enabled (#35770) 2025-10-15 18:59:33 +02:00
Laurent Destailleur
025aefb69c Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-10-14 21:18:09 +02:00
Laurent Destailleur
d0634c5b93 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-10-14 21:12:47 +02:00
Alexandre SPANGARO
59009d67a5 FIX Accountancy - Printing the subsidiary ledger returns the general ledger (#35719)
* Update listbyaccount to transfer type="sub" information

* Detail by subsidiary account

* Fix typo
2025-10-14 19:53:08 +02:00
Alexandre SPANGARO
b77850521b FIX Accountancy - Print subledger balance return general balance (#35712)
* FIX Accountancy - Print subledger balance return general balance

* Update pdf_balance.modules.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-10-11 15:31:04 +02:00
VIAL-GOUTEYRON Quentin
de6a6ef039 Fix: [Import] Prevents $keyfield variable overwrite when processing hidden fields (#35693)
* FIX: prevent duplicate key fields and improve field handling in import_xlsx and import_csv modules

* FIX: remove leftover debug statement in import_xlsx module
2025-10-09 18:22:32 +02:00
ldestailleur
8c77b76400 No risk on compatiblity 2025-10-09 13:22:45 +02:00
ldestailleur
d17f13f149 FIX detection of setup not done with
MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING
2025-10-09 13:13:51 +02:00
Frédéric FRANCE
3b3c5a53d3 fix example captcha (#35620)
* fix example captcha

* Update modCaptchaStandard.class.php
2025-10-03 16:06:54 +02:00
ldestailleur
a9c0a59d59 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-10-03 13:00:22 +02:00
ldestailleur
1eeee0ab80 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-10-03 12:58:31 +02:00
Christophe Battarel
4f75fb7f8a FIX : bad name for target import table (#35615)
Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2025-10-03 11:38:46 +02:00
ThomasNgr-OpenDSI
de49d24d1b QUAL Remove duplicate code block (#35591)
* QUAL Remove duplicate code block

* fix PHPStan

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-10-03 10:04:27 +02:00
Laurent Destailleur
d26fb57e52 Fix CI 2025-10-02 16:28:29 +02:00
ldestailleur
8b58b215b4 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-09-27 15:48:40 +02:00
ldestailleur
fe28e36638 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-09-27 15:42:44 +02:00
Joachim Kueter
16c9d4005f Fix #35208 - Multicurrency fix for discount in invoice (Sponge) (#35506)
* Multicurrency fix for discount

* removed empty line
2025-09-27 12:10:15 +02:00
Dylan Bourdere
0ba4c17e66 Fix some undefined array key warning (#35471)
* fix some undefined array key warning

* fix some undefined array key warning
2025-09-24 18:39:38 +02:00
Dylan Bourdere
59ec1a2811 fix ui on multi line subtotal & fix text contrast (#35449)
* fix ui on multi line subtotal & fix text contrast

* extract subtotal pdf logic

* phpcs

* lint

* lint

* refactor

* phpcs

* phpcs

* phpcs

* Update pdf.lib.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-23 23:24:37 +02:00
ldestailleur
ee39ef632a FIX Generation of member cards (file not found and substitution broken) 2025-09-17 12:38:20 +02:00
ldestailleur
ee38ff0aaf Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-09-02 12:02:40 +02:00
ldestailleur
6727d0c361 FIX we saw links to object on private not just after a save. 2025-09-02 03:51:08 +02:00
Benjamin Chanudet
53aae1a4b8 FIX #35147 SQL Error on Beluga Export when ExpenseReport is enabled (#35149)
* Fix SQL error when ExpenseReport module is enabled (#35147)

* fix date filtering that prevents data to be displayed

* add date and amount for expense reports

* Update pdf_beluga.modules.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-01 20:33:12 +02:00
ldestailleur
c1fb41e5d9 FIX setup of default doc template for supplier proposal when none. 2025-09-01 11:10:36 +02:00
ldestailleur
d8c2e61e43 Fix error on captcha when function GD does not exists 2025-08-27 02:50:11 +02:00
Laurent Destailleur
0af854e355 Log 2025-08-26 05:46:26 +02:00
ldestailleur
924204ac29 LEFT JOIN syntax 2025-08-20 17:09:43 +02:00
ldestailleur
f33cc75ead Fix CI 2025-08-09 13:52:31 +02:00
ldestailleur
9cbeff83a4 FIX Test on mandatory product or thirdparty barcode 2025-08-09 11:46:41 +02:00
ldestailleur
944c47c876 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-08-07 19:31:18 +02:00
ldestailleur
ec669eef2a Duplicate lines 2025-08-07 16:18:45 +02:00
ldestailleur
990462fb9a Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-08-07 16:18:25 +02:00
Joachim Kueter
da56360404 Fix for issue #34891 - wrong Skonto/Escompte calculation (#34892)
When foreign currency is involved, the wrong total was used, mixing two currencies when calculating the sum.
2025-08-07 12:25:59 +02:00
ldestailleur
687f870c19 Debug v22 2025-07-30 14:43:24 +02:00
ldestailleur
b07614414c Fix CI 2025-07-28 18:51:29 +02:00
ldestailleur
6d0277f2b8 Fix CI 2025-07-28 18:38:14 +02:00
ldestailleur
e7eff817e9 Fix bad position of closing brackets. 2025-07-28 17:19:23 +02:00
ldestailleur
7c6a307a01 Fix CI 2025-07-28 17:18:38 +02:00
ldestailleur
030b3d3df5 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-07-27 13:58:13 +02:00
ldestailleur
6c960ffbaf Fix translation 2025-07-27 13:54:02 +02:00
ldestailleur
1c37761545 Debug v22 2025-07-26 13:13:31 +02:00
ldestailleur
935f947c18 Debug v22 2025-07-26 12:43:55 +02:00
ldestailleur
a7e5510245 Debug v22 2025-07-26 12:17:01 +02:00
ldestailleur
e8de1b62d1 Debug v22 2025-07-26 11:38:27 +02:00
ldestailleur
abbb25d6fe Debug v22 - Fix amount before discount in multicurrency mode 2025-07-25 16:47:18 +02:00
ldestailleur
a27ff8b053 Debug v22 2025-07-25 15:41:57 +02:00
ldestailleur
5248d0bba5 Fix default value of currency update 2025-07-25 03:22:53 +02:00
sonikf
92ce005080 fix translation for non latin languages (#34744)
* fix translation for non latin languages

* fix translation for non latin languages

* fix translation for non latin languages
2025-07-15 11:39:42 +02:00
Lucas Marcouiller
659f758d61 Fix table webhook history (#34737)
* Fix name of option for supplier

* Update functions.lib.php (#34718)

Add __MYCOMPANY_URL__ & __MYCOMPANY_PHONEMOBILE__ in getCommonSubstitutionArray

* Fix bad value  fourn paiement process (#34722)

* Fix bad value  fourn paiement process

* best fix

* fix takepos console error (#34709)

* fix console error

* exit early

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* Fix CI

* Clean code

* Fix table wenhook history

---------

Co-authored-by: ldestailleur <eldy@destailleur.fr>
Co-authored-by: Deefaze <6393617+Deefaze@users.noreply.github.com>
Co-authored-by: Francis Appels <francis.appels@yahoo.com>
2025-07-15 06:13:10 +02:00