571 Commits

Author SHA1 Message Date
Marion Muszynski
23f29a55d6 modif css 2016-10-21 16:16:12 +02:00
Marion Muszynski
06a303fb6a modif css 2016-10-21 16:06:36 +02:00
Marion Muszynski
c90126baa8 addition of styled select 2016-10-21 15:54:52 +02:00
Marion Muszynski
f04d4c2b38 Merge branch 'ticket-AideContact-SAV' into develop 2016-10-19 12:51:48 +02:00
Marion Muszynski
a598bb04f4 modif css 2016-10-19 12:51:28 +02:00
Marion Muszynski
85ea947a11 Merge branch 'ticket-AideContact-SAV' into develop 2016-10-19 12:44:51 +02:00
Marion Muszynski
47b180afb1 continuation of modif 2016-10-19 12:44:12 +02:00
Marion Muszynski
3db72e00f4 Merge branch 'ticket-AideContact-SAV' into develop 2016-10-18 17:07:37 +02:00
Marion Muszynski
1d4435a4ef continuing 2016-10-18 17:02:58 +02:00
Marion Muszynski
6c51d23463 Merge branch 'ticket-AideContact-SAV' into develop 2016-10-18 16:12:31 +02:00
Marion Muszynski
85650ffaba fix 2016-10-18 16:12:13 +02:00
Marion Muszynski
b7b982305f continuation 2016-10-18 15:25:52 +02:00
Marion Muszynski
3550b68bc5 add custom message 2016-10-18 14:43:12 +02:00
Marion Muszynski
b5916c5a74 Merge branch 'ticket-AideContact-SAV' into develop 2016-10-18 12:12:27 +02:00
Marion Muszynski
84f2643e53 continuation sav 2016-10-18 12:12:06 +02:00
Marion Muszynski
6e0cfd7635 modif 2016-10-17 17:29:37 +02:00
Marion Muszynski
27a62959a6 start refund sav page 2016-10-14 18:30:05 +02:00
Marion Muszynski
bb95ffcaa1 Merge branch 'ticket-11056' into develop 2016-10-14 13:11:15 +02:00
Marion Muszynski
9edcc64a82 modification of delivery mode selection 2016-10-14 13:10:56 +02:00
Marion Muszynski
ead50a26c4 Merge branch 'ticket-AssociateProducts' into develop 2016-10-05 18:12:19 +02:00
Marion Muszynski
4a19fa9288 modif css accessories 2016-10-05 18:12:04 +02:00
Marion Muszynski
6e515c5207 Merge branch 'ticket-AssociateProducts' into develop 2016-10-05 17:51:08 +02:00
Marion Muszynski
6a415ac50f modif css 2016-10-05 17:50:45 +02:00
Marion Muszynski
e1a3654411 Merge branch 'ticket-AssociateProducts' into develop 2016-10-05 16:19:10 +02:00
Marion Muszynski
047f419b8e addition of img to recognize the product 2016-10-05 16:18:52 +02:00
Marion Muszynski
77222b5026 Merge branch 'ticket-AssociateProducts' into develop 2016-10-05 14:36:33 +02:00
Marion Muszynski
6475f2140c modification of product autocomplete with only enabled products 2016-10-05 14:36:15 +02:00
Marion Muszynski
541a0ed663 fix conflict 2016-10-05 11:27:50 +02:00
Marion Muszynski
6c927d2266 addition of id category of sale in sale management 2016-10-05 11:25:43 +02:00
Marion Muszynski
a33e2da7ca Merge branch 'ticket-10805' into develop 2016-09-23 17:16:50 +02:00
Marion Muszynski
7ca4e6918b addition has to clean function to see if there are products to clean 2016-09-23 17:16:26 +02:00
Marion Muszynski
5edc9724a3 Merge branch 'ticket-10805' into develop 2016-09-23 17:00:11 +02:00
Marion Muszynski
4d2f0e1f9a fix bug updateposition on big product list 2016-09-23 16:59:49 +02:00
Marion Muszynski
47db67e6b5 Merge branch 'ticket-printProductEan' 2016-09-23 13:21:06 +02:00
Marion Muszynski
1a3ce467c5 Merge branch 'ticket-printProductEan' into develop 2016-09-22 13:41:39 +02:00
Marion Muszynski
1ee43aad25 generation and print ean via admin product 2016-09-22 13:40:56 +02:00
Marion Muszynski
73a3127d3e Merge branch 'ticket-eanUpgrade' into develop 2016-09-22 11:13:52 +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
6373ce6e24 Merge branch 'ticket-eanUpgrade' 2016-09-22 10:42:26 +02:00
Marion Muszynski
cde8f42b60 fix 2016-09-22 10:22:19 +02:00
Marion Muszynski
b040fa269b fix 2016-09-22 09:47:14 +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
430cabc449 Merge branch 'ticket-eanUpgrade' into develop 2016-09-20 14:49:30 +02:00
Marion Muszynski
58d2b92b0c continuing braderie upgrade 2016-09-20 14:49:02 +02:00
Marion Muszynski
443b054b7e Merge branch 'ticket-eanUpgrade' into develop 2016-09-19 17:50:32 +02:00
Marion Muszynski
3f2345c222 small fix 2016-09-15 15:37:44 +02:00
Marion Muszynski
be66a5cb5a Merge branch 'ticket-10133' into develop 2016-09-15 12:07:24 +02:00
Marion Muszynski
6304de6703 fix of unknown function 2016-09-15 12:07:03 +02:00