From ffd0f25e13fde13307c460d3961118215f5bd8b6 Mon Sep 17 00:00:00 2001
From: FrancescoUK <francesco.lodolo.uk@gmail.com>
Date: Fri, 8 Apr 2016 12:03:45 +0100
Subject: [PATCH] Fix to "count shown instead of quantity" on certain Reports
 (#453)

---
 application/controllers/Reports.php           | 91 +++++++++++--------
 application/language/de-CH/reports_lang.php   |  1 +
 application/language/en/reports_lang.php      |  1 +
 application/language/es/reports_lang.php      |  1 +
 application/language/fr/reports_lang.php      |  1 +
 application/language/hu-HU/reports_lang.php   |  1 +
 application/language/id/reports_lang.php      |  1 +
 application/language/nl-BE/reports_lang.php   |  1 +
 .../language/pt-BR/datepicker_lang.php        | 45 ---------
 application/language/pt-BR/giftcards_lang.php | 28 +++---
 application/language/pt-BR/reports_lang.php   |  1 +
 application/language/ru/reports_lang.php      |  1 +
 application/language/th/reports_lang.php      |  1 +
 application/language/tr/reports_lang.php      |  1 +
 application/language/zh/reports_lang.php      |  1 +
 .../models/reports/Detailed_receivings.php    |  4 +-
 application/models/reports/Detailed_sales.php |  4 +-
 application/models/reports/Inventory_low.php  |  7 +-
 .../models/reports/Inventory_summary.php      |  2 +-
 .../models/reports/Specific_customer.php      |  4 +-
 .../models/reports/Specific_discount.php      |  4 +-
 .../models/reports/Specific_employee.php      |  4 +-
 .../models/reports/Summary_categories.php     |  2 +-
 .../models/reports/Summary_customers.php      |  2 +-
 .../models/reports/Summary_employees.php      |  2 +-
 application/models/reports/Summary_items.php  |  2 +-
 application/models/reports/Summary_sales.php  |  2 +-
 .../models/reports/Summary_suppliers.php      |  2 +-
 application/views/reports/tabular.php         |  2 +-
 translations/reports_lang.csv                 |  1 +
 30 files changed, 102 insertions(+), 118 deletions(-)

diff --git a/application/controllers/Reports.php b/application/controllers/Reports.php
index b4b693600..20fba579c 100644
--- a/application/controllers/Reports.php
+++ b/application/controllers/Reports.php
@@ -4,7 +4,6 @@ require_once (APPPATH."libraries/ofc-library/Open-flash-chart.php");
 
 class Reports extends Secure_area
 {
-
 	function __construct()
 	{
 		parent::__construct('reports');
@@ -15,18 +14,19 @@ class Reports extends Secure_area
 		$submodule_id = $matches[1] . ((count($matches) > 2) ? $matches[2] : "s");
 		$employee_id=$this->Employee->get_logged_in_employee_info()->person_id;
 		// check access to report submodule
-		if (sizeof($exploder) > 1 && !$this->Employee->has_grant('reports_'.$submodule_id,$employee_id))
+		if (sizeof($exploder) > 1 && !$this->Employee->has_grant('reports_' . $submodule_id,$employee_id))
 		{
 			redirect('no_access/reports/reports_' . $submodule_id);
 		}
+
 		$this->load->helper('report');
 	}
 
 	//Initial report listing screen
 	function index()
 	{
-		$data['grants']=$this->Employee->get_employee_grants($this->session->userdata('person_id'));
-		$this->load->view("reports/listing",$data);
+		$data['grants'] = $this->Employee->get_employee_grants($this->session->userdata('person_id'));
+		$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)
@@ -47,7 +47,7 @@ class Reports extends Secure_area
 				'POS '.$report_data['sale_id'],
 				array('class'=>'modal-dlg modal-btn-submit')),
 				$report_data['sale_date'],
-				$report_data['items_purchased'],
+				to_quantity_decimals($report_data['items_purchased']),
 				$report_data['employee_name'],
 				$report_data['customer_name'],
 				to_currency($report_data['subtotal']),
@@ -57,6 +57,7 @@ class Reports extends Secure_area
 				to_currency($report_data['profit']),
 				$report_data['payment_type'],
 				$report_data['comment']);
+
 		echo get_detailed_data_row($summary_data, $this);
 	}
 
@@ -71,13 +72,14 @@ class Reports extends Secure_area
 				'RECV '.$report_data['receiving_id'],
 				array('class'=>'modal-dlg modal-btn-submit')),
 				$report_data['receiving_date'],
-				$report_data['items_purchased'],
+				to_quantity_decimals($report_data['items_purchased']),
 				$report_data['employee_name'],
 				$report_data['supplier_name'],
 				to_currency($report_data['total']),
 				$report_data['payment_type'],
 				$report_data['invoice_number'],
 				$report_data['comment']);
+
 		echo get_detailed_data_row($summary_data, $this);
 	}
 
@@ -90,6 +92,7 @@ class Reports extends Secure_area
 				'start_date'=>$start_date,
 				'end_date'=>$end_date,
 				'sale_type'=>$sale_type));
+
 		echo get_sales_summary_totals($summary, $this);
 	}
 
@@ -114,14 +117,14 @@ class Reports extends Secure_area
 
 		$data = array(
 			"title" => $this->lang->line('reports_sales_summary_report'),
-			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
+			"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
 		);
 
-		$this->load->view("reports/tabular",$data);
+		$this->load->view("reports/tabular", $data);
 	}
 
 	//Summary categories report
@@ -145,14 +148,14 @@ class Reports extends Secure_area
 
 		$data = array(
 			"title" => $this->lang->line('reports_categories_summary_report'),
-			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
+			"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
 		);
 
-		$this->load->view("reports/tabular",$data);
+		$this->load->view("reports/tabular", $data);
 	}
 
 	//Summary customers report
@@ -176,14 +179,14 @@ class Reports extends Secure_area
 
 		$data = array(
 			"title" => $this->lang->line('reports_customers_summary_report'),
-			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
+			"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
 		);
 
-		$this->load->view("reports/tabular",$data);
+		$this->load->view("reports/tabular", $data);
 	}
 
 	//Summary suppliers report
@@ -207,14 +210,14 @@ class Reports extends Secure_area
 
 		$data = array(
 			"title" => $this->lang->line('reports_suppliers_summary_report'),
-			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
+			"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
 		);
 
-		$this->load->view("reports/tabular",$data);
+		$this->load->view("reports/tabular", $data);
 	}
 
 	//Summary items report
@@ -238,14 +241,14 @@ class Reports extends Secure_area
 
 		$data = array(
 			"title" => $this->lang->line('reports_items_summary_report'),
-			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
+			"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
 		);
 
-		$this->load->view("reports/tabular",$data);
+		$this->load->view("reports/tabular", $data);
 	}
 
 	//Summary employees report
