697 Commits

Author SHA1 Message Date
Marion Muszynski
70e5c4a7dd adding cookie for checked sale 2016-06-22 11:48:28 +02:00
Marion Muszynski
ae50025d14 continuing updating 2016-06-22 11:26:51 +02:00
Marion Muszynski
8ebec9fb3e addind admin pending orders 2016-06-21 17:18:24 +02:00
Marion Muszynski
c442173cb8 add nex adminTab 2016-06-20 18:27:54 +02:00
Marion Muszynski
c29d8725ac add status modify button 2016-06-20 15:32:06 +02:00
Marion Muszynski
9ddab586a1 Merge branch 'ticket-10254' 2016-06-20 15:14:50 +02:00
Marion Muszynski
a11f4ad97e modif button color 2016-06-20 15:13:18 +02:00
Marion Muszynski
6265c1b2af begin update adminlogistic 2016-06-20 15:09:13 +02:00
Marion Muszynski
ad30bb51a4 modif in Sale function for M2 2016-06-20 12:56:59 +02:00
Marion Muszynski
3d4d7b16e2 update invoice 2016-06-20 12:49:32 +02:00
Marion Muszynski
56163f32ab update bdc log 2016-06-20 11:01:39 +02:00
Srv Bebeboutik
e7e7f8381c push prod modif carrier 2016-06-20 10:42:30 +02:00
Marion Muszynski
6c3e87c85a Merge branch 'ticket-8251' 2016-06-10 14:53:46 +02:00
Marion Muszynski
2c07f5a0b2 good fix this time 2016-06-10 14:52:32 +02:00
Marion Muszynski
50eff4bc6c Merge branch 'ticket-8251' 2016-06-10 14:46:04 +02:00
Marion Muszynski
9f39cdffe4 petit fix 2016-06-10 14:45:46 +02:00
Marion Muszynski
7ea4968d08 fix 2016-06-10 14:44:45 +02:00
Marion Muszynski
ce9af872f7 Merge branch 'ticket-8251' 2016-06-10 14:39:59 +02:00
Marion Muszynski
e3bc588287 update function expe48hbis 2016-06-10 14:37:34 +02:00
Marion Muszynski
b276ca2f68 Merge branch 'ticket-8251' 2016-06-10 12:24:33 +02:00
Marion Muszynski
1386f8460f modif for prod 2016-06-10 12:19:45 +02:00
Marion Muszynski
bafeacf546 Merge branch 'ticket-9875' 2016-06-10 11:55:33 +02:00
Marion Muszynski
40ab87cd45 update request deb expe 2016-06-10 11:55:09 +02:00
Marion Muszynski
389356d129 suite update 2016-06-10 11:41:50 +02:00
Marion Muszynski
2d776eae51 Merge branch 'ticket-9875' 2016-06-10 10:22:49 +02:00
Marion Muszynski
182a608e3b little update in request 2016-06-10 10:22:26 +02:00
Marion Muszynski
b49366dde2 ajout du wholesale_price dans import decli 2016-06-09 12:43:52 +02:00
Marion Muszynski
7945d0c0ad modif for ecotax style 2016-06-09 11:49:33 +02:00
Marion Muszynski
dbe607dccc modif invoices for multi expe48h 2016-06-09 10:31:52 +02:00
Marion Muszynski
2611a2e1ca Merge branch 'ticket-10169' 2016-06-08 17:46:27 +02:00
Marion Muszynski
1615e9a452 adding fields in sale exports 2016-06-08 17:44:21 +02:00
Marion Muszynski
77023fdbcb invoice for multi 48h 2016-06-08 16:56:43 +02:00
Marion Muszynski
ba706ec6c9 Merge branch 'ticket-fidelite' 2016-06-08 16:33:40 +02:00
Marion Muszynski
d47310bc0a redirect for es version 2016-06-08 16:27:56 +02:00
Marion Muszynski
2b2ae3fa8a modif zoomdiv 2016-06-08 14:29:19 +02:00
Marion Muszynski
ab21f10643 Merge branch 'ticket-fidelite' 2016-06-08 12:53:58 +02:00
Marion Muszynski
dc85f8eca6 modif trad 2016-06-08 12:53:38 +02:00
Marion Muszynski
60996f7bcf Merge branch 'ticket-fidelite' 2016-06-08 12:26:28 +02:00
Marion Muszynski
c0836540bc delete some stuff about categories 2016-06-08 12:25:05 +02:00
Marion Muszynski
5c8e35adf2 Merge branch 'ticket-fidelite' 2016-06-08 12:16:37 +02:00
Marion Muszynski
e7ce0ecb86 opti request suite 2016-06-08 12:14:54 +02:00
Marion Muszynski
e9300ff725 opti request 2 2016-06-08 12:02:16 +02:00
Marion Muszynski
83c4acc83d opti request 2016-06-08 11:44:13 +02:00
Marion Muszynski
30b39b5776 fix conflicts 2016-06-08 10:53:07 +02:00
Marion Muszynski
b9f7b26a59 modif css shopping cart 2016-06-08 10:37:37 +02:00
Marion Muszynski
6196489224 Merge branch 'ticket-8041' 2016-06-07 17:47:45 +02:00
Marion Muszynski
563896bbcb rename import done 2016-06-07 17:42:59 +02:00
Marion Muszynski
577249435f Merge branch 'ticket-10122' 2016-06-07 17:00:06 +02:00
Marion Muszynski
5f21c6d3b2 update braderie 2016-06-07 16:40:19 +02:00
Srv Bebeboutik
3ba607554c modif end sale 2016-06-07 16:02:16 +02:00