Commit Graph

240 Commits

Author SHA1 Message Date
Marion Muszynski
91ca51a960 modif cookie 2016-06-28 15:45:43 +02:00
Marion Muszynski
77b9c22014 fix conflicts 2016-06-22 15:03:36 +02:00
Marion Muszynski
70e5c4a7dd adding cookie for checked sale 2016-06-22 11:48:28 +02:00
Marion Muszynski
3d4d7b16e2 update invoice 2016-06-20 12:49:32 +02:00
Marion Muszynski
389356d129 suite update 2016-06-10 11:41:50 +02:00
Marion Muszynski
b49366dde2 ajout du wholesale_price dans import decli 2016-06-09 12:43:52 +02:00
Marion Muszynski
563896bbcb rename import done 2016-06-07 17:42:59 +02:00
Marion Muszynski
b332800b77 new fields in product db 2016-06-06 14:35:07 +02:00
Srv Bebeboutik
7085c1b80a update from prod 2016-06-06 12:35:00 +02:00
Marion Muszynski
72545630a3 fix conflicts 2016-06-06 11:32:25 +02:00
Marion Muszynski
192b88a451 adding delivery desc in product import 2016-06-03 12:16:33 +02:00
Marion Muszynski
99b35ed57a adding delivery description field for product 2016-06-03 12:07:12 +02:00
Marion Muszynski
8b9edb3d67 modif admin product and import 2016-05-30 13:11:57 +02:00
Marion Muszynski
16d8afa0a8 addind fields to product import 2016-05-26 16:38:36 +02:00
Marion Muszynski
7e7b335749 modif filter adminOrder 2016-05-13 10:41:09 +02:00
Marion Muszynski
ffbb3232b9 modif soflex 2016-05-09 17:43:57 +02:00
Marion Muszynski
23ede34fec suite modif tpl product 2016-05-02 15:19:54 +02:00
Marion Muszynski
2a160422d9 adding desc more for product 2016-04-27 16:11:19 +02:00
Marion Muszynski
d4722a7e81 order in search product 2016-04-14 13:06:06 +02:00
Marion Muszynski
d326f1bb59 update adminProducts order 2016-04-13 10:39:29 +02:00
Marion Muszynski
7a131e2bef correction ordre AdminProduct 2016-04-12 17:39:47 +02:00
Marion Muszynski
43a24d1c7a update braderie and rack 2016-04-12 16:11:08 +02:00
Marion Muszynski
91efe4469e fix conflict adminProduct 2016-04-06 14:46:47 +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
Srv Bebeboutik
0ec932fb7f add quote import 2016-04-04 11:44:16 +02:00
Marion Muszynski
5c9f1e5d29 Merge branch 'alexandre-braderie' into develop 2016-04-01 15:23:30 +02:00
Marion Muszynski
0c6bda8578 update reorder 2016-04-01 15:23:01 +02:00
Marion Muszynski
6cd59dce28 fix conflict 2016-04-01 15:07:22 +02:00
Marion Muszynski
815bc77445 adding reorder product 2016-04-01 15:03:40 +02:00
Srv Bebeboutik
e4a9771a82 change int country to varchar 2016-03-31 12:05:30 +02:00
Marion Muszynski
4a4d6d63d2 update trad 2016-03-16 12:18:41 +01:00
Marion Muszynski
f1129c1b0b adding total quantity ticket#9598 2016-03-10 11:04:39 +01:00
Srv Bebeboutik
0918b1e26d push prod 2016-02-24 16:23:27 +01:00
Marion Muszynski
09ee75be23 update AdminCustomerThread for module ant_support_form 2016-02-23 18:07:06 +01:00
Marion Muszynski
58084aa3c7 adding module ant_support et ant_support_form 2016-02-19 15:30:29 +01:00
Srv Bebeboutik
241f738908 updateprod 2016-02-09 10:46:07 +01:00
Srv Bebeboutik
b7fc35d3ae divers ticket 2016-01-27 15:59:19 +01:00
Srv Bebeboutik
d5670d941a update stat BO 2016-01-06 11:53:10 +01:00
Srv Bebeboutik
340bc7c146 push site 2016-01-04 12:48:08 +01:00