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*}


+
{else}
-
{/if}
@@ -36,7 +36,7 @@
{* Generate HTML code for printing Delivery Icon with link *}
{if ($order_state->delivery && $order->delivery_number)}
-
+
{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)}
-
{l s='View delivery slip'}
+
{l s='View delivery slip'}
{else}
{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 '';
if (($orderState->invoice AND $order->invoice_number) AND (int)($tr['product_number']))
- echo '
';
+ echo '
';
else
echo ' ';
echo '';
echo '';
if ($orderState->delivery AND $order->delivery_number)
- echo '
';
+ echo '
';
else
echo ' ';
echo '';
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;