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

// Fixed #PSTEST-456

Browse Source
This commit is contained in:
bMancone
2012-01-24 17:22:49 +00:00
parent 39fb3fed96
commit 75f104de38
5 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/pdf/HTMLTemplate.php
+1 -1
View File
@@ -166,7 +166,7 @@ abstract class HTMLTemplateCore
if (!isset($_LANGPDF) OR !is_array($_LANGPDF))
return str_replace('"', '"', $string);
$key = md5(str_replace('\'', '\\\'', $string));
$str = (key_exists('PDF_invoice'.$key, $_LANGPDF) ? $_LANGPDF['PDF_invoice'.$key] : $string);
$str = (key_exists('PDF'.$key, $_LANGPDF) ? $_LANGPDF['PDF'.$key] : $string);
return $str;
}
classes/pdf/HTMLTemplateOrderReturn.php
+1 -1
View File
@@ -41,7 +41,7 @@ class HTMLTemplateOrderReturnCore extends HTMLTemplate
// header informations
$this->date = Tools::displayDate($this->order->invoice_date, (int)$this->order->id_lang);
$this->title = 'Order Return '.sprintf('%06d', $this->order_return->id); // TODO
$this->title = HTMLTemplateOrderReturn::l('Order Return '.sprintf('%06d', $this->order_return->id); // TODO
// footer informations
$this->shop = new Shop((int)$this->order->id_shop);
classes/pdf/HTMLTemplateSupplyOrderForm.php
+2 -1
View File
@@ -88,7 +88,7 @@ class HTMLTemplateSupplyOrderFormCore extends HTMLTemplate
*/
public function getFilename()
{
return (HTMLTemplateSupplyOrderForm::l('SupplyOrderForm').sprintf('_%s', $this->supply_order->reference).'.pdf');
return (self::l('SupplyOrderForm').sprintf('_%s', $this->supply_order->reference).'.pdf');
}
protected function getTaxOrderSummary()
@@ -122,6 +122,7 @@ class HTMLTemplateSupplyOrderFormCore extends HTMLTemplate
{
$this->address = $this->address_warehouse;
$free_text = HTMLTemplateSupplyOrderForm::l('DE: Discount excluded ');
$free_text .= ' ';
$free_text .= HTMLTemplateSupplyOrderForm::l(' DI: Discount included');
$this->smarty->assign(array(