From 18764d5cafef24dfa1df4a1f7f2e5b152ebbac1f Mon Sep 17 00:00:00 2001
From: FrancescoUK <francesco.lodolo.uk@gmail.com>
Date: Thu, 5 May 2016 22:31:24 +0100
Subject: [PATCH] Hide delete button from Takings print, fix null value for
 margins, add a missing / (#507)

---
 application/views/partial/print_receipt.php | 8 ++++----
 application/views/receivings/receiving.php  | 2 +-
 application/views/sales/manage.php          | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/application/views/partial/print_receipt.php b/application/views/partial/print_receipt.php
index bcfdcaf75..bd1e8ee73 100644
--- a/application/views/partial/print_receipt.php
+++ b/application/views/partial/print_receipt.php
@@ -8,10 +8,10 @@ function printdoc()
 		if (window.jsPrintSetup) 
 		{
 			// set top margins in millimeters
-			jsPrintSetup.setOption('marginTop', <?php echo $this->Appconfig->get('print_top_margin'); ?>);
-			jsPrintSetup.setOption('marginLeft', <?php echo $this->Appconfig->get('print_left_margin'); ?>);
-			jsPrintSetup.setOption('marginBottom', <?php echo $this->Appconfig->get('print_bottom_margin'); ?>);
-			jsPrintSetup.setOption('marginRight', <?php echo $this->Appconfig->get('print_right_margin'); ?>);
+			jsPrintSetup.setOption('marginTop', '<?php echo $this->Appconfig->get('print_top_margin'); ?>');
+			jsPrintSetup.setOption('marginLeft', '<?php echo $this->Appconfig->get('print_left_margin'); ?>');
+			jsPrintSetup.setOption('marginBottom', '<?php echo $this->Appconfig->get('print_bottom_margin'); ?>');
+			jsPrintSetup.setOption('marginRight', '<?php echo $this->Appconfig->get('print_right_margin'); ?>');
 
 			<?php if (!$this->Appconfig->get('print_header'))
 			{
diff --git a/application/views/receivings/receiving.php b/application/views/receivings/receiving.php
index 024615a50..8e49dc7b4 100644
--- a/application/views/receivings/receiving.php
+++ b/application/views/receivings/receiving.php
@@ -50,7 +50,7 @@ if (isset($error))
 		</div>
 	<?php echo form_close(); ?>
 
-	<?php echo form_open($controller_name."add", array('id'=>'add_item_form', 'class'=>'form-horizontal panel panel-default')); ?>
+	<?php echo form_open($controller_name."/add", array('id'=>'add_item_form', 'class'=>'form-horizontal panel panel-default')); ?>
 		<div class="panel-body form-group">
 			<ul>
 				<li class="pull-left first_li">
diff --git a/application/views/sales/manage.php b/application/views/sales/manage.php
index f74b9c07f..2fe2d6fa1 100755
--- a/application/views/sales/manage.php
+++ b/application/views/sales/manage.php
@@ -54,7 +54,7 @@ $(document).ready(function()
 
 <div id="toolbar">
 	<div class="pull-left form-inline" role="toolbar">
-		<button id="delete" class="btn btn-default btn-sm">
+		<button id="delete" class="btn btn-default btn-sm print_hide">
 			<span class="glyphicon glyphicon-trash">&nbsp</span><?php echo $this->lang->line("common_delete");?>
 		</button>