Marion Muszynski ae6cec83f0 Merge branch 'ticket-14485-philea_2' into develop

2017-11-13 13:00:42 +01:00

..

assets

adjusting for printing client

2017-02-22 11:42:15 +01:00

carriers

fix cron trace for order state changement

2017-10-24 11:03:33 +02: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 log in adminLogistics

2017-11-13 12:20:58 +01:00

AdminLogisticsFind.php

add modules

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

AdminLogisticsPending.php

fix query

2017-08-28 15:40:55 +02:00

ajax.php

Merge branch 'ticket-14485-philea_2' into develop

2017-11-13 13:00:42 +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

push from prod for trad

2017-07-04 15:43:19 +02:00

getassets.php

adjusting for printing client

2017-02-22 11:42:15 +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

addition of another if statement to match eans with first 0

2017-04-18 17:01:00 +02: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