Marion Muszynski
|
1dc2a7f6b2
|
fix conflict
|
2017-10-17 16:29:54 +02:00 |
|
Marion Muszynski
|
b54fe1d1a0
|
fix translations
|
2017-10-11 15:26:13 +02:00 |
|
Marion Muszynski
|
902de142ed
|
indication of shipping everywhere
|
2017-10-11 13:24:49 +02:00 |
|
Marion Muszynski
|
4af060a724
|
fix
|
2017-09-28 16:50:03 +02:00 |
|
root
|
115b1b5f61
|
fix cron
|
2017-09-28 16:45:54 +02:00 |
|
root
|
91e4537e41
|
fix and trad from prod
|
2017-09-13 10:28:19 +02:00 |
|
root
|
61ed06dc22
|
Revert "Revert "fix from prod""
This reverts commit 38a13c74d6e654a40632251017e8e60e1bc709d3.
|
2017-09-01 11:22:11 +02:00 |
|
root
|
38a13c74d6
|
Revert "fix from prod"
This reverts commit cd44650b28c6a00c47aa3079863fdc5c28fdcc33.
|
2017-09-01 11:16:02 +02:00 |
|
root
|
cd44650b28
|
fix from prod
|
2017-09-01 11:06:24 +02:00 |
|
Marion Muszynski
|
4015a120f5
|
Merge branch 'ticket-13973-OrderInWaiting'
|
2017-08-28 15:42:38 +02:00 |
|
Marion Muszynski
|
48288ea952
|
fix query
|
2017-08-28 15:40:55 +02:00 |
|
Marion Muszynski
|
b221e2eaf5
|
order by carrier firstly
|
2017-08-28 15:37:48 +02:00 |
|
Marion Muszynski
|
1d12895602
|
fill prtmis field for mondial relay dpc
|
2017-08-28 10:04:09 +02:00 |
|
Marion Muszynski
|
3ed2d5a51b
|
update pending orders
|
2017-08-24 10:57:38 +02:00 |
|
Marion Muszynski
|
f5a5600bba
|
formatting error message
|
2017-08-22 16:21:08 +02:00 |
|
Marion Muszynski
|
a7515c2a36
|
return an error when mr not found
|
2017-08-22 16:19:31 +02:00 |
|
Marion Muszynski
|
735739a317
|
send in transit mail for mr expe
|
2017-08-22 14:53:40 +02:00 |
|
root
|
76dee4cf4c
|
fix from prod
|
2017-08-21 17:57:02 +02:00 |
|
Marion Muszynski
|
8636efc018
|
fix reprint MR for multi parcel
|
2017-08-21 15:05:19 +02:00 |
|
root
|
e75e1e61bb
|
fix from prod
|
2017-07-25 16:56:59 +02:00 |
|
root
|
1a975aea61
|
fix MR from prod
|
2017-07-19 14:34:05 +02:00 |
|
root
|
c0c836cfe1
|
fix mr fron prod
|
2017-07-04 15:46:45 +02:00 |
|
root
|
c23288a05b
|
push from prod for trad
|
2017-07-04 15:43:19 +02:00 |
|
root
|
383d48726c
|
Merge branch 'master' of gitlab.antadis.net:dev-antadis/bebeboutik
|
2017-07-04 15:32:36 +02:00 |
|
root
|
dd218bb37a
|
push from prod
|
2017-07-04 15:32:17 +02:00 |
|
Marion Muszynski
|
72965b110b
|
add auto carrier selection
|
2017-07-04 15:29:26 +02:00 |
|
Marion Muszynski
|
7ef211bbf7
|
addition of another if statement to match eans with first 0
|
2017-04-18 17:01:00 +02:00 |
|
Marion Muszynski
|
8f62586369
|
fix conflict
|
2017-04-11 12:08:19 +02:00 |
|
Marion Muszynski
|
3876e9e439
|
adjusting for printing client
|
2017-02-22 11:42:15 +01:00 |
|
Marion Muszynski
|
6b59c291b2
|
add test mondial reprint
|
2017-02-15 12:10:01 +01:00 |
|
Marion Muszynski
|
cacdcf5408
|
addition of cron for agencies and some fixes
|
2017-02-15 11:37:40 +01:00 |
|
Marion Muszynski
|
e53e4262f2
|
modif sent address lines to wsu when expe country is Belgium
|
2017-02-13 11:10:34 +01:00 |
|
Marion Muszynski
|
1bab93e949
|
modif cab mondial relay
|
2017-02-13 11:04:44 +01:00 |
|
Marion Muszynski
|
22b1dbbcf7
|
fix expe to IT and PT
|
2017-02-02 17:22:42 +01:00 |
|
Marion Muszynski
|
7a5e5e613b
|
fix DOM es to DOS in wsu
|
2017-02-01 17:03:39 +01:00 |
|
Marion Muszynski
|
b51eefefed
|
fix ES product type, missing company name in wsu
|
2017-02-01 11:08:40 +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
|
8204486942
|
update cron and mail conf_order
|
2017-01-26 15:32:22 +01:00 |
|
Marion Muszynski
|
879b699d36
|
fix search in pltri
|
2017-01-25 11:34:52 +01:00 |
|
Marion Muszynski
|
c4f2b99864
|
fix ajax for MR carrier name
|
2017-01-20 10:48:37 +01:00 |
|
Marion Muszynski
|
84e9dc6d75
|
add xl and xxl mode in ajax logistic
|
2017-01-19 17:56:05 +01:00 |
|
Marion Muszynski
|
d70e587997
|
fix renderlabel for 24* and lD* HOM
|
2017-01-19 17:52:56 +01:00 |
|
Marion Muszynski
|
27a4d1e8cb
|
changement for dev and for dom carrier
|
2017-01-19 17:36:29 +01:00 |
|
Marion Muszynski
|
b20f4f5b53
|
modif mondialrelay registerlabel
|
2017-01-19 15:21:06 +01:00 |
|
Marion Muszynski
|
3c4069254f
|
adjusting for bbb
|
2017-01-17 12:41:02 +01:00 |
|
Marion Muszynski
|
9b2f18c2ef
|
fix wsu laposte, addition in adminLogistics and ajax for MR
|
2017-01-12 13:03:48 +01:00 |
|
Marion Muszynski
|
c4cbe24bb5
|
addition of crons and admin_order tpl for Mondial Relay
|
2017-01-11 15:53:24 +01:00 |
|
Marion Muszynski
|
5192561bac
|
update BlockOrderSummary, AdminPrivateSalesSale, ParentOrderController, AdminLogistic, logistic, OrderDetailController, order_detail tpl, mondial relay tpl for Mondial Relay
|
2017-01-11 15:33:44 +01:00 |
|
Marion Muszynski
|
e29e86cf42
|
addition of wsu for LaPoste webservices
|
2016-11-16 12:28:39 +01:00 |
|
Marion Muszynski
|
e83a9dc746
|
allow braderie to sending management
|
2016-10-28 10:54:34 +02:00 |
|