Marion Muszynski
|
bcd33c882e
|
Merge branch 'ticket-9895' into develop
|
2016-08-25 17:04:47 +02:00 |
|
Rodney Figaro
|
da3c1aeed5
|
fix admin product - now no redirection after changing an image
|
2016-08-25 16:49:16 +02:00 |
|
Marion Muszynski
|
cf8f32d6c1
|
Merge branch 'ticket-9895' into develop
|
2016-08-25 12:48:36 +02:00 |
|
Rodney Figaro
|
b82ca57e10
|
change single image upload to multiple images upload in admin > catalog edit product
|
2016-08-25 10:57:15 +02:00 |
|
Marion Muszynski
|
3d12d226f5
|
Merge branch 'fix-10571' into develop
|
2016-08-23 15:02:55 +02:00 |
|
Rodney Figaro
|
a2b0ea366d
|
change the admin invoices selection in database : now saved globally, no more per employee
|
2016-08-23 14:26:07 +02:00 |
|
Marion Muszynski
|
2a82114fa9
|
fix conflict
|
2016-08-22 17:10:12 +02:00 |
|
Rodney Figaro
|
ac9aadcdf3
|
fix js code + texts in english
|
2016-08-22 10:30:03 +02:00 |
|
Rodney Figaro
|
b9c36ee801
|
save orders selection for each employee using their id
|
2016-08-22 09:50:29 +02:00 |
|
Rodney Figaro
|
95a32fc2e3
|
save the selected orders in configuration table in BO
|
2016-08-19 18:08:32 +02:00 |
|
Marion Muszynski
|
a7fdab4e49
|
Merge branch 'ticket-cartValidate' into develop
|
2016-07-21 17:29:40 +02:00 |
|
Marion Muszynski
|
850222794c
|
adding validatecart with paypal method
|
2016-07-21 17:29:17 +02:00 |
|
Marion Muszynski
|
e489a60c90
|
Merge branch 'ticket-simplemulti_invoice'
|
2016-07-08 10:52:17 +02:00 |
|
Marion Muszynski
|
115ef349c6
|
fix conflict where I deleted my modif !
|
2016-07-06 12:43:18 +02:00 |
|
Marion Muszynski
|
200ab432b5
|
fix conflicts
|
2016-07-06 12:38:35 +02:00 |
|
Marion Muszynski
|
7f6949043e
|
adding various description blocks in Admin product edit fast
|
2016-07-06 12:14:28 +02:00 |
|
Marion Muszynski
|
6e2d4dff6e
|
Merge branch 'ticket-simplemulti_invoice' into develop
|
2016-07-04 17:51:51 +02:00 |
|
Marion Muszynski
|
9391dd015a
|
adding column in admin invoice for same brand in multi sale
|
2016-07-04 17:51:26 +02:00 |
|
Marion Muszynski
|
50698ab701
|
Merge branch 'ticket-6355'
|
2016-06-30 13:06:37 +02:00 |
|
Marion Muszynski
|
9fb4d1786c
|
Merge branch 'ticket-simplemulti_invoice' into develop
|
2016-06-28 15:46:05 +02:00 |
|
Marion Muszynski
|
91ca51a960
|
modif cookie
|
2016-06-28 15:45:43 +02:00 |
|
Marion Muszynski
|
f3fdc49173
|
fix conflict
|
2016-06-22 16:11:15 +02:00 |
|
Marion Muszynski
|
77b9c22014
|
fix conflicts
|
2016-06-22 15:03:36 +02:00 |
|
Marion Muszynski
|
94dc4f3b40
|
Merge branch 'ticket-simplemulti_invoice' into develop
|
2016-06-22 11:48:50 +02:00 |
|
Marion Muszynski
|
70e5c4a7dd
|
adding cookie for checked sale
|
2016-06-22 11:48:28 +02:00 |
|
Marion Muszynski
|
ff30aab5d5
|
Merge branch 'ticket-simplemulti_invoice' into develop
|
2016-06-20 12:49:51 +02:00 |
|
Marion Muszynski
|
3d4d7b16e2
|
update invoice
|
2016-06-20 12:49:32 +02:00 |
|
Marion Muszynski
|
9b9e586d0f
|
Merge branch 'ticket-8251' into develop
|
2016-06-10 11:42:32 +02:00 |
|
Marion Muszynski
|
389356d129
|
suite update
|
2016-06-10 11:41:50 +02:00 |
|
Marion Muszynski
|
c48154134d
|
Merge branch 'ticket-6355' into develop
|
2016-06-09 12:44:16 +02:00 |
|
Marion Muszynski
|
b49366dde2
|
ajout du wholesale_price dans import decli
|
2016-06-09 12:43:52 +02:00 |
|
Marion Muszynski
|
4148656a60
|
Merge branch 'ticket-8041' into develop
|
2016-06-07 17:43:19 +02:00 |
|
Marion Muszynski
|
563896bbcb
|
rename import done
|
2016-06-07 17:42:59 +02:00 |
|
Marion Muszynski
|
7065edffe4
|
fix conflict
|
2016-06-06 17:42:00 +02:00 |
|
Marion Muszynski
|
b332800b77
|
new fields in product db
|
2016-06-06 14:35:07 +02:00 |
|
Srv Bebeboutik
|
7085c1b80a
|
update from prod
|
2016-06-06 12:35:00 +02:00 |
|
Marion Muszynski
|
72545630a3
|
fix conflicts
|
2016-06-06 11:32:25 +02:00 |
|
Marion Muszynski
|
5371099ba2
|
Merge branch 'tiket-productTemplate' into develop
|
2016-06-03 12:16:54 +02:00 |
|
Marion Muszynski
|
192b88a451
|
adding delivery desc in product import
|
2016-06-03 12:16:33 +02:00 |
|
Marion Muszynski
|
76f698ee8f
|
Merge branch 'tiket-productTemplate' into develop
|
2016-06-03 12:07:42 +02:00 |
|
Marion Muszynski
|
99b35ed57a
|
adding delivery description field for product
|
2016-06-03 12:07:12 +02:00 |
|
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
|
a013207444
|
Merge branch 'tiket-productTemplate' into develop
|
2016-05-26 16:39:10 +02:00 |
|
Marion Muszynski
|
16d8afa0a8
|
addind fields to product import
|
2016-05-26 16:38:36 +02:00 |
|
Marion Muszynski
|
e7a93aa24e
|
Merge branch 'ticket-filterOrders' into develop
|
2016-05-13 10:41:38 +02:00 |
|
Marion Muszynski
|
7e7b335749
|
modif filter adminOrder
|
2016-05-13 10:41:09 +02:00 |
|
Marion Muszynski
|
7604dca9cd
|
Merge branch 'ticket-flexibilite' into develop
|
2016-05-09 17:44:43 +02:00 |
|
Marion Muszynski
|
ffbb3232b9
|
modif soflex
|
2016-05-09 17:43:57 +02:00 |
|
Marion Muszynski
|
73ceb55254
|
fix conflict site_mobile css
|
2016-05-02 15:23:47 +02:00 |
|