vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
123284 commits 1 branch 0 tags 1.5 GiB
Commit graph

123284 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
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
Anthony Berton
467bbdb64c
FIX - database last_main_doc for user (#25531) 
* FIX - database last_main_doc for user

* Fix column display (#25490)

* Fix php syntax (#25508)

* FIX Fatal Error PHP 8 : division by 0 (#25384)

* FIX Fatal Error PHP 8 : division by 0

* Update objectline_view.tpl.php

---------

Co-authored-by: atm-lena <lena.papazian@atm-consulting.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* Fix phpcs

* FIX fatal error on Stripe setup page and security when terminal not used

* FIX Try to fix the date of invoice on TakePOS on eastern timezone

* FIX - database last_main_doc for user

* Update objectline_view.tpl.php

---------

Co-authored-by: Anthony Berton <anthony.berton@bb2a.fr>
Co-authored-by: John BOTELLA <john.botella@atm-consulting.fr>
Co-authored-by: ptibogxiv <support@ptibogxiv.net>
Co-authored-by: atm-lena <52402938+atm-lena@users.noreply.github.com>
Co-authored-by: atm-lena <lena.papazian@atm-consulting.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-08-01 16:51:30 +02:00
Laurent Destailleur
723c731a87 Fix warning 2023-08-01 14:16:07 +02:00
Laurent Destailleur
3d8f14e78d Debug v19 2023-08-01 14:14:54 +02:00
Laurent Destailleur
6ddee88615 FIX Duplicate warning message 2023-08-01 13:55:33 +02:00
Laurent Destailleur
9482ae5215 Debug sort filter 2023-08-01 13:50:58 +02:00
lamrani abdelwadoud
b88c9307d7
New for sorting fields on leave balances #18011 (#25526) 
* product_card problem unexpected tocken

* add field employees for sort and select for hide & show fields

* button show & hide

* fix conflit

* fix conflit

* fix conflit
 2023-08-01 13:40:08 +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
a724aac108 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-08-01 13:14:05 +02:00
Laurent Destailleur
3d65f576ac Fix security 2023-08-01 13:12:08 +02:00
Laurent Destailleur
812997f127 Update security 2023-08-01 13:05:50 +02:00
Laurent Destailleur
014b4d21ea Update security 2023-08-01 13:04:31 +02:00
Laurent Destailleur
1a039e04a8 Update link to report a vulnerability 2023-08-01 12:13:43 +02:00
Laurent Destailleur
d17a88834e Update security.md 2023-08-01 12:13:03 +02:00
Laurent Destailleur
cef58c11da Uodate security 2023-08-01 11:55:06 +02:00
Laurent Destailleur
280ed8ef83 Update the SECURITY.md file 2023-08-01 11:52:22 +02:00
Laurent Destailleur
d34e718770 Debug v18 2023-07-31 22:40:17 +02:00
Laurent Destailleur
ddaa32d67b Debug v18 2023-07-31 22:17:46 +02:00
Laurent Destailleur
4c81205014 Fix trans 2023-07-31 21:56:01 +02:00
Laurent Destailleur
72a6e54f02 Fix debug v18 2023-07-31 21:54:38 +02:00
Laurent Destailleur
20134d0f1b Debug v18 2023-07-31 21:52:58 +02:00
Laurent Destailleur
5ac5dce4cb Look and feel v19 2023-07-31 21:44:03 +02:00
Laurent Destailleur
05a4b0a3e2 Fix debug v18 2023-07-31 21:43:36 +02:00
Laurent Destailleur
d040f5c8a9 Experiment color type 2023-07-31 20:16:49 +02:00
Laurent Destailleur
21559be84d Upgrade ckeditor 4.22.1 2023-07-31 15:36:55 +02:00
Laurent Destailleur
fc225cc5dd Fix tool dos2unix 2023-07-31 15:32:56 +02:00
Laurent Destailleur
a1a8ad2159 FIX #yogosha17287 2023-07-31 14:50:27 +02:00