1536 Commits

Author SHA1 Message Date
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
9b26468a1a Merge branch 'ticket-12379-addEanLogBDC' 2017-02-08 14:41:48 +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
275b18592f Merge branch 'ticket-12450-updateFormSupport' 2017-02-07 16:40:36 +01:00
Marion Muszynski
5159283a8a making order choice required 2017-02-07 16:34:03 +01:00
Marion Muszynski
dcf75aeb61 Merge branch 'ticket-12454-update_blockordersummary' 2017-02-07 15:37:29 +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
39c6043616 Merge branch 'ticket-10133-fixWSU' 2017-02-02 17:22:59 +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
ddbfece978 Merge branch 'ticket-12428-fixwsu' 2017-02-01 17:03:57 +01:00
Marion Muszynski
7a5e5e613b fix DOM es to DOS in wsu 2017-02-01 17:03:39 +01:00
Marion Muszynski
3bc8d1f584 Merge branch 'ticket-12417-RedirectLogged' 2017-02-01 12:26:47 +01:00
Marion Muszynski
842d90ba05 change redirect to home when customer is logged 2017-02-01 12:24:39 +01:00
Marion Muszynski
6566082dc0 Merge branch 'ticket-12420-fixMissingCompanyWSU' 2017-02-01 11:08:59 +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
9e254ef0d1 Merge branch 'ticket-12407-FixBDC' 2017-01-31 10:28:15 +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
91148dc453 Merge branch 'ticket-12397-LinkCategoryWithDiscount' 2017-01-30 15:13:09 +01:00
Marion Muszynski
25447fd61a addition of discount category checking 2017-01-30 15:08:10 +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
549cbfa145 Merge branch 'ticket-12392-fixItalianNumber' 2017-01-30 10:35:47 +01:00
Marion Muszynski
555895f753 fix es number checking 2017-01-30 10:35:32 +01:00
Marion Muszynski
58ad31a40d Merge branch 'ticket-12392-fixItalianNumber' 2017-01-27 16:57:43 +01:00
Marion Muszynski
7ba5a2c7d0 fix es mobile error message 2017-01-27 16:57:27 +01:00
Marion Muszynski
047cc79226 Merge branch 'ticket-12392-fixItalianNumber' 2017-01-27 16:53:00 +01:00
Marion Muszynski
4714908ab4 fix phone number 2017-01-27 16:52:44 +01:00
Marion Muszynski
6d4ccad85f Merge branch 'update-helperform' 2017-01-27 13:18:45 +01:00
Marion Muszynski
c7e3f930c5 update helperform including lang managment 2017-01-27 13:04:48 +01:00
Marion Muszynski
3d5022241a Merge branch 'ticket-12382-TwitterLink' 2017-01-27 11:34:19 +01:00
Marion Muszynski
15dff13eee remove twitter link for es version 2017-01-27 11:33:28 +01:00
Marion Muszynski
bded5d1ae8 Merge branch 'ticket-12340-UpdateDeliveryPrice' 2017-01-27 10:46:51 +01:00
Marion Muszynski
14582e4e0f change delay name of socol carriers when its delivered in Belgium 2017-01-27 10:45:48 +01:00
Marion Muszynski
14a00cb64a Merge branch 'ticket-10580-FixBugWSU' 2017-01-26 17:03:50 +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
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