Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
107,259 Commits 36 Branches 189 Tags
a06b51e06c69f7c63e1a941ae68698cb997ae28d
Commit Graph

110 Commits

Author SHA1 Message Date
Laurent Destailleur
43e7547611 Fix sql errors 2022-03-17 11:49:14 +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
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
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
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
15440917b1 Fix #ygosha5698 2021-03-22 11:30:18 +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
Frédéric FRANCE
db871994fb code syntax variants webservice directory 2021-02-26 13:10:10 +01:00
josemariagomezroncero
c0a489ec1a Update ProductCombination.class.php 
Product dont update product variation statut when desactivate for sale.
 2021-02-24 23:16:46 +01:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 13:32:18 +00:00
Laurent Destailleur
43ed2c6c20 Fix phpunit 2020-09-21 12:35:20 +02:00
Laurent Destailleur
c5aff1769a Merge pull request #14631 from c3do/patch-3 
NEW ref_ext for Attributes and Combinations
 2020-09-20 17:50:51 +02:00
Laurent Destailleur
216b3c885d Fix escaping 2020-09-20 01:30:36 +02:00
Cédric
0d20b6645d Update ProductCombination.class.php 2020-09-17 12:37:20 +02:00
Laurent Destailleur
c0ef7e8f13 fix phpcs 2020-09-14 04:23:14 +02:00
Laurent Destailleur
48e34c2069 Add int 2020-09-12 15:53:18 +02:00
Cédric
3209708e30 Update ProductCombination.class.php 2020-09-10 13:56:58 +02:00
Scrutinizer Auto-Fixer
c263c8a76c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-08 19:27:28 +00:00
stickler-ci
61903a1079 Fixing style errors. 2020-09-07 15:24:35 +00:00
Cédric
5992641360 Merge branch 'develop' into patch-3 2020-09-07 17:22:18 +02:00
Scrutinizer Auto-Fixer
b78ff67d7e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-07 08:18:17 +00:00
Laurent Destailleur
be1460e3eb Fix doxygen 2020-09-07 02:49:39 +02:00
stickler-ci
af91013506 Fixing style errors. 2020-09-06 15:52:02 +00:00
Cédric
03e9e17be4 Merge branch 'develop' into patch-3 2020-09-06 17:50:54 +02:00
Laurent Destailleur
f2a16d860e Enhance method fetchByFkProductChild() 2020-09-04 14:05:35 +02:00
Laurent Destailleur
4383f1d00c Update ProductCombination.class.php 2020-09-04 13:50:22 +02:00
stickler-ci
8d6c19a432 Fixing style errors. 2020-09-04 10:10:37 +00:00
Cédric
b841a4354e NEW ref_ext for Attributes 2020-09-04 12:06:09 +02:00
Cédric
925a1475a1 add ref_ext to ProductCombination.class.php 2020-09-04 11:01:47 +02:00
Laurent Destailleur
9293d1917a Update ProductCombination.class.php 2020-09-03 12:37:30 +02:00
Laurent Destailleur
1d3c54dd64 Update ProductCombination.class.php 2020-09-03 12:36:57 +02:00
John Botella
cd952f7427 Fix and factor fetch combination price level 2020-09-02 16:24:22 +02:00
Laurent Destailleur
5be10f133c Fix several regressions with variants creation 2020-08-17 13:55:18 +02:00
Laurent Destailleur
96d4eeb8be Fix syntax error 2020-08-17 12:24:32 +02:00