Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
126,919 Commits 36 Branches 189 Tags
cb15d8c7beb0db960202c0207fe164e65e59349c
Commit Graph

126919 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
b847a5e224 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-08-01 15:23:12 +02:00
Laurent Destailleur
0c19ac1fcc FIX #25524 2023-08-01 15:22:32 +02:00
Laurent Destailleur
68c49ab476 Fix #yogosha17332 2023-08-01 14:51:49 +02:00
Laurent Destailleur
92c389bad6 Fix back to page 2023-08-01 14:24:42 +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
Frédéric FRANCE
f5e4ab7380 fix tooltip (#25527) 2023-08-01 13:36:53 +02:00
Francis Appels
d3b0d5be98 FIX Billing massaction should possible on Processed Reception. (#25530) 2023-08-01 13:36:38 +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
Lamrani Abdel
22dc2e7f4c fix conflits 2023-08-01 13:01:40 +02:00
Lamrani Abdel
4a234961dd fix conflits 2023-08-01 12:38:26 +02:00
Lamrani Abdel
027ac42dd3 fix conflits 2023-08-01 12:37:14 +02:00