Marion Muszynski 877fab90a7 fix conflicts

2017-01-27 13:09:02 +01:00

..

assets

add modules

2016-01-04 12:49:26 +01:00

carriers

fix conflicts

2017-01-27 13:09:02 +01:00

img

add modules

2016-01-04 12:49:26 +01:00

libs

add modules

2016-01-04 12:49:26 +01:00

AdminLaPosteSummary.php

add modules

2016-01-04 12:49:26 +01:00

AdminLogistics.php

fix ajax for MR carrier name

2017-01-20 10:48:37 +01:00

AdminLogisticsFind.php

add modules

2016-01-04 12:49:26 +01:00

AdminLogisticsPending.php

small js update in adminlogisticpending

2016-07-11 12:35:41 +02:00

ajax.php

fix ajax for MR carrier name

2017-01-20 10:48:37 +01:00

en.php

add modules

2016-01-04 12:49:26 +01:00

es.php

add modules

2016-01-04 12:49:26 +01:00

fr.php

add modules

2016-01-04 12:49:26 +01:00

getassets.php

add modules

2016-01-04 12:49:26 +01:00

getformats.php

add modules

2016-01-04 12:49:26 +01:00

logistics.php

update BlockOrderSummary, AdminPrivateSalesSale, ParentOrderController, AdminLogistic, logistic, OrderDetailController, order_detail tpl, mondial relay tpl for Mondial Relay

2017-01-11 15:33:44 +01:00

logo.gif

add modules

2016-01-04 12:49:26 +01:00

scripts.js

add modules

2016-01-04 12:49:26 +01:00

select_sale.php

add modules

2016-01-04 12:49:26 +01:00

styles.css

modification to reprint label with multi products

2016-08-26 16:35:02 +02:00