Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
130,797 Commits 36 Branches 189 Tags
a2c92f183cc54c35013469638780c28e65df0b51
Commit Graph

164 Commits

Author SHA1 Message Date
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
Laurent Destailleur
3b22b6192d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-28 21:36:08 +02:00
Laurent Destailleur
60dfcdba00 Fix var type 2020-05-28 21:29:30 +02:00
Frédéric FRANCE
5aa84c64d0 Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-23 18:54:33 +02:00
Frédéric FRANCE
2085ac73e7 Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-23 18:34:58 +02:00
Laurent Destailleur
3a15688f17 FIX #13951 2020-05-23 13:53:47 +02:00
Laurent Destailleur
a9b5feb680 Merge branch 'develop' into keep_child_label_if_modified 2020-05-23 13:51:13 +02:00
Laurent Destailleur
83ecbef9bc FIX #13911 #13940 2020-05-23 13:46:37 +02:00
gael.langlais
dce93197d7 FIX #13908 keep child label if modified by user 2020-05-22 17:58:24 +02:00
Frédéric FRANCE
ba8cf2b398 add new rule 2020-05-21 09:21:30 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-10 08:59:32 +00:00
Laurent Destailleur
badc4327c2 Merge branch 'develop' into patch-3 2020-02-21 19:45:33 +01:00
Frédéric FRANCE
9e4fb8d4fe doxygen 2019-12-15 10:02:20 +01:00
Cédric
45bf3e4df9 Merge branch 'develop' into patch-3 2019-11-28 13:11:52 +01:00
Laurent Destailleur
30ea48a715 Fix api for deletion of attributes 2019-11-26 12:58:41 +01:00
stickler-ci
7a3f6c362d Fixing style errors. 2019-11-23 15:23:31 +00:00
Cédric
6086ecef86 Can add already existing product as variant 
ONLY if the reference is forced
 2019-11-23 16:14:21 +01:00
Cédric
3aef39c64d New can customize the reference of a combination 2019-11-23 13:45:58 +01:00
Cédric
40e4af234d Inject $user instead of global var 2019-11-17 01:24:07 +01:00
Laurent Destailleur
c02cd80b75 Clean code 2019-11-12 10:11:30 +01:00
Cédric
df4bcdcb94 Edit updateProperties to inject $user 2019-11-09 14:13:14 +01:00
Frédéric FRANCE
a7797ba1da clean indent in variants directory 2019-10-26 20:53:39 +02:00
Frédéric FRANCE
e75f7d448c Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Frédéric FRANCE
1c07006015 wip 2019-02-25 21:36:27 +01:00
Frédéric FRANCE
bc395b247a fix html5 in variant 2019-02-16 08:00:16 +01:00
Frédéric FRANCE
1e43f8e54a PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00
Frédéric FRANCE
273d68381c psr2 end file new line none found 2019-02-03 15:21:21 +01:00
Frédéric FRANCE
86d854f3f4 Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Juanjo Menent
34118bcf20 New: works with variants: 
- Multiprices compatibility
 2018-10-19 12:02:14 +02:00
Juanjo Menent
1714bce8a1 New: works with variants: 
- Better function name
 2018-10-19 08:53:01 +02:00
Juanjo Menent
c588f5e6c0 New: works with variants: 
-Child label with combination labels
 2018-10-18 10:55:27 +02:00
Juanjo Menent
6c76f9517f New: works with variants: 
-Child label with combination labels
 2018-10-18 10:26:21 +02:00
Juanjo Menent
fd989230a4 New: works with variants: 
-Child label change if parent changes
 2018-10-18 09:09:42 +02:00
Juanjo Menent
ab55ff2e2c New: works with variants: 
- Make the checkbox working correctly
 2018-10-11 15:44:23 +02:00