134 Commits

Author SHA1 Message Date
Marion Muszynski
6b70af5e17 prevent restock when product is in braderie 2017-05-02 10:44:13 +02:00
Marion Muszynski
11790c0eff prevent restockage when it s sent by philea 2017-04-25 15:03:41 +02:00
Marion Muszynski
8fbeb85cd0 fix conflicts 2017-04-24 11:28:57 +02:00
Marion Muszynski
6b7d57bb43 show join file 2017-04-21 13:51:47 +02:00
Marion Muszynski
72a2a1f74f save file name in db for mess 2017-04-21 13:07:45 +02:00
Marion Muszynski
90dd61b5bb add multilang on category img thumbs 2017-04-18 12:48:42 +02:00
Marion Muszynski
d017974d15 fix link reply 2017-04-13 14:24:42 +02:00
Marion Muszynski
dac13d6486 fix when no customer but visitor 2017-04-10 17:05:01 +02:00
Marion Muszynski
4aafc8ca10 fix 2017-04-07 11:18:57 +02:00
Marion Muszynski
83bd4d15c3 fix insert product customs 2017-04-07 10:22:21 +02:00
Marion Muszynski
89f72c7045 Merge branch 'ticket-12462-returnMR' 2017-04-06 16:24:22 +02:00
Marion Muszynski
db3f82675d fix color 2017-04-06 16:18:12 +02:00
Marion Muszynski
2b861808e0 addition of conversation history in customer thread 2017-04-06 16:10:25 +02:00
Marion Muszynski
db43bc59df modification of instructions 2017-03-21 11:22:28 +01:00
Marion Muszynski
29d133070d fix re-sending return instructions 2017-03-07 17:49:34 +01:00
Marion Muszynski
29a1b8a743 addition of button to resend return instruction 2017-03-07 17:33:22 +01:00
Marion Muszynski
e120917ca0 addition of herper for return order search 2017-03-03 10:58:46 +01:00
Marion Muszynski
a099f27ab0 comment paid option for mondial relay return to be enabled later 2017-02-27 10:31:48 +01:00
Marion Muszynski
2837aea4a5 addition of picto for random product 2017-02-21 11:49:55 +01:00
Marion Muszynski
5225e667ad saving euro sign in adminImport 2017-02-09 10:06:06 +01:00
Marion Muszynski
3b7bde22db addition of mondial relay return process in adminOrder 2017-02-06 16:07:35 +01:00
Marion Muszynski
17ac2cc24c addition of import/export for delivery prices in adminShipping 2017-01-24 14:02:45 +01:00
Marion Muszynski
bdb9cf6b29 fix vaucher calue in mail sent 2017-01-09 12:09:25 +01:00
Marion Muszynski
a29a54f41e addition of new discount of 5 for missing product 2017-01-09 12:03:58 +01:00
Marion Muszynski
d148fffa70 Merge branch 'ticket-11201-SlowCategoryCreation' 2016-12-26 11:43:23 +01:00
Marion Muszynski
fa07f444a0 Merge branch 'change-AdminInvoice' 2016-12-26 10:59:54 +01:00
Marion Muszynski
0dd562f216 fix bugs 2016-12-26 10:58:08 +01:00
Marion Muszynski
3d34054aec changement css 2016-12-26 09:36:06 +01:00
Marion Muszynski
589ed49b8a keeping new status for the first order 2016-12-23 13:59:26 +01:00
Marion Muszynski
a965103db4 continuing changement 2016-12-23 13:04:16 +01:00
Marion Muszynski
b200eff972 begining of changement css 2016-12-23 12:06:36 +01:00
Marion Muszynski
2b30de1cce changement, deletion of pdf overrided 2016-12-21 12:24:31 +01:00
Marion Muszynski
715db47da4 add manually generation of ntree 2016-12-14 10:28:03 +01:00
Marion Muszynski
2b5fbe4bb7 fix link for es 2016-12-02 16:26:34 +01:00
Marion Muszynski
966d6fa2d2 if statement according the id_contact 2016-12-02 16:18:19 +01:00
Marion Muszynski
7ce5c6905c adjust link reply 2016-12-02 16:12:31 +01:00
Marion Muszynski
4b10e0f6e4 change reply link 2016-12-02 16:00:14 +01:00
Marion Muszynski
ed6002b84b gift management 2016-12-02 10:15:51 +01:00
Marion Muszynski
2ac3271169 ajusting autocomplete ajax_product search 2016-11-30 12:40:27 +01:00
Marion Muszynski
c17fb91c63 addition of orders selection and css modif 2016-11-24 16:04:13 +01:00
Marion Muszynski
e7413fd51e add of multi delete option 2016-11-10 13:21:20 +01:00
Marion Muszynski
7d3c98f79f addition of category checking 2016-11-08 13:07:15 +01:00
Marion Muszynski
45a39353ab addition of shipping number in admin order 2016-11-03 11:27:56 +01:00
Marion Muszynski
5b95689b06 small updating 2016-11-02 17:03:58 +01:00
Marion Muszynski
f90f499f00 css adjusting 2016-10-31 14:38:37 +01:00
Marion Muszynski
c6ea6b27cf modif css 2016-10-28 17:56:37 +02:00
Marion Muszynski
1f7b49b9b9 modifications 2016-10-26 15:11:40 +02:00
Marion Muszynski
938fa45de0 css 2016-10-25 12:23:57 +02:00
Marion Muszynski
67b3583d59 addition css 2016-10-25 12:20:15 +02:00
Marion Muszynski
7aaf231422 integration product list in sav message 2016-10-25 12:03:06 +02:00