@@ -269,14 +272,14 @@ class Reports extends Secure_area
 
 		$data = array(
 			"title" => $this->lang->line('reports_employees_summary_report'),
-			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
+			"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
 		);
 
-		$this->load->view("reports/tabular",$data);
+		$this->load->view("reports/tabular", $data);
 	}
 
 	//Summary taxes report
@@ -298,14 +301,14 @@ class Reports extends Secure_area
 
 		$data = array(
 			"title" => $this->lang->line('reports_taxes_summary_report'),
-			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
+			"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
 		);
 
-		$this->load->view("reports/tabular",$data);
+		$this->load->view("reports/tabular", $data);
 	}
 
 	//Summary discounts report
@@ -318,19 +321,20 @@ class Reports extends Secure_area
 
 		foreach($report_data as $row)
 		{
-			$tabular_data[] = array($row['discount_percent'], $row['count']);
+			$tabular_data[] = array($row['discount_percent'], 
+				$row['count']);
 		}
 
 		$data = array(
 			"title" => $this->lang->line('reports_discounts_summary_report'),
-			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
+			"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
 		);
 
-		$this->load->view("reports/tabular",$data);
+		$this->load->view("reports/tabular", $data);
 	}
 
 	//Summary payments report
@@ -343,12 +347,14 @@ class Reports extends Secure_area
 
 		foreach($report_data as $row)
 		{
-			$tabular_data[] = array($row['payment_type'], $row['count'], to_currency($row['payment_amount']));
+			$tabular_data[] = array($row['payment_type'], 
+				$row['count'], 
+				to_currency($row['payment_amount']));
 		}
 
 		$data = array(
 			"title" => $this->lang->line('reports_payments_summary_report'),
-			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
+			"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)),
@@ -363,6 +369,7 @@ class Reports extends Secure_area
 	{
 		$data = array();
 		$data['mode'] = 'sale';
+
 		$this->load->view("reports/date_input", $data);
 	}
 
@@ -374,6 +381,7 @@ class Reports extends Secure_area
 		$stock_locations['all'] =  $this->lang->line('reports_all');
 		$data['stock_locations'] = array_reverse($stock_locations, TRUE);
         $data['mode'] = 'sale';
+
 		$this->load->view("reports/date_input", $data);
 	}
 
@@ -384,6 +392,7 @@ class Reports extends Secure_area
 		$stock_locations['all'] =  $this->lang->line('reports_all');
 		$data['stock_locations'] = array_reverse($stock_locations, TRUE);
  		$data['mode'] = 'receiving';
+
         $this->load->view("reports/date_input", $data);
     }
 
@@ -396,7 +405,7 @@ class Reports extends Secure_area
 		$data = array(
 			"title" => $this->lang->line('reports_sales_summary_report'),
 			"data_file" => site_url("reports/graphical_summary_sales_graph/$start_date/$end_date/$sale_type"),
-			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
+			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) . '-' . date($this->config->item('dateformat'), strtotime($end_date)),
 			"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type))
 		);
 
@@ -413,7 +422,7 @@ class Reports extends Secure_area
 		$graph_data = array();
 		foreach($report_data as $row)
 		{
-			$graph_data[date($this->config->item('dateformat'), strtotime($row['sale_date']))]= $row['total'];
+			$graph_data[date($this->config->item('dateformat'), strtotime($row['sale_date']))] = $row['total'];
 		}
 
 		$data = array(
@@ -424,7 +433,6 @@ class Reports extends Secure_area
 		);
 
 		$this->load->view("reports/graphs/line", $data);
-
 	}
 
 	//Graphical summary items report
@@ -436,7 +444,7 @@ class Reports extends Secure_area
 		$data = array(
 			"title" => $this->lang->line('reports_items_summary_report'),
 			"data_file" => site_url("reports/graphical_summary_items_graph/$start_date/$end_date/$sale_type"),
-			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
+			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) . '-' . date($this->config->item('dateformat'), strtotime($end_date)),
 			"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type))
 		);
 
@@ -475,7 +483,7 @@ class Reports extends Secure_area
 		$data = array(
 			"title" => $this->lang->line('reports_categories_summary_report'),
 			"data_file" => site_url("reports/graphical_summary_categories_graph/$start_date/$end_date/$sale_type"),
-			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
+			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) . '-' . date($this->config->item('dateformat'), strtotime($end_date)),
 			"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type))
 		);
 
@@ -512,7 +520,7 @@ class Reports extends Secure_area
 		$data = array(
 			"title" => $this->lang->line('reports_suppliers_summary_report'),
 			"data_file" => site_url("reports/graphical_summary_suppliers_graph/$start_date/$end_date/$sale_type"),
-			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
+			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) . '-' . date($this->config->item('dateformat'), strtotime($end_date)),
 			"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type))
 		);
 
@@ -549,7 +557,7 @@ class Reports extends Secure_area
 		$data = array(
 			"title" => $this->lang->line('reports_employees_summary_report'),
 			"data_file" => site_url("reports/graphical_summary_employees_graph/$start_date/$end_date/$sale_type"),
-			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
+			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) . '-' . date($this->config->item('dateformat'), strtotime($end_date)),
 			"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type))
 		);
 
@@ -586,7 +594,7 @@ class Reports extends Secure_area
 		$data = array(
 			"title" => $this->lang->line('reports_taxes_summary_report'),
 			"data_file" => site_url("reports/graphical_summary_taxes_graph/$start_date/$end_date/$sale_type"),
-			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
+			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) . '-' . date($this->config->item('dateformat'), strtotime($end_date)),
 			"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type))
 		);
 
@@ -623,7 +631,7 @@ class Reports extends Secure_area
 		$data = array(
 			"title" => $this->lang->line('reports_customers_summary_report'),
 			"data_file" => site_url("reports/graphical_summary_customers_graph/$start_date/$end_date/$sale_type"),
-			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
+			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) . '-' . date($this->config->item('dateformat'), strtotime($end_date)),
 			"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type))
 		);
 
@@ -662,7 +670,7 @@ class Reports extends Secure_area
 		$data = array(
 			"title" => $this->lang->line('reports_discounts_summary_report'),
 			"data_file" => site_url("reports/graphical_summary_discounts_graph/$start_date/$end_date/$sale_type"),
-			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
+			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) . '-' . date($this->config->item('dateformat'), strtotime($end_date)),
 			"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type))
 		);
 
@@ -742,6 +750,7 @@ class Reports extends Secure_area
 			$customers[$customer->person_id] = $customer->first_name .' '.$customer->last_name;
 		}
 		$data['specific_input_data'] = $customers;
+
 		$this->load->view("reports/specific_input", $data);
 	}
 
