Marion Muszynski
|
60577f145a
|
fix conflict
|
2016-11-22 11:53:24 +01:00 |
|
Marion Muszynski
|
1e6dd3ddda
|
css modification and addition of shipping column
|
2016-11-21 16:29:22 +01:00 |
|
Marion Muszynski
|
03c169aca4
|
Merge branch 'ticket-11210-imageVP' into develop
|
2016-11-18 10:55:05 +01:00 |
|
Marion Muszynski
|
d91720a2d4
|
adapt the modif to thumb img
|
2016-11-18 10:54:38 +01:00 |
|
Marion Muszynski
|
d8d9dcf9af
|
Merge branch 'ticket-11210-imageVP' into develop
|
2016-11-10 16:09:28 +01:00 |
|
Marion Muszynski
|
e34bef4bd2
|
small fix
|
2016-11-10 16:09:09 +01:00 |
|
Marion Muszynski
|
fe03ca4ed1
|
Merge branch 'ticket-11210-imageVP' into develop
|
2016-11-10 10:36:37 +01:00 |
|
Marion Muszynski
|
ca38824e83
|
restriction on liston and listoff
|
2016-11-10 10:36:14 +01:00 |
|
Marion Muszynski
|
a9c19b6c6c
|
Merge branch 'ticket-11210-imageVP' into develop
|
2016-11-09 17:50:56 +01:00 |
|
Marion Muszynski
|
9a9a222552
|
simplification of img uploaded in privatesale
|
2016-11-09 17:50:41 +01:00 |
|
Marion Muszynski
|
b4eaebddcf
|
fix vi bugs
|
2016-11-07 15:35:57 +01:00 |
|
Marion Muszynski
|
54427ea473
|
new delay added in choice in ps management
|
2016-11-07 15:35:15 +01:00 |
|
Marion Muszynski
|
49aeb076ac
|
Merge branch 'ticket-11056' into develop
|
2016-10-20 14:03:30 +02:00 |
|
Marion Muszynski
|
37d7422d08
|
fix js
|
2016-10-20 14:03:15 +02:00 |
|
Marion Muszynski
|
593166c883
|
Merge branch 'ticket-11056' into develop
|
2016-10-20 13:49:19 +02:00 |
|
Marion Muszynski
|
302ba040d1
|
modif expedition
|
2016-10-20 13:48:55 +02:00 |
|
Marion Muszynski
|
bb95ffcaa1
|
Merge branch 'ticket-11056' into develop
|
2016-10-14 13:11:15 +02:00 |
|
Marion Muszynski
|
9edcc64a82
|
modification of delivery mode selection
|
2016-10-14 13:10:56 +02:00 |
|
Marion Muszynski
|
541a0ed663
|
fix conflict
|
2016-10-05 11:27:50 +02:00 |
|
Marion Muszynski
|
6c927d2266
|
addition of id category of sale in sale management
|
2016-10-05 11:25:43 +02:00 |
|
Marion Muszynski
|
b4ff3a8ee5
|
addition of remove img option in adminPrivateSalesSales
|
2016-09-06 11:07:40 +02:00 |
|
Marion Muszynski
|
7af6d9ccd7
|
adding bg for sale
|
2016-06-10 16:49:43 +02:00 |
|
Marion Muszynski
|
72545630a3
|
fix conflicts
|
2016-06-06 11:32:25 +02:00 |
|
Marion Muszynski
|
d63a2d7d5a
|
addind field to config if delivery of sale is enabled only in fr
|
2016-05-30 15:42:20 +02:00 |
|
Marion Muszynski
|
85c5e03a39
|
adapte for prod
|
2016-05-13 15:50:44 +02:00 |
|
Marion Muszynski
|
f542a268e7
|
pre checked carriers sale
|
2016-05-13 15:48:09 +02:00 |
|
Marion Muszynski
|
0b0ebcb26f
|
fix conflict consommables
|
2016-04-12 15:17:45 +02:00 |
|
Thibault GUILLAUME
|
3d0ebede08
|
test
|
2016-04-04 11:47:52 +02:00 |
|
Marion Muszynski
|
6279c24199
|
adding privatesale country
|
2016-04-04 10:49:37 +02:00 |
|
Marion Muszynski
|
8dc1943ee4
|
modif getSales with option consumable
|
2016-03-21 10:22:14 +01:00 |
|
Marion Muszynski
|
df4be5618d
|
update to see consommables in BO
|
2016-03-16 15:47:25 +01:00 |
|
Thibault UBUNTU
|
477aaf257f
|
add braderie select in VP
|
2016-03-14 10:59:58 +01:00 |
|
Srv Bebeboutik
|
e9d8e2942a
|
add delay on bo
|
2016-01-22 11:51:02 +01:00 |
|
Srv Bebeboutik
|
6c0978166c
|
add modules
|
2016-01-04 12:49:26 +01:00 |
|