Merge branch 'ticket-newExtract' into develop

This commit is contained in:
Marion Muszynski 2016-04-27 12:08:45 +02:00
commit 73fb48d7b4

View File

@ -928,6 +928,7 @@ class AdminBulkUpdate extends AdminTab {
'Nomenclature',
'NGP9',
'Pays de destination',
'Pays d\'origine',
'Valeur',
'Régime',
'Masse',
@ -1064,6 +1065,7 @@ class AdminBulkUpdate extends AdminTab {
'nc8' => $customs['nc8'],
'NGP9' => '',
'country_exp' => $row_properties[$p->id]['country_exp'],
'product_country' => $customs['id_country'],
'value' => str_replace('.', ',', ($quantity_sold * $p->wholesale_price)),
'regime' => 21,
'weight' => str_replace('.', ',', Tools::ps_round(($p->weight * $quantity_sold),2)),
@ -1096,6 +1098,7 @@ class AdminBulkUpdate extends AdminTab {
$product_d['nc8'],
$product_d['NGP9'],
$product_d['country_exp'],
$product_d['product_country'],
$product_d['value'],
$product_d['regime'],
$product_d['weight'],