diff --git a/admin-dev/themes/default/template/controllers/supply_orders_change_state/form.tpl b/admin-dev/themes/default/template/controllers/supply_orders_change_state/form.tpl
index 80b9f4504..0136bff87 100644
--- a/admin-dev/themes/default/template/controllers/supply_orders_change_state/form.tpl
+++ b/admin-dev/themes/default/template/controllers/supply_orders_change_state/form.tpl
@@ -29,13 +29,13 @@
 
 <br />
 
-{if isset($supply_order_state) && $supply_order_state->editable == false}
+{if isset($supply_order_state) && $supply_order_state->editable == false && isset($supply_order)}
 <fieldset>
 <legend>
 <img src="../img/admin/pdf.gif" alt="{l s='Supply Order State'}">
 {l s='Print the supply order form'}
 </legend>
-<a href="pdf.php?id_supply_order='.(int)$supply_order->id.'" target="_blank" title="Export as PDF">{l s='Click here to download the supply order form'}.</a>
+<a href="pdf.php?id_supply_order={$supply_order->id}" target="_blank" title="Export as PDF">{l s='Click here to download the supply order form'}.</a>
 </fieldset>
 {/if}
 
diff --git a/controllers/admin/AdminSupplyOrdersController.php b/controllers/admin/AdminSupplyOrdersController.php
index 0a5acf37c..3d33ac147 100644
--- a/controllers/admin/AdminSupplyOrdersController.php
+++ b/controllers/admin/AdminSupplyOrdersController.php
@@ -584,6 +584,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
 		// assigns our content
 		$helper->tpl_vars['show_change_state_form'] = true;
 		$helper->tpl_vars['supply_order_state'] = $supply_order_state;
+		$helper->tpl_vars['supply_order'] = $supply_order;
 
 		// generates the form to display
 		$content = $helper->generateForm($this->fields_form);