Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
71,061 Commits 36 Branches 189 Tags
01e7b5747d3ece7bb4623c8889ffa98ebb39bc7c
Commit Graph

72 Commits

Author SHA1 Message Date
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
52ad5c5565 New: works with variants: 
-To edit child price and weight impacts better to see in tab the father price and weight
 2018-10-18 12:21:39 +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
Laurent Destailleur
57bb8bcfcd Disabled action are hidden with reason 2018-10-16 20:27:33 +02:00
Juanjo Menent
ab55ff2e2c New: works with variants: 
- Make the checkbox working correctly
 2018-10-11 15:44:23 +02:00
Juanjo Menent
2ef0e95586 New: works with variants: 
- If product is parent showing stock of childs and not itself
- Add function hasVariants for know if product has variants
 2018-10-11 12:08:50 +02:00
Philippe GRAND
c7c3780400 clean code 2018-10-05 15:34:32 +02:00
Alexey Pyltsyn
49de7a5881 Replace multiple load calls with loadLangs method 2018-10-01 09:22:23 +03:00
Frédéric FRANCE
aab617aeb3 remove deprecated 2018-09-09 18:38:48 +02:00
Frédéric FRANCE
0e0db9d1ee remove deprecated 2018-09-09 15:52:55 +02:00
Frédéric FRANCE
ebcf43ec73 function Comment Missing 2018-08-31 21:39:23 +02:00
Laurent Destailleur
85eed6cf80 Merge branch 'develop' into trimtrailing 2018-08-21 13:40:04 +02:00
Laurent Destailleur
5effcd222f Merge pull request #9150 from frederic34/variant 
code cleaning
 2018-08-21 13:21:11 +02:00
Philippe GRAND
a31ad5af3d standardize code 2018-08-17 17:55:00 +02:00
Frédéric FRANCE
6f74ecceaf Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-12 18:21:59 +02:00
Frédéric FRANCE
cb53366955 Merge remote-tracking branch 'upstream/develop' into variant 2018-08-07 16:55:50 +02:00
Frédéric FRANCE
9025c452ef Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-07 16:40:03 +02:00
Philippe GRAND
42fe2b78de clean and update code 2018-08-07 10:44:26 +02:00
Philippe GRAND
59cd0a5e5e uniformize 2018-08-04 15:58:05 +02:00
Philippe GRAND
541e919ae0 Clean and update code 2018-07-27 14:49:33 +02:00
Frédéric FRANCE
b90d125fda trim trailing 2018-07-26 20:19:52 +02:00
Frédéric FRANCE
b87c3b80af code cleaning 2018-07-25 09:36:34 +02:00
Laurent Destailleur
4a5fd35e11 Look and feel v8 2018-06-13 22:57:41 +02:00
Frédéric FRANCE
455f809968 Update admin.php 2018-05-26 09:40:00 +02:00
Laurent Destailleur
546da0ceda Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/core/modules/modStock.class.php
	htdocs/product/inventory/list.php
 2018-05-05 14:40:39 +02:00
fappels
db76fd7895 Fix delete all product variants of a parent product 
User object missing
 2018-05-02 22:33:23 +02:00
Frédéric FRANCE
6fc444e045 we can see what we are doing 2018-04-24 12:08:17 +02:00
Frédéric FRANCE
5f4e2dc565 variant on services 2018-04-24 11:01:17 +02:00
Laurent Destailleur
cef9782179 Clean defined constant at begin of pages 2018-04-21 12:00:55 +02:00
Laurent Destailleur
bbfc4a3e17 NEW Look and feel v8 - Show Picto "+" on all links "Add record" 2018-04-18 03:26:15 +02:00
Laurent Destailleur
46d28acb44 Look and feel v8 2018-04-18 02:10:23 +02:00
Laurent Destailleur
e2838aa074 NEW Show also size in bytes in tooltip if visible unit is not bytes 2018-04-15 17:58:13 +02:00
Laurent Destailleur
1feee6378f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-11 14:45:52 +02:00
Laurent Destailleur
21c65f812a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-11 13:21:20 +02:00
Frédéric FRANCE
a95bc76afb Update combinations.php 2018-04-11 12:10:58 +02:00
Frédéric FRANCE
bc7623d383 Update getCombinations.php 2018-04-11 12:05:23 +02:00
Frédéric FRANCE
2c76a6cd80 Update combinations.php 2018-04-11 11:44:22 +02:00
Laurent Destailleur
64f21b8a3c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/card.php
 2018-03-11 00:10:13 +01:00
BadPixxel
836054a8b3 BugFix Issue #8261: Variants module. Combinations cannot be edited 2018-03-10 14:51:24 +01:00
Laurent Destailleur
a833c271e1 Missing user 2018-03-10 12:37:44 +01:00
Laurent Destailleur
41638e6dff Fix back link of look and feel v7 2018-02-26 09:20:05 +01:00
Laurent Destailleur
a0231b5c60 Fix responsive 2017-12-01 12:55:28 +01:00
Laurent Destailleur
ae906270f3 Debug module variant 2017-11-26 18:43:43 +01:00
Laurent Destailleur
2c07886360 Debug module variant 2017-11-26 15:08:00 +01:00
Laurent Destailleur
1ec6c13ece Debug module variant 2017-11-26 10:13:32 +01:00
Laurent Destailleur
776f999b71 Merge branch 'develop' into develop_update_tablednd 2017-11-17 15:10:09 +01:00