Commit Graph

33082 Commits

Author SHA1 Message Date
Laurent Destailleur
921a6f3135 Fix warning 2023-08-06 12:26:27 +02:00
Laurent Destailleur
e3e73d9096 Work on renaming libelle into label 2023-08-06 01:14:36 +02:00
Laurent Destailleur
da1d622f80 Fix warnings 2023-08-06 00:41:59 +02:00
Laurent Destailleur
c0f27e5a57 Fix warning 2023-08-06 00:30:00 +02:00
Laurent Destailleur
0076ec69b8 The property ->brouillon has been removed from all classes. It was not
reliable and was a duplicate of ->status == self::STATUS_DRAFT.
2023-08-06 00:16:25 +02:00
Laurent Destailleur
7ce9bf6b23 Clean code 2023-08-05 15:44:28 +02:00
Laurent Destailleur
91982253a0 Clean code 2023-08-05 14:59:31 +02:00
Laurent Destailleur
0658c91bb6 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-05 14:21:40 +02:00
Laurent Destailleur
4431ca659f Debug v18 2023-08-05 14:20:25 +02:00
Laurent Destailleur
3f8e343b10 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-05 14:10:42 +02:00
Laurent Destailleur
8646b826e0 Debug v18 2023-08-05 14:09:11 +02:00
Laurent Destailleur
ea364ff1a3 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-05 13:47:17 +02:00
Laurent Destailleur
df76b9940d Debug v18 2023-08-05 13:27:56 +02:00
Laurent Destailleur
fc94e39d58 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-05 12:40:47 +02:00
Laurent Destailleur
b47a640f0b Debug v18 2023-08-05 12:37:25 +02:00
Laurent Destailleur
f5f7ed7ca8 Code comment 2023-08-04 18:43:48 +02:00
Laurent Destailleur
a4c54e5059 Debug v18 2023-08-04 18:24:56 +02:00
Charlène Benke
8539fa5cfa Update html.formticket.class.php 2023-08-04 15:44:23 +02:00
Charlène Benke
37b13d97b5 Update contract.lib.php 2023-08-04 15:01:21 +02:00
Laurent Destailleur
b52c79dcfe Fix warnings 2023-08-04 04:37:10 +02:00
Laurent Destailleur
c6a1c5cfcd Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-04 04:31:22 +02:00
Laurent Destailleur
ff11a7442e Fix warnings 2023-08-04 04:28:45 +02:00
Laurent Destailleur
630e305161 Standardize db drivers. No more static class. 2023-08-04 04:18:59 +02:00
Laurent Destailleur
d232a95f37 Fix duplicate property 2023-08-04 04:08:22 +02:00
Laurent Destailleur
36eef9d106 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-04 04:07:47 +02:00
Laurent Destailleur
2cf504660b Debug v18 2023-08-04 04:01:02 +02:00
Laurent Destailleur
d877b50bc7 Debug v18 2023-08-04 03:53:32 +02:00
Laurent Destailleur
6062a60625 Code comment 2023-08-04 00:13:29 +02:00
Laurent Destailleur
3d9e1e65de Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-08-03 23:02:15 +02:00
Laurent Destailleur
6d9e890a17 Fix param mandatory 2023-08-03 23:00:39 +02:00
Laurent Destailleur
f464c97e98 Code comment 2023-08-03 22:39:41 +02:00
FLIO
d4b722959f edit the function selectarray for remove the script for separator and move it where we want to use this 2023-08-02 20:20:08 +02:00
FLIO
458bd56f70 Merge branch 'develop' into feature2#21426 2023-08-02 20:08:26 +02:00
Maxime Kohlhaas
b5d84cbb55 Fix : uniformize RCUR instead of RECUR (#25536) 2023-08-02 19:32:04 +02:00
UT from dolibit
f44c74d310 Update commonobject.class.php (#25560) 2023-08-02 19:17:05 +02:00
antonin_tdj
a00045b94c Check was after submit (#25551)
Check was added in the wrong place. 
I moved it a few lines before.
2023-08-02 19:16:47 +02:00
Lucas Marcouiller
ab6c05f4db New : can overwrite email_from on mail templates (#25086)
Co-authored-by: Hystepik <lucas.marcouiller@gmail.com>
2023-08-02 12:05:44 +02:00
Maxime Kohlhaas
ea07e1ceb9 Fix use of YEAR in SQL 2023-08-02 10:13:21 +02:00
Laurent Destailleur
a127dd2d15 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-08-02 00:41:43 +02:00
Laurent Destailleur
dfe00afd40 Exclude warning 2023-08-02 00:41:21 +02:00
Laurent Destailleur
b76dadd5c5 Clean code 2023-08-02 00:37:02 +02:00
onhairech
84243dc5e4 Fix #25416 :the email subject is not replaced when an email template… (#25534)
* Fix #25416 :the email subject is not replaced when an email template is applied in tickets

* Update html.formticket.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-08-02 00:02:53 +02:00
Laurent Destailleur
49e63e1d38 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-08-01 19:17:09 +02:00
Laurent Destailleur
b52f426518 Remove hardcoded value 2023-08-01 18:52:35 +02:00
antonin_tdj
8c3c607225 NEW LDAP Active Directory UserAccountControl (#25507)
* fix ldapGroup

* add default userAccountControl to admin

* add const on activation

* update triggers create and enable/disable

---------

Co-authored-by: amarchal <antonin@letempledujeu.fr>
2023-08-01 18:20:51 +02:00
Laurent Destailleur
0cc392d210 Fix warning 2023-08-01 18:11:15 +02:00
Laurent Destailleur
83cbe02403 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-08-01 17:55:14 +02:00
Laurent Destailleur
1808d77ce6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-01 17:52:13 +02:00
Laurent Destailleur
c76a244b27 Close #25502 2023-08-01 17:25:28 +02:00
Lucas Marcouiller
679edeab09 NEW #25512 applicative anti bruteforce - security on too many login attempts (#25520)
* Close #25512 New security on too many login attempts

* Update security_other.php

* Update functions_dolibarr.php

---------

Co-authored-by: Hystepik <lucas.marcouiller@gmail.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-08-01 17:16:50 +02:00