From d8c404bda7ad68aa40840d76bfeca0700adab1f4 Mon Sep 17 00:00:00 2001 From: fBrignoli Date: Tue, 26 Jun 2012 08:26:43 +0000 Subject: [PATCH] [-] PDF : Bug Fixed #PSCFV-2773 - Front office, error on generating RMA form git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16129 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/pdf/HTMLTemplateOrderReturn.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/pdf/HTMLTemplateOrderReturn.php b/classes/pdf/HTMLTemplateOrderReturn.php index e012d109a..0ba35584f 100755 --- a/classes/pdf/HTMLTemplateOrderReturn.php +++ b/classes/pdf/HTMLTemplateOrderReturn.php @@ -69,7 +69,7 @@ class HTMLTemplateOrderReturnCore extends HTMLTemplate 'products' => OrderReturn::getOrdersReturnProducts((int)$this->order_return->id, $this->order), 'delivery_address' => $formatted_delivery_address, 'invoice_address' => $formatted_invoice_address, - 'shop_address' => AddressFormat::generateAddress($this->address, array(), '
', ' ') + 'shop_address' => AddressFormat::generateAddress($this->shop->getAddress(), array(), '
', ' ') )); return $this->smarty->fetch($this->getTemplate('order-return')); }