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 |
|
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
|
846fc44bc3
|
Merge branch 'ticket-12340-UpdateDeliveryPrice'
|
2017-01-24 14:06:04 +01:00 |
|
Marion Muszynski
|
17ac2cc24c
|
addition of import/export for delivery prices in adminShipping
|
2017-01-24 14:02:45 +01:00 |
|
Marion Muszynski
|
8ae11e0adb
|
Merge branch 'ticket-12333-logModifScaddress'
|
2017-01-24 10:19:17 +01:00 |
|
Marion Muszynski
|
26d6feb522
|
aadition of log when employees update socol address
|
2017-01-24 10:19:01 +01:00 |
|
Marion Muszynski
|
ffaffefc08
|
Merge branch 'ticket-12200-FuturSalesInMenu'
|
2017-01-23 15:30:59 +01:00 |
|
Marion Muszynski
|
fe1aed864a
|
remove click on future sale links
|
2017-01-23 15:10:48 +01:00 |
|
Marion Muszynski
|
7d5783ac32
|
adding future sales in privatesale menu
|
2017-01-23 11:28:33 +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
|
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
|
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 |
|