Marion Muszynski
|
ecf606391e
|
Merge branch 'ticket-13032' into develop
|
2017-04-18 17:01:16 +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
|
35e33703b7
|
fix conflicts
|
2017-04-13 12:32:44 +02:00 |
|
Marion Muszynski
|
8f62586369
|
fix conflict
|
2017-04-11 12:08:19 +02:00 |
|
Marion Muszynski
|
0e1db8cc03
|
Merge branch 'ticket-11985-MondialRelay_part2' into develop
|
2017-02-22 11:42:39 +01:00 |
|
Marion Muszynski
|
3876e9e439
|
adjusting for printing client
|
2017-02-22 11:42:15 +01:00 |
|
Marion Muszynski
|
9a634c0d74
|
Merge branch 'ticket-12562-trustedShopsES' into develop
|
2017-02-17 10:23:28 +01:00 |
|
Marion Muszynski
|
b74733c1dd
|
Merge branch 'ticket-11985-MondialRelay_part2' into develop
|
2017-02-15 12:10:20 +01:00 |
|
Marion Muszynski
|
6b59c291b2
|
add test mondial reprint
|
2017-02-15 12:10:01 +01:00 |
|
Marion Muszynski
|
8a61a09988
|
Merge branch 'ticket-11985-MondialRelay_part2' into develop
|
2017-02-15 11:39:15 +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
|
eeac92d0ef
|
fix conflicts
|
2017-02-07 16:35:59 +01:00 |
|
Marion Muszynski
|
878608ec79
|
Merge branch 'ticket-12272-TrustedShops' into develop
|
2017-02-03 17:06:45 +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
|
7f57941994
|
Merge branch 'ticket-12417-RedirectLogged' into develop
|
2017-02-01 12:24:58 +01:00 |
|
Marion Muszynski
|
b51eefefed
|
fix ES product type, missing company name in wsu
|
2017-02-01 11:08:40 +01:00 |
|
Marion Muszynski
|
877fab90a7
|
fix conflicts
|
2017-01-27 13:09:02 +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 |
|
Marion Muszynski
|
31bb7e145b
|
fix form reprint
|
2016-09-01 11:17:43 +02:00 |
|
Marion Muszynski
|
ad26e64ad0
|
fix weight
|
2016-08-31 16:25:49 +02:00 |
|
Marion Muszynski
|
b9ff9ead70
|
fix to loop the correct product array
|
2016-08-26 16:37:19 +02:00 |
|
Marion Muszynski
|
064072bfb8
|
modification to reprint label with multi products
|
2016-08-26 16:35:02 +02:00 |
|
Marion Muszynski
|
9e2007dfe8
|
adding re print label option
|
2016-08-26 12:00:54 +02:00 |
|
Marion Muszynski
|
fdc8a91a61
|
suite
|
2016-08-25 16:59:26 +02:00 |
|
Marion Muszynski
|
ed4df2bd73
|
continuing
|
2016-08-25 12:14:34 +02:00 |
|
Marion Muszynski
|
ce0e4e89b4
|
start ticket
|
2016-08-23 18:05:47 +02:00 |
|
root
|
880d16d5b0
|
updateprod
|
2016-08-18 15:56:46 +02:00 |
|
Marion Muszynski
|
7faebc96f0
|
small js update in adminlogisticpending
|
2016-07-11 12:35:41 +02:00 |
|
Srv Bebeboutik
|
7701a95063
|
fix from prod
|
2016-07-06 16:07:22 +02:00 |
|
Marion Muszynski
|
ae50025d14
|
continuing updating
|
2016-06-22 11:26:51 +02:00 |
|
Marion Muszynski
|
8ebec9fb3e
|
addind admin pending orders
|
2016-06-21 17:18:24 +02:00 |
|
Marion Muszynski
|
c442173cb8
|
add nex adminTab
|
2016-06-20 18:27:54 +02:00 |
|
Marion Muszynski
|
c29d8725ac
|
add status modify button
|
2016-06-20 15:32:06 +02:00 |
|
Marion Muszynski
|
6265c1b2af
|
begin update adminlogistic
|
2016-06-20 15:09:13 +02:00 |
|