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
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
ldestailleur
df88659105
Fix doc
2025-07-17 19:03:39 +02:00
ldestailleur
043a2fd9e2
Update makepack
2025-07-17 19:02:44 +02:00
ldestailleur
3f1796c83b
Fix link
2025-07-17 18:58:29 +02:00
ldestailleur
fe5acac757
Sync transifex
2025-07-17 18:57:22 +02:00
ldestailleur
28545de94f
Sync transifex
2025-07-17 18:56:16 +02:00
ldestailleur
4409b188ab
Fix link
2025-07-17 18:55:28 +02:00
ldestailleur
92f12873d0
Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop
2025-07-17 18:32:58 +02:00
ldestailleur
ca995180a3
Debug v22 - Fix bad trans and setup for Cash acocunting.
2025-07-17 18:31:40 +02:00
ldestailleur
31a66e2ce2
Debug v22
2025-07-17 18:12:46 +02:00