antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ticket-12218-extractVP' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2017-01-19 10:00:15 +01:00
commit 8db5e64bd0
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/privatesales_logistique/AdminPrivateSalesLogistique.php
View File

@ -678,6 +678,8 @@ class AdminPrivateSalesLogistique extends AdminTab {
'position', 'position',
'poids', 'poids',
'quantity', 'quantity',
'quantity_sold',
'stock_initial',
'product_name', 'product_name',
'combination', 'combination',
'ean13', 'ean13',
@ -685,7 +687,6 @@ class AdminPrivateSalesLogistique extends AdminTab {
'Pays de fabrication', 'Pays de fabrication',
// 'location', // 'location',
// 'brand', // 'brand',
'quantity_sold',
'public_price_wt', 'public_price_wt',
'price_wt', 'price_wt',
'wholesale_price', 'wholesale_price',
@ -838,6 +839,8 @@ class AdminPrivateSalesLogistique extends AdminTab {
$p->position, $p->position,
str_replace('.', ',', $p->weight), str_replace('.', ',', $p->weight),
$v['qty'], $v['qty'],
$quantity_sold,
($v['qty']+$quantity_sold),
$p->name[$id_lang], $p->name[$id_lang],
implode(' - ', $names), implode(' - ', $names),
$v['ean13'], $v['ean13'],
@ -845,7 +848,6 @@ class AdminPrivateSalesLogistique extends AdminTab {
$customs['id_country'], $customs['id_country'],
// $v['location'], // $v['location'],
// $v['brand'], // $v['brand'],
$quantity_sold,
str_replace('.', ',', $p->getPrice(TRUE, (int) $k, 2, NULL, FALSE, FALSE)), str_replace('.', ',', $p->getPrice(TRUE, (int) $k, 2, NULL, FALSE, FALSE)),
str_replace('.', ',', $p->getPrice(TRUE, (int) $k, 2)), str_replace('.', ',', $p->getPrice(TRUE, (int) $k, 2)),
str_replace('.', ',', Tools::ps_round($p->wholesale_price, 2)), str_replace('.', ',', Tools::ps_round($p->wholesale_price, 2)),
@ -903,6 +905,8 @@ class AdminPrivateSalesLogistique extends AdminTab {
$p->position, $p->position,
str_replace('.', ',', $p->weight), str_replace('.', ',', $p->weight),
$p->quantity, $p->quantity,
$quantity_sold,
($p->quantity+$quantity_sold),
$p->name[$id_lang], $p->name[$id_lang],
'', '',
$p->ean13, $p->ean13,
@ -910,7 +914,6 @@ class AdminPrivateSalesLogistique extends AdminTab {
$customs['id_country'], $customs['id_country'],
// $p->location, // $p->location,
// $p->manufacturer_name, // $p->manufacturer_name,
$quantity_sold,
str_replace('.', ',', $p->getPrice(TRUE, NULL, 2, NULL, FALSE, FALSE)), str_replace('.', ',', $p->getPrice(TRUE, NULL, 2, NULL, FALSE, FALSE)),
str_replace('.', ',', $p->getPrice(TRUE, NULL, 2)), str_replace('.', ',', $p->getPrice(TRUE, NULL, 2)),
str_replace('.', ',', Tools::ps_round($p->wholesale_price, 2)), str_replace('.', ',', Tools::ps_round($p->wholesale_price, 2)),
@ -985,12 +988,13 @@ class AdminPrivateSalesLogistique extends AdminTab {
'position', 'position',
'poids', 'poids',
'quantity', 'quantity',
'quantity_sold',
'stock_initial',
'product_name', 'product_name',
'combination', 'combination',
'ean13', 'ean13',
'NC8', 'NC8',
'Pays de fabrication', 'Pays de fabrication',
'quantity_sold',
'public_price_wt', 'public_price_wt',
'price_wt', 'price_wt',
'wholesale_price', 'wholesale_price',
@ -1141,12 +1145,13 @@ class AdminPrivateSalesLogistique extends AdminTab {
$p->position, $p->position,
str_replace('.', ',', $p->weight), str_replace('.', ',', $p->weight),
$v['qty'], $v['qty'],
$quantity_sold,
($v['qty']+$quantity_sold),
$p->name[$id_lang], $p->name[$id_lang],
implode(' - ', $names), implode(' - ', $names),
$v['ean13'], $v['ean13'],
$customs['nc8'], $customs['nc8'],
$customs['id_country'], $customs['id_country'],
$quantity_sold,
str_replace('.', ',', $p->getPrice(TRUE, (int) $k, 2, NULL, FALSE, FALSE)), str_replace('.', ',', $p->getPrice(TRUE, (int) $k, 2, NULL, FALSE, FALSE)),
str_replace('.', ',', $p->getPrice(TRUE, (int) $k, 2)), str_replace('.', ',', $p->getPrice(TRUE, (int) $k, 2)),
str_replace('.', ',', Tools::ps_round($p->wholesale_price, 2)), str_replace('.', ',', Tools::ps_round($p->wholesale_price, 2)),
@ -1199,12 +1204,13 @@ class AdminPrivateSalesLogistique extends AdminTab {
$p->position, $p->position,
str_replace('.', ',', $p->weight), str_replace('.', ',', $p->weight),
$p->quantity, $p->quantity,
$quantity_sold,
($p->quantity+$quantity_sold),
$p->name[$id_lang], $p->name[$id_lang],
'', '',
$p->ean13, $p->ean13,
$customs['nc8'], $customs['nc8'],
$customs['id_country'], $customs['id_country'],
$quantity_sold,
str_replace('.', ',', $p->getPrice(TRUE, NULL, 2, NULL, FALSE, FALSE)), str_replace('.', ',', $p->getPrice(TRUE, NULL, 2, NULL, FALSE, FALSE)),
str_replace('.', ',', $p->getPrice(TRUE, NULL, 2)), str_replace('.', ',', $p->getPrice(TRUE, NULL, 2)),
str_replace('.', ',', Tools::ps_round($p->wholesale_price, 2)), str_replace('.', ',', Tools::ps_round($p->wholesale_price, 2)),