diff --git a/application/models/rawmaterialdetails_model.php b/application/models/rawmaterialdetails_model.php index 2fdf5da0..967c002a 100755 --- a/application/models/rawmaterialdetails_model.php +++ b/application/models/rawmaterialdetails_model.php @@ -176,10 +176,13 @@ class rawmaterialdetails_model extends CI_Model // } function checkMaterialExists($material) { - + // $sql="SELECT MaterialCode, MaterialName, MaterialType, Category,REPLACE(MaterialName, ' ', '') + // FROM T_MaterialMaster + // WHERE REPLACE(MaterialName, ' ', '') LIKE REPLACE('%'".$material."'%', ' ', '')"; + $this->db->select('MaterialCode,MaterialName,MaterialType,Category'); $this->db->from('T_MaterialMaster'); - $this->db->like('MaterialName', $material); + $this->db->like('REPLACE(MaterialName, " ", "")',$material); $query = $this->db->get(); //print_r($query->result()); diff --git a/application/models/supplier_model.php b/application/models/supplier_model.php index 01d11db7..c657b5db 100755 --- a/application/models/supplier_model.php +++ b/application/models/supplier_model.php @@ -182,7 +182,7 @@ function addNewsupplier($supplier) $this->db->select('SupplierID,SupplierName,Address'); $this->db->from('T_SupplierDetailsN'); - $this->db->like('SupplierName', $supp_name); + $this->db->like('REPLACE(SupplierName, " ", "")', $supp_name); $query = $this->db->get(); diff --git a/application/views/addRawMaterial.php b/application/views/addRawMaterial.php index 8941e3b1..9eed59e2 100755 --- a/application/views/addRawMaterial.php +++ b/application/views/addRawMaterial.php @@ -10,27 +10,27 @@ function isNumberKey(evt) } -function BlockSpecial(evt) { - var charCode; - if (window.event - charCode = window.event.keyCode; //for IE - else - charCode = evt.which; //for firefox +// function BlockSpecial(evt) { +// var charCode; +// if (window.event +// charCode = window.event.keyCode; //for IE +// else +// charCode = evt.which; //for firefox - if (charCode >= 91 && charCode <= 96) - return false; - if (charCode >= 123 && charCode <= 126) - return false; - if (charCode >= 33 && charCode <= 47) - return false; - if (charCode >= 58&& charCode <= 64) - return false; +// if (charCode >= 91 && charCode <= 96) +// return false; +// if (charCode >= 123 && charCode <= 126) +// return false; +// if (charCode >= 33 && charCode <= 47) +// return false; +// if (charCode >= 58&& charCode <= 64) +// return false; - else - { - return true; - } - } +// else +// { +// return true; +// } +// } function onlyAlphabets(evt) { var charCode; if (window.event) @@ -280,7 +280,11 @@ function BlockSpecial(evt) { + \ No newline at end of file diff --git a/application/views/editSupplier.php b/application/views/editSupplier.php index 917972c3..b4c55d40 100755 --- a/application/views/editSupplier.php +++ b/application/views/editSupplier.php @@ -807,7 +807,9 @@ if(!validateGST()) }); $('#supplierName').change(function() { - var supplier = $('#supplierName').val(); + var suppliername = $('#supplierName').val(); + var supplier = suppliername.replace(/ /g,''); + $('#content').loader('show'); $.ajax({ data:{id:supplier}, @@ -828,7 +830,9 @@ $('#supplierName').change(function() { }); - alert("'" + supplier + "' - related supplier are , " + " \n \n" + related_supplier); + alert("'" + suppliername + "' - related supplier are , " + " \n \n" + related_supplier); + $("#supplierName").focus(); + } else{ $('#content').loader('hide');