Merge branch 'ticket-12218-extractVP' into develop
This commit is contained in:
commit
5672344b84
@ -918,7 +918,12 @@ class PDFCore extends PDF_PageGroupCore
|
||||
if(!empty(self::$order->gift_message)) {
|
||||
$pdf->Ln(15);
|
||||
$pdf->SetFont(self::fontname(), 'B', 10);
|
||||
$pdf->Cell(190, 0, Tools::iconv('utf-8', self::encoding(), self::$order->gift_message) , 0, 0, 'C');
|
||||
$message = wordwrap(trim(self::$order->gift_message), 70, "\n", false);
|
||||
$messages = explode("\n",$message);
|
||||
foreach ($messages as $key => $mess) {
|
||||
$pdf->Cell(190, 0, Tools::iconv('utf-8', self::encoding(), $mess) , 0, 0, 'C');
|
||||
$pdf->Ln(5);
|
||||
}
|
||||
}
|
||||
if($multi) {
|
||||
$pdf->Ln(15);
|
||||
|
@ -1266,6 +1266,8 @@ class AdminBulkUpdate extends AdminTab {
|
||||
'position',
|
||||
'poids',
|
||||
'quantity',
|
||||
'quantity_sold',
|
||||
'stock_initial',
|
||||
'product_name',
|
||||
'combination',
|
||||
'ean13',
|
||||
@ -1273,7 +1275,6 @@ class AdminBulkUpdate extends AdminTab {
|
||||
'Pays de fabrication',
|
||||
// 'location',
|
||||
// 'brand',
|
||||
'quantity_sold',
|
||||
'public_price_wt',
|
||||
'price_wt',
|
||||
'wholesale_price',
|
||||
@ -1426,6 +1427,8 @@ class AdminBulkUpdate extends AdminTab {
|
||||
$p->position,
|
||||
str_replace('.', ',', $p->weight),
|
||||
$v['qty'],
|
||||
$quantity_sold,
|
||||
($v['qty']+$quantity_sold),
|
||||
$p->name[$id_lang],
|
||||
implode(' - ', $names),
|
||||
$v['ean13'],
|
||||
@ -1433,7 +1436,6 @@ class AdminBulkUpdate extends AdminTab {
|
||||
$customs['id_country'],
|
||||
// $v['location'],
|
||||
// $v['brand'],
|
||||
$quantity_sold,
|
||||
str_replace('.', ',', $p->getPrice(TRUE, (int) $k, 2, NULL, FALSE, FALSE)),
|
||||
str_replace('.', ',', $p->getPrice(TRUE, (int) $k, 2)),
|
||||
str_replace('.', ',', Tools::ps_round($p->wholesale_price, 2)),
|
||||
@ -1486,6 +1488,8 @@ class AdminBulkUpdate extends AdminTab {
|
||||
$p->position,
|
||||
str_replace('.', ',', $p->weight),
|
||||
$p->quantity,
|
||||
$quantity_sold,
|
||||
($p->quantity+$quantity_sold),
|
||||
$p->name[$id_lang],
|
||||
'',
|
||||
$p->ean13,
|
||||
@ -1493,7 +1497,6 @@ class AdminBulkUpdate extends AdminTab {
|
||||
$customs['id_country'],
|
||||
// $p->location,
|
||||
// $p->manufacturer_name,
|
||||
$quantity_sold,
|
||||
str_replace('.', ',', $p->getPrice(TRUE, NULL, 2, NULL, FALSE, FALSE)),
|
||||
str_replace('.', ',', $p->getPrice(TRUE, NULL, 2)),
|
||||
str_replace('.', ',', Tools::ps_round($p->wholesale_price, 2)),
|
||||
@ -1566,6 +1569,8 @@ class AdminBulkUpdate extends AdminTab {
|
||||
'position',
|
||||
'poids',
|
||||
'quantity',
|
||||
'quantity_sold',
|
||||
'stock_initial',
|
||||
'product_name',
|
||||
'combination',
|
||||
'ean13',
|
||||
@ -1573,7 +1578,6 @@ class AdminBulkUpdate extends AdminTab {
|
||||
'Pays de fabrication',
|
||||
// 'location',
|
||||
// 'brand',
|
||||
'quantity_sold',
|
||||
'public_price_wt',
|
||||
'price_wt',
|
||||
'wholesale_price',
|
||||
@ -1725,6 +1729,8 @@ class AdminBulkUpdate extends AdminTab {
|
||||
$p->position,
|
||||
str_replace('.', ',', $p->weight),
|
||||
$v['qty'],
|
||||
$quantity_sold,
|
||||
($v['qty']+$quantity_sold),
|
||||
$p->name[$id_lang],
|
||||
implode(' - ', $names),
|
||||
$v['ean13'],
|
||||
@ -1732,7 +1738,6 @@ class AdminBulkUpdate extends AdminTab {
|
||||
$customs['id_country'],
|
||||
// $v['location'],
|
||||
// $v['brand'],
|
||||
$quantity_sold,
|
||||
str_replace('.', ',', $p->getPrice(TRUE, (int) $k, 2, NULL, FALSE, FALSE)),
|
||||
str_replace('.', ',', $p->getPrice(TRUE, (int) $k, 2)),
|
||||
str_replace('.', ',', Tools::ps_round($p->wholesale_price, 2)),
|
||||
@ -1789,6 +1794,8 @@ class AdminBulkUpdate extends AdminTab {
|
||||
$p->position,
|
||||
str_replace('.', ',', $p->weight),
|
||||
$p->quantity,
|
||||
$quantity_sold,
|
||||
($p->quantity+$quantity_sold),
|
||||
$p->name[$id_lang],
|
||||
'',
|
||||
$p->ean13,
|
||||
@ -1796,7 +1803,6 @@ class AdminBulkUpdate extends AdminTab {
|
||||
$customs['id_country'],
|
||||
// $p->location,
|
||||
// $p->manufacturer_name,
|
||||
$quantity_sold,
|
||||
str_replace('.', ',', $p->getPrice(TRUE, NULL, 2, NULL, FALSE, FALSE)),
|
||||
str_replace('.', ',', $p->getPrice(TRUE, NULL, 2)),
|
||||
str_replace('.', ',', Tools::ps_round($p->wholesale_price, 2)),
|
||||
|
Loading…
Reference in New Issue
Block a user