Commit graph

126990 commits

Author SHA1 Message Date
Laurent Destailleur
57b894eb43 Merge 2023-09-08 15:28:26 +02:00
Laurent Destailleur
99406caa3a Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-09-08 15:26:21 +02:00
Laurent Destailleur
803aca262e Fix edit colors with html5 component 2023-09-08 15:25:50 +02:00
Lamrani Abdel
f2b72ec15a NEW functionality add section changeLog to Doc in MB 2023-09-08 14:45:59 +02:00
Laurent Destailleur
5a9b2ce8de Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-09-08 14:45:09 +02:00
Laurent Destailleur
ec28a40d53 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-09-08 14:43:32 +02:00
Laurent Destailleur
8d686ece0f Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-09-08 14:41:26 +02:00
Laurent Destailleur
ef01b6a1e9 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-09-08 14:32:28 +02:00
Laurent Destailleur
1995ee7a03 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-09-08 14:29:30 +02:00
Laurent Destailleur
6dbd7e35f2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-08 14:17:17 +02:00
Laurent Destailleur
c379420d86 Fix regression in dol_eval 2023-09-08 14:12:12 +02:00
sonikf
5b6b18e115
Update ticket.lang 2023-09-08 15:07:17 +03:00
sonikf
ea64e69a41
Update main.lang 2023-09-08 15:04:53 +03:00
sonikf
704cbbe266
Update main.lang 2023-09-08 14:59:21 +03:00
sonikf
d153d7778f
Update errors.lang 2023-09-08 14:52:47 +03:00
sonikf
bd970931c0
Update admin.lang 2023-09-08 14:44:25 +03:00
sonikf
ea1a1b8bad
Update hrm.lang 2023-09-08 14:41:59 +03:00
sonikf
ec71da27be
Update sendings.lang 2023-09-08 14:39:20 +03:00
Lamrani Abdel
5adf2ccf5b fix problem 2023-09-08 12:11:52 +02:00
Frédéric FRANCE
373424f8ed
phpdoc 2023-09-08 11:57:11 +02:00
Laurent Destailleur
bc9f72a1dc
Merge pull request #25807 from hregis/fix_multicompany18_compatibility
FIX avoid wrong backtopage url
2023-09-08 11:56:59 +02:00
Laurent Destailleur
971a98f8d6
Merge pull request #25808 from atm-maxime/16.0
Fix missing $conf
2023-09-08 11:51:58 +02:00
Laurent Destailleur
9ca23dee12
Merge pull request #25809 from frederic34/patch-6
phpstan
2023-09-08 11:51:23 +02:00
Laurent Destailleur
19be291211
Merge pull request #25810 from frederic34/patch-7
phpstan
2023-09-08 11:50:26 +02:00
Laurent Destailleur
0ead94b5ed
Merge pull request #25812 from FHenry/dev_repairusecorrectcollation
new: add in repair.php force_collation_from_conf_on_tables
2023-09-08 11:48:48 +02:00
Laurent Destailleur
e5c49cd006
Merge pull request #25844 from frederic34/patch-9
do not trunc label but only use css overflowmax
2023-09-08 11:42:51 +02:00
Laurent Destailleur
e3688382ba
Merge pull request #25821 from vmaury/fix_25820
Order by salary lastname in hollidays month report (instead of fk_user)
2023-09-08 11:26:33 +02:00
Frédéric FRANCE
01232b721d
do not trunc label but only use css overflowmax 2023-09-08 11:25:54 +02:00
Laurent Destailleur
eef311dee7
Merge pull request #25823 from frederic34/loadlangs
fix loadlangs
2023-09-08 11:25:35 +02:00
Laurent Destailleur
d91ce60ab4
Merge pull request #25819 from frederic34/setascustomer
deprecate set_as_client
2023-09-08 11:23:06 +02:00
Laurent Destailleur
6676494baf
Merge pull request #25826 from yledoare/18.0
Fix #25613
2023-09-08 11:21:40 +02:00
atm-greg
4f3d9dc6a9 Merge branch '16.0' of github.com:Dolibarr/dolibarr into FIX_16.0_commande_box_sql 2023-09-08 11:20:18 +02:00
atm-greg
aa34f800c2 user inner join 2023-09-08 11:18:59 +02:00
Laurent Destailleur
390a7c8e6b
Merge pull request #25831 from ATM-Consulting/FIX_17.0_facture_fournisseur
FIX 17.0 PHP8: supplier invoice class
2023-09-08 11:14:59 +02:00
Laurent Destailleur
6df3661044
Merge pull request #25834 from thomas-Ngr/14.0_fix_stripe_language
FIX payment : language is not propagated to following pages
2023-09-08 10:59:59 +02:00
Laurent Destailleur
0914bc5c63
Merge pull request #25838 from mc2rcanarslan/fix_product_sql_error
fix: missing space in generated product sql
2023-09-08 10:57:15 +02:00
Laurent Destailleur
f4079b6a70
Merge pull request #25843 from ATM-Consulting/Fix_18.0_dol_banner_on_fournisseur.php
use Product instance for dol_banner
2023-09-08 10:56:55 +02:00
atm-greg
c99b5210de use Product instance for dol_banner 2023-09-08 10:32:25 +02:00
Frédéric FRANCE
6f0e82f5d7
phpstan 2023-09-08 09:49:47 +02:00
Frédéric FRANCE
198e7bf795 Merge remote-tracking branch 'upstream/develop' into loadlangs 2023-09-08 09:28:48 +02:00
Frédéric FRANCE
1fa038c017
Merge branch 'develop' into develop-2 2023-09-08 09:13:17 +02:00
Laurent Destailleur
e9787451a8 Disallow more use of parenthesis into dol_eval 2023-09-08 05:51:06 +02:00
Laurent Destailleur
7819b9586d Exclude more exec functions 2023-09-08 04:28:09 +02:00
Laurent Destailleur
c2f8c4f47c Sec: param onlysimplestring is always 1 or 2 2023-09-08 02:29:20 +02:00
Laurent Destailleur
32837761b5 Sec: Increase list of not allowed function in dol_eval 2023-09-08 01:59:57 +02:00
Laurent Destailleur
0c588ccd60 Sec: Increase list of not allowed function in dol_eval 2023-09-08 01:59:09 +02:00
Laurent Destailleur
684c0b88b5 Sec: More robust call for dol_eval (with param '2') for computed fields 2023-09-08 01:57:47 +02:00
Laurent Destailleur
80c0c9c344 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-08 01:40:30 +02:00
Laurent Destailleur
9ed7bb77cd Sec: Increase list of not allowed function in dol_eval 2023-09-08 01:36:26 +02:00
Laurent Destailleur
3073a98563 Fix creation of subdir for website 2023-09-08 01:28:11 +02:00