897 Commits

Author SHA1 Message Date
Marion Muszynski
47db67e6b5 Merge branch 'ticket-printProductEan' 2016-09-23 13:21:06 +02:00
Marion Muszynski
0141a4e3ac fix url redirect 2016-09-23 13:16:44 +02:00
Marion Muszynski
41c2d81f39 addition of specific attribute ean printing 2016-09-23 13:09:34 +02:00
Marion Muszynski
9ecb1ae139 Merge branch 'fix-braderie' 2016-09-23 11:30:44 +02:00
Marion Muszynski
c508f407b0 change input to a tag 2016-09-23 11:27:32 +02:00
Marion Muszynski
d18e879c5e Merge branch 'fix-braderie' 2016-09-23 11:01:50 +02:00
Marion Muszynski
32301b7dd3 fix open window on click enter 2016-09-23 11:01:28 +02:00
Marion Muszynski
06e84c95da Merge branch 'ticket-eanUpgrade' 2016-09-22 17:17:54 +02:00
Marion Muszynski
6af23598eb modif css 2016-09-22 16:21:32 +02:00
Marion Muszynski
b19cae2d4a change emplacement of fields 2016-09-22 16:13:45 +02:00
Marion Muszynski
1ee43aad25 generation and print ean via admin product 2016-09-22 13:40:56 +02:00
Marion Muszynski
02a9fb3dbf Merge branch 'ticket-eanUpgrade' 2016-09-22 11:13:12 +02:00
Marion Muszynski
7a8d2c9339 move of comment block 2016-09-22 11:12:49 +02:00
Marion Muszynski
379cd9f5b0 Merge branch 'ticket-eanUpgrade' 2016-09-22 11:03:14 +02:00
Marion Muszynski
c049980a9a up lenght reference of product 2016-09-22 11:02:55 +02:00
Marion Muszynski
6373ce6e24 Merge branch 'ticket-eanUpgrade' 2016-09-22 10:42:26 +02:00
Marion Muszynski
0a542f0944 Merge branch 'fix-adminProduct' 2016-09-22 10:22:37 +02:00
Marion Muszynski
cde8f42b60 fix 2016-09-22 10:22:19 +02:00
Marion Muszynski
18193e6836 Merge branch 'fix-adminProduct' 2016-09-22 09:47:41 +02:00
Marion Muszynski
b040fa269b fix 2016-09-22 09:47:14 +02:00
Marion Muszynski
45b2b58b71 Merge branch 'fix-adminProduct' 2016-09-22 09:44:39 +02:00
Marion Muszynski
e6e0e55633 fix missing argument in getFieldValue 2016-09-22 09:44:06 +02:00
Marion Muszynski
a2591680b7 addition of hook 2016-09-22 09:37:19 +02:00
Marion Muszynski
2c792510a9 Merge branch 'fix-bugQuantity' 2016-09-21 14:45:52 +02:00
Marion Muszynski
be48ec27d5 fix last_qties for categoryscroll ajax 2016-09-21 14:45:37 +02:00
Marion Muszynski
d598b4df54 Merge branch 'ticket-10945' 2016-09-21 10:50:58 +02:00
Marion Muszynski
4230758422 add refund and cancel permission to profile 14 braderie 2016-09-21 10:50:36 +02:00
Marion Muszynski
85cc7b57dc showing of comments for braderie on product page 2016-09-20 14:55:03 +02:00
Marion Muszynski
58d2b92b0c continuing braderie upgrade 2016-09-20 14:49:02 +02:00
Marion Muszynski
66a38f85bb fix bug vi 2016-09-20 11:08:30 +02:00
Marion Muszynski
ffe2e24a7a reset quantity value in braderie after product was added 2016-09-20 11:02:50 +02:00
Marion Muszynski
1d5336485a Merge branch 'ticket-eanUpgrade' 2016-09-19 18:24:20 +02:00
Marion Muszynski
96ba6fbaca second fix 2016-09-19 18:07:02 +02:00
Marion Muszynski
cd540ac533 fix attribute image 2016-09-19 18:01:20 +02:00
Marion Muszynski
81769c64e7 addition of product image in braderie 2016-09-19 17:50:14 +02:00
Marion Muszynski
0e4e134544 Merge branch 'ticket-philea' 2016-09-19 15:40:17 +02:00
Marion Muszynski
fa825f9cc7 modif css 2016-09-19 15:39:50 +02:00
Marion Muszynski
588b23161d Merge branch 'ticket-philea' 2016-09-19 15:34:37 +02:00
Marion Muszynski
d9b117774d css fix 2016-09-19 15:33:43 +02:00
Marion Muszynski
dafde1fd0f Merge branch 'ticket-philea' 2016-09-19 11:58:48 +02:00
Marion Muszynski
a51cf6fb55 continuing to add some stuff 2016-09-19 11:58:14 +02:00
Marion Muszynski
50da985ca7 Merge branch 'ticket-philea' 2016-09-16 17:33:55 +02:00
Marion Muszynski
e1f82aba03 small fix 2016-09-16 17:33:23 +02:00
Marion Muszynski
d0b55456b9 Merge branch 'ticket-philea' 2016-09-16 17:18:04 +02:00
Marion Muszynski
4e42740019 message modification 2016-09-16 17:17:41 +02:00
Marion Muszynski
4179f1513d Merge branch 'ticket-philea' 2016-09-16 16:36:46 +02:00
Marion Muszynski
56136b51ec addition of report management 2016-09-16 16:36:16 +02:00
Marion Muszynski
967a9659cf Merge branch 'ticket-philea' 2016-09-15 16:30:12 +02:00
Marion Muszynski
0980058b1d matching ART CDC 2016-09-15 16:29:54 +02:00
Marion Muszynski
e9d46cd1a4 Merge branch 'ticket-10884' 2016-09-15 16:05:12 +02:00