From 35283b7e734545e971ab604487ed9cb991447c18 Mon Sep 17 00:00:00 2001
From: velz2020 <velmurugan.s@venbainfotech.com>
Date: Fri, 8 Dec 2017 17:53:33 +0530
Subject: [PATCH] QAD Issue Fixes

---
 application/controllers/quality.php  | 2 +-
 application/models/quality_model.php | 2 +-
 application/views/qualityreport.php  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/controllers/quality.php b/application/controllers/quality.php
index ec4ec8ef..da667498 100644
--- a/application/controllers/quality.php
+++ b/application/controllers/quality.php
@@ -261,7 +261,7 @@ class quality extends BaseController
 		{
 			$count++;
 			if($count != 12){
-			$ssize = $afs['Sieve Size µm'];
+			$ssize = $afs['Sieve Size µm'];
 			$sandweight = $afs['Sand Weight'];
 			$Percentage = $afs['Percentage'];
 			$Multiplier = $afs['Multiplier'];
diff --git a/application/models/quality_model.php b/application/models/quality_model.php
index 3c04db95..4d1de88c 100644
--- a/application/models/quality_model.php
+++ b/application/models/quality_model.php
@@ -102,7 +102,7 @@ class Quality_model extends CI_Model
 		$this->db->join('ip_clients','ip_invoices.client_id=ip_clients.client_id');
 		$this->db->join('ip_invoice_items','ip_invoices.invoice_id=ip_invoice_items.invoice_id');
 		$this->db->join('ip_products','ip_invoice_items.item_product_id=ip_products.product_id');
-		$this->db->join('ip_invoice_custom','ip_invoices.invoice_number=ip_invoice_custom.invoice_id and invoice_custom_fieldid=62');
+		$this->db->join('ip_invoice_custom','ip_invoices.invoice_id=ip_invoice_custom.invoice_id and invoice_custom_fieldid=62');
 		$this->db->where('ip_invoices.invoice_number NOT IN (SELECT invoiceid from T_Test_Report_Master)',NULL,false);
 		$this->db->order_by('ip_invoices.invoice_number');
 		$res = $this->db->get();
diff --git a/application/views/qualityreport.php b/application/views/qualityreport.php
index 4deddc8c..8778557a 100644
--- a/application/views/qualityreport.php
+++ b/application/views/qualityreport.php
@@ -591,7 +591,7 @@ function calculateMaster(id)
 	{
 		var ide = z+'result';
 		var res = document.getElementById(ide).textContent;
-		console.log(res)
+		//console.log(res)
 		if(res != 'OK')
 		{
 			flag++;
@@ -812,7 +812,7 @@ var ctx = c.getContext("2d");
 ctx.clearRect(0, 0, c.width, c.height);
 var xlabels = datalabel;
 var xlabelscount = xlabels.length;
-console.log(xlabelscount);
+//console.log(xlabelscount);
 var dataset = dataset;
 
  Array.prototype.max = function() {