@@ -769,7 +778,7 @@ class Reports extends Secure_area
 		$customer_info = $this->Customer->get_info($customer_id);
 		$data = array(
 			"title" => $customer_info->first_name .' '. $customer_info->last_name.' '.$this->lang->line('reports_report'),
-			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
+			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) . '-' . date($this->config->item('dateformat'), strtotime($end_date)),
 			"headers" => $model->getDataColumns(),
 			"summary_data" => $summary_data,
 			"details_data" => $details_data,
@@ -792,6 +801,7 @@ class Reports extends Secure_area
 			$employees[$employee->person_id] = $employee->first_name .' '.$employee->last_name;
 		}
 		$data['specific_input_data'] = $employees;
+
 		$this->load->view("reports/specific_input", $data);
 	}
 
@@ -819,7 +829,7 @@ class Reports extends Secure_area
 		$employee_info = $this->Employee->get_info($employee_id);
 		$data = array(
 			"title" => $employee_info->first_name .' '. $employee_info->last_name.' '.$this->lang->line('reports_report'),
-			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
+			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) . '-' . date($this->config->item('dateformat'), strtotime($end_date)),
 			"headers" => $model->getDataColumns(),
 			"summary_data" => $summary_data,
 			"details_data" => $details_data,
@@ -842,6 +852,7 @@ class Reports extends Secure_area
 			$discounts[$i] = $i . '%';
 		}
 		$data['specific_input_data'] = $discounts;
+
 		$this->load->view("reports/specific_input", $data);
 	}
 
@@ -868,7 +879,7 @@ class Reports extends Secure_area
 
 		$data = array(
 			"title" => $discount. '% '.$this->lang->line('reports_discount') . ' ' . $this->lang->line('reports_report'),
-			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
+			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) . '-' . date($this->config->item('dateformat'), strtotime($end_date)),
 			"headers" => $headers,
 			"summary_data" => $summary_data,
 			"details_data" => $details_data,
@@ -910,7 +921,7 @@ class Reports extends Secure_area
 
 		$data = array(
 			"title" => $this->lang->line('reports_detailed_sales_report'),
-			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
+			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) . '-' . date($this->config->item('dateformat'), strtotime($end_date)),
 			"headers" => $model->getDataColumns(),
 			"editable" => "sales",
 			"summary_data" => $summary_data,
