1754 Commits

Author SHA1 Message Date
Marion Muszynski
c4f2b99864 fix ajax for MR carrier name 2017-01-20 10:48:37 +01:00
Marion Muszynski
9beb6c978a Merge branch 'ticket-12218-extractVP' 2017-01-20 09:43:29 +01:00
Marion Muszynski
2d7b50fbc5 moving column for sale extract 2017-01-20 09:42:39 +01:00
Marion Muszynski
84e9dc6d75 add xl and xxl mode in ajax logistic 2017-01-19 17:56:05 +01:00
Marion Muszynski
d70e587997 fix renderlabel for 24* and lD* HOM 2017-01-19 17:52:56 +01:00
Marion Muszynski
27a4d1e8cb changement for dev and for dom carrier 2017-01-19 17:36:29 +01:00
Marion Muszynski
109132c0bf Merge branch 'ticket-11199-RebuildNewsletter' 2017-01-19 16:03:03 +01:00
Marion Muszynski
b0e7195fa2 changement in flux 2017-01-19 16:02:47 +01:00
Marion Muszynski
b20f4f5b53 modif mondialrelay registerlabel 2017-01-19 15:21:06 +01:00
Marion Muszynski
b31b1bd6f0 Merge branch 'ticket-12197-NewDiscountAdminOrder' 2017-01-19 10:10:22 +01:00
Marion Muszynski
9c57696681 Merge branch 'ticket-12218-extractVP' 2017-01-19 10:05:25 +01:00
Marion Muszynski
9b2f30ba82 changement extract vp in bdc menu 2017-01-19 09:59:58 +01:00
Marion Muszynski
071f0d0bbf Merge branch 'ticket-12236-UpdateBDCLog' 2017-01-18 17:57:20 +01:00
Marion Muszynski
be749cda88 fix column 2017-01-18 17:56:30 +01:00
Marion Muszynski
d1af2da132 Merge branch 'ticket-12236-UpdateBDCLog' 2017-01-18 16:35:00 +01:00
Marion Muszynski
b6cde7a321 Merge branch 'ticket-12292-EsPhoneFix' 2017-01-18 16:26:30 +01:00
Marion Muszynski
244a6ee814 final fix in js soflex 2017-01-18 16:26:15 +01:00
Marion Muszynski
c8e449e87c Merge branch 'ticket-12292-EsPhoneFix' 2017-01-18 15:37:31 +01:00
Marion Muszynski
545e6afa55 little change js 2017-01-18 15:37:17 +01:00
Marion Muszynski
13a8ef7a7b Merge branch 'ticket-12292-EsPhoneFix' 2017-01-18 15:27:45 +01:00
Marion Muszynski
04cf9600d1 fix syntax 2017-01-18 15:27:32 +01:00
Marion Muszynski
94be836082 Merge branch 'ticket-12292-EsPhoneFix' 2017-01-18 14:59:43 +01:00
Marion Muszynski
1b541255de fix 2017-01-18 14:59:25 +01:00
Marion Muszynski
d9802497a8 Merge branch 'ticket-12292-EsPhoneFix' 2017-01-18 14:54:08 +01:00
Marion Muszynski
c85377ecac fix es mobile phone number of 9 numbers 2017-01-18 14:53:53 +01:00
Marion Muszynski
08443a1b69 Merge branch 'ticket-12204-ImportEan' 2017-01-18 12:31:24 +01:00
Marion Muszynski
50e5e0a441 Merge branch 'ticket-12218-extractVP' 2017-01-18 12:19:56 +01:00
Marion Muszynski
b4370e2440 fix quantity sold request in adminPrivatesSaleLogistic 2017-01-18 11:32:54 +01:00
Marion Muszynski
d0dc500502 fix quantity sold request 2017-01-18 11:05:54 +01:00
Marion Muszynski
197e7aab03 add initial stock column in extract vp bulkupdate 2017-01-18 10:29:36 +01:00
Marion Muszynski
9f68ba0e12 Merge branch 'ticket-12256-fixInvoice' 2017-01-17 15:39:59 +01:00
Marion Muszynski
390c7d795f fix gift message on invoice pdf 2017-01-17 15:39:36 +01:00
Marion Muszynski
7f189160dd fix total column 2017-01-17 15:13:12 +01:00
Marion Muszynski
f7ad50aacd modif bdc log 2017-01-17 15:07:07 +01:00
Marion Muszynski
5fe1eeadde moving of block update ean 2017-01-17 13:28:43 +01:00
Marion Muszynski
41f3e18e89 addition of new update of ean 2017-01-17 13:25:37 +01:00
Marion Muszynski
3c4069254f adjusting for bbb 2017-01-17 12:41:02 +01:00
Marion Muszynski
41087356d8 return shipping cost enable when clicking on generateDiscount2 2017-01-17 10:06:26 +01:00
Marion Muszynski
a48649bacc Merge branch 'ticket-11199-RebuildNewsletter' 2017-01-16 17:54:42 +01:00
Marion Muszynski
8b4a8d1e27 changement flux 2017-01-16 17:53:55 +01:00
Marion Muszynski
f3e3ea668c Merge branch 'ticket-10580-LaPosteWSU_fixMobile' 2017-01-16 14:12:33 +01:00
Marion Muszynski
8e86fbe849 addition of mobile phone restriction for wsu la poste 2017-01-16 14:12:15 +01:00
Marion Muszynski
a2d47eec98 Merge branch 'ticket-12256-fixMobile' 2017-01-13 12:47:51 +01:00
Marion Muszynski
217c96b383 fix css 2 2017-01-13 12:47:30 +01:00
Marion Muszynski
360c802846 Merge branch 'ticket-12256-fixMobile' 2017-01-13 12:43:05 +01:00
Marion Muszynski
17bf597781 fix css 2017-01-13 12:42:49 +01:00
Marion Muszynski
c75ac311d8 fix paymentModule 2017-01-12 14:31:57 +01:00
Marion Muszynski
9b2f18c2ef fix wsu laposte, addition in adminLogistics and ajax for MR 2017-01-12 13:03:48 +01:00
Marion Muszynski
4716b247d9 fix 2017-01-11 18:26:36 +01:00
Marion Muszynski
092a1b169b fix 2017-01-11 18:11:29 +01:00