Commit Graph

612 Commits

Author SHA1 Message Date
Frédéric FRANCE
d3bbb29ed6
Fix filter syntax on product card 2023-03-22 09:34:21 +01:00
Laurent Destailleur
95b306ba84 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-02-07 00:19:54 +01:00
Laurent Destailleur
ff4ea81429 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-02-04 16:11:16 +01:00
Mélina JOUM
e10a7de3e0 stickler-ci error 2023-02-02 17:52:07 +01:00
Mélina JOUM
f46d9f1a15 Fix GETPOST 2023-02-02 15:54:24 +01:00
Mélina JOUM
4b61ef946a Fix 2023-02-02 11:44:10 +01:00
Mélina JOUM
afa1fd3e8a Get data back on product update 2023-02-01 16:51:13 +01:00
Laurent Destailleur
95986647b4 Fix php8 compatibility 2022-12-30 14:56:55 +01:00
Laurent Destailleur
8e82bb7148 Clean code 2022-12-30 02:02:34 +01:00
Laurent Destailleur
50c76110bb Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2022-12-14 11:19:12 +01:00
Laurent Destailleur
62b0447c7b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-14 11:02:23 +01:00
Juanjo Menent
9b3f6cfa5a Fix #23142 2022-12-09 20:38:44 +01:00
Anthony Berton
4ba0283e0b FIX - PHP Warning and use isModEnabled 2022-12-07 09:59:30 +01:00
Laurent Destailleur
013d242943 Merge FCKEDITOR_ENABLE_DETAILS and FCKEDITOR_ENABLE_PRODUCTDESC.
The 2 options has similar effect, only one in code is required.
2022-10-25 17:16:14 +02:00
Laurent Destailleur
1f9424a4b3 Clean code/options 2022-10-25 11:34:31 +02:00
Laurent Destailleur
cd9984cd3e
Update card.php 2022-10-24 19:19:41 +02:00
stickler-ci
b048d95cc8 Fixing style errors. 2022-10-20 16:09:26 +00:00
melina
72d163b896 Added hidden constant and modified edit on reference 2022-10-20 16:21:31 +02:00
Regis Houssin
514cc76fe2 FIX use propal instead propale 2022-10-16 16:44:34 +02:00
Philippe GRAND
82c7a6e9f0 update code towards php8 compliance 2022-10-06 16:57:43 +02:00
Frédéric France
3a3dad6fb8 Merge remote-tracking branch 'upstream/develop' into pr/dolibit-ut/22136 2022-09-28 20:23:40 +02:00
Alexandre SPANGARO
be55f63b63 Use isModEnabled 2022-09-25 06:31:56 +02:00
Alexandre SPANGARO
cce6d82741 Use isModEnabled 2022-09-25 06:09:58 +02:00
Alexandre SPANGARO
3eba955992 Use isModEnabled 2022-09-25 06:05:35 +02:00
Laurent Destailleur
7dbde6f934
Merge branch 'develop' into develop_NEW_Service_DefaultWorkstation 2022-09-13 01:38:49 +02:00
Frédéric France
705b436494 replace other deprecated 2022-09-10 14:03:47 +02:00
Laurent Destailleur
cf887dba16
Merge pull request #22075 from grandoc/new_branch_04_09_2022
update code
2022-09-09 18:03:43 +02:00
UT from dolibit
34522910e8
Update card.php 2022-09-08 19:37:40 +02:00
atm-lena
81ed97e9fc Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-09-08 11:21:05 +02:00
Philippe GRAND
94a646103d update code 2022-09-04 13:32:12 +02:00
Frédéric France
8e66b7207e replace ! empty by !empty 2022-08-31 22:14:20 +02:00
Frédéric France
e71692e745 fix php8 warnings 2022-08-31 22:02:31 +02:00
Frédéric France
fc01cc66cd fix php8 warnings 2022-08-31 21:55:55 +02:00
UT from dolibit
5b8f7cf00c
Update card.php 2022-08-29 18:45:11 +02:00
atm-lena
6e5d395ac8 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-08-24 11:38:19 +02:00
Frédéric France
582f6b196e use isModEnabled 2022-08-23 20:02:37 +02:00
Frédéric France
4bef0f5745 use isModEnabled 2022-08-23 20:01:34 +02:00
Frédéric FRANCE
7f60a34799 use isModEnabled 2022-08-19 18:07:21 +02:00
stickler-ci
6c1289382c Fixing style errors. 2022-08-14 13:49:28 +00:00
Vincent de Grandpré
7a22e6f339 commentaires du code en anglais 2022-08-14 09:48:49 -04:00
stickler-ci
142f242267 Fixing style errors. 2022-08-13 22:35:53 +00:00
Vincent de Grandpré
fd64b3baec CLOSE 21748 Maillage sur ErrorProductAlreadyExists en créant produit 2022-08-13 18:32:30 -04:00
atm-lena
2fbba30e2a Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-08-11 12:11:41 +02:00
Laurent Destailleur
95b1b3f990 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/commande/card.php
	htdocs/emailcollector/class/emailcollector.class.php
	htdocs/index.php
	htdocs/website/index.php
2022-08-10 13:16:02 +02:00
Laurent Destailleur
9e55377f0a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-08-10 13:10:52 +02:00
Laurent Destailleur
643f4c8bdc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-08-10 13:08:03 +02:00
Frédéric FRANCE
5ef9d2d40d
keep url 2022-08-08 11:11:17 +02:00
Frédéric FRANCE
96c17b485c
do not loose decription
when changing country, reload cause description lost
2022-08-08 11:07:38 +02:00
atm-lena
462352b957 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-07-29 12:06:43 +02:00
Laurent Destailleur
ab81492fa4 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.formwebsite.class.php
	htdocs/core/lib/cron.lib.php
2022-07-24 22:17:25 +02:00