Michael RICOIS
|
12e70b0f98
|
Merge branch 'fix/canonical' into develop
|
2017-12-12 17:04:53 +01:00 |
|
Marion Muszynski
|
4bcfdbb767
|
fix order of crp
|
2017-12-12 11:11:09 +01:00 |
|
Michael RICOIS
|
851bb2cd1f
|
Merge branch 'fix/soapclient-500' into develop
|
2017-12-11 16:19:28 +01:00 |
|
Marion Muszynski
|
bebb9461d9
|
fix sort comment by id_sale
|
2017-12-11 11:27:44 +01:00 |
|
Marion Muszynski
|
1bd2788bd7
|
Merge branch 'ticket-14485-phileaMultiSingle' into develop
|
2017-11-30 14:43:45 +01:00 |
|
Marion Muszynski
|
4c4960928a
|
fix for multi only
|
2017-11-30 14:43:27 +01:00 |
|
Marion Muszynski
|
b7aafef91c
|
Merge branch 'ticket-14485-phileaMultiSingle' into develop
|
2017-11-30 12:03:35 +01:00 |
|
Marion Muszynski
|
7e221662a7
|
fix
|
2017-11-30 12:03:19 +01:00 |
|
Marion Muszynski
|
2c41ee7ab2
|
Merge branch 'ticket-14485-phileaMultiSingle' into develop
|
2017-11-30 12:00:38 +01:00 |
|
Marion Muszynski
|
b64e174c07
|
fix
|
2017-11-30 12:00:22 +01:00 |
|
Marion Muszynski
|
fc53cdc137
|
Merge branch 'ticket-14485-phileaMultiSingle' into develop
|
2017-11-30 11:48:38 +01:00 |
|
Marion Muszynski
|
09b51bac62
|
fix
|
2017-11-30 11:48:27 +01:00 |
|
Marion Muszynski
|
83e5247666
|
Merge branch 'ticket-14485-phileaMultiSingle' into develop
|
2017-11-30 11:46:50 +01:00 |
|
Marion Muszynski
|
8c3e336003
|
add multi and single sent
|
2017-11-30 11:46:34 +01:00 |
|
Marion Muszynski
|
a846de99eb
|
Merge branch 'ticket-14828-ChangeIdContactDynamically' into develop
|
2017-11-23 15:32:07 +01:00 |
|
root
|
59f0826643
|
fixes for philea from prod
|
2017-11-23 15:06:35 +01:00 |
|
Marion Muszynski
|
0ea19438a0
|
Merge branch 'fix-SaleClass' into develop
|
2017-11-13 15:29:01 +01:00 |
|
Marion Muszynski
|
527b648246
|
add dropshipping parcel checking
|
2017-11-13 13:10:38 +01:00 |
|
Marion Muszynski
|
b22ccef249
|
fix conflict
|
2017-11-13 12:07:59 +01:00 |
|
Marion Muszynski
|
8bf78bf282
|
fix script philea
|
2017-11-13 12:05:56 +01:00 |
|
Marion Muszynski
|
0c8837cfbe
|
Merge branch 'ticket-14485-UpdatePhilea' into develop
|
2017-10-23 16:18:52 +02:00 |
|
Marion Muszynski
|
cdf4f68b74
|
change input to select
|
2017-10-23 16:18:37 +02:00 |
|
Marion Muszynski
|
7d7003353c
|
Merge branch 'ticket-14485-UpdatePhilea' into develop
|
2017-10-19 15:40:37 +02:00 |
|
Marion Muszynski
|
430de0c2e4
|
update philea to sync none philea sale after it s ended
|
2017-10-19 15:40:22 +02:00 |
|
Marion Muszynski
|
c028e2a65c
|
beginning of update
|
2017-10-17 16:22:24 +02:00 |
|
Marion Muszynski
|
d5bbf47f10
|
fix conflicts
|
2017-09-29 15:51:41 +02:00 |
|
root
|
115b1b5f61
|
fix cron
|
2017-09-28 16:45:54 +02:00 |
|
Marion Muszynski
|
dcfd8aa511
|
Merge branch 'ticket-13156-FilterVP' into develop
|
2017-08-28 18:09:23 +02:00 |
|
root
|
b9c24cbdbb
|
fixes and trad from prod
|
2017-08-28 11:00:40 +02:00 |
|
Marion Muszynski
|
15a82bf7f0
|
Merge branch 'ticket-13814-mailAlertUpdate' into develop
|
2017-08-22 11:31:13 +02:00 |
|
root
|
1efe0a509d
|
fix from prod
|
2017-08-21 12:20:02 +02:00 |
|
Marion Muszynski
|
aca897dd80
|
Merge branch 'ticket-13942-fixDeliveryDelay' into develop
|
2017-08-21 12:06:06 +02:00 |
|
Marion Muszynski
|
f36246257c
|
fix conflict
|
2017-08-21 11:46:25 +02:00 |
|
Marion Muszynski
|
0e84b82114
|
remove company name for MR expe
|
2017-08-21 11:44:27 +02:00 |
|
Marion Muszynski
|
8184784f2e
|
Merge branch 'ticket-13323-AdwordsES' into develop
|
2017-07-26 13:21:38 +02:00 |
|
root
|
e75e1e61bb
|
fix from prod
|
2017-07-25 16:56:59 +02:00 |
|
root
|
9a723dcbc6
|
fix philea from prod
|
2017-07-25 16:54:35 +02:00 |
|
Marion Muszynski
|
a4b3b52b27
|
Merge branch 'ticket-13473-IVAForEs' into develop
|
2017-06-14 10:58:42 +02:00 |
|
Marion Muszynski
|
eba11aa018
|
fix script to expected stock and add report view to adminPhilea
|
2017-06-12 12:15:15 +02:00 |
|
Marion Muszynski
|
765f5195dd
|
received CRR
|
2017-06-12 10:30:57 +02:00 |
|
Marion Muszynski
|
d313207099
|
Merge branch 'ticket-9103-saleBg' into develop
|
2017-06-08 11:51:50 +02:00 |
|
Marion Muszynski
|
1646e22344
|
addition of script for expected stock
|
2017-06-07 10:21:15 +02:00 |
|
Marion Muszynski
|
eeac92d0ef
|
fix conflicts
|
2017-02-07 16:35:59 +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
|
682d0b48f8
|
fix conflicts
|
2017-01-11 15:55:31 +01:00 |
|
Marion Muszynski
|
4e1f497252
|
comment mr modif for philea
|
2017-01-11 10:54:50 +01:00 |
|
Marion Muszynski
|
306e61920d
|
Merge branch 'ticket-11985-MondialRelay' into develop
|
2017-01-02 12:26:11 +01:00 |
|
Marion Muszynski
|
9047143c5b
|
addition of new v of mondialrelay and start of chamgements to include mr in philea
|
2017-01-02 12:25:33 +01:00 |
|