dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[*] BO : Fix #PSCFV-8504 carrier on invoice and delivery slip

Browse Source
This commit is contained in:
gRoussac
2013-06-27 10:56:50 +02:00
parent 7f1b44f451
commit 13b7bc959e
4 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/pdf/HTMLTemplateInvoice.php
+4 -2
View File
@@ -89,7 +89,8 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate
$tax_exempt = Configuration::get('VATNUMBER_MANAGEMENT')
&& !empty($address->vat_number)
&& $address->id_country != Configuration::get('VATNUMBER_COUNTRY');
$carrier = new Carrier($this->order->id_carrier);
$this->smarty->assign(array(
'tax_exempt' => $tax_exempt,
'use_one_after_another_method' => $this->order_invoice->useOneAfterAnotherTaxComputationMethod(),
@@ -98,7 +99,8 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate
'ecotax_tax_breakdown' => $this->order_invoice->getEcoTaxTaxesBreakdown(),
'wrapping_tax_breakdown' => $this->order_invoice->getWrappingTaxesBreakdown(),
'order' => $this->order,
'order_invoice' => $this->order_invoice
'order_invoice' => $this->order_invoice,
'carrier' => $carrier
));
return $this->smarty->fetch($this->getTemplate('invoice.tax-tab'));