From 4b5d883c69db1b743f1848e36269ee41d8188c46 Mon Sep 17 00:00:00 2001
From: jekkos <jeroen.peelaerts@gmail.com>
Date: Tue, 10 May 2016 19:04:24 +0200
Subject: [PATCH] Remove specific input view for excel export (#535)

---
 application/config/routes.php                 |  5 +-
 application/controllers/Reports.php           | 92 +++++++------------
 application/views/reports/date_input.php      | 16 +---
 .../views/reports/date_input_excel_export.php | 67 --------------
 application/views/reports/excel_export.php    | 51 ----------
 .../views/reports/inventory_summary_input.php | 27 ------
 application/views/reports/specific_input.php  | 26 +-----
 7 files changed, 36 insertions(+), 248 deletions(-)
 delete mode 100644 application/views/reports/date_input_excel_export.php
 delete mode 100644 application/views/reports/excel_export.php

diff --git a/application/config/routes.php b/application/config/routes.php
index 72eb297f7..1b3b03950 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -56,14 +56,13 @@ $route['no_access/([^/]+)/([^/]+)'] = 'no_access/index/$1/$2';
 $route['sales/index/([^/]+)'] = 'sales/manage/$1';
 $route['sales/index/([^/]+)/([^/]+)'] = 'sales/manage/$1/$2';
 $route['sales/index/([^/]+)/([^/]+)/([^/]+)'] = 'sales/manage/$1/$2/$3';
-$route['reports/(summary_:any)/([^/]+)/([^/]+)'] = 'reports/$1/$2/$3/$4';
+$route['reports/(summary_:any)/([^/]+)/([^/]+)'] = 'reports/$1/$2/$3';
 $route['reports/summary_:any'] = 'reports/date_input';
 $route['reports/(graphical_:any)/([^/]+)/([^/]+)'] = 'reports/$1/$2/$3';
 $route['reports/graphical_:any'] = 'reports/date_input';
 $route['reports/(inventory_:any)/([^/]+)'] = 'reports/$1/$2';
-$route['reports/inventory_:any'] = 'reports/excel_export';
 $route['reports/inventory_summary'] = 'reports/inventory_summary_input';
-$route['reports/(inventory_summary)/([^/]+)/([^/]+)/([^/]+)'] = 'reports/$1/$2/$3/$4';
+$route['reports/(inventory_summary)/([^/]+)/([^/]+)/([^/]+)'] = 'reports/$1/$2';
 
 $route['reports/(detailed_sales)/([^/]+)/([^/]+)/([^/]+)'] = 'reports/$1/$2/$3$/$4';
 $route['reports/detailed_sales'] = 'reports/date_input_sales';
diff --git a/application/controllers/Reports.php b/application/controllers/Reports.php
index 82c876a1f..64d8b40d2 100644
--- a/application/controllers/Reports.php
+++ b/application/controllers/Reports.php
@@ -29,13 +29,6 @@ class Reports extends Secure_area
 		$this->load->view("reports/listing", $data);
 	}
 
-	//Input for reports that require only a date range and an export to excel. (see routes.php to see that all summary reports route here)
-	function date_input_excel_export()
-	{
-		$data = array();
-		$this->load->view("reports/date_input_excel_export", $data);
-	}
-
  	function get_detailed_sales_row($sale_id)
 	{
 		$this->load->model('reports/Detailed_sales');
@@ -108,7 +101,7 @@ class Reports extends Secure_area
 	}
 
 	//Summary sales report
-	function summary_sales($start_date, $end_date, $sale_type, $export_excel=0)
+	function summary_sales($start_date, $end_date, $sale_type)
 	{
 		$this->load->model('reports/Summary_sales');
 		$model = $this->Summary_sales;
@@ -131,15 +124,14 @@ class Reports extends Secure_area
 			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) . '-' . date($this->config->item('dateformat'), strtotime($end_date)),
 			"headers" => $model->getDataColumns(),
 			"data" => $tabular_data,
-			"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type)),
-			"export_excel" => $export_excel
+			"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type))
 		);
 
 		$this->load->view("reports/tabular", $data);
 	}
 
 	//Summary categories report
