Marion Muszynski
|
17ac2cc24c
|
addition of import/export for delivery prices in adminShipping
|
2017-01-24 14:02:45 +01:00 |
|
Marion Muszynski
|
1c36dc6731
|
fix conflicts
|
2017-01-24 12:35:45 +01:00 |
|
Marion Muszynski
|
9fe2c90d1c
|
revert changement
|
2017-01-24 12:34:44 +01:00 |
|
Marion Muszynski
|
e02f19c21b
|
fix conflict
|
2017-01-24 11:30:02 +01:00 |
|
Marion Muszynski
|
4eaa76f76a
|
hide relay select for widget socol
|
2017-01-24 11:27:47 +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
|
63a0b72670
|
Merge branch 'ticket-12200-FuturSalesInMenu' into develop
|
2017-01-23 15:11:06 +01:00 |
|
Marion Muszynski
|
fe1aed864a
|
remove click on future sale links
|
2017-01-23 15:10:48 +01:00 |
|
Marion Muszynski
|
eaf807cff3
|
Merge branch 'ticket-12200-FuturSalesInMenu' into develop
|
2017-01-23 11:28:51 +01:00 |
|
Marion Muszynski
|
7d5783ac32
|
adding future sales in privatesale menu
|
2017-01-23 11:28:33 +01:00 |
|
Marion Muszynski
|
876417e78e
|
Merge branch 'ticket-11985-MondialRelay_part2' into develop
|
2017-01-20 10:48:52 +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
|
9a37a9aa9c
|
Merge branch 'ticket-11985-MondialRelay_part2' into develop
|
2017-01-19 17:56:24 +01:00 |
|
Marion Muszynski
|
84e9dc6d75
|
add xl and xxl mode in ajax logistic
|
2017-01-19 17:56:05 +01:00 |
|
Marion Muszynski
|
161a2dbc5b
|
Merge branch 'ticket-11985-MondialRelay_part2' into develop
|
2017-01-19 17:53:17 +01:00 |
|
Marion Muszynski
|
d70e587997
|
fix renderlabel for 24* and lD* HOM
|
2017-01-19 17:52:56 +01:00 |
|
Marion Muszynski
|
d63be8f6ae
|
Merge branch 'ticket-11985-MondialRelay_part2' into develop
|
2017-01-19 17:36:47 +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
|
3118610fb1
|
Merge branch 'ticket-11985-MondialRelay_part2' into develop
|
2017-01-19 15:21:22 +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
|
8db5e64bd0
|
Merge branch 'ticket-12218-extractVP' into develop
|
2017-01-19 10:00:15 +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
|
efb9867eb5
|
Merge branch 'ticket-12218-extractVP' into develop
|
2017-01-18 11:33:23 +01:00 |
|
Marion Muszynski
|
b4370e2440
|
fix quantity sold request in adminPrivatesSaleLogistic
|
2017-01-18 11:32:54 +01:00 |
|
Marion Muszynski
|
c683c0dc86
|
Merge branch 'ticket-12218-extractVP' into develop
|
2017-01-18 11:06:49 +01:00 |
|
Marion Muszynski
|
d0dc500502
|
fix quantity sold request
|
2017-01-18 11:05:54 +01:00 |
|
Marion Muszynski
|
5672344b84
|
Merge branch 'ticket-12218-extractVP' into develop
|
2017-01-18 10:30:06 +01:00 |
|