1124 Commits

Author SHA1 Message Date
Marion Muszynski
b64a84b5e7 fix when no order in one of country 2017-02-17 10:35:25 +01:00
Marion Muszynski
7ef48d6256 implementation of trsutedshop ES 2017-02-17 10:23:07 +01:00
Marion Muszynski
4a9082d25f fix size 2017-02-16 18:04:08 +01:00
Marion Muszynski
7ee1ef8d6a fix label size 2017-02-16 17:59:30 +01:00
Marion Muszynski
6b59c291b2 add test mondial reprint 2017-02-15 12:10:01 +01:00
Marion Muszynski
cacdcf5408 addition of cron for agencies and some fixes 2017-02-15 11:37:40 +01:00
Marion Muszynski
e53e4262f2 modif sent address lines to wsu when expe country is Belgium 2017-02-13 11:10:34 +01:00
Marion Muszynski
1bab93e949 modif cab mondial relay 2017-02-13 11:04:44 +01:00
Marion Muszynski
c06219cbb6 Merge branch 'ticket-12379-addEanLogBDC' 2017-02-08 16:43:23 +01:00
Marion Muszynski
c64f8e7b32 change to number format 2017-02-08 16:43:09 +01:00
Marion Muszynski
f96aa77018 Merge branch 'ticket-12379-addEanLogBDC' 2017-02-08 15:27:58 +01:00
Marion Muszynski
926acb1681 update number format of ean column 2017-02-08 15:27:44 +01:00
Marion Muszynski
eb28219c18 Merge branch 'ticket-12379-addEanLogBDC' 2017-02-08 15:16:03 +01:00
Marion Muszynski
3c74370c97 update column dimension 2017-02-08 15:15:47 +01:00
Marion Muszynski
0bc72ecb87 Merge branch 'ticket-10393' 2017-02-08 14:49:31 +01:00
Marion Muszynski
89759dfc68 moving ean column to the right place 2017-02-08 14:34:56 +01:00
Marion Muszynski
dc7775ca89 addition of ean column in bdc log 2017-02-08 13:11:53 +01:00
Marion Muszynski
49d3d97d23 beginning of label adjusting 2017-02-08 12:04:06 +01:00
Marion Muszynski
5159283a8a making order choice required 2017-02-07 16:34:03 +01:00
Marion Muszynski
2e844dc459 addition of order date for blockordersummary in bo 2017-02-07 15:37:14 +01:00
Marion Muszynski
a1913954d3 Merge branch 'ticket-12272-TrustedShops' 2017-02-07 11:26:49 +01:00
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