Commit Graph

11 Commits

Author SHA1 Message Date
Marion Muszynski
07603dfa84 Merge branch 'ticket-12197-NewDiscountAdminOrder' into develop 2017-01-17 10:06:49 +01:00
Marion Muszynski
41087356d8 return shipping cost enable when clicking on generateDiscount2 2017-01-17 10:06:26 +01:00
Marion Muszynski
1bde1c8550 fix conflict 2016-11-30 12:59:56 +01:00
Marion Muszynski
98a00dc459 fix on deletion 2016-11-30 12:58:26 +01:00
Marion Muszynski
a3f697a0be fix conflict 2016-11-30 12:42:16 +01:00
Marion Muszynski
2ac3271169 ajusting autocomplete ajax_product search 2016-11-30 12:40:27 +01:00
Marion Muszynski
6c51d23463 Merge branch 'ticket-AideContact-SAV' into develop 2016-10-18 16:12:31 +02:00
Marion Muszynski
b7b982305f continuation 2016-10-18 15:25:52 +02:00
Marion Muszynski
4a19fa9288 modif css accessories 2016-10-05 18:12:04 +02:00
Marion Muszynski
047f419b8e addition of img to recognize the product 2016-10-05 16:18:52 +02:00
Srv Bebeboutik
340bc7c146 push site 2016-01-04 12:48:08 +01:00