203 Commits

Author SHA1 Message Date
Marion Muszynski
91536bdb4d Merge branch 'ticket11985-invoiceMR' 2017-07-04 16:23:26 +02:00
Marion Muszynski
a38cc1a255 remove var dump 2017-07-04 15:54:02 +02:00
Marion Muszynski
c6c5ad32ca fix delete customer 2017-06-28 15:00:53 +02:00
Marion Muszynski
a2a0385822 upgrading of return process 2017-06-26 11:52:56 +02:00
Marion Muszynski
1524ec205c Merge branch 'ticket-13532-ProductDisable' 2017-06-20 11:46:50 +02:00
Marion Muszynski
92bd1d406d fix css 2017-06-20 10:59:11 +02:00
Marion Muszynski
1f971275a0 multiple disable/enable product 2017-06-20 10:09:07 +02:00
Marion Muszynski
12e744b313 Merge branch 'ticket-9103-UrlMetaCategory' 2017-06-20 09:51:32 +02:00
Marion Muszynski
15e76afb93 multi disable/enable product 2017-06-19 17:48:38 +02:00
Marion Muszynski
fec2e5ba19 remove add buttom 2017-06-19 12:18:25 +02:00
Marion Muszynski
dadf16f8fb separate la poste invoices and mr invoices 2017-06-16 17:51:19 +02:00
Marion Muszynski
dde433e46a start of changement 2017-06-16 14:49:10 +02:00
Marion Muszynski
645926e5ed fix image legend for es 2017-06-12 15:30:27 +02:00
Marion Muszynski
3a33250608 translate link rewrite category/product 2017-06-12 14:41:59 +02:00
Marion Muszynski
b954a729a4 addition of return comment 2017-06-08 16:05:19 +02:00
Marion Muszynski
bed6683539 fix and add shipping number list in order 2017-06-07 15:07:19 +02:00
Marion Muszynski
be7863e514 fix instructions and reasons 2017-06-06 11:57:55 +02:00
Marion Muszynski
b615e9eadb addition of order return history 2017-05-31 16:58:27 +02:00
Marion Muszynski
66dea81ece addition of label generation to resend parcel 2017-05-29 16:17:54 +02:00
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