71 Commits

Author SHA1 Message Date
Marion Muszynski
0b0ebcb26f fix conflict consommables 2016-04-12 15:17:45 +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
8dc1943ee4 modif getSales with option consumable 2016-03-21 10:22:14 +01:00
Marion Muszynski
df4be5618d update to see consommables in BO 2016-03-16 15:47:25 +01: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