1103 Commits

Author SHA1 Message Date
Marion Muszynski
7928b68db6 changement remote address for prod 2017-02-07 11:26:34 +01:00
Marion Muszynski
35a2b19dc7 Merge branch 'ticket-12272-TrustedShops' 2017-02-07 11:18:45 +01:00
Marion Muszynski
b7acd26f89 reduction of sent orders in same time 2017-02-07 11:18:28 +01:00
Marion Muszynski
5fa1fa042c Merge branch 'evo-philea-Destock' 2017-02-06 10:19:22 +01:00
Marion Muszynski
f94a974cb1 updating categories search in step 3 2017-02-06 10:19:06 +01:00
Marion Muszynski
0817b85066 Merge branch 'evo-philea-Destock' 2017-02-06 09:45:09 +01:00
Marion Muszynski
c8523de176 Big changement in labelgenerate for new bigger labels 2017-02-03 16:55:47 +01:00
Marion Muszynski
22b1dbbcf7 fix expe to IT and PT 2017-02-02 17:22:42 +01:00
Marion Muszynski
b78f6bb387 addition module trusted shops bbb 2017-02-02 13:00:59 +01:00
Marion Muszynski
7a5e5e613b fix DOM es to DOS in wsu 2017-02-01 17:03:39 +01:00
Marion Muszynski
b51eefefed fix ES product type, missing company name in wsu 2017-02-01 11:08:40 +01:00
Marion Muszynski
3f4f645b3f Merge branch 'ticket-12393-moveEanColumn' 2017-01-31 15:33:06 +01:00
Marion Muszynski
fb008bccb3 moving ean column between supplier ref and id product 2017-01-31 15:32:46 +01:00
Marion Muszynski
48b30283fa up of allow memory and max execution time for extract of BDC 2017-01-31 10:27:59 +01:00
Marion Muszynski
a54d3a8224 add some css 2017-01-30 16:53:12 +01:00
Marion Muszynski
1199ebb6ec Merge branch 'ticket-12340-UpdateDeliveryPrice' 2017-01-30 10:51:44 +01:00
Marion Muszynski
f453ffb161 fix address for ES and BE in order summary block for relay socol 2017-01-30 10:49:05 +01:00
Marion Muszynski
555895f753 fix es number checking 2017-01-30 10:35:32 +01:00
Marion Muszynski
7ba5a2c7d0 fix es mobile error message 2017-01-27 16:57:27 +01:00
Marion Muszynski
4714908ab4 fix phone number 2017-01-27 16:52:44 +01:00
Marion Muszynski
8a2af96f1e update css labelgenerate before updating size of label 2017-01-27 15:16:30 +01:00
Marion Muszynski
15dff13eee remove twitter link for es version 2017-01-27 11:33:28 +01:00
Marion Muszynski
163dec0625 big changement in wsu la poste, Monaco, Belgique, special char 2017-01-26 17:03:33 +01:00
Marion Muszynski
8204486942 update cron and mail conf_order 2017-01-26 15:32:22 +01:00
Marion Muszynski
879b699d36 fix search in pltri 2017-01-25 11:34:52 +01:00
Marion Muszynski
f4dd25b002 Merge branch 'fix-soflexibilite' 2017-01-25 10:20:54 +01:00
Marion Muszynski
fa79488d36 Merge branch 'ticket-12215-showDelay' 2017-01-24 17:32:36 +01:00
Marion Muszynski
25fea84b8c changement how to show sale delay 2017-01-24 17:32:22 +01:00
Marion Muszynski
cb34675312 fix CMT when other countries than BE or FR 2017-01-24 15:41:19 +01:00
Marion Muszynski
7d5783ac32 adding future sales in privatesale menu 2017-01-23 11:28:33 +01:00
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
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
244a6ee814 final fix in js soflex 2017-01-18 16:26:15 +01:00
Marion Muszynski
545e6afa55 little change js 2017-01-18 15:37:17 +01:00
Marion Muszynski
04cf9600d1 fix syntax 2017-01-18 15:27:32 +01:00
Marion Muszynski
1b541255de fix 2017-01-18 14:59:25 +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