Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
108,088 Commits 36 Branches 189 Tags
cb15a21e41f9af36d14247fbb3f5da8ff4c05588
Commit Graph

269 Commits

Author SHA1 Message Date
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
Laurent Destailleur
dbd7292cd6 Replace doubleval into floatval 2021-05-20 09:22:55 +02:00
Laurent Destailleur
d6cdfcdd8c Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/paiement/card.php
	htdocs/compta/paiement/class/paiement.class.php
	htdocs/public/members/new.php
 2021-04-27 02:07:48 +02:00
stickler-ci
a8136a00b1 Fixing style errors. 2021-04-26 15:07:41 +00:00
jpb
8d07b43ccd space stickler 2021-04-26 17:05:21 +02:00
jpb
09d68dd7a6 fix the productCombination class on updatePrice 2021-04-26 17:00:53 +02:00
Laurent Destailleur
fd2d317b4a Fix #yogosha5881 2021-04-25 15:55:36 +02:00
Laurent Destailleur
8a62d97b89 Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
Laurent Destailleur
6e422d26f3 FIX #yogosha5746 - next step (wip) 2021-03-30 16:20:18 +02:00
Laurent Destailleur
537e979e5a Debug v13 2021-03-24 02:06:16 +01:00
Laurent Destailleur
15440917b1 Fix #ygosha5698 2021-03-22 11:30:18 +01:00
Laurent Destailleur
f6145a119f Fix #yogosha5679 2021-03-20 18:58:34 +01:00
Laurent Destailleur
725439c5e7 Merge pull request #16806 from dolibit-ut/patch-110 
Update create.php
 2021-03-18 22:52:34 +01:00
Laurent Destailleur
74506232e4 Merge pull request #16805 from dolibit-ut/patch-109 
Update card.php
 2021-03-18 22:51:23 +01:00
UT from dolibit
8844f4fda9 Update create_val.php 
$help_url = 'EN:Module_Products#Variants';

llxHeader('', $title, $help_url);
 2021-03-18 20:57:09 +01:00
UT from dolibit
b7aed07284 Update create.php 
$help_url = 'EN:Module_Products#Variants';

llxHeader('', $title, $help_url);
 2021-03-18 20:55:41 +01:00
UT from dolibit
3ca9bee5de Update card.php 
$help_url = 'EN:Module_Products#Variants';

llxHeader('', $title, $help_url);
 2021-03-18 20:52:24 +01:00
Laurent Destailleur
8aefb1b641 Merge pull request #16426 from josemariagomezroncero/patch-9 
NEW Set status of all variant when setting status of parent
 2021-02-26 13:25:04 +01:00
Laurent Destailleur
afcc3cb3e6 Update ProductCombination.class.php 2021-02-26 13:24:30 +01:00
Laurent Destailleur
77356afd03 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-26 13:22:28 +01:00
Laurent Destailleur
9e202467e0 Code comment 2021-02-26 13:22:13 +01:00