Merge branch 'ticket-newExtract' into develop

This commit is contained in:
Marion Muszynski 2016-04-27 18:05:37 +02:00
commit edfbde5fd3

View File

@ -1054,7 +1054,6 @@ class AdminBulkUpdate extends AdminTab {
if ($quantity_sold == 0) {
continue;
}
$products_detail[] = array(
'position' => $p->position,
'sale_country' => $row_properties[$p->id]['country'],
@ -1066,7 +1065,7 @@ class AdminBulkUpdate extends AdminTab {
'NGP9' => '',
'country_exp' => $row_properties[$p->id]['country_exp'],
'product_country' => $customs['id_country'],
'value' => str_replace('.', ',', ($quantity_sold * $p->wholesale_price)),
'value' => str_replace('.', ',', ($quantity_sold * Product::getPriceStatic($p->id, false, NULL, 2))),
'regime' => 21,
'weight' => str_replace('.', ',', Tools::ps_round(($p->weight * $quantity_sold),2)),
'quantity_sold' => $quantity_sold,