diff --git a/app/Controllers/Rawmaterialdetails.php b/app/Controllers/Rawmaterialdetails.php index 35fbeb25..68eee19a 100755 --- a/app/Controllers/Rawmaterialdetails.php +++ b/app/Controllers/Rawmaterialdetails.php @@ -282,7 +282,7 @@ class Rawmaterialdetails extends BaseController $data['currentstock'] = $this->rawmaterialdetails_model->getMaterialstock($RawMaterialID, $currentdate); $data['materialType'] = $this->rawmaterialdetails_model->getmaterialType($MaterialType); $data['materialCategory'] = $this->rawmaterialdetails_model->getmaterialCategory($MaterialCategory); - $data['materialCategoryList']= $this->materialCategories_model->where('is_active',1)->findAll(); // Told by Pavithra + $data['materialCategoryList']= $this->config_model->getMaterialCategoryList(); // Told by Pavithra $data['UOMList'] = $this->rawmaterialdetails_model->getUOM($UOM); $data['costcentercode'] = $this->rawmaterialdetails_model->getCostCenterCode(); $data['cfUOM'] = $this->rawmaterialdetails_model->getConversionfactorUOM(); diff --git a/app/Models/Config_model.php b/app/Models/Config_model.php index 884a3a71..32e0d7a4 100755 --- a/app/Models/Config_model.php +++ b/app/Models/Config_model.php @@ -319,7 +319,6 @@ return $result; public function getMaterialCategoryList(){ $result = $this->db->table('t_configdetails') - ->select('ConfigValue') ->where('Config_ID','C023') ->get() ->getResultArray(); diff --git a/app/Views/editRawmaterial.php b/app/Views/editRawmaterial.php index c7de4012..c85dda52 100755 --- a/app/Views/editRawmaterial.php +++ b/app/Views/editRawmaterial.php @@ -174,10 +174,11 @@ if ($total <= $reorder) { -->