-	function summary_categories($start_date, $end_date, $sale_type, $export_excel=0)
+	function summary_categories($start_date, $end_date, $sale_type)
 	{
 		$this->load->model('reports/Summary_categories');
 		$model = $this->Summary_categories;
@@ -162,15 +154,14 @@ class Reports extends Secure_area
 			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) . '-' . date($this->config->item('dateformat'), strtotime($end_date)),
 			"headers" => $model->getDataColumns(),
 			"data" => $tabular_data,
-			"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type)),
-			"export_excel" => $export_excel
+			"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type))
 		);
 
 		$this->load->view("reports/tabular", $data);
 	}
 
 	//Summary customers report
-	function summary_customers($start_date, $end_date, $sale_type, $export_excel=0)
+	function summary_customers($start_date, $end_date, $sale_type)
 	{
 		$this->load->model('reports/Summary_customers');
 		$model = $this->Summary_customers;
@@ -193,15 +184,14 @@ class Reports extends Secure_area
 			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) . '-' . date($this->config->item('dateformat'), strtotime($end_date)),
 			"headers" => $model->getDataColumns(),
 			"data" => $tabular_data,
-			"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type)),
-			"export_excel" => $export_excel
+			"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type))
 		);
 
 		$this->load->view("reports/tabular", $data);
 	}
 
 	//Summary suppliers report
-	function summary_suppliers($start_date, $end_date, $sale_type, $export_excel=0)
+	function summary_suppliers($start_date, $end_date, $sale_type)
 	{
 		$this->load->model('reports/Summary_suppliers');
 		$model = $this->Summary_suppliers;
@@ -224,15 +214,14 @@ class Reports extends Secure_area
 			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) . '-' . date($this->config->item('dateformat'), strtotime($end_date)),
 			"headers" => $model->getDataColumns(),
 			"data" => $tabular_data,
-			"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type)),
-			"export_excel" => $export_excel
+			"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type))
 		);
 
 		$this->load->view("reports/tabular", $data);
 	}
 
 	//Summary items report
-	function summary_items($start_date, $end_date, $sale_type, $export_excel=0)
+	function summary_items($start_date, $end_date, $sale_type)
 	{
 		$this->load->model('reports/Summary_items');
 		$model = $this->Summary_items;
@@ -255,15 +244,14 @@ class Reports extends Secure_area
 			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) . '-' . date($this->config->item('dateformat'), strtotime($end_date)),
 			"headers" => $model->getDataColumns(),
 			"data" => $tabular_data,
-			"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type)),
-			"export_excel" => $export_excel
+			"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type))
 		);
 
 		$this->load->view("reports/tabular", $data);
 	}
 
 	//Summary employees report
-	function summary_employees($start_date, $end_date, $sale_type, $export_excel=0)
+	function summary_employees($start_date, $end_date, $sale_type)
 	{
 		$this->load->model('reports/Summary_employees');
 		$model = $this->Summary_employees;
@@ -286,15 +274,14 @@ class Reports extends Secure_area
 			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) . '-' . date($this->config->item('dateformat'), strtotime($end_date)),
 			"headers" => $model->getDataColumns(),
 			"data" => $tabular_data,
-			"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type)),
-			"export_excel" => $export_excel
+			"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type))
 		);
 
 		$this->load->view("reports/tabular", $data);
 	}
 
 	//Summary taxes report
-	function summary_taxes($start_date, $end_date, $sale_type, $export_excel=0)
+	function summary_taxes($start_date, $end_date, $sale_type)
 	{
 		$this->load->model('reports/Summary_taxes');
 		$model = $this->Summary_taxes;
@@ -315,15 +302,14 @@ class Reports extends Secure_area
 			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) . '-' . date($this->config->item('dateformat'), strtotime($end_date)),
 			"headers" => $model->getDataColumns(),
 			"data" => $tabular_data,
-			"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type)),
-			"export_excel" => $export_excel
+			"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type))
 		);
 
 		$this->load->view("reports/tabular", $data);
 	}
 
 	//Summary discounts report
-	function summary_discounts($start_date, $end_date, $sale_type, $export_excel=0)
+	function summary_discounts($start_date, $end_date, $sale_type)
 	{
 		$this->load->model('reports/Summary_discounts');
 		$model = $this->Summary_discounts;
@@ -341,15 +327,14 @@ class Reports extends Secure_area
 			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) . '-' . date($this->config->item('dateformat'), strtotime($end_date)),
 			"headers" => $model->getDataColumns(),
 			"data" => $tabular_data,
