From 2a5faa02717d5aeadaf59bacfd826ae902e97fd8 Mon Sep 17 00:00:00 2001
From: vChabot <vincent.chabot@prestashop.com>
Date: Thu, 22 Dec 2011 13:38:00 +0000
Subject: [PATCH] // Improvement : target blank on PDF

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11594 b9a71923-0436-4b27-9f14-aed3839534dd
---
 admin-dev/themes/template/helper/list/list_content.tpl | 2 +-
 admin-dev/themes/template/orders/_documents.tpl        | 2 +-
 admin-dev/themes/template/orders/_print_pdf_icon.tpl   | 4 ++--
 admin-dev/themes/template/orders/view.tpl              | 2 +-
 classes/order/Order.php                                | 4 ++--
 controllers/admin/AdminOrdersController.php            | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/admin-dev/themes/template/helper/list/list_content.tpl b/admin-dev/themes/template/helper/list/list_content.tpl
index 013723810..52fa23926 100644
--- a/admin-dev/themes/template/helper/list/list_content.tpl
+++ b/admin-dev/themes/template/helper/list/list_content.tpl
@@ -51,7 +51,7 @@
 				{if isset($params.position) && $order_by == 'position'} dragHandle{/if}
 				{if isset($params.align)} {$params.align}{/if}"
 
-			{if (!isset($params.position) && !$no_link)}
+			{if (!isset($params.position) && !$no_link && !isset($params.remove_onclick))}
 				onclick="document.location = '{$current_index}&{$identifier}={$tr.$identifier}{if $view}&view{else}&update{/if}{$table}&token={$token}'">
 			{else}
 				>
diff --git a/admin-dev/themes/template/orders/_documents.tpl b/admin-dev/themes/template/orders/_documents.tpl
index 0931cdc3b..f1df28292 100644
--- a/admin-dev/themes/template/orders/_documents.tpl
+++ b/admin-dev/themes/template/orders/_documents.tpl
@@ -15,7 +15,7 @@
 	{*/if*}
 		<td class="document_date">{dateFormat date=$document->date_add}</td>
 		<td class="document_type">Invoice</td>
-		<td class="document_number"><a href="pdf.php?pdf&id_order_invoice={$document->id}">{$document->getInvoiceNumberFormatted($current_id_lang)} <img src="../img/admin/details.gif" alt="{l s='See the invoice'}" /></a></td>
+		<td class="document_number"><a target="_blank" href="pdf.php?pdf&id_order_invoice={$document->id}">{$document->getInvoiceNumberFormatted($current_id_lang)} <img src="../img/admin/details.gif" alt="{l s='See the invoice'}" /></a></td>
 		<td class="document_amount">
 		{*if TYPE DOCUMENT = INVOICE *}
 			{displayPrice price=$document->total_paid_tax_incl currency=$currency->id}&nbsp;
diff --git a/admin-dev/themes/template/orders/_print_pdf_icon.tpl b/admin-dev/themes/template/orders/_print_pdf_icon.tpl
index 6fd634008..0a70cc625 100644
--- a/admin-dev/themes/template/orders/_print_pdf_icon.tpl
+++ b/admin-dev/themes/template/orders/_print_pdf_icon.tpl
@@ -27,7 +27,7 @@
 {* Generate HTML code for printing Invoice Icon with link *}
 <span style="width:20px; margin-right:5px;">
 {if (($order_state->invoice && $order->invoice_number) && $tr['product_number'])}
-	<a href="pdf.php?id_order={$order->id}&pdf"><img src="../img/admin/tab-invoice.gif" alt="invoice" /></a>
+	<a target="_blank" href="pdf.php?id_order={$order->id}&pdf"><img src="../img/admin/tab-invoice.gif" alt="invoice" /></a>
 {else}
 	-
 {/if}
@@ -36,7 +36,7 @@
 {* Generate HTML code for printing Delivery Icon with link *}
 <span style="width:20px;">
 {if ($order_state->delivery && $order->delivery_number)}
