diff --git a/classes/pdf/HTMLTemplateDeliverySlip.php b/classes/pdf/HTMLTemplateDeliverySlip.php
index 6ca63012f..e6cf7faf0 100755
--- a/classes/pdf/HTMLTemplateDeliverySlip.php
+++ b/classes/pdf/HTMLTemplateDeliverySlip.php
@@ -60,13 +60,16 @@ class HTMLTemplateDeliverySlipCore extends HTMLTemplate
$invoice_address = new Address((int)$this->order->id_address_invoice);
$formatted_invoice_address = AddressFormat::generateAddress($invoice_address, array(), '
', ' ');
}
-
+
+ $carrier = new Carrier($this->order->id_carrier);
+ $carrier->name = ($carrier->name == '0' ? Configuration::get('PS_SHOP_NAME') : $carrier->name);
$this->smarty->assign(array(
'order' => $this->order,
'order_details' => $this->order_invoice->getProducts(),
'delivery_address' => $formatted_delivery_address,
'invoice_address' => $formatted_invoice_address,
- 'order_invoice' => $this->order_invoice
+ 'order_invoice' => $this->order_invoice,
+ 'carrier' => $carrier
));
return $this->smarty->fetch($this->getTemplate('delivery-slip'));
diff --git a/classes/pdf/HTMLTemplateInvoice.php b/classes/pdf/HTMLTemplateInvoice.php
index 86c475833..b66d092a4 100755
--- a/classes/pdf/HTMLTemplateInvoice.php
+++ b/classes/pdf/HTMLTemplateInvoice.php
@@ -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'));
diff --git a/pdf/delivery-slip.tpl b/pdf/delivery-slip.tpl
index affc1273e..b64100eb2 100755
--- a/pdf/delivery-slip.tpl
+++ b/pdf/delivery-slip.tpl
@@ -71,7 +71,7 @@
| + |
{l s='Order Number:' pdf='true'} {$order->getUniqReference()} @@ -93,9 +93,14 @@ {/foreach} |
| {l s='ITEMS TO BE DELIVERED' pdf='true'} | diff --git a/pdf/invoice.tpl b/pdf/invoice.tpl index c2b20cc7d..1a051ab22 100755 --- a/pdf/invoice.tpl +++ b/pdf/invoice.tpl @@ -92,6 +92,11 @@ {/foreach}