Commit Graph

71 Commits

Author SHA1 Message Date
Rodney Figaro
da3c1aeed5 fix admin product - now no redirection after changing an image 2016-08-25 16:49:16 +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
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
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
root
880d16d5b0 updateprod 2016-08-18 15:56:46 +02:00
Marion Muszynski
850222794c adding validatecart with paypal method 2016-07-21 17:29:17 +02:00
Marion Muszynski
d1c984cb76 update sort invoice 2016-07-11 14:44:19 +02:00
Srv Bebeboutik
4a93e29747 modif prod, remove log email sending to us 2016-07-08 15:52:31 +02:00
Marion Muszynski
e489a60c90 Merge branch 'ticket-simplemulti_invoice' 2016-07-08 10:52:17 +02:00
Marion Muszynski
7f6949043e adding various description blocks in Admin product edit fast 2016-07-06 12:14:28 +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
4de026d0db add id_employee 2016-07-04 17:42:02 +02:00
Marion Muszynski
8dbbf309bf fix 2016-07-04 17:33:56 +02:00
Marion Muszynski
276cc9a2b6 sending email when order delivery address is modified in BO 2016-07-04 17:30:04 +02:00
Marion Muszynski
3be779d03b Merge branch 'ticket-simplemulti_logistic' 2016-07-04 16:58:23 +02:00
Marion Muszynski
50698ab701 Merge branch 'ticket-6355' 2016-06-30 13:06:37 +02:00
Marion Muszynski
91ca51a960 modif cookie 2016-06-28 15:45:43 +02:00
Marion Muszynski
77b9c22014 fix conflicts 2016-06-22 15:03:36 +02:00
Marion Muszynski
70e5c4a7dd adding cookie for checked sale 2016-06-22 11:48:28 +02:00
Marion Muszynski
8ebec9fb3e addind admin pending orders 2016-06-21 17:18:24 +02:00
Marion Muszynski
3d4d7b16e2 update invoice 2016-06-20 12:49:32 +02:00
Marion Muszynski
2c07f5a0b2 good fix this time 2016-06-10 14:52:32 +02:00
Marion Muszynski
9f39cdffe4 petit fix 2016-06-10 14:45:46 +02:00
Marion Muszynski
7ea4968d08 fix 2016-06-10 14:44:45 +02:00
Marion Muszynski
e3bc588287 update function expe48hbis 2016-06-10 14:37:34 +02:00
Marion Muszynski
1386f8460f modif for prod 2016-06-10 12:19:45 +02:00
Marion Muszynski
389356d129 suite update 2016-06-10 11:41:50 +02:00
Marion Muszynski
b49366dde2 ajout du wholesale_price dans import decli 2016-06-09 12:43:52 +02:00
Marion Muszynski
dbe607dccc modif invoices for multi expe48h 2016-06-09 10:31:52 +02:00
Marion Muszynski
77023fdbcb invoice for multi 48h 2016-06-08 16:56:43 +02:00
Marion Muszynski
563896bbcb rename import done 2016-06-07 17:42:59 +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
192b88a451 adding delivery desc in product import 2016-06-03 12:16:33 +02:00
Marion Muszynski
99b35ed57a adding delivery description field for product 2016-06-03 12:07:12 +02:00
Marion Muszynski
91e2fb16ba update scaddressedit with map 2016-06-02 11:28:50 +02:00
Marion Muszynski
8b9edb3d67 modif admin product and import 2016-05-30 13:11:57 +02:00
Marion Muszynski
16d8afa0a8 addind fields to product import 2016-05-26 16:38:36 +02:00
Marion Muszynski
796b0af17c modif for update socol address in BO order 2016-05-18 10:30:17 +02:00
Marion Muszynski
7e7b335749 modif filter adminOrder 2016-05-13 10:41:09 +02:00
Marion Muszynski
ffbb3232b9 modif soflex 2016-05-09 17:43:57 +02:00
Marion Muszynski
23ede34fec suite modif tpl product 2016-05-02 15:19:54 +02:00
Marion Muszynski
2a160422d9 adding desc more for product 2016-04-27 16:11:19 +02:00
Marion Muszynski
d4722a7e81 order in search product 2016-04-14 13:06:06 +02:00
Marion Muszynski
d326f1bb59 update adminProducts order 2016-04-13 10:39:29 +02:00
Marion Muszynski
7a131e2bef correction ordre AdminProduct 2016-04-12 17:39:47 +02:00
Marion Muszynski
43a24d1c7a update braderie and rack 2016-04-12 16:11:08 +02:00