19 Commits

Author SHA1 Message Date
Marion Muszynski
72545630a3 fix conflicts 2016-06-06 11:32:25 +02:00
Marion Muszynski
1fa19380d2 adding generate all ean for a specific sale 2016-05-26 13:01:58 +02:00
Marion Muszynski
43a24d1c7a update braderie and rack 2016-04-12 16:11:08 +02:00
Marion Muszynski
fe03a17200 add generate rack in labelgenerate 2016-04-08 10:27:46 +02:00
Marion Muszynski
d658b0eab2 update message confirm for deletion ean 2016-04-04 15:54:18 +02:00
Marion Muszynski
7fbf095387 update for delete ean in sale 2016-04-04 15:20:32 +02:00
Marion Muszynski
74ee8fd6e1 fix sort products 2016-03-23 13:23:33 +01:00
Marion Muszynski
5cc2da8f90 fix confilct 2016-03-22 17:38:33 +01:00
Marion Muszynski
0974e32f3c fix labelgenerate 2016-03-22 17:31:19 +01:00
Srv Bebeboutik
bf20d2be17 fix labelgenerate 2016-03-22 17:23:04 +01:00
Marion Muszynski
66ad7b0ecd Merge branch 'ticket-7748' into develop 2016-03-22 17:17:46 +01:00
Marion Muszynski
8e7e351af3 sort products for labelgenerate 2016-03-22 17:17:22 +01:00
Thibault UBUNTU
fad3dbe3c5 fix merge master 2016-03-10 10:40:06 +01:00
Srv Bebeboutik
56da5a1b8f fix labelgenerate 2016-03-10 09:53:45 +01:00
Srv Bebeboutik
f43730525b add pid on query 2016-03-09 16:38:21 +01:00
Srv Bebeboutik
392892f3d2 update labelgenerate 2016-03-09 16:33:48 +01:00
Srv Bebeboutik
8c1242b850 delte img from repo 2016-03-02 10:45:21 +01:00
Marion Muszynski
ce7462c19e labelgenerate 2016-02-24 17:12:23 +01:00
Marion Muszynski
8481dff77e adding labelgenerate 2016-02-22 12:33:51 +01:00