25 Commits

Author SHA1 Message Date
Marion Muszynski
1611b7d87b Merge branch 'tiket-productTemplate' into develop 2016-05-30 13:12:21 +02:00
Marion Muszynski
8b9edb3d67 modif admin product and import 2016-05-30 13:11:57 +02:00
Marion Muszynski
73ceb55254 fix conflict site_mobile css 2016-05-02 15:23:47 +02:00
Marion Muszynski
23ede34fec suite modif tpl product 2016-05-02 15:19:54 +02:00
Marion Muszynski
95b51d3389 fix conflict css 2016-04-27 16:13:54 +02:00
Marion Muszynski
2a160422d9 adding desc more for product 2016-04-27 16:11:19 +02:00
Marion Muszynski
39451cb3c6 fix conflict 2016-04-13 10:41:45 +02:00
Marion Muszynski
d326f1bb59 update adminProducts order 2016-04-13 10:39:29 +02:00
Marion Muszynski
f38db51e45 fix conflict 2016-04-12 18:07:38 +02:00
Marion Muszynski
7a131e2bef correction ordre AdminProduct 2016-04-12 17:39:47 +02:00
Marion Muszynski
9a576cd82d fix conflict braderie 2016-04-12 16:15:40 +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
Srv Bebeboutik
340bc7c146 push site 2016-01-04 12:48:08 +01:00