From e2bc6885d0e2408ce6ba9817a35eecb527f37e33 Mon Sep 17 00:00:00 2001
From: venbatechnologies <venbatechnologies@gmail.com>
Date: Wed, 7 Mar 2018 16:29:42 +0530
Subject: [PATCH] inactive material issues fixed in po screen

---
 application/models/requistion_model.php  | 1 +
 application/views/addRawMaterial.php     | 2 +-
 application/views/editOldRawmaterial.php | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/application/models/requistion_model.php b/application/models/requistion_model.php
index 011f5e15..8acffae5 100755
--- a/application/models/requistion_model.php
+++ b/application/models/requistion_model.php
@@ -176,6 +176,7 @@ ifnull(Po.Quantity,0)  as POQTY,sta.StatusName
     {
 		 $this->db->select('MaterialCode, MaterialName,UOM');
          $this->db->from('T_MaterialMaster');
+         $this->db->where('IsActive',1);
 		 //$this->db->where('MaterialType',$ReqType );
 		 
 		 $query = $this->db->get();
diff --git a/application/views/addRawMaterial.php b/application/views/addRawMaterial.php
index ce720616..a52012d4 100755
--- a/application/views/addRawMaterial.php
+++ b/application/views/addRawMaterial.php
@@ -139,7 +139,7 @@
                                 <div class="col-md-3">
                                     <div class="form-group">
                                         <label for="conversionfactor">Conversion Factor</label>
-                                        <input type="text" class="form-control" id="conversionfactor"  name="conversionfactor" maxlength="255" onkeypress="return onlyAlphabets(event);">
+                                        <input type="text" class="form-control" id="conversionfactor"  name="conversionfactor" maxlength="255">
                                     </div>
                                 </div>
                                 <div class="col-md-3">
diff --git a/application/views/editOldRawmaterial.php b/application/views/editOldRawmaterial.php
index 6b24be94..b200bde1 100755
--- a/application/views/editOldRawmaterial.php
+++ b/application/views/editOldRawmaterial.php
@@ -163,7 +163,7 @@ if(!empty($materialDetails))
                                 <div class="col-md-3">
                                     <div class="form-group">
                                         <label for="conversionfactor">Conversion Factor</label>
-                                        <input type="text" class="form-control" id="conversionfactor"  name="conversionfactor" maxlength="255" value="<?php echo $conversionfactor;?>" onkeypress="return isNumberKey(event);">
+                                        <input type="text" class="form-control" id="conversionfactor"  name="conversionfactor" maxlength="255" value="<?php echo $conversionfactor;?>">
                                     </div>
                                 </div>