-			"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type)),
-			"export_excel" => $export_excel
+			"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type))
 		);
 
 		$this->load->view("reports/tabular", $data);
 	}
 
 	//Summary payments report
-	function summary_payments($start_date, $end_date, $sale_type, $export_excel=0)
+	function summary_payments($start_date, $end_date, $sale_type)
 	{
 		$this->load->model('reports/Summary_payments');
 		$model = $this->Summary_payments;
@@ -368,8 +353,7 @@ class Reports extends Secure_area
 			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) . '-' . date($this->config->item('dateformat'), strtotime($end_date)),
 			"headers" => $model->getDataColumns(),
 			"data" => $tabular_data,
-			"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type)),
-			"export_excel" => $export_excel
+			"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type))
 		);
 
 		$this->load->view("reports/tabular", $data);
@@ -765,7 +749,7 @@ class Reports extends Secure_area
 		$this->load->view("reports/specific_input", $data);
 	}
 
-	function specific_customer($start_date, $end_date, $customer_id, $sale_type, $export_excel=0)
+	function specific_customer($start_date, $end_date, $customer_id, $sale_type)
 	{
 		$this->load->model('reports/Specific_customer');
 		$model = $this->Specific_customer;
@@ -793,8 +777,7 @@ class Reports extends Secure_area
 			"headers" => $model->getDataColumns(),
 			"summary_data" => $summary_data,
 			"details_data" => $details_data,
-			"overall_summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date,'customer_id' =>$customer_id, 'sale_type'=>$sale_type)),
-			"export_excel" => $export_excel
+			"overall_summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date,'customer_id' =>$customer_id, 'sale_type'=>$sale_type))
 		);
 
 		$this->load->view("reports/tabular_details", $data);
@@ -815,7 +798,7 @@ class Reports extends Secure_area
 		$this->load->view("reports/specific_input", $data);
 	}
 
-	function specific_employee($start_date, $end_date, $employee_id, $sale_type, $export_excel=0)
+	function specific_employee($start_date, $end_date, $employee_id, $sale_type)
 	{
 		$this->load->model('reports/Specific_employee');
 		$model = $this->Specific_employee;
@@ -843,8 +826,7 @@ class Reports extends Secure_area
 			"headers" => $model->getDataColumns(),
 			"summary_data" => $summary_data,
 			"details_data" => $details_data,
-			"overall_summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date,'employee_id' =>$employee_id, 'sale_type'=>$sale_type)),
-			"export_excel" => $export_excel
+			"overall_summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date,'employee_id' =>$employee_id, 'sale_type'=>$sale_type))
 		);
 
 		$this->load->view("reports/tabular_details", $data);
@@ -865,7 +847,7 @@ class Reports extends Secure_area
 		$this->load->view("reports/specific_input", $data);
 	}
 
-	function specific_discount($start_date, $end_date, $discount, $sale_type, $export_excel = 0)
+	function specific_discount($start_date, $end_date, $discount, $sale_type)
 	{
 		$this->load->model('reports/Specific_discount');
 		$model = $this->Specific_discount;
@@ -892,14 +874,13 @@ class Reports extends Secure_area
 			"headers" => $headers,
 			"summary_data" => $summary_data,
 			"details_data" => $details_data,
-			"overall_summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date,'discount' =>$discount, 'sale_type'=>$sale_type)),
-			"export_excel" => $export_excel
+			"overall_summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date,'discount' =>$discount, 'sale_type'=>$sale_type))
 		);
 
 		$this->load->view("reports/tabular_details", $data);
 	}
 
-	function detailed_sales($start_date, $end_date, $sale_type, $location_id='all', $export_excel=0)
+	function detailed_sales($start_date, $end_date, $sale_type, $location_id='all')
 	{
 		$this->load->model('reports/Detailed_sales');
 		$model = $this->Detailed_sales;
@@ -950,14 +931,13 @@ class Reports extends Secure_area
 			"editable" => "sales",
 			"summary_data" => $summary_data,
 			"details_data" => $details_data,
-			"overall_summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type, 'location_id'=>$location_id)),
-			"export_excel" => $export_excel
+			"overall_summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type, 'location_id'=>$location_id))
 		);
 
 		$this->load->view("reports/tabular_details", $data);
 	}
 
