244 Commits

Author SHA1 Message Date
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
Marion Muszynski
6feaf9ff28 test carrier cost 2016-03-18 15:57:22 +01:00
Marion Muszynski
879418dea1 add check carrier in ParentOrderController 2016-03-17 12:31:42 +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
Marion Muszynski
086f3f5906 add define 2016-03-16 17:56:03 +01:00
Alexandre Simonet
32ff09ae0f duplicate attributes 2016-03-16 17:49:08 +01:00
Marion Muszynski
df4be5618d update to see consommables in BO 2016-03-16 15:47:25 +01:00
Marion Muszynski
de06f70738 check consommables 2016-03-16 15:24:12 +01:00
Alexandre Simonet
1662a5fa70 Fix pSQL 2016-03-16 12:58:12 +01:00
Alexandre Simonet
3bdec3deda Clone images 2016-03-16 12:57:28 +01:00
Marion Muszynski
380f5dbd85 Merge branch 'ticket-9598' 2016-03-16 12:19:10 +01:00
Marion Muszynski
4a4d6d63d2 update trad 2016-03-16 12:18:41 +01:00
Alexandre Simonet
58d917bc6a Check si le produit existe deja dans la vente 2016-03-16 12:14:19 +01:00
Marion Muszynski
df1836083c Merge branch 'ticket-9598' 2016-03-16 11:58:53 +01:00
Thibault UBUNTU
7b289bba8a fix divers 2016-03-16 11:49:15 +01:00
Alexandre Simonet
2625d7e0f0 open in new tab 2016-03-15 17:47:45 +01:00
Alexandre Simonet
545c8edf25 Intertion dans la braderie ajax 2016-03-15 16:07:49 +01:00
Alexandre Simonet
d6e96411e9 Boutton voir cette catégorie 2016-03-15 15:31:05 +01:00
Alexandre Simonet
18074c115b Insertion d'un produit dans la braderie 2016-03-15 15:05:40 +01:00
Alexandre Simonet
5038fd8e1f [WIP] get categories sales 2016-03-14 18:06:51 +01:00