ldestailleur
beea58cae6
Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop
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
ldestailleur
65fabdaf38
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2025-07-17 19:26:24 +02:00
ldestailleur
e8b2664921
Debug v22
2025-07-17 19:26:24 +02:00
ldestailleur
5f4ff4d472
Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop
2025-07-17 19:26:24 +02:00
Alexandre SPANGARO
478ac4a1b4
UX Repair install script ( #34663 )
...
* UX Repair install script
* Presentation
* Fix language
* FIX CI
2025-07-17 19:26:24 +02:00
ldestailleur
a0dc36b613
Debug v22
2025-07-17 19:26:24 +02:00
ldestailleur
1f6a9d54e8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2025-07-17 19:26:24 +02:00
ldestailleur
f1cef8ec80
FIX mass action "Merge PDF" with high number of objects.
2025-07-17 19:26:24 +02:00
ldestailleur
d8a07f6fd6
Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop
2025-07-17 19:26:24 +02:00
ldestailleur
24fcc2803f
Fix warning
2025-07-17 19:26:24 +02:00
ldestailleur
43b05c56b6
Debug v22
2025-07-17 19:26:24 +02:00
ldestailleur
462090421f
Trans
2025-07-17 19:26:24 +02:00
ldestailleur
890f5e1c7b
Clean code
2025-07-17 19:26:24 +02:00
ldestailleur
acb3e1d397
Trans
2025-07-17 19:26:24 +02:00
ldestailleur
f0a0aeb3a4
FIX #34746 - More complete fix for CVE-2024-40137
2025-07-17 19:26:24 +02:00
Noé Cendrier
241a919da1
NEW: New hook mergePdf ( #34707 )
...
* ADD: New hook mergePdf (#32 )
* Update actions_massactions.inc.php
* Rename hook
---------
Co-authored-by: altairis-melina <91946767+altairis-melina@users.noreply.github.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-07-15 18:48:01 +02:00
ldestailleur
1832675c96
Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop
2025-07-15 18:44:45 +02:00
ldestailleur
52bf642601
Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0
2025-07-15 18:44:05 +02:00
ldestailleur
9ed1527e0c
Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0
2025-07-15 18:36:49 +02:00
ldestailleur
bb09797599
Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0
2025-07-15 18:36:39 +02:00
ldestailleur
bc82fba711
Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0
2025-07-15 18:31:15 +02:00
ldestailleur
2d48131a91
Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0
2025-07-15 18:15:55 +02:00
ldestailleur
df60ce695c
Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
2025-07-15 18:09:34 +02:00
ldestailleur
8a79e957c6
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2025-07-15 17:20:13 +02:00
ldestailleur
1dd83c65aa
Doc
2025-07-15 16:15:59 +02:00
ldestailleur
18dd243182
Trans
2025-07-15 16:05:46 +02:00
ldestailleur
0f53cf3cf8
Better fix for #34702
2025-07-15 16:00:53 +02:00
ldestailleur
414b98e36f
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-15 15:57:05 +02:00
Alain Rihs
870979362e
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-15 15:54:52 +02:00
Frédéric FRANCE
12781d7ccd
add tables for paiement extrafields ( #34695 )
...
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-07-15 15:43:21 +02:00
Clément
1e6b70a09a
NEW Customized step in duration select ( #34652 )
...
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-07-15 15:41:23 +02:00
HENRY Florian
69f82e5cb6
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-15 15:40:25 +02:00
ldestailleur
daf901dfed
Doc
2025-07-15 15:36:54 +02:00
ldestailleur
4a696a6dba
Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop
2025-07-15 15:22:52 +02:00
ldestailleur
85782ca3f6
Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0
2025-07-15 15:21:59 +02:00
ldestailleur
6f15da3537
Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0
2025-07-15 14:55:51 +02:00
ldestailleur
11535787df
Doc comment
2025-07-15 14:55:40 +02:00
Regis Houssin
d63e36d8fb
FIX wrong multicompany filter ( #34714 )
...
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-07-15 14:55:09 +02:00
ldestailleur
cb447b608b
Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0
2025-07-15 12:54:10 +02:00
ldestailleur
deb758f023
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2025-07-15 12:54:06 +02:00
ldestailleur
034804aa42
Doc
2025-07-15 12:36:15 +02:00
Francis Appels
55567c9e8e
WebPortal: Make controller form objects accessable in hookPrintPageView ( #34742 )
...
* Make formList public in list controller to allow modify properties by hook.
* WebPortal: Make controller form objects accessable in hookPrintPageView
2025-07-15 11:44:08 +02:00
Alexandre SPANGARO
e52ddc0181
Fix display on page treasury accounting ( #34741 )
...
* 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
* Comment
* PHPStan > Update baseline (#34734 )
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
* FIX: we should ensure Commande::$lines array contains OrderLine objects (#34727 )
* Uniformize position of button with other page & remove useless column
* Remove useless column
* FIX Fiscal year - Translation error on status
* Revert "FIX Fiscal year - Translation error on status"
This reverts commit a6f96ac0a9bece0f7d2182229ed7e6c744460fdd.
---------
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>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
Co-authored-by: Noé Cendrier <81741011+altairis-noe@users.noreply.github.com>
2025-07-15 11:43:29 +02:00
Alexandre SPANGARO
6ff0ef4990
FIX Fiscal year - Translation error on status ( #34743 )
2025-07-15 11:41:44 +02:00