Commit Graph

146190 Commits

Author SHA1 Message Date
Jyhere
91dd2e87ee NEW: API GET endpoint for thirdparties types listing (c_typent) (#34751)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-07-18 00:56:10 +02:00
F-Node-Karlsruhe
e59f2447e7 fix purchase order refernece key in pdf generation (#34757)
* fix refernece key in pdf generation

Signed-off-by: F-Node-Karlsruhe <christian.fries@eecc.de>

* Update pdf.lib.php

---------

Signed-off-by: F-Node-Karlsruhe <christian.fries@eecc.de>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-07-17 22:20:45 +02:00
ldestailleur
de8c7f3c6e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-07-17 21:48:55 +02:00
ldestailleur
487633c117 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-07-17 21:48:46 +02:00
ldestailleur
49a834b08c Fix warning 2025-07-17 21:48:31 +02:00
Charlène Benke
2bd22cc7c6 NEW : add api_paiements.class.php (#34756)
* NEW : add api_paiements.class.php

* Update functions2.lib.php

add payement api folder

* Update api_paiements.class.php

* Update api_paiements.class.php
2025-07-17 21:34:26 +02:00
ldestailleur
a9c48a3e4d Debug v22 2025-07-17 21:04:59 +02:00
ldestailleur
2b0deccae5 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-07-17 19:31:16 +02:00
ldestailleur
1e5733d124 Update makepack 2025-07-17 19:30:58 +02:00
ldestailleur
7d26242fdd Fix link 2025-07-17 19:30:58 +02:00
ldestailleur
7c8598cc2d Sync transifex 2025-07-17 19:30:58 +02:00
ldestailleur
fd10fea1fa Debug v22 - Fix bad trans and setup for Cash acocunting. 2025-07-17 19:30:58 +02:00
ldestailleur
176c7d178d Debug v22 2025-07-17 19:30:58 +02:00
ldestailleur
f0f5006ce2 Debug v22 2025-07-17 19:30:58 +02:00
ldestailleur
270caf0dcb Debug v22 2025-07-17 19:30:58 +02:00
ldestailleur
423b302a2b Debug v22 2025-07-17 19:30:58 +02:00
ldestailleur
54ba7c2672 FIX mass action "Merge PDF" with high number of objects. 2025-07-17 19:30:58 +02:00
ldestailleur
ae18318072 Fix warning 2025-07-17 19:30:58 +02:00
ldestailleur
8738c4e6f7 Trans 2025-07-17 19:30:58 +02:00
ldestailleur
590f04ce04 Debug v22 2025-07-17 19:30:58 +02:00
ldestailleur
a533b23a1d Clean code 2025-07-17 19:30:58 +02:00
ldestailleur
95744663cb Trans 2025-07-17 19:30:58 +02:00
ldestailleur
c0a0acf129 FIX #34746 2025-07-17 19:30:58 +02:00
ldestailleur
a145b3b44d Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-07-17 19:30:58 +02:00
ldestailleur
4b7ea3d0de Trans 2025-07-17 19:30:58 +02:00
ldestailleur
edf45ef25d Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-07-17 19:30:58 +02:00
ldestailleur
78689fd180 Better fix for #34702 2025-07-17 19:30:58 +02:00
ldestailleur
b410bf0731 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-07-17 19:30:58 +02:00
HENRY Florian
5d88aea4b9 fix: advanced target emailling missing case (#34715)
* fix: advanced target emailling missing case

* fix: travis for simple quote SQL

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-07-17 19:30:58 +02:00
ldestailleur
1515adf313 Revert "FIX when using THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT and direct link New prospect, New Customer or New Supplier (#34702)"
This reverts commit 870979362e.
2025-07-17 19:30:58 +02:00
ldestailleur
5396578a75 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-07-17 19:30:58 +02:00
Alain Rihs
db3a5cfbef FIX when using THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT and direct link New prospect, New Customer or New Supplier (#34702)
* Update card.php

#FIX when using THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT and direct link New prospect, New Customer or New Supplier

* 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>

* Update card.php

* Fix CI

* Clean code

* Comment

* Update card.php

"if (getDolGlobalInt('THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT')) {":
this part of code is wrong when we click on "New customer", Customer AND Prospect are selected. New test on line 1452 cover this case. So when type is C, variable object->client should be 1.
And I corrected the new code with parenthesis.

* Update card.php

distraction error in the new code

---------

Co-authored-by: ldestailleur <eldy@destailleur.fr>
Co-authored-by: Deefaze <6393617+Deefaze@users.noreply.github.com>
Co-authored-by: Lucas Marcouiller <45882981+Hystepik@users.noreply.github.com>
Co-authored-by: Francis Appels <francis.appels@yahoo.com>
2025-07-17 19:30:58 +02:00
ldestailleur
27a97d68a2 Doc comment 2025-07-17 19:30:58 +02:00
Regis Houssin
d280c807b6 FIX wrong multicompany filter (#34714)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-07-17 19:30:58 +02:00
ldestailleur
61dcd176e0 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-07-17 19:30:58 +02:00
ldestailleur
a4aa00c498 Sec: Remove all functions that accept callable params - CVE-2024-40137 2025-07-17 19:30:58 +02:00
ldestailleur
080585aca1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-07-17 19:26:34 +02:00
ldestailleur
fd36861c17 Fix doc 2025-07-17 19:26:24 +02:00
ldestailleur
66c8f356e9 Sync transifex 2025-07-17 19:26:24 +02:00
ldestailleur
79acce8711 Update makepack 2025-07-17 19:26:24 +02:00
ldestailleur
d365595685 Fix link 2025-07-17 19:26:24 +02:00
ldestailleur
42c0e26b3b Fix link 2025-07-17 19:26:24 +02:00
ldestailleur
beea58cae6 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-07-17 19:26:24 +02:00
ldestailleur
c7edba6b80 Sync transifex 2025-07-17 19:26:24 +02:00
ldestailleur
6bd29ed4d6 Prepare dev for v23 2025-07-17 19:26:24 +02:00
ldestailleur
66ceb9911d Debug v22 - Fix bad trans and setup for Cash acocunting. 2025-07-17 19:26:24 +02:00
ldestailleur
03bd45a505 Debug 2025-07-17 19:26:24 +02:00
ldestailleur
5940007f00 Debug v22 2025-07-17 19:26:24 +02:00
ldestailleur
d9c56d586b Simplify regex 2025-07-17 19:26:24 +02:00
ldestailleur
144846eef5 Debug v22 2025-07-17 19:26:24 +02:00