-	<a href="pdf.php?id_delivery={$order->delivery_number}"><img src="../img/admin/delivery.gif" alt="delivery" /></a>
+	<a target="_blank" href="pdf.php?id_delivery={$order->delivery_number}"><img src="../img/admin/delivery.gif" alt="delivery" /></a>
 {else}
 	-
 {/if}
diff --git a/admin-dev/themes/template/orders/view.tpl b/admin-dev/themes/template/orders/view.tpl
index 9e1a47ae0..54aeff585 100755
--- a/admin-dev/themes/template/orders/view.tpl
+++ b/admin-dev/themes/template/orders/view.tpl
@@ -69,7 +69,7 @@
 			{/if}
 			 -
 			{if ($currentState->delivery || $order->delivery_number)}
-			<a href="pdf.php?id_delivery={$order->delivery_number}"><img src="../img/admin/delivery.gif" alt="{l s='View delivery slip'}" /> {l s='View delivery slip'}</a>
+			<a target="_blank" href="pdf.php?id_delivery={$order->delivery_number}"><img src="../img/admin/delivery.gif" alt="{l s='View delivery slip'}" /> {l s='View delivery slip'}</a>
 			{else}
 			<img src="../img/admin/delivery_ko.gif" alt="{l s='No delivery slip'}" /> {l s='No delivery slip'}
 			{/if}
diff --git a/classes/order/Order.php b/classes/order/Order.php
index d05181bab..f4d049de9 100644
--- a/classes/order/Order.php
+++ b/classes/order/Order.php
@@ -1139,13 +1139,13 @@ class OrderCore extends ObjectModel
 			die(Tools::displayError('Invalid objects'));
 		echo '<span style="width:20px; margin-right:5px;">';
 		if (($orderState->invoice AND $order->invoice_number) AND (int)($tr['product_number']))
-			echo '<a href="pdf.php?id_order='.(int)($order->id).'&pdf"><img src="../img/admin/tab-invoice.gif" alt="invoice" /></a>';
+			echo '<a target="_blank" href="pdf.php?id_order='.(int)($order->id).'&pdf"><img src="../img/admin/tab-invoice.gif" alt="invoice" /></a>';
 		else
 			echo '&nbsp;';
 		echo '</span>';
 		echo '<span style="width:20px;">';
 		if ($orderState->delivery AND $order->delivery_number)
-			echo '<a href="pdf.php?id_delivery='.(int)($order->delivery_number).'"><img src="../img/admin/delivery.gif" alt="delivery" /></a>';
+			echo '<a target="_blank" href="pdf.php?id_delivery='.(int)($order->delivery_number).'"><img src="../img/admin/delivery.gif" alt="delivery" /></a>';
 		else
 			echo '&nbsp;';
 		echo '</span>';
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index 1d433faa1..eb6033dcb 100755
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -70,7 +70,7 @@ class AdminOrdersControllerCore extends AdminController
 		'payment' => array('title' => $this->l('Payment'), 'width' => 100),
 		'osname' => array('title' => $this->l('Status'), 'color' => 'color', 'width' => 230, 'type' => 'select', 'list' => $statesArray, 'filter_key' => 'os!id_order_state', 'filter_type' => 'int'),
 		'date_add' => array('title' => $this->l('Date'), 'width' => 120, 'align' => 'right', 'type' => 'datetime', 'filter_key' => 'a!date_add'),
-		'id_pdf' => array('title' => $this->l('PDF'), 'width' => 35, 'align' => 'center', 'callback' => 'printPDFIcons', 'orderby' => false, 'search' => false));
+		'id_pdf' => array('title' => $this->l('PDF'), 'width' => 35, 'align' => 'center', 'callback' => 'printPDFIcons', 'orderby' => false, 'search' => false, 'remove_onclick' => true));
 
 		$this->shopLinkType = 'shop';
 		$this->shopShareDatas = Shop::SHARE_ORDER;