2
0
forked from Wavyzz/dolibarr
Commit Graph

40028 Commits

Author SHA1 Message Date
Deefaze
15cdde5a05 Update functions.lib.php (#34718)
Add __MYCOMPANY_URL__ & __MYCOMPANY_PHONEMOBILE__ in getCommonSubstitutionArray
2025-07-10 14:55:05 +02:00
ldestailleur
8088f4a30e Debug v22 2025-07-09 19:02:50 +02:00
ldestailleur
1c2b5e885f Doc 2025-07-09 18:57:09 +02:00
Laurent Destailleur
eee6104288 Fix phan 2025-07-08 15:49:31 +02:00
Laurent Destailleur
fabcb1cf17 Fix CI 2025-07-08 15:44:37 +02:00
Frédéric FRANCE
38203fd694 add substitutions for year of previous or next month (#34691)
* add substitutions for year of previous or next month

* add substitutions for year of previous or next month

* add substitutions for year of previous or next month

* add substitutions for year of previous or next month

* add substitutions for year of previous or next month

* add substitutions for year of previous or next month

* add substitutions for year of previous or next month

* add substitutions for year of previous or next month

* add substitutions for year of previous or next month

* add substitutions for year of previous or next month

* add substitutions for year of previous or next month

* fix

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-07-06 13:45:11 +03:00
Laurent Destailleur
5af8569805 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-07-05 22:49:43 +02:00
Laurent Destailleur
f047007c19 Clean code 2025-07-05 22:48:36 +02:00
F-Node-Karlsruhe
1956776415 Allow email claim in oidc (#34669)
* allow email claim in oidc

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

* switch to allow mail address in login

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

* revert back to first draft

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

---------

Signed-off-by: F-Node-Karlsruhe <christian.fries@eecc.de>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-07-05 20:11:47 +03:00
Laurent Destailleur
4f679f06d7 Fix CI 2025-07-05 12:41:00 +02:00
Laurent Destailleur
6748d3a14b Fix CI 2025-07-05 12:31:08 +02:00
Laurent Destailleur
84879c15e9 Fix CI 2025-07-05 12:09:45 +02:00
Laurent Destailleur
b70943db59 Fix typo 2025-07-05 11:45:25 +02:00
Laurent Destailleur
6b68f5aad0 Fix CI 2025-07-05 11:33:46 +02:00
Laurent Destailleur
dff214402e Fix warning 2025-07-05 01:21:45 +02:00
Mohamed DAOUD
b506f03c62 Improve error messages returned by getURLContent (#34689)
* enhance getURLContent error messages

* fix CI
2025-07-04 09:54:01 +03:00
Laurent Destailleur
19a9be927e Fix Add a protection when 2 users are allowed (should not happen) 2025-07-01 21:08:44 +02:00
Laurent Destailleur
24e3f31ba1 Fix CI 2025-07-01 20:32:31 +02:00
Laurent Destailleur
ac892efb42 Fix CI 2025-07-01 16:22:21 +02:00
Laurent Destailleur
e2c2f73e9c Fix CI 2025-07-01 15:39:16 +02:00
Laurent Destailleur
2941cf1c19 Fix CI 2025-07-01 15:29:15 +02:00
Laurent Destailleur
8c8a45a191 Doc 2025-06-30 15:49:20 +02:00
Laurent Destailleur
f974c49fcc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-30 15:14:31 +02:00
Laurent Destailleur
00ff8d490a Debug v22 2025-06-30 15:14:09 +02:00
Alexandre SPANGARO
621b91097a Translate term Incoterm (#34661) 2025-06-29 12:45:29 +02:00
ldestailleur
38b752f367 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-28 18:57:10 +02:00
ldestailleur
27479f41c5 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-06-28 18:56:46 +02:00
ldestailleur
29c953bd37 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-06-28 18:56:26 +02:00
ldestailleur
9d30492846 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-06-28 18:55:40 +02:00
Marc de Lima Lucio
4841a8d2ce FIX: pre-send mail mass action: keep __EMAIL__ substitution (#34522)
* FIX: pre-send mail mass action: keep __EMAIL__ substitution

* FIX: comment

* test github workflows

* test github workflow for 18

* test v18 pr workflow

* FIX: massaction email tpl: keep preset

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-28 17:58:07 +02:00
ldestailleur
7013499dfa Try fix CI 2025-06-28 14:40:48 +02:00
ldestailleur
4721a84cec Fix warnings 2025-06-28 13:30:32 +02:00
ldestailleur
d1ddf4314e Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-28 13:18:15 +02:00
ldestailleur
1dd0afe027 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-06-28 13:17:37 +02:00
ldestailleur
51f246b4ac Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-06-28 13:17:30 +02:00
ldestailleur
109d30fbea Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-06-28 13:16:59 +02:00
ldestailleur
d2e9c01796 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-06-28 13:16:30 +02:00
ldestailleur
75c3456743 FIX #34654 2025-06-28 13:14:11 +02:00
ldestailleur
c6a5bf3836 Fix CI 2025-06-27 21:30:37 +02:00
ldestailleur
da5c0749e9 Fix warning 2025-06-27 16:57:00 +02:00
ldestailleur
1a5d71319e Fix check on entity is a different security check than check on external
user so code must not be nested.
2025-06-27 16:43:16 +02:00
ldestailleur
358daa3ca0 Clean doc and code 2025-06-27 13:39:50 +02:00
ldestailleur
7909b0f17a Close #34627 2025-06-27 00:52:48 +02:00
Florian Mortgat
094dd3a9d1 FIX 21.0: $height and $width can be ints, but also 'auto' (#34636)
* FIX 21.0: $height and $width can be ints, but also 'auto' (which is commonly used), so check for this special value before typecasting

* Update html.form.class.php

* Update html.form.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-27 00:30:00 +02:00
Ferran Marcet
267c77ec22 New: Add note private on order export (#34642)
* New: Mail template for contacts

* New: Mail template for contacts

* New: Mail template for contacts

* New: Andorra's Accounting Plan

* New: Add function to make substitutions on Takepos receipt

* New: Add function to make substitutions on Takepos receipt

* New: Add note private on order export

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-27 00:26:42 +02:00
ldestailleur
497d774a21 Fix the selectForFormsList was not using correctly the
ismultientitymanaged. Replace a join with and exists.
2025-06-27 00:21:50 +02:00
ldestailleur
bf7ec83640 Debug v28 2025-06-26 20:00:24 +02:00
ldestailleur
4db4fa153c Debug v22 2025-06-26 01:37:45 +02:00
ldestailleur
38aa9cbacc Debug v22 2025-06-25 13:09:56 +02:00
ldestailleur
8c88eab05c Debug v22 - Removed conflict code with old dolopenpopup architecture 2025-06-25 12:29:11 +02:00