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

Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

Browse Source
This commit is contained in:
gRoussac
2013-03-01 15:47:20 +01:00
parent 046fbf52b8 0b4fc0b000
commit 0ea0b662f9
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/pdf/HTMLTemplateOrderSlip.php
+3 -3
View File
@@ -142,10 +142,10 @@ class HTMLTemplateOrderSlipCore extends HTMLTemplateInvoice
*/ */
public function getTaxTabContent() public function getTaxTabContent()
{ {
$invoice_address = new Address((int)$this->order->id_address_invoice); $address = new Address((int)$this->order->{Configuration::get('PS_TAX_ADDRESS_TYPE')});
$tax_exempt = Configuration::get('VATNUMBER_MANAGEMENT') $tax_exempt = Configuration::get('VATNUMBER_MANAGEMENT')
&& !empty($invoice_address->vat_number) && !empty($address->vat_number)
&& $invoice_address->id_country != Configuration::get('VATNUMBER_COUNTRY'); && $address->id_country != Configuration::get('VATNUMBER_COUNTRY');
$this->smarty->assign(array( $this->smarty->assign(array(
'tax_exempt' => $tax_exempt, 'tax_exempt' => $tax_exempt,