Commit graph

133486 commits

Author SHA1 Message Date
Lamrani Abdel
0e56473620 update function for overwrite folder 2023-12-18 18:13:50 +01:00
Laurent Destailleur
4dcd7955ef FIX Error on emailreminder not reported 2023-12-18 17:42:17 +01:00
Charlène Benke
b881dca994
php V8 warning 2023-12-18 16:53:12 +01:00
Laurent Destailleur
7193fae3dd Fix security on doc signature. Fix bad position of signature file. 2023-12-18 16:41:40 +01:00
Laurent Destailleur
327cbfca3f css 2023-12-18 15:22:40 +01:00
Frédéric FRANCE
735cfee1d7
FIX 2023-12-18 15:14:07 +01:00
Laurent Destailleur
a7fa5accf9 Debug v19 2023-12-18 15:06:25 +01:00
Frédéric FRANCE
96cbc1d33a
Merge branch 'develop' into clean_phpstan_action 2023-12-18 14:50:53 +01:00
Laurent Destailleur
0bcf61d220 Debug v19 2023-12-18 14:36:24 +01:00
Laurent Destailleur
f6fc9a41a6 Debug v19 2023-12-18 14:13:00 +01:00
Laurent Destailleur
b49aff4d02 Debug v19 2023-12-18 13:51:25 +01:00
MDW
c0145d7958 Qual Ease the use of phpcs with configuration file at root
# Qual Add .phpcs.xml.dist

This configuration file at the root still references the configuration
file used in the CI flows, but it allows running 'phpcs' from the root
without having to specify anything else than the files you want to check.
2023-12-18 13:17:16 +01:00
Frédéric FRANCE
7da8bc5892
Merge branch 'develop' into patch-19 2023-12-18 11:02:06 +01:00
Benjamin Falière
88a72050fe Modify subject structure 2023-12-18 09:45:09 +01:00
Benjamin Falière
9038a6e6e8 Merge remote-tracking branch 'origin/develop' into improveTicketMail 2023-12-18 09:35:38 +01:00
Regis Houssin
70e01178a9 FIX uniformization to use "intervention" 2023-12-18 09:27:52 +01:00
Frédéric FRANCE
65e528f619
Merge branch 'develop' into patch-3 2023-12-18 09:22:56 +01:00
Frédéric FRANCE
fe5cf6fd8b
Merge branch 'develop' into clean_phpstan_action 2023-12-18 09:10:01 +01:00
Alexandre SPANGARO
148ab759d3 Merge branch 'develop' into 20_css_1 2023-12-18 05:04:01 +01:00
MDW
0391e02b28 Fix seen as undeclared by static checker.
# Fix  seen as undeclared by static checker.
https://github.com/Dolibarr/dolibarr/pull/26480/checks#step:5:79
https://github.com/Dolibarr/dolibarr/pull/26480/checks#step:5:80
2023-12-18 05:00:39 +01:00
MDW
e49f32ab2d dolGetGlobalInt -> getDolGlobalInt
Detected with phan -> https://github.com/Dolibarr/dolibarr/actions/runs/7242660297/job/19728384233?pr=26480#step:5:39
2023-12-18 03:13:37 +01:00
Laurent Destailleur
770bc15ca3 Debug v19 2023-12-18 00:02:21 +01:00
Laurent Destailleur
5e28ab0ec3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-17 23:54:37 +01:00
Laurent Destailleur
4dc5483b12 Fix warning 2023-12-17 23:54:08 +01:00
Laurent Destailleur
45bfea94a6 Removed not used code 2023-12-17 23:36:18 +01:00
Laurent Destailleur
689ba89b21
Merge pull request #27108 from altairisfr/ORDER_REOPEN_TO_DRAFT_2023
add constant ORDER_REOPEN_TO_DRAFT
2023-12-17 23:27:56 +01:00
Laurent Destailleur
c6e33a89a4 Doc 2023-12-17 23:21:59 +01:00
Laurent Destailleur
b5cce1c718
Merge pull request #27110 from defrance/patch-309
php V8 warning
2023-12-17 23:20:19 +01:00
Laurent Destailleur
abdfd74d25
Merge pull request #27114 from mc2rcanarslan/patch-4
FIX: wrong object field assignment
2023-12-17 23:15:09 +01:00
Laurent Destailleur
3c926883b4
Merge pull request #27115 from JonBendtsen/patch-1
Thirdparty email missing in send message form for ticket #27034
2023-12-17 23:14:51 +01:00
Laurent Destailleur
0f456f7126
Merge pull request #27117 from ATM-Nicolas/fix_17_php8_error_converting_object_to_string
FIX : Fatal error converting object of class User to string (php8)
2023-12-17 23:13:58 +01:00
Laurent Destailleur
084d2ee34e
Merge pull request #27119 from frederic34/patch-4
fix phpdoc
2023-12-17 23:11:20 +01:00
Laurent Destailleur
e1b94535f7
Merge pull request #27120 from frederic34/patch-9
clean code
2023-12-17 23:10:31 +01:00
Laurent Destailleur
01a30c55eb
Merge pull request #27122 from frederic34/patch-7
fix warning
2023-12-17 23:09:25 +01:00
Laurent Destailleur
4979b43ebc
Merge pull request #27124 from thibdrev/patch-1
fix #27123 - Missing translation key "ErrorStartDateGreaterEnd"
2023-12-17 23:09:03 +01:00
Alexandre SPANGARO
644bf76c18 NEW : llxHeader body css for donation 2023-12-17 23:08:08 +01:00
Laurent Destailleur
a50bb45d24 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-17 23:02:03 +01:00
Laurent Destailleur
bb65d9520d Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
Conflicts:
	htdocs/modulebuilder/template/myobject_list.php
2023-12-17 23:01:21 +01:00
Laurent Destailleur
22c93cb029 Fix phpcs 2023-12-17 22:59:15 +01:00
Laurent Destailleur
f7772ecb2b Fix phpcs 2023-12-17 22:55:46 +01:00
Laurent Destailleur
6c873e66da Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-17 22:53:22 +01:00
Laurent Destailleur
191b8f5205 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-12-17 22:51:58 +01:00
Laurent Destailleur
1661534d5a Fix set PROFID1 2023-12-17 22:51:13 +01:00
Laurent Destailleur
0c5769f329 Fix set of PROFID1 2023-12-17 22:50:23 +01:00
Alexandre SPANGARO
b17d2d6004 NEW : llxHeader body css for asset 2023-12-17 22:32:25 +01:00
Laurent Destailleur
98009ea6be Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/compta/bank/class/account.class.php
	htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
	htdocs/langs/en_US/recruitment.lang
	htdocs/master.inc.php
	htdocs/projet/contact.php
2023-12-17 22:17:14 +01:00
Laurent Destailleur
64b9414271 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
Conflicts:
	htdocs/modulebuilder/template/myobject_list.php
2023-12-17 22:08:40 +01:00
Laurent Destailleur
8cb9bdd852 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
Conflicts:
	htdocs/comm/action/list.php
	htdocs/compta/facture/list.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/product/stock/movement_list.php
	htdocs/product/stock/productlot_list.php
	htdocs/ticket/list.php
2023-12-17 22:06:48 +01:00
Laurent Destailleur
438e922a75 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
Conflicts:
	htdocs/master.inc.php
2023-12-17 21:49:42 +01:00
Laurent Destailleur
21b7d68f49 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/comm/action/list.php
	htdocs/compta/facture/list.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/product/stock/movement_list.php
	htdocs/product/stock/productlot_list.php
2023-12-17 21:49:08 +01:00