214 Commits

Author SHA1 Message Date
Marion Muszynski
bf619d7173 update trad in export bdc 2016-04-06 13:21:04 +02:00
Marion Muszynski
42704a03c7 creation bdc logistique 2016-04-06 13:09:54 +02:00
Marion Muszynski
c35bcc893a avancées dans le bdc log 2016-04-05 18:15:35 +02:00
Marion Muszynski
2f57a773ff Merge branch 'ticket-crazyegg' 2016-04-05 16:19:33 +02:00
Marion Muszynski
4309307488 modif script put in header.tpl 2016-04-05 16:18:52 +02:00
Marion Muszynski
c6887b7b84 suite ticket 9791 2016-04-05 16:14:32 +02:00
Marion Muszynski
12d18ea080 Merge branch 'ticket-9643' 2016-04-05 14:43:37 +02:00
Marion Muszynski
3a767a9e58 Merge branch 'ticket-ean' 2016-04-05 14:29:19 +02:00
Marion Muszynski
c9023ddb9a fix ref problem 2016-04-05 14:20:50 +02:00
Marion Muszynski
0db74b6f35 Merge branch 'ticket-crazyegg' 2016-04-04 17:31:23 +02:00
Marion Muszynski
f986fa77a6 ajout script crazyegg 2016-04-04 17:30:52 +02:00
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
aa10c07dd6 update categories pb 2016-04-04 14:18:12 +02:00
Marion Muszynski
11a07506c0 update product name 2016-04-04 13:34:26 +02:00
Srv Bebeboutik
85c9a39043 https on facebook 2016-04-04 11:44:49 +02:00
Srv Bebeboutik
0ec932fb7f add quote import 2016-04-04 11:44:16 +02:00
Marion Muszynski
6279c24199 adding privatesale country 2016-04-04 10:49:37 +02:00
Marion Muszynski
0c6bda8578 update reorder 2016-04-01 15:23:01 +02:00
Marion Muszynski
815bc77445 adding reorder product 2016-04-01 15:03:40 +02:00
Marion Muszynski
f1223a3289 update to add product in parent category 2016-04-01 11:51:58 +02:00
Marion Muszynski
bfa1328547 update for bip ean 2016-03-31 12:47:51 +02:00
Srv Bebeboutik
56f1489fbc petite trad 2016-03-31 12:08:39 +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
c3c53223ca remove ie6 info 2016-03-31 12:06:40 +02:00
Srv Bebeboutik
bcdb91f1e3 prepare ssl 2016-03-31 12:06:08 +02:00
Srv Bebeboutik
e4a9771a82 change int country to varchar 2016-03-31 12:05:30 +02:00
Marion Muszynski
4905fc1e86 update braderie with category 2016-03-31 11:51:37 +02:00
Marion Muszynski
5e01b9492e Merge branch 'ticket-9759' 2016-03-29 17:42:58 +02:00
Marion Muszynski
3ab5a75a06 update for prod with good email addresses 2016-03-29 17:42:28 +02:00
Marion Muszynski
3284953789 update logo adminAlert 2016-03-29 17:38:35 +02:00
Marion Muszynski
e1e40f0458 update mail template and module 2016-03-29 17:33:15 +02:00
Marion Muszynski
ba8fa44d2f fix hook 2016-03-29 17:20:28 +02:00
Marion Muszynski
975c490261 update for tests in dev 2016-03-29 17:08:52 +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
058aae7d32 Merge branch 'ticket-7748' 2016-03-23 13:25:33 +01:00
Marion Muszynski
74ee8fd6e1 fix sort products 2016-03-23 13:23:33 +01:00
Marion Muszynski
67264249a5 fix quantity and product with attribute 2016-03-23 11:49:34 +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
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
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
7e3fe49847 fix price in socolissimo 2016-03-18 17:06:08 +01:00