-	function detailed_receivings($start_date, $end_date, $receiving_type, $location_id='all', $export_excel=0)
+	function detailed_receivings($start_date, $end_date, $receiving_type, $location_id='all')
 	{
 		$this->load->model('reports/Detailed_receivings');
 		$model = $this->Detailed_receivings;
@@ -1008,19 +988,13 @@ class Reports extends Secure_area
 			"editable" => "receivings",
 			"summary_data" => $summary_data,
 			"details_data" => $details_data,
-			"overall_summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'receiving_type'=>$receiving_type, 'location_id'=>$location_id)),
-			"export_excel" => $export_excel
+			"overall_summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'receiving_type'=>$receiving_type, 'location_id'=>$location_id))
 		);
 
 		$this->load->view("reports/tabular_details", $data);
 	}
 
-	function excel_export()
-	{
-		$this->load->view("reports/excel_export", array());
-	}
-
-	function inventory_low($export_excel=0)
+	function inventory_low()
 	{
 		$this->load->model('reports/Inventory_low');
 		$model = $this->Inventory_low;
@@ -1041,8 +1015,7 @@ class Reports extends Secure_area
 			"subtitle" => '',
 			"headers" => $model->getDataColumns(),
 			"data" => $tabular_data,
-			"summary_data" => $model->getSummaryData(array()),
-			"export_excel" => $export_excel
+			"summary_data" => $model->getSummaryData(array())
 		);
 
 		$this->load->view("reports/tabular", $data);
@@ -1063,7 +1036,7 @@ class Reports extends Secure_area
 		$this->load->view("reports/inventory_summary_input", $data);
 	}
 
-	function inventory_summary($export_excel=0, $location_id='all', $item_count='all')
+	function inventory_summary($location_id='all', $item_count='all')
 	{
 		$this->load->model('reports/Inventory_summary');
 		$model = $this->Inventory_summary;
@@ -1087,8 +1060,7 @@ class Reports extends Secure_area
 			"subtitle" => '',
 			"headers" => $model->getDataColumns(),
 			"data" => $tabular_data,
-			"summary_data" => $model->getSummaryData($report_data),
-			"export_excel" => $export_excel
+			"summary_data" => $model->getSummaryData($report_data)
 		);
 
 		$this->load->view("reports/tabular", $data);
diff --git a/application/views/reports/date_input.php b/application/views/reports/date_input.php
index 8fede009a..3747a1ed9 100644
--- a/application/views/reports/date_input.php
+++ b/application/views/reports/date_input.php
@@ -78,21 +78,7 @@ $(document).ready(function()
 
 	$("#generate_report").click(function()
 	{		
-		var input_type = $("#input_type").val();
-		var location_id = $("#location_id").val();
-		var location = window.location + '/' + start_date + '/' + end_date;
-
-		if (input_type)
-		{
-			location += '/' + input_type;
-		}
-
-		if (location_id)
-		{
-			location += '/' + location_id;
-		}
-
-		window.location = location;
+		window.location = [window.location, start_date, end_date, $("#input_type").val() || 0, $("#location_id").val()].join("/");
 	});
 });
 </script>
