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
|
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
|
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
|
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
|
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 |
|
Marion Muszynski
|
fee10ec7af
|
Merge branch 'evo-philea-Destock' into develop
|
2017-01-02 11:34:32 +01:00 |
|
Marion Muszynski
|
b0d7f2ddb3
|
changement date from for send_commande to philea
|
2016-12-26 14:58:42 +01:00 |
|
Marion Muszynski
|
b3b9d7313f
|
Merge branch 'ticket-12052-PreventDelivery' into develop
|
2016-12-15 12:02:48 +01:00 |
|
Marion Muszynski
|
7f724c2012
|
css changement and optimisation db philea_sent
|
2016-12-14 15:17:32 +01:00 |
|
Marion Muszynski
|
692cfc1d20
|
prevent multi same update of order state
|
2016-12-14 11:30:09 +01:00 |
|
Marion Muszynski
|
b5f2e365ad
|
fix conflicts
|
2016-12-12 16:09:07 +01:00 |
|
Marion Muszynski
|
38f6a0daba
|
fix
|
2016-12-08 15:48:08 +01:00 |
|
Marion Muszynski
|
f4e2256c65
|
fix conflicts
|
2016-12-08 15:46:19 +01:00 |
|
Marion Muszynski
|
3352dfb3e3
|
last changements for prod
|
2016-12-08 15:23:33 +01:00 |
|
Marion Muszynski
|
ce40fc52c7
|
fix conflict
|
2016-12-08 13:28:32 +01:00 |
|
Marion Muszynski
|
e807437a10
|
finition
|
2016-12-08 13:25:39 +01:00 |
|
Marion Muszynski
|
d4f4452c43
|
changement
|
2016-12-08 12:31:06 +01:00 |
|
Marion Muszynski
|
a4752145fa
|
fix conflicts
|
2016-12-07 14:36:59 +01:00 |
|
Marion Muszynski
|
7cb36d6b0d
|
changement for pack gestion
|
2016-12-07 14:29:33 +01:00 |
|
Marion Muszynski
|
0a9afab232
|
pack gestion at expedition reception
|
2016-12-07 10:36:03 +01:00 |
|
Marion Muszynski
|
ef4a76b327
|
log with mail sending
|
2016-12-06 16:11:12 +01:00 |
|
Marion Muszynski
|
58776438d1
|
continuing
|
2016-12-06 15:45:47 +01:00 |
|
Marion Muszynski
|
5bd20c72d3
|
continuing
|
2016-12-06 10:07:54 +01:00 |
|
Marion Muszynski
|
8df93121a8
|
continuing pack management
|
2016-12-05 10:13:27 +01:00 |
|
Marion Muszynski
|
192cd79a6b
|
continuing packs
|
2016-12-02 15:34:57 +01:00 |
|
Marion Muszynski
|
a3f697a0be
|
fix conflict
|
2016-11-30 12:42:16 +01:00 |
|
Marion Muszynski
|
807bd6d30e
|
add log mail
|
2016-11-30 11:38:16 +01:00 |
|
Marion Muszynski
|
5f30b92b59
|
send all the products of multi order in one time
|
2016-11-30 11:35:55 +01:00 |
|
Marion Muszynski
|
0dc8db8d58
|
addition of packs
|
2016-11-28 17:07:43 +01:00 |
|