Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 01:28:19 +01:00
Code Issues Packages Projects Releases Wiki Activity
125,174 Commits 36 Branches 190 Tags
2e431468a04bb95093e1750fdbbe48c30e936a10
Commit Graph

148 Commits

Author SHA1 Message Date
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
Laurent Destailleur
15e7cd0fb3 Fix doxygen 2020-08-17 05:54:22 +02:00
Laurent Destailleur
cf73c2d8e1 Fix travis 2020-08-17 05:26:32 +02:00
Laurent Destailleur
9712e3d28f Fix travis 2020-08-17 05:09:27 +02:00
Laurent Destailleur
b7c38f4617 Merge pull request #14433 from c3do/patch-1 
NEW Triggers Attributes and Attributes values
 2020-08-16 23:45:32 +02:00
stickler-ci
959ccce777 Fixing style errors. 2020-08-13 09:48:28 +00:00
John Botella
4e1f554c15 Fix - add variation price fallback behavior 2020-08-13 11:43:33 +02:00
John Botella
f0268b4aaf Add declinaison price level 2020-08-12 10:14:29 +02:00
Cédric
3f233a3200 Fix comment params 2020-08-08 23:01:41 +02:00
stickler-ci
d7a65a540e Fixing style errors. 2020-08-08 20:58:51 +00:00
Cédric
ed1a2cd917 Update 1 2020-08-08 22:45:51 +02:00
Cédric
e73a7c78f7 NEW triggers create, modify, delete 2020-08-08 22:10:50 +02:00
Cédric
bb16564b98 NEW triggers create, modify, delete 
Also modified deleteByFkAttribute() to use the function delete()
 2020-08-08 22:08:46 +02:00