// Merge -> revision 9061

This commit is contained in:
rMalie
2011-10-05 15:21:55 +00:00
parent d8f04cedb7
commit bbc6c6bdc4
53 changed files with 795 additions and 456 deletions
+1 -1
View File
@@ -1434,7 +1434,7 @@ class shopimporter extends ImportModule
$carrier = new Carrier((int)$item['id_carrier']);
$currency = new Currency($order->id_currency);
$order->conversion_rate = $currency->conversion_rate;
$order->conversion_rate = !empty($currency->conversion_rate) ? $currency->conversion_rate : 1;
$order->total_products = (float)$item['total_products'];
$order->total_products_wt = (float)$item['total_products_wt'];
$order->total_discounts = (float)$item['total_discounts'];