Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 17:48:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
140,250 Commits 36 Branches 190 Tags
901b9dab72357dad4e162f94d6b53e1e84d20dd5
Commit Graph

489 Commits

Author SHA1 Message Date
Frédéric France
4bef0f5745 use isModEnabled 2022-08-23 20:01:34 +02:00
Laurent Destailleur
40d31d9b8b Update combinations.php 2022-07-24 20:18:10 +02:00
This Charlène
69626875fc PHP - cannot use a scalar as an array warning 
generate an error :  cannot use a scalar as an array warning (even on php V7)
 2022-07-24 20:16:59 +02:00
Laurent Destailleur
083b785ec8 Update combinations.php 2022-07-24 20:13:48 +02:00
This Charlène
54c2cc245d PHP V8 warning 2022-07-20 11:34:01 +02:00
This Charlène
3e8cb1de57 php V8 warning 2022-07-20 11:31:20 +02:00
This Charlène
8cb1e138de forgotted fields 2022-07-20 11:15:44 +02:00
This Charlène
2c898b45e3 PHP - cannot use a scalar as an array warning 
generate an error :  cannot use a scalar as an array warning (even on php V7)
 2022-07-20 11:10:54 +02:00
Laurent Destailleur
24dc936000 Revert "default to create on card.php if $action is empty" 
This reverts commit e0b664066b.
 2022-07-11 00:05:50 +02:00
Christian Foellmann
e0b664066b default to create on card.php if $action is empty 2022-07-11 00:01:42 +02:00
Laurent Destailleur
9a92c7d9b0 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/extrafields.class.php
 2022-07-10 19:28:16 +02:00
Laurent Destailleur
3d226801ba Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-07-10 19:22:02 +02:00
stickler-ci
04fd17347e Fixing style errors. 2022-07-08 07:36:09 +00:00
Gauthier PC portable 024
787f52fd7f FIX : with callback function 2022-07-08 09:32:20 +02:00
Gauthier PC portable 024
77552fa32a FIX : We must remove empty values of $features array in fetchByProductCombination2ValuePairs() because some products can use only several attributes in their variations and not necessarily all. In this case, fetch doesn't work without my correction 2022-07-07 10:17:56 +02:00
Faustin
54777f9614 array productCombinations implicitly converted to a boolean 2022-06-13 14:33:23 +02:00
Laurent Destailleur
25e70bead8 phpcs 2022-05-18 23:27:26 +02:00
lmarcouiller
207ebc9266 fix php 8.0 warnings 2022-05-11 15:06:11 +02:00
Laurent Destailleur
91d539bbef Clean code of not used method 2022-05-10 14:38:40 +02:00
Laurent Destailleur
c96e3bdddf PHP v8 compatibility 2022-04-30 19:50:20 +02:00
Laurent Destailleur
95dc25587c Standardize code of the fetch_lines() 2022-03-28 13:50:47 +02:00
Laurent Destailleur
9747efe050 Fix phpcs 2022-03-24 14:09:46 +01:00
Laurent Destailleur
4a80f35aaa Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2022-03-23 17:26:25 +01:00
Laurent Destailleur
c620757dbc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/langs/en_US/projects.lang
	htdocs/product/price.php
	htdocs/reception/class/reception.class.php
 2022-03-23 17:23:21 +01:00
Laurent Destailleur
32f2499c36 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/langs/en_US/projects.lang
	htdocs/langs/en_US/propal.lang
	htdocs/product/price.php
	htdocs/projet/card.php
	htdocs/reception/class/reception.class.php
 2022-03-23 17:04:31 +01:00
kamel
26a462dce0 NEW : Update variants to standard card and list (permission) 2022-03-18 15:43:32 +01:00
kamel
1418fd7054 NEW : Update variants to standard card and list 2022-03-18 15:38:44 +01:00
Laurent Destailleur
43e7547611 Fix sql errors 2022-03-17 11:49:14 +01:00
Marc de Lima Lucio
e989371651 FIX: better error management at product selling price update 2022-03-08 14:49:26 +01:00
Laurent Destailleur
626a5b90f1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-16 21:23:45 +01:00
Laurent Destailleur
c3733a92e1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
 2022-02-16 21:22:49 +01:00
Quentin VIAL-GOUTEYRON
82b3d89923 FIX wieght is loose if it's comma on combinations 2022-02-15 11:31:09 +01:00
Laurent Destailleur
142e9473c5 Responsive 2021-11-07 18:28:59 +01:00
Laurent Destailleur
f5edd25f6d Clean code 2021-11-07 18:14:49 +01:00
Laurent Destailleur
dd2207d6c5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/list.php
	htdocs/core/db/DoliDB.class.php
	htdocs/resource/list.php
 2021-11-06 21:11:05 +01:00
Laurent Destailleur
7e68f9e013 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/db/DoliDB.class.php
	htdocs/resource/list.php
 2021-11-06 21:04:17 +01:00
stickler-ci
5c10cd5ba9 Fixing style errors. 2021-11-02 13:20:41 +00:00
BadPixxel
98929f2dba FIX: Status propagation from Parent Product 
toSell or toBuy Status propagation should be done only when parent is updated. 

Otherwise, any modification made on the parent will overwrite the specific configuration made at the child level.
 2021-11-02 14:16:55 +01:00
Laurent Destailleur
cee573cf96 Update ProductCombination.class.php 2021-10-31 17:42:43 +01:00
Gauthier PC portable 024
1e45b9b1cd FIX : We need a default price base type in variant creation case with multiprices when parent has been created with only one level price 2021-10-25 15:25:58 +02:00
Laurent Destailleur
d064ab2b17 Add more action to GET action to check 2021-10-02 12:58:15 +02:00
Laurent Destailleur
37603b451a Fix token in url 2021-09-27 12:24:01 +02:00
Laurent Destailleur
5c8fb38426 Fix add del* action into list of sensitive actions 2021-09-19 14:41:46 +02:00
lmarcouiller
3a1a688ab2 Fix #18604 : fix percentage on variant product 2021-09-10 15:03:08 +02:00
Laurent Destailleur
3d72a21396 Clean code 2021-08-28 03:09:41 +02:00
Laurent Destailleur
46d993c9a6 Clean code 2021-08-27 22:42:04 +02:00
Laurent Destailleur
000c32c137 FIx #18313 2021-08-02 20:20:52 +02:00
Laurent Destailleur
c2b910f6ed Clean code 2021-06-11 15:08:54 +02:00
Laurent Destailleur
7e95c5ec20 Clean code 2021-06-08 11:40:50 +02:00
Laurent Destailleur
11fa523070 FIX CWE-269 2021-05-21 15:54:11 +02:00