Marion Muszynski
|
e94b10553d
|
begin bdc logistique
|
2016-04-04 17:23:15 +02:00 |
|
Marion Muszynski
|
d658b0eab2
|
update message confirm for deletion ean
|
2016-04-04 15:54:18 +02:00 |
|
Marion Muszynski
|
7fbf095387
|
update for delete ean in sale
|
2016-04-04 15:20:32 +02:00 |
|
Marion Muszynski
|
e76af013f5
|
Merge branch 'alexandre-braderie' into develop
|
2016-04-04 14:18:42 +02:00 |
|
Marion Muszynski
|
aa10c07dd6
|
update categories pb
|
2016-04-04 14:18:12 +02:00 |
|
Marion Muszynski
|
e8a15b1e19
|
Merge branch 'alexandre-braderie' into develop
|
2016-04-04 13:35:04 +02:00 |
|
Marion Muszynski
|
11a07506c0
|
update product name
|
2016-04-04 13:34:26 +02:00 |
|
Thibault UBUNTU
|
8471702ff7
|
fix
|
2016-04-04 13:25:38 +02:00 |
|
Thibault UBUNTU
|
39f9ff27e5
|
skin page payment
|
2016-04-04 13:24:07 +02:00 |
|
Thibault GUILLAUME
|
5beaf8e77e
|
fix conflict
|
2016-04-04 11:49: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
|
7500debda5
|
Merge branch 'alexandre-braderie' into develop
|
2016-04-01 11:52:23 +02:00 |
|
Marion Muszynski
|
f1223a3289
|
update to add product in parent category
|
2016-04-01 11:51:58 +02:00 |
|
Marion Muszynski
|
17fed79f4f
|
Merge branch 'alexandre-braderie' into develop
|
2016-03-31 12:48:18 +02:00 |
|
Marion Muszynski
|
bfa1328547
|
update for bip ean
|
2016-03-31 12:47:51 +02:00 |
|
Srv Bebeboutik
|
7512ebbe4b
|
modif pour le flux partenaire familydeal
|
2016-03-31 12:08:00 +02:00 |
|
Srv Bebeboutik
|
ba20deb904
|
add lang to emarsys rss img
|
2016-03-31 12:07:30 +02:00 |
|
Srv Bebeboutik
|
bcdb91f1e3
|
prepare ssl
|
2016-03-31 12:06:08 +02:00 |
|
Marion Muszynski
|
33c3bc741a
|
Merge branch 'alexandre-braderie' into develop
|
2016-03-31 11:52:20 +02:00 |
|
Marion Muszynski
|
4905fc1e86
|
update braderie with category
|
2016-03-31 11:51:37 +02:00 |
|
Marion Muszynski
|
3ab5a75a06
|
update for prod with good email addresses
|
2016-03-29 17:42:28 +02:00 |
|
Marion Muszynski
|
053876e6d2
|
Merge branch 'ticket-9759' into develop
|
2016-03-29 17:39:01 +02:00 |
|
Marion Muszynski
|
3284953789
|
update logo adminAlert
|
2016-03-29 17:38:35 +02:00 |
|
Marion Muszynski
|
65a43a991c
|
Merge branch 'ticket-9759' into develop
|
2016-03-29 17:33:44 +02:00 |
|
Marion Muszynski
|
e1e40f0458
|
update mail template and module
|
2016-03-29 17:33:15 +02:00 |
|
Marion Muszynski
|
c27c0fc1aa
|
Merge branch 'ticket-9759' into develop
|
2016-03-29 17:10:05 +02:00 |
|
Marion Muszynski
|
975c490261
|
update for tests in dev
|
2016-03-29 17:08:52 +02:00 |
|
Marion Muszynski
|
9a5cf505da
|
Merge branch 'ticket-9759' into develop
|
2016-03-29 17:02:21 +02:00 |
|
Marion Muszynski
|
b763543244
|
adding ant_alert module
|
2016-03-29 17:01:26 +02:00 |
|
Srv Bebeboutik
|
84b337ab99
|
add logo to payment page paypal
|
2016-03-24 10:29:55 +01:00 |
|
Marion Muszynski
|
74ee8fd6e1
|
fix sort products
|
2016-03-23 13:23:33 +01:00 |
|
Marion Muszynski
|
26701eeba5
|
fix conflict
|
2016-03-23 12:02:14 +01:00 |
|
Marion Muszynski
|
67264249a5
|
fix quantity and product with attribute
|
2016-03-23 11:49:34 +01:00 |
|
Marion Muszynski
|
5cc2da8f90
|
fix confilct
|
2016-03-22 17:38:33 +01:00 |
|
Thibault UBUNTU
|
d7bf4edb67
|
fix problem product whitout attribut
|
2016-03-22 17:34:39 +01:00 |
|
Marion Muszynski
|
0974e32f3c
|
fix labelgenerate
|
2016-03-22 17:31:19 +01:00 |
|
Srv Bebeboutik
|
bf20d2be17
|
fix labelgenerate
|
2016-03-22 17:23:04 +01:00 |
|
Marion Muszynski
|
66ad7b0ecd
|
Merge branch 'ticket-7748' into develop
|
2016-03-22 17:17:46 +01:00 |
|
Marion Muszynski
|
8e7e351af3
|
sort products for labelgenerate
|
2016-03-22 17:17:22 +01:00 |
|
Alexandre Simonet
|
50a7b40c66
|
fix event
|
2016-03-22 16:55:07 +01:00 |
|
Alexandre Simonet
|
fb0b4514a1
|
fix wip
|
2016-03-22 16:38:49 +01:00 |
|
Alexandre Simonet
|
0aade6697d
|
fix wip
|
2016-03-22 16:32:33 +01:00 |
|
Marion Muszynski
|
7b5a052eba
|
Merge branch 'ticket-9642' into develop
|
2016-03-21 10:22:38 +01:00 |
|
Marion Muszynski
|
8dc1943ee4
|
modif getSales with option consumable
|
2016-03-21 10:22:14 +01:00 |
|
Alexandre Simonet
|
9240003ba5
|
Fix
|
2016-03-21 10:07:35 +01:00 |
|
Marion Muszynski
|
1195b73c6e
|
Merge branch 'ticket-9642' into develop
|
2016-03-18 17:06:40 +01:00 |
|
Marion Muszynski
|
7e3fe49847
|
fix price in socolissimo
|
2016-03-18 17:06:08 +01:00 |
|
Alexandre Simonet
|
5d429f51fd
|
fix
|
2016-03-17 11:57:24 +01:00 |
|
Alexandre Simonet
|
fa884bd460
|
ajout quantity
|
2016-03-16 18:05:41 +01:00 |
|