@@ -953,7 +964,7 @@ class Reports extends Secure_area
 
 		$data = array(
 			"title" => $this->lang->line('reports_detailed_receivings_report'),
-			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
+			"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) . '-' . date($this->config->item('dateformat'), strtotime($end_date)),
 			"headers" => $model->getDataColumns(),
 			"header_width" => intval(100 / count($headers['summary'])),
 			"editable" => "receivings",
diff --git a/application/language/de-CH/reports_lang.php b/application/language/de-CH/reports_lang.php
index 3e4509ea0..710386667 100644
--- a/application/language/de-CH/reports_lang.php
+++ b/application/language/de-CH/reports_lang.php
@@ -46,6 +46,7 @@ $lang["reports_payments_summary_report"] = "Bericht: Zahlungen (summarisch)";
 $lang["reports_profit"] = "Gewinn";
 $lang["reports_cost"] = "Kosten";
 $lang["reports_quantity_purchased"] = "Menge gekauft";
+$lang["reports_quantity"] = "Menge";
 $lang["reports_received_by"] = "Erhalten von";
 $lang["reports_receiving_id"] = "Einangs-ID";
 $lang["reports_receiving_type"] = "Eingangstyp";
diff --git a/application/language/en/reports_lang.php b/application/language/en/reports_lang.php
index a3f2225c3..89660fb6a 100644
--- a/application/language/en/reports_lang.php
+++ b/application/language/en/reports_lang.php
@@ -46,6 +46,7 @@ $lang["reports_payments_summary_report"] = "Payments Summary Report";
 $lang["reports_profit"] = "Profit";
 $lang["reports_cost"] = "Cost";
 $lang["reports_quantity_purchased"] = "Quantity Purchased";
+$lang["reports_quantity"] = "Quantity";
 $lang["reports_received_by"] = "Received By";
 $lang["reports_receiving_id"] = "Receiving ID";
 $lang["reports_receiving_type"] = "Receiving Type";
diff --git a/application/language/es/reports_lang.php b/application/language/es/reports_lang.php
index bd9182518..60c45ceba 100644
--- a/application/language/es/reports_lang.php
+++ b/application/language/es/reports_lang.php
@@ -46,6 +46,7 @@ $lang["reports_payments_summary_report"] = "Reporte de Resumen de Pagos";
 $lang["reports_profit"] = "Ganancia";
 $lang["reports_cost"] = "Cost";
 $lang["reports_quantity_purchased"] = "Cantidad Comprada";
+$lang["reports_quantity"] = "Cantidad";
 $lang["reports_received_by"] = "Recibido por";
 $lang["reports_receiving_id"] = "ID de Recepción";
 $lang["reports_receiving_type"] = "Tipo de Recepción";
diff --git a/application/language/fr/reports_lang.php b/application/language/fr/reports_lang.php
index 27f885fdf..66d72cb0f 100644
--- a/application/language/fr/reports_lang.php
+++ b/application/language/fr/reports_lang.php
@@ -46,6 +46,7 @@ $lang["reports_payments_summary_report"] = "Rapport: Résumé des Paiements";
 $lang["reports_profit"] = "Bénéfice";
 $lang["reports_cost"] = "Cost";
 $lang["reports_quantity_purchased"] = "Quantité Achetée";
+$lang["reports_quantity"] = "Quantité";
 $lang["reports_received_by"] = "Recu par";
 $lang["reports_receiving_id"] = "";
 $lang["reports_receiving_type"] = "";
diff --git a/application/language/hu-HU/reports_lang.php b/application/language/hu-HU/reports_lang.php
index 751a926ac..3e98fe9aa 100644
--- a/application/language/hu-HU/reports_lang.php
+++ b/application/language/hu-HU/reports_lang.php
@@ -46,6 +46,7 @@ $lang["reports_payments_summary_report"] = "Fizetések összefoglaló riport";
 $lang["reports_profit"] = "Profit";
 $lang["reports_cost"] = "Kiadás";
 $lang["reports_quantity_purchased"] = "Vásárolt mennyiség";
+$lang["reports_quantity"] = "Mennyiség";
 $lang["reports_received_by"] = "Átvéve";
 $lang["reports_receiving_id"] = "Átvételi ID";
 $lang["reports_receiving_type"] = "Átvételi típus";
diff --git a/application/language/id/reports_lang.php b/application/language/id/reports_lang.php
index d500a8d9e..53652933d 100644
--- a/application/language/id/reports_lang.php
+++ b/application/language/id/reports_lang.php
@@ -46,6 +46,7 @@ $lang["reports_payments_summary_report"] = "Laporan Ringkasan Pembayaran";
 $lang["reports_profit"] = "Keuntungan/Laba";
 $lang["reports_cost"] = "";
 $lang["reports_quantity_purchased"] = "Jumlah Dibeli";
+$lang["reports_quantity"] = "Jumlah";
 $lang["reports_received_by"] = "Diterima Oleh";
 $lang["reports_receiving_id"] = "Id Penerima";
 $lang["reports_receiving_type"] = "Type Diterima";
diff --git a/application/language/nl-BE/reports_lang.php b/application/language/nl-BE/reports_lang.php
index 3bd09841a..ecbbe9b48 100755
--- a/application/language/nl-BE/reports_lang.php
+++ b/application/language/nl-BE/reports_lang.php
@@ -46,6 +46,7 @@ $lang["reports_payments_summary_report"] = "Overzicht Betalingen";
 $lang["reports_profit"] = "Winst";
 $lang["reports_cost"] = "Cost";
 $lang["reports_quantity_purchased"] = "Aangekochte Hoeveelheid";
+$lang["reports_quantity"] = "Stock";
 $lang["reports_received_by"] = "Ontvangen door";
 $lang["reports_receiving_id"] = "";
 $lang["reports_receiving_type"] = "";
diff --git a/application/language/pt-BR/datepicker_lang.php b/application/language/pt-BR/datepicker_lang.php
index 3a55d96f8..d0b890c9a 100644
--- a/application/language/pt-BR/datepicker_lang.php
+++ b/application/language/pt-BR/datepicker_lang.php
@@ -1,50 +1,5 @@
 <?php 
 
-$lang["datepicker_days_sunday"] = "Domingo";
-$lang["datepicker_days_monday"] = "Segunda Feira";
-$lang["datepicker_days_tueday"] = "Terça-feira";
-$lang["datepicker_days_wednesday"] = "Quarta-feira";
-$lang["datepicker_days_thursday"] = "Quinta-feira";
-$lang["datepicker_days_friday"] = "Sexta-feira";
-$lang["datepicker_days_saturday"] = "Sábado";
-$lang["datepicker_daysshort_sunday"] = "Dom";
-$lang["datepicker_daysshort_monday"] = "Seg";
-$lang["datepicker_daysshort_tueday"] = "Ter";
-$lang["datepicker_daysshort_wednesday"] = "Qua";
-$lang["datepicker_daysshort_thursday"] = "Qui";
-$lang["datepicker_daysshort_friday"] = "Sex";
-$lang["datepicker_daysshort_saturday"] = "Sab";
-$lang["datepicker_daysmin_sunday"] = "D";
-$lang["datepicker_daysmin_monday"] = "S";
-$lang["datepicker_daysmin_tueday"] = "T";
-$lang["datepicker_daysmin_wednesday"] = "Q";
-$lang["datepicker_daysmin_thursday"] = "Q";
-$lang["datepicker_daysmin_friday"] = "S";
-$lang["datepicker_daysmin_saturday"] = "S";
-$lang["datepicker_months_january"] = "Janeiro";
-$lang["datepicker_months_february"] = "Fevereiro";
-$lang["datepicker_months_march"] = "Março";
-$lang["datepicker_months_april"] = "Abril";
-$lang["datepicker_months_may"] = "Maio";
-$lang["datepicker_months_june"] = "Junho";
-$lang["datepicker_months_july"] = "Julho";
-$lang["datepicker_months_august"] = "Agosto";
-$lang["datepicker_months_september"] = "Setembro";
-$lang["datepicker_months_october"] = "Outubro";
-$lang["datepicker_months_november"] = "Novembro";
-$lang["datepicker_months_december"] = "Dezembro";
-$lang["datepicker_monthsshort_january"] = "Jan";
-$lang["datepicker_monthsshort_february"] = "Fev";
-$lang["datepicker_monthsshort_march"] = "Mar";
-$lang["datepicker_monthsshort_april"] = "Abr";
-$lang["datepicker_monthsshort_may"] = "Mai";
-$lang["datepicker_monthsshort_june"] = "Jun";
-$lang["datepicker_monthsshort_july"] = "Jul";
-$lang["datepicker_monthsshort_august"] = "Ago";
-$lang["datepicker_monthsshort_september"] = "Set";
-$lang["datepicker_monthsshort_october"] = "Out";
-$lang["datepicker_monthsshort_november"] = "Nov";
-$lang["datepicker_monthsshort_december"] = "Dez";
 $lang["datepicker_today"] = "Hoje";
 $lang["datepicker_weekstart"] = "";
 $lang["datepicker_all_time"] = "Todos";
diff --git a/application/language/pt-BR/giftcards_lang.php b/application/language/pt-BR/giftcards_lang.php
index a250bc0fd..10f13f1ef 100644
--- a/application/language/pt-BR/giftcards_lang.php
+++ b/application/language/pt-BR/giftcards_lang.php
@@ -3,8 +3,8 @@
 $lang["giftcards_add_minus"] = "Inventory to add/subtract";
 $lang["giftcards_allow_alt_description"] = "Allow Alt Description";
 $lang["giftcards_amazon"] = "Amazon";
-$lang["giftcards_remaining_balance"] = "cupom %1 remaining value is %2!";
-$lang["giftcards_bulk_edit"] = "Editar Múltiplos Itens";
+$lang["giftcards_remaining_balance"] = "upom %1 remaining value is %2!";
+$lang["giftcards_bulk_edit"] = "Editar M�ltiplos Itens";
 $lang["giftcards_cannot_be_deleted"] = "Could not deleted selected cupom one or more of the selected cupom has sales.";
 $lang["giftcards_cannot_find_giftcard"] = "Cannot find any information about cupom";
 $lang["giftcards_card_value"] = "Valor";
@@ -15,23 +15,23 @@ $lang["giftcards_change_all_to_serialized"] = "Change All To Serialized";
 $lang["giftcards_change_all_to_unserialized"] = "Change All To Unserialized";
 $lang["giftcards_confirm_bulk_edit"] = "Are you sure you want to edit all the cupom selected?";
 $lang["giftcards_confirm_delete"] = "Are you sure you want to delete the selected cupom?";
-$lang["giftcards_cost_price"] = "Preço Custo";
+$lang["giftcards_cost_price"] = "Pre�o Custo";
 $lang["giftcards_count"] = "Update Inventory";
 $lang["giftcards_current_quantity"] = "Quantidade Atual";
-$lang["giftcards_description"] = "Descrição";
-$lang["giftcards_details_count"] = "Detalhes contagem de inventário";
+$lang["giftcards_description"] = "Descri��o";
+$lang["giftcards_details_count"] = "Detalhes contagem de invent�rio";
 $lang["giftcards_do_nothing"] = "Do Nothing";
 $lang["giftcards_edit_fields_you_want_to_update"] = "Edit the fields you want to edit for ALL selected cupom";
 $lang["giftcards_edit_multiple_giftcards"] = "Editing Multiple cupom";
 $lang["giftcards_error_adding_updating"] = "Error adding/updating cupom";
 $lang["giftcards_error_updating_multiple"] = "Error updating cupom";
 $lang["giftcards_excel_import_failed"] = "Excel import failed";
-$lang["giftcards_generate_barcodes"] = "Gerar Códigos de Barras";
+$lang["giftcards_generate_barcodes"] = "Gerar C�digos de Barras";
 $lang["giftcards_giftcard"] = "Cupom";
-$lang["giftcards_giftcard_number"] = "Cupom Número";
+$lang["giftcards_giftcard_number"] = "Cupom N�mero";
 $lang["giftcards_info_provided_by"] = "Info provided by";
-$lang["giftcards_inventory_comments"] = "Comentário";
-$lang["giftcards_is_serialized"] = "Cupom has Serial Número";
+$lang["giftcards_inventory_comments"] = "Coment�rio";
+$lang["giftcards_is_serialized"] = "Cupom has Serial N�mero";
 $lang["giftcards_low_inventory_giftcards"] = "Low Inventory cupom";
 $lang["giftcards_manually_editing_of_quantity"] = "Manual Edit of Quantidade";
 $lang["giftcards_must_select_giftcard_for_barcode"] = "You must select at least 1 cupom to generate barcodes";
@@ -40,14 +40,14 @@ $lang["giftcards_no_description_giftcards"] = "No Description cupom";
 $lang["giftcards_no_giftcards_to_display"] = "Sem cupons para mostrar";
 $lang["giftcards_none"] = "None";
 $lang["giftcards_none_selected"] = "You have not selected any cupom to edit";
-$lang["giftcards_number"] = "Cupom Número must be a number";
-$lang["giftcards_number_information"] = "Cupom Número";
-$lang["giftcards_number_required"] = "Cupom Número is a required field";
+$lang["giftcards_number"] = "Cupom N�mero must be a number";
+$lang["giftcards_number_information"] = "Cupom N�mero";
+$lang["giftcards_number_required"] = "Cupom N�mero is a required field";
 $lang["giftcards_one_or_multiple"] = "Cupom(s)";
 $lang["giftcards_person_id"] = "Cliente";
 $lang["giftcards_quantity"] = "Quantidade";
 $lang["giftcards_quantity_required"] = "Quantidade is a required field. Please Close ( X ) to cancel";
-$lang["giftcards_reorder_level"] = "Nível de reabastecimento";
+$lang["giftcards_reorder_level"] = "N�vel de reabastecimento";
 $lang["giftcards_retrive_giftcard_info"] = "Retrieve cupom Info";
 $lang["giftcards_sales_tax_1"] = "Imposto sobre vendas";
 $lang["giftcards_sales_tax_2"] = "Imposto sobre vendas 2";
@@ -61,7 +61,7 @@ $lang["giftcards_tax_1"] = "Imposto 1";
 $lang["giftcards_tax_2"] = "Imposto 2";
 $lang["giftcards_tax_percent"] = "Imposto Percent";
 $lang["giftcards_tax_percents"] = "Imposto Percent(s)";
-$lang["giftcards_unit_price"] = "Preço Unitário";
+$lang["giftcards_unit_price"] = "Pre�o Unit�rio";
 $lang["giftcards_upc_database"] = "UPC Database";
 $lang["giftcards_update"] = "Update cupom";
 $lang["giftcards_use_inventory_menu"] = "Use Inv. Menu";
diff --git a/application/language/pt-BR/reports_lang.php b/application/language/pt-BR/reports_lang.php
index 27afaf261..90a48a9c7 100644
--- a/application/language/pt-BR/reports_lang.php
+++ b/application/language/pt-BR/reports_lang.php
@@ -46,6 +46,7 @@ $lang["reports_payments_summary_report"] = "Pagamentos Resumo Relatório";
 $lang["reports_profit"] = "Lucro";
 $lang["reports_cost"] = "Custo";
 $lang["reports_quantity_purchased"] = "Quantidade Comprada";
+$lang["reports_quantity"] = "Quantidade";
 $lang["reports_received_by"] = "Recebido pord By";
 $lang["reports_receiving_id"] = "Receiving ID";
 $lang["reports_receiving_type"] = "Receiving Type";
diff --git a/application/language/ru/reports_lang.php b/application/language/ru/reports_lang.php
index 235982a37..7139cc0dd 100644
--- a/application/language/ru/reports_lang.php
+++ b/application/language/ru/reports_lang.php
@@ -46,6 +46,7 @@ $lang["reports_payments_summary_report"] = "Платежей Сводный от
 $lang["reports_profit"] = "прибыль";
 $lang["reports_cost"] = "Cost";
 $lang["reports_quantity_purchased"] = "купенный количество";
+$lang["reports_quantity"] = "Количество";
 $lang["reports_received_by"] = "получило за";
 $lang["reports_receiving_id"] = "";
 $lang["reports_receiving_type"] = "";
diff --git a/application/language/th/reports_lang.php b/application/language/th/reports_lang.php
index 0dac1299a..d8fa75ab7 100644
--- a/application/language/th/reports_lang.php
+++ b/application/language/th/reports_lang.php
@@ -46,6 +46,7 @@ $lang["reports_payments_summary_report"] = "รายงานสรุปกา
 $lang["reports_profit"] = "กำไร";
 $lang["reports_cost"] = "Cost";
 $lang["reports_quantity_purchased"] = "จำนวนการช์้อ";
+$lang["reports_quantity"] = "จำนวน";
 $lang["reports_received_by"] = "รับโดย";
 $lang["reports_receiving_id"] = "IDรับสินค้า";
 $lang["reports_receiving_type"] = "รูปแบบการรับสินค้า";
diff --git a/application/language/tr/reports_lang.php b/application/language/tr/reports_lang.php
index 41ba372f5..9e1bd9c13 100644
--- a/application/language/tr/reports_lang.php
+++ b/application/language/tr/reports_lang.php
@@ -46,6 +46,7 @@ $lang["reports_payments_summary_report"] = "Ödeme Özet Raporu";
 $lang["reports_profit"] = "Kâr";
 $lang["reports_cost"] = "";
 $lang["reports_quantity_purchased"] = "Satın Alınan Adet";
+$lang["reports_quantity"] = "Adet";
 $lang["reports_received_by"] = "Alım Yapan";
 $lang["reports_receiving_id"] = "Alım No";
 $lang["reports_receiving_type"] = "Alım Türü";
diff --git a/application/language/zh/reports_lang.php b/application/language/zh/reports_lang.php
index 1b989b161..a956230fc 100755
--- a/application/language/zh/reports_lang.php
+++ b/application/language/zh/reports_lang.php
@@ -46,6 +46,7 @@ $lang["reports_payments_summary_report"] = "收入報告摘要";
 $lang["reports_profit"] = "利潤";
 $lang["reports_cost"] = "Cost";
 $lang["reports_quantity_purchased"] = "銷售金額";
+$lang["reports_quantity"] = "數量";
 $lang["reports_received_by"] = "收款人";
 $lang["reports_receiving_id"] = "";
 $lang["reports_receiving_type"] = "";
diff --git a/application/models/reports/Detailed_receivings.php b/application/models/reports/Detailed_receivings.php
index f0ce2c7a2..771f87ac5 100644
--- a/application/models/reports/Detailed_receivings.php
+++ b/application/models/reports/Detailed_receivings.php
@@ -9,8 +9,8 @@ class Detailed_receivings extends Report
 	
 	public function getDataColumns()
 	{
-		return array('summary' => array($this->lang->line('reports_receiving_id'), $this->lang->line('reports_date'), $this->lang->line('reports_count'), $this->lang->line('reports_received_by'), $this->lang->line('reports_supplied_by'), $this->lang->line('reports_total'), $this->lang->line('reports_payment_type'), $this->lang->line('recvs_invoice_number'), $this->lang->line('reports_comments')),
-					'details' => array($this->lang->line('reports_item_number'), $this->lang->line('reports_name'), $this->lang->line('reports_category'), $this->lang->line('reports_count'), $this->lang->line('reports_total'), $this->lang->line('reports_discount'))
+		return array('summary' => array($this->lang->line('reports_receiving_id'), $this->lang->line('reports_date'), $this->lang->line('reports_quantity'), $this->lang->line('reports_received_by'), $this->lang->line('reports_supplied_by'), $this->lang->line('reports_total'), $this->lang->line('reports_payment_type'), $this->lang->line('recvs_invoice_number'), $this->lang->line('reports_comments')),
+					'details' => array($this->lang->line('reports_item_number'), $this->lang->line('reports_name'), $this->lang->line('reports_category'), $this->lang->line('reports_quantity'), $this->lang->line('reports_total'), $this->lang->line('reports_discount'))
 		);		
 	}
 	
diff --git a/application/models/reports/Detailed_sales.php b/application/models/reports/Detailed_sales.php
index 3fb90a4ba..bf1ef3d37 100644
--- a/application/models/reports/Detailed_sales.php
+++ b/application/models/reports/Detailed_sales.php
@@ -9,8 +9,8 @@ class Detailed_sales extends Report
 	
 	public function getDataColumns()
 	{
-		return array('summary' => array($this->lang->line('reports_sale_id'), $this->lang->line('reports_date'), $this->lang->line('reports_count'), $this->lang->line('reports_sold_by'), $this->lang->line('reports_sold_to'), $this->lang->line('reports_subtotal'), $this->lang->line('reports_total'), $this->lang->line('reports_tax'), $this->lang->line('reports_cost'), $this->lang->line('reports_profit'), $this->lang->line('reports_payment_type'), $this->lang->line('reports_comments')),
-					 'details' => array($this->lang->line('reports_name'), $this->lang->line('reports_category'), $this->lang->line('reports_serial_number'), $this->lang->line('reports_description'), $this->lang->line('reports_count'), $this->lang->line('reports_subtotal'), $this->lang->line('reports_total'), $this->lang->line('reports_tax'), $this->lang->line('reports_cost'), $this->lang->line('reports_profit'), $this->lang->line('reports_discount'))
+		return array('summary' => array($this->lang->line('reports_sale_id'), $this->lang->line('reports_date'), $this->lang->line('reports_quantity'), $this->lang->line('reports_sold_by'), $this->lang->line('reports_sold_to'), $this->lang->line('reports_subtotal'), $this->lang->line('reports_total'), $this->lang->line('reports_tax'), $this->lang->line('reports_cost'), $this->lang->line('reports_profit'), $this->lang->line('reports_payment_type'), $this->lang->line('reports_comments')),
+					 'details' => array($this->lang->line('reports_name'), $this->lang->line('reports_category'), $this->lang->line('reports_serial_number'), $this->lang->line('reports_description'), $this->lang->line('reports_quantity'), $this->lang->line('reports_subtotal'), $this->lang->line('reports_total'), $this->lang->line('reports_tax'), $this->lang->line('reports_cost'), $this->lang->line('reports_profit'), $this->lang->line('reports_discount'))
 		);		
 	}
 	
diff --git a/application/models/reports/Inventory_low.php b/application/models/reports/Inventory_low.php
index f20342c4e..668a82f2c 100644
--- a/application/models/reports/Inventory_low.php
+++ b/application/models/reports/Inventory_low.php
@@ -9,7 +9,12 @@ class Inventory_low extends Report
 	
 	public function getDataColumns()
 	{
-		return array($this->lang->line('reports_item_name'), $this->lang->line('reports_item_number'), $this->lang->line('reports_description'), $this->lang->line('reports_count'), $this->lang->line('reports_reorder_level'), $this->lang->line('reports_stock_location'));
+		return array($this->lang->line('reports_item_name'),
+					$this->lang->line('reports_item_number'), 
+					$this->lang->line('reports_description'), 
+					$this->lang->line('reports_quantity'), 
+					$this->lang->line('reports_reorder_level'), 
+					$this->lang->line('reports_stock_location'));
 	}
 	
     public function getData(array $inputs)
diff --git a/application/models/reports/Inventory_summary.php b/application/models/reports/Inventory_summary.php
index dac6de043..fd00927fe 100644
--- a/application/models/reports/Inventory_summary.php
+++ b/application/models/reports/Inventory_summary.php
@@ -12,7 +12,7 @@ class Inventory_summary extends Report
 		return array($this->lang->line('reports_item_name'),
 					$this->lang->line('reports_item_number'),
 					$this->lang->line('reports_description'),
-					$this->lang->line('reports_count'),
+					$this->lang->line('reports_quantity'),
 					$this->lang->line('reports_reorder_level'),
 					$this->lang->line('reports_stock_location'),
 					$this->lang->line('reports_cost_price'),
diff --git a/application/models/reports/Specific_customer.php b/application/models/reports/Specific_customer.php
index 1c90e61a7..0dc63442d 100644
--- a/application/models/reports/Specific_customer.php
+++ b/application/models/reports/Specific_customer.php
@@ -9,8 +9,8 @@ class Specific_customer extends Report
 	
 	public function getDataColumns()
 	{
-		return array('summary' => array($this->lang->line('reports_sale_id'), $this->lang->line('reports_date'), $this->lang->line('reports_count'), $this->lang->line('reports_sold_by'), $this->lang->line('reports_subtotal'), $this->lang->line('reports_total'), $this->lang->line('reports_tax'), $this->lang->line('reports_cost'), $this->lang->line('reports_profit'), $this->lang->line('reports_payment_type'), $this->lang->line('reports_comments')),
-					 'details' => array($this->lang->line('reports_name'), $this->lang->line('reports_category'), $this->lang->line('reports_serial_number'), $this->lang->line('reports_description'), $this->lang->line('reports_count'), $this->lang->line('reports_subtotal'), $this->lang->line('reports_total'), $this->lang->line('reports_tax'), $this->lang->line('reports_cost'), $this->lang->line('reports_profit'), $this->lang->line('reports_discount'))
+		return array('summary' => array($this->lang->line('reports_sale_id'), $this->lang->line('reports_date'), $this->lang->line('reports_quantity'), $this->lang->line('reports_sold_by'), $this->lang->line('reports_subtotal'), $this->lang->line('reports_total'), $this->lang->line('reports_tax'), $this->lang->line('reports_cost'), $this->lang->line('reports_profit'), $this->lang->line('reports_payment_type'), $this->lang->line('reports_comments')),
+					 'details' => array($this->lang->line('reports_name'), $this->lang->line('reports_category'), $this->lang->line('reports_serial_number'), $this->lang->line('reports_description'), $this->lang->line('reports_quantity'), $this->lang->line('reports_subtotal'), $this->lang->line('reports_total'), $this->lang->line('reports_tax'), $this->lang->line('reports_cost'), $this->lang->line('reports_profit'), $this->lang->line('reports_discount'))
 		);		
 	}
 	
diff --git a/application/models/reports/Specific_discount.php b/application/models/reports/Specific_discount.php
index 8c4ac2cda..36c7b1271 100755
--- a/application/models/reports/Specific_discount.php
+++ b/application/models/reports/Specific_discount.php
@@ -9,8 +9,8 @@ class Specific_discount extends Report
 	
 	public function getDataColumns()
 	{
-		return array('summary' => array($this->lang->line('reports_sale_id'), $this->lang->line('reports_date'), $this->lang->line('reports_count'), $this->lang->line('reports_sold_to'), $this->lang->line('reports_subtotal'), $this->lang->line('reports_total'), $this->lang->line('reports_tax'), /*$this->lang->line('reports_profit'),*/ $this->lang->line('reports_payment_type'), $this->lang->line('reports_comments')),
-					 'details' => array($this->lang->line('reports_name'), $this->lang->line('reports_category'), $this->lang->line('reports_serial_number'), $this->lang->line('reports_description'), $this->lang->line('reports_count'), $this->lang->line('reports_subtotal'), $this->lang->line('reports_total'), $this->lang->line('reports_tax'), /*$this->lang->line('reports_profit'),*/ $this->lang->line('reports_discount'))
+		return array('summary' => array($this->lang->line('reports_sale_id'), $this->lang->line('reports_date'), $this->lang->line('reports_quantity'), $this->lang->line('reports_sold_to'), $this->lang->line('reports_subtotal'), $this->lang->line('reports_total'), $this->lang->line('reports_tax'), /*$this->lang->line('reports_profit'),*/ $this->lang->line('reports_payment_type'), $this->lang->line('reports_comments')),
+					 'details' => array($this->lang->line('reports_name'), $this->lang->line('reports_category'), $this->lang->line('reports_serial_number'), $this->lang->line('reports_description'), $this->lang->line('reports_quantity'), $this->lang->line('reports_subtotal'), $this->lang->line('reports_total'), $this->lang->line('reports_tax'), /*$this->lang->line('reports_profit'),*/ $this->lang->line('reports_discount'))
 		);		
 	}
 	
diff --git a/application/models/reports/Specific_employee.php b/application/models/reports/Specific_employee.php
index 83110f18c..e5a971291 100644
--- a/application/models/reports/Specific_employee.php
+++ b/application/models/reports/Specific_employee.php
@@ -9,8 +9,8 @@ class Specific_employee extends Report
 	
 	public function getDataColumns()
 	{
-		return array('summary' => array($this->lang->line('reports_sale_id'), $this->lang->line('reports_date'), $this->lang->line('reports_count'), $this->lang->line('reports_sold_to'), $this->lang->line('reports_subtotal'), $this->lang->line('reports_total'), $this->lang->line('reports_tax'), $this->lang->line('reports_cost'), $this->lang->line('reports_profit'), $this->lang->line('reports_payment_type'), $this->lang->line('reports_comments')),
-					 'details' => array($this->lang->line('reports_name'), $this->lang->line('reports_category'), $this->lang->line('reports_serial_number'), $this->lang->line('reports_description'), $this->lang->line('reports_count'), $this->lang->line('reports_subtotal'), $this->lang->line('reports_total'), $this->lang->line('reports_tax'), $this->lang->line('reports_cost'), $this->lang->line('reports_profit'), $this->lang->line('reports_discount'))
+		return array('summary' => array($this->lang->line('reports_sale_id'), $this->lang->line('reports_date'), $this->lang->line('reports_quantity'), $this->lang->line('reports_sold_to'), $this->lang->line('reports_subtotal'), $this->lang->line('reports_total'), $this->lang->line('reports_tax'), $this->lang->line('reports_cost'), $this->lang->line('reports_profit'), $this->lang->line('reports_payment_type'), $this->lang->line('reports_comments')),
+					 'details' => array($this->lang->line('reports_name'), $this->lang->line('reports_category'), $this->lang->line('reports_serial_number'), $this->lang->line('reports_description'), $this->lang->line('reports_quantity'), $this->lang->line('reports_subtotal'), $this->lang->line('reports_total'), $this->lang->line('reports_tax'), $this->lang->line('reports_cost'), $this->lang->line('reports_profit'), $this->lang->line('reports_discount'))
 		);		
 	}
 	
diff --git a/application/models/reports/Summary_categories.php b/application/models/reports/Summary_categories.php
index df87a78ba..10b481c7f 100644
--- a/application/models/reports/Summary_categories.php
+++ b/application/models/reports/Summary_categories.php
@@ -9,7 +9,7 @@ class Summary_categories extends Report
 	
 	public function getDataColumns()
 	{
-		return array($this->lang->line('reports_category'), $this->lang->line('reports_count'), $this->lang->line('reports_subtotal'), $this->lang->line('reports_total'), $this->lang->line('reports_tax'), $this->lang->line('reports_cost'), $this->lang->line('reports_profit'));
+		return array($this->lang->line('reports_category'), $this->lang->line('reports_quantity'), $this->lang->line('reports_subtotal'), $this->lang->line('reports_total'), $this->lang->line('reports_tax'), $this->lang->line('reports_cost'), $this->lang->line('reports_profit'));
 	}
 	
 	public function getData(array $inputs)
diff --git a/application/models/reports/Summary_customers.php b/application/models/reports/Summary_customers.php
index 11ad12848..cd68c6bfe 100644
--- a/application/models/reports/Summary_customers.php
+++ b/application/models/reports/Summary_customers.php
@@ -9,7 +9,7 @@ class Summary_customers extends Report
 	
 	public function getDataColumns()
 	{
-		return array($this->lang->line('reports_customer'), $this->lang->line('reports_count'), $this->lang->line('reports_subtotal'), $this->lang->line('reports_total'), $this->lang->line('reports_tax'), $this->lang->line('reports_cost'), $this->lang->line('reports_profit'));
+		return array($this->lang->line('reports_customer'), $this->lang->line('reports_quantity'), $this->lang->line('reports_subtotal'), $this->lang->line('reports_total'), $this->lang->line('reports_tax'), $this->lang->line('reports_cost'), $this->lang->line('reports_profit'));
 	}
 	
 	public function getData(array $inputs)
diff --git a/application/models/reports/Summary_employees.php b/application/models/reports/Summary_employees.php
index 3f1732201..5582c3f68 100644
--- a/application/models/reports/Summary_employees.php
+++ b/application/models/reports/Summary_employees.php
@@ -9,7 +9,7 @@ class Summary_employees extends Report
 	
 	public function getDataColumns()
 	{
-		return array($this->lang->line('reports_employee'), $this->lang->line('reports_count'), $this->lang->line('reports_subtotal'), $this->lang->line('reports_total'), $this->lang->line('reports_tax'), $this->lang->line('reports_cost'), $this->lang->line('reports_profit'));
+		return array($this->lang->line('reports_employee'), $this->lang->line('reports_quantity'), $this->lang->line('reports_subtotal'), $this->lang->line('reports_total'), $this->lang->line('reports_tax'), $this->lang->line('reports_cost'), $this->lang->line('reports_profit'));
 	}
 	
 	public function getData(array $inputs)
diff --git a/application/models/reports/Summary_items.php b/application/models/reports/Summary_items.php
index 735ea53bf..352f713ec 100644
--- a/application/models/reports/Summary_items.php
+++ b/application/models/reports/Summary_items.php
@@ -9,7 +9,7 @@ class Summary_items extends Report
 	
 	public function getDataColumns()
 	{
-		return array($this->lang->line('reports_item'), $this->lang->line('reports_count'), $this->lang->line('reports_subtotal'), $this->lang->line('reports_total'), $this->lang->line('reports_tax'), $this->lang->line('reports_cost'), $this->lang->line('reports_profit'));
+		return array($this->lang->line('reports_item'), $this->lang->line('reports_quantity'), $this->lang->line('reports_subtotal'), $this->lang->line('reports_total'), $this->lang->line('reports_tax'), $this->lang->line('reports_cost'), $this->lang->line('reports_profit'));
 	}
 	
 	public function getData(array $inputs)
diff --git a/application/models/reports/Summary_sales.php b/application/models/reports/Summary_sales.php
index 17c200dbe..83f5eb619 100644
--- a/application/models/reports/Summary_sales.php
+++ b/application/models/reports/Summary_sales.php
@@ -9,7 +9,7 @@ class Summary_sales extends Report
 
 	public function getDataColumns()
 	{
-		return array($this->lang->line('reports_date'), $this->lang->line('reports_count'), $this->lang->line('reports_subtotal'), $this->lang->line('reports_total'), $this->lang->line('reports_tax'), $this->lang->line('reports_cost'), $this->lang->line('reports_profit'));
+		return array($this->lang->line('reports_date'), $this->lang->line('reports_quantity'), $this->lang->line('reports_subtotal'), $this->lang->line('reports_total'), $this->lang->line('reports_tax'), $this->lang->line('reports_cost'), $this->lang->line('reports_profit'));
 	}
 	
 	public function getData(array $inputs)
diff --git a/application/models/reports/Summary_suppliers.php b/application/models/reports/Summary_suppliers.php
index 42af4c520..b0ce5dd31 100644
--- a/application/models/reports/Summary_suppliers.php
+++ b/application/models/reports/Summary_suppliers.php
@@ -9,7 +9,7 @@ class Summary_suppliers extends Report
 	
 	public function getDataColumns()
 	{
-		return array($this->lang->line('reports_supplier'), $this->lang->line('reports_count'), $this->lang->line('reports_subtotal'), $this->lang->line('reports_total'), $this->lang->line('reports_tax'), $this->lang->line('reports_cost'), $this->lang->line('reports_profit'));
+		return array($this->lang->line('reports_supplier'), $this->lang->line('reports_quantity'), $this->lang->line('reports_subtotal'), $this->lang->line('reports_total'), $this->lang->line('reports_tax'), $this->lang->line('reports_cost'), $this->lang->line('reports_profit'));
 	}
 	
 	public function getData(array $inputs)
diff --git a/application/views/reports/tabular.php b/application/views/reports/tabular.php
index 305c0576d..f39f3f01b 100644
--- a/application/views/reports/tabular.php
+++ b/application/views/reports/tabular.php
@@ -1,5 +1,5 @@
 <?php 
-	//OJB: Check if for excel export process
+	// Check if for excel export process
 	if($export_excel == 1)
 	{
 		ob_start();
diff --git a/translations/reports_lang.csv b/translations/reports_lang.csv
index d56df7a20..203701935 100644
--- a/translations/reports_lang.csv
+++ b/translations/reports_lang.csv
@@ -45,6 +45,7 @@ reports_payments_summary_report,Fizetések összefoglaló riport,Bericht: Zahlun
 reports_profit,Profit,Gewinn,Winst,Ganancia,Profit,Bénéfice,利潤,прибыль,กำไร,Kâr,Keuntungan/Laba,Lucro
 reports_cost,Kiadás,Kosten,Cost,Cost,Cost,Cost,Cost,Cost,Cost,,,Custo
 reports_quantity_purchased,Vásárolt mennyiség,Menge gekauft,Aangekochte Hoeveelheid,Cantidad Comprada,Quantity Purchased,Quantité Achetée,銷售金額,купенный количество,จำนวนการช์้อ,Satın Alınan Adet,Jumlah Dibeli,Quantidade Comprada
+reports_quantity,Mennyiség,Menge,Stock,Cantidad,Quantity,Quantité,數量,Количество,จำนวน,Adet,Jumlah,Quantidade
 reports_received_by,Átvéve,Erhalten von,Ontvangen door,Recibido por,Received By,Recu par,收款人,получило за,รับโดย,Alım Yapan,Diterima Oleh,Recebido pord By
 reports_receiving_id,Átvételi ID,Einangs-ID,,ID de Recepción,Receiving ID,,,,IDรับสินค้า,Alım No,Id Penerima,Receiving ID
 reports_receiving_type,Átvételi típus,Eingangstyp,,Tipo de Recepción,Receiving Type,,,,รูปแบบการรับสินค้า,Alım Türü,Type Diterima,Receiving Type