Commit graph

126990 commits

Author SHA1 Message Date
Lamrani Abdel
a327f6fb52 fix incohenrent 2023-08-03 16:18:44 +02:00
Lamrani Abdel
7c736dc85b new update when try to delete don 2023-08-03 16:14:00 +02:00
pascal
f9e37412c6 Add filter to restric properties returned 2023-08-03 09:32:43 +02:00
Laurent Destailleur
0365e8c194 Fix trans 2023-08-02 23:25:39 +02:00
Laurent Destailleur
feb53f1d6a Clean code 2023-08-02 23:19:57 +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
Florian HENRY
831f88259a remove unwanted files 2023-08-02 20:05:03 +02:00
Lamrani Abdel
52a2d3174c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2023-08-02 19:35:02 +02:00
Maxime Kohlhaas
b5d84cbb55
Fix : uniformize RCUR instead of RECUR (#25536) 2023-08-02 19:32:04 +02:00
Lucas Marcouiller
fe7eed9197
Fix bookcal booking structure (#25559)
Co-authored-by: Hystepik <lucas.marcouiller@gmail.com>
2023-08-02 19:23:33 +02:00
UT from dolibit
9443be693f
Update availabilities_extrafields.php (#25555)
* Update availabilities_extrafields.php

* Update availabilities_extrafields.php

delete  button part
2023-08-02 19:22:56 +02:00
UT from dolibit
abfdb0a853
Update booking_extrafields.php (#25556)
delete Buttons part
2023-08-02 19:20:37 +02:00
UT from dolibit
f0dbc21956
Update ChangeLog (#25561)
is line 22 the sames as line 15 ?
2023-08-02 19:17:30 +02:00
UT from dolibit
4d5a06a3f3
Update calendar_extrafields.php (#25557) 2023-08-02 19:17:14 +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
Laurent Destailleur
39c02afb76 Debug v18 2023-08-02 18:03:47 +02:00
Laurent Destailleur
e7c2dcead6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-02 16:19:24 +02:00
Laurent Destailleur
c1d9efee13 Doc 2023-08-02 16:11:53 +02:00
Laurent Destailleur
b6f66058c3 Add custom toolbar for ckeditor inline 2023-08-02 16:04:13 +02:00
Florian HENRY
a786b533a4 fix: on contact list if thirdparty is only supplier le link comm/card.php is bad regarding perms tested and tabs preselected 2023-08-02 14:20:35 +02:00
Lucas Marcouiller
0688dcfb75
New : add deletedraft massaction to orders_list (#25170)
Co-authored-by: Hystepik <lucas.marcouiller@gmail.com>
2023-08-02 12:18:09 +02:00
Laurent Destailleur
a8ef7cdd12 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-02 12:09:10 +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
Lamrani Abdel
9837e1ab62 fix css problem 2023-08-02 12:04:30 +02:00
lamrani abdelwadoud
01efddbc23
Merge branch 'develop' into formAddPropertyMB 2023-08-02 11:52:56 +02:00
atm-thibaultf
67e938bdfa FIX_reload_linked_objects_on_propal_closeas 2023-08-02 11:52:03 +02:00
Maxime Kohlhaas
ea07e1ceb9 Fix use of YEAR in SQL 2023-08-02 10:13:21 +02:00
Laurent Destailleur
3c6d681d22 Test again exakat 2023-08-02 03:05:08 +02:00
Laurent Destailleur
759ba40780 Test for sonarqube 2023-08-02 03:03:26 +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
Laurent Destailleur
17d813a8d5 Clean code 2023-08-02 00:34:52 +02:00
Laurent Destailleur
9249ae6176 Doc 2023-08-02 00:27:53 +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
NextGestion
7eb09403c6
Merge branch 'Dolibarr:develop' into dolibarr_fixbugs 2023-08-01 18:54:34 +01: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
Charlène Benke
3cbea573f4
harmonize hook name (#25350)
* harmonize hook name

* Update card.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-08-01 18:47:54 +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
fc95cf43b3 Debug v18 2023-08-01 18:05:13 +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
a90de0f66c Debug v18 2023-08-01 17:51:44 +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