\ No newline at end of file
diff --git a/application/views/reports/date_input_excel_export.php b/application/views/reports/date_input_excel_export.php
deleted file mode 100644
index 3c2347a82..000000000
--- a/application/views/reports/date_input_excel_export.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php $this->load->view("partial/header"); ?>
-
-<div id="page_title"><?php echo $this->lang->line('reports_report_input'); ?></div>
-
-<?php
-if(isset($error))
-{
-	echo "<div class='alert alert-dismissible alert-danger'>".$error."</div>";
-}
-?>
-
-<?php echo form_open('#', array('id'=>'item_form', 'enctype'=>'multipart/form-data', 'class'=>'form-horizontal')); ?>
-	<div class="form-group form-group-sm">
-		<?php echo form_label($this->lang->line('reports_date_range'), 'report_date_range_label', array('class'=>'control-label col-xs-2 required')); ?>
-		<div class="col-xs-3">
-				<?php echo form_input(array('name'=>'daterangepicker', 'class'=>'form-control input-sm', 'id'=>'daterangepicker')); ?>
-		</div>
-	</div>
-
-	<div class="form-group form-group-sm">
-		<?php echo form_label($this->lang->line('reports_sale_type'), 'reports_sale_type_label', array('class'=>'required control-label col-xs-2')); ?>
-		<div id='report_sale_type' class="col-xs-3">
-			<?php echo form_dropdown('sale_type', array('all' => $this->lang->line('reports_all'),
-			'sales' => $this->lang->line('reports_sales'),
-			'returns' => $this->lang->line('reports_returns')), 'all', array('id'=>'input_type', 'class'=>'form-control')); ?>
-		</div>
-	</div>
-
-	<div class="form-group form-group-sm">
-		<?php echo form_label($this->lang->line('common_export_excel'), 'export_excel', !empty($basic_version) ? array('class'=>'control-label required col-xs-3') : array('class'=>'control-label col-xs-2')); ?>
-		<div class="col-xs-3">
-			<label class="radio-inline">
-				<input type="radio" name="export_excel" id="export_excel_yes" value='1' /> <?php echo $this->lang->line('common_export_excel_yes'); ?>
-			</label>
-			<label class="radio-inline">
-				<input type="radio" name="export_excel" id="export_excel_no" value='0' checked='checked' /> <?php echo $this->lang->line('common_export_excel_no'); ?>
-			</label>
-		</div>
-	</div>
-
-	<?php
-	echo form_button(array(
-		'name'=>'generate_report',
-		'id'=>'generate_report',
-		'content'=>$this->lang->line('common_submit'),
-		'class'=>'btn btn-primary btn-sm')
-	);
-	?>
-<?php echo form_close(); ?>
-
-<?php $this->load->view("partial/footer"); ?>
-
-<script type="text/javascript" language="javascript">
-$(document).ready(function()
-{
-	<?php $this->load->view('partial/daterangepicker'); ?>
-
-	$("#generate_report").click(function()
-	{
-		var sale_type = $("#sale_type").val();
-		var location = window.location + '/' + start_date + '/' + end_date + '/' + sale_type;
-		location += '/' + $("input[name='export_excel']:checked").val();
-
-		window.location = location;
-	});
-});
-</script>
\ No newline at end of file
diff --git a/application/views/reports/excel_export.php b/application/views/reports/excel_export.php
deleted file mode 100644
index 101fd55f8..000000000
--- a/application/views/reports/excel_export.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php $this->load->view("partial/header"); ?>
-
-<div id="page_title"><?php echo $this->lang->line('reports_report_input'); ?></div>
-
-<?php
-if(isset($error))
-{
-	echo "<div class='alert alert-dismissible alert-danger'>".$error."</div>";
-}
-?>
-
-<?php echo form_open('#', array('id'=>'item_form', 'enctype'=>'multipart/form-data', 'class'=>'form-horizontal')); ?>
-	<div class="form-group form-group-sm">
-		<?php echo form_label($this->lang->line('common_export_excel'), 'export_excel', !empty($basic_version) ? array('class'=>'control-label required col-xs-3') : array('class'=>'control-label col-xs-2')); ?>
-		<div class="col-xs-4">
-			<label class="radio-inline">
-				<input type="radio" name="export_excel" id="export_excel_yes" value='1' /> <?php echo $this->lang->line('common_export_excel_yes'); ?>
-			</label>
-			<label class="radio-inline">
-				<input type="radio" name="export_excel" id="export_excel_no" value='0' checked='checked' /> <?php echo $this->lang->line('common_export_excel_no'); ?>
-			</label>
-		</div>
-	</div>
-
-<?php
-	echo form_button(array(
-		'name'=>'generate_report',
-		'id'=>'generate_report',
-		'content'=>$this->lang->line('common_submit'),
-		'class'=>'btn btn-primary btn-sm')
-	);
-?>
-<?php echo form_close(); ?>
-
-<?php $this->load->view("partial/footer"); ?>
-
-<script type="text/javascript" language="javascript">
-$(document).ready(function()
-{
-	$("#generate_report").click(function()
-	{
-		var export_excel = 0;
-		if ($("#export_excel_yes").attr('checked'))
-		{
-			export_excel = 1;
-		}
-		
-		window.location = window.location+'/' + export_excel;
-	});	
-});
-</script>
\ No newline at end of file
diff --git a/application/views/reports/inventory_summary_input.php b/application/views/reports/inventory_summary_input.php
index 3588574ee..d351af562 100644
--- a/application/views/reports/inventory_summary_input.php
+++ b/application/views/reports/inventory_summary_input.php
@@ -10,17 +10,6 @@ if(isset($error))
 ?>
 
 <?php echo form_open('#', array('id'=>'item_form', 'enctype'=>'multipart/form-data', 'class'=>'form-horizontal')); ?>
-	<div class="form-group form-group-sm">
-		<?php echo form_label($this->lang->line('common_export_excel'), 'export_excel', !empty($basic_version) ? array('class'=>'control-label required col-xs-3') : array('class'=>'control-label col-xs-2')); ?>
-		<div class="col-xs-4">
-			<label class="radio-inline">
-				<input type="radio" name="export_excel" id="export_excel_yes" value='1' /> <?php echo $this->lang->line('common_export_excel_yes'); ?>
-			</label>
-			<label class="radio-inline">
-				<input type="radio" name="export_excel" id="export_excel_no" value='0' checked='checked' /> <?php echo $this->lang->line('common_export_excel_no'); ?>
-			</label>
-		</div>
-	</div>
 
 	<div class="form-group form-group-sm">
 		<?php echo form_label($this->lang->line('reports_stock_location'), 'reports_stock_location_label', array('class'=>'required control-label col-xs-2')); ?>
@@ -47,19 +36,3 @@ if(isset($error))
 <?php echo form_close(); ?>
 
 <?php $this->load->view("partial/footer"); ?>
-
-<script type="text/javascript" language="javascript">
-$(document).ready(function()
-{
-	$("#generate_report").click(function()
-	{
-		var export_excel = 0;
-		if ($("#export_excel_yes").attr('checked'))
-		{
-			export_excel = 1;
-		}
-		
-		window.location = window.location+'/' + export_excel + '/' + $("#location_id").val() + '/' + $("#item_count").val();
-	});	
-});
-</script>
\ No newline at end of file
diff --git a/application/views/reports/specific_input.php b/application/views/reports/specific_input.php
index 3d4e10913..5022b1fd8 100644
--- a/application/views/reports/specific_input.php
+++ b/application/views/reports/specific_input.php
@@ -33,18 +33,6 @@ if(isset($error))
 		</div>
 	</div>
 
-	<div class="form-group form-group-sm">
-		<?php echo form_label($this->lang->line('common_export_excel'), 'export_excel', !empty($basic_version) ? array('class'=>'control-label required col-xs-3') : array('class'=>'control-label col-xs-2')); ?>
-		<div class="col-xs-3">
-			<label class="radio-inline">
-				<input type="radio" name="export_excel" id="export_excel_yes" value='1' /> <?php echo $this->lang->line('common_export_excel_yes'); ?>
-			</label>
-			<label class="radio-inline">
-				<input type="radio" name="export_excel" id="export_excel_no" value='0' checked='checked' /> <?php echo $this->lang->line('common_export_excel_no'); ?>
-			</label>
-		</div>
-	</div>
-
 	<?php 
 	echo form_button(array(
 			'name'=>'generate_report',
@@ -64,19 +52,7 @@ $(document).ready(function()
 
 	$("#generate_report").click(function()
 	{
-		var sale_type = $("#sale_type").val();
-		var location = window.location + '/' + start_date + '/' + end_date + '/' + $('#specific_input_data').val() + '/' + sale_type;
-
-		if ($("#export_excel_yes").attr('checked'))
-		{
-			location += '/' + 1;
-		}
-		else
-		{
-			location += '/' + 0;	
-		}
-
-		window.location = location;
+		window.location = [window.location, start_date, end_date, $('#specific_input_data').val(), $("#sale_type").val() || 0].join("/");
 	});
 });
 </script>
\ No newline at end of file