Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
123,917 Commits 36 Branches 189 Tags
c6a30bcf9eda0f7f420ac07b256b51dde3ccd00f
Commit Graph

32162 Commits

Author SHA1 Message Date
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
Laurent Destailleur
6a962cbefa Debug v19 2023-08-01 17:06:22 +02:00
Olivier Lesueur
4a14ba2083 Use SSL connection to MySQL server if server name starts with ssl:// (#25525) 
* Use SSL connection to MySQL server if server name starts with ssl://

* Update mysqli.class.php

---------

Co-authored-by: Olivier Lesueur <o.lesueur@crm.fnattp.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-08-01 16:58:32 +02:00
Laurent Destailleur
3d8f14e78d Debug v19 2023-08-01 14:14:54 +02:00
Laurent Destailleur
332f8ad95c Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-01 13:15:48 +02:00
Laurent Destailleur
4c81205014 Fix trans 2023-07-31 21:56:01 +02:00
Laurent Destailleur
5ac5dce4cb Look and feel v19 2023-07-31 21:44:03 +02:00
Laurent Destailleur
d040f5c8a9 Experiment color type 2023-07-31 20:16:49 +02:00
Laurent Destailleur
e374ebf26b Debug v18 2023-07-31 14:17:38 +02:00
Laurent Destailleur
40ebf86eab Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-07-31 13:51:32 +02:00
Laurent Destailleur
016ab20155 Fix warning 2023-07-31 03:52:05 +02:00
Laurent Destailleur
66c1ba9ae9 Debug v18 2023-07-31 03:47:37 +02:00
Laurent Destailleur
6277cb836f Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-07-31 02:44:26 +02:00
Florent Poinsaut
cdc8bc1b6f FIX add notification hook to allow external module trigger (#25506) 2023-07-31 01:54:49 +02:00
Florent Poinsaut
e2915d2979 NEW Add picto in product/service list in object lines (#25511) 2023-07-31 01:41:24 +02:00
Frédéric FRANCE
79f645f9e1 clean code (#25516) 2023-07-31 01:36:33 +02:00
Laurent Destailleur
9fd651ee5c FIX warnings 2023-07-30 19:46:23 +02:00
Laurent Destailleur
7cbc8728a5 FIX warnings 2023-07-30 19:44:04 +02:00
Laurent Destailleur
9b0901383e Fix warning 2023-07-30 18:58:18 +02:00
Laurent Destailleur
6b0630561e Fix warnings 2023-07-30 18:58:11 +02:00
Laurent Destailleur
01e65bbad1 Fix warning 2023-07-30 18:58:04 +02:00
Laurent Destailleur
c0d75460ad Fix warning 2023-07-30 18:53:32 +02:00
Laurent Destailleur
980923e4b2 Fix warnings 2023-07-30 18:47:40 +02:00
Laurent Destailleur
6748835cee Fix warning 2023-07-30 18:42:05 +02:00
Laurent Destailleur
22bed76e40 Fix warning 2023-07-30 18:36:12 +02:00
Laurent Destailleur
78212d3b9d Fix warning 2023-07-30 18:32:44 +02:00
Laurent Destailleur
a72fac7c3d FIX pn in language selection on target for emailing 2023-07-30 15:20:16 +02:00
Laurent Destailleur
19f5622c8b Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-07-30 04:16:13 +02:00
Laurent Destailleur
71abe871ef Debug v18 2023-07-30 03:12:16 +02:00
Laurent Destailleur
2f8130d74a NEW Add tab Events/Agenda on recurring invoices 2023-07-29 21:02:52 +02:00
Laurent Destailleur
e12bfb3e3c Can re-enable a default disabled stream with conf.php 2023-07-29 17:31:27 +02:00
Laurent Destailleur
e099ca093a Debug v18 2023-07-28 18:59:54 +02:00
Laurent Destailleur
31082fbea0 Log 2023-07-27 15:51:32 +02:00
UT from dolibit
155848585f Update interface_20_all_Logevents.class.php 
$langs->load("users");     only once at the start
 2023-07-27 13:16:00 +02:00
Laurent Destailleur
57adce857c Fix phpcs 2023-07-26 02:47:49 +02:00
Laurent Destailleur
a3d691e631 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-07-26 01:58:07 +02:00