diff --git a/application/controllers/rawmaterialdetails.php b/application/controllers/rawmaterialdetails.php index 3c7bde10..625e7ed9 100755 --- a/application/controllers/rawmaterialdetails.php +++ b/application/controllers/rawmaterialdetails.php @@ -119,8 +119,8 @@ class rawmaterialdetails extends BaseController $this->form_validation->set_rules('MaterialName','Material Name','trim|required|'); $this->form_validation->set_rules('MaterialType','MaterialType','trim|callback_MaterialType_validate'); + $this->form_validation->set_rules('MaterialCategory','MaterialCategory','trim|callback_materialcategory_validate'); $this->form_validation->set_rules('UOM','UOM','trim|callback_UOM_validate'); - $this->form_validation->set_rules('MaterialCategory','MaterialCategory','trim|callback__validate'); if($this->form_validation->run() == FALSE) { @@ -137,6 +137,7 @@ class rawmaterialdetails extends BaseController $CostCenterCode = $this->input->post('Costcenter'); $ConversionFactor = $this->input->post('conversionfactor'); $ConversionFactorUOM = $this->input->post('conversionfactorUOM'); + $HSNcode = $this->input->post('HSNcode'); $CreatedBy = $this->session->userdata('userId'); $chked = $this->input->post('isactive'); @@ -150,7 +151,7 @@ class rawmaterialdetails extends BaseController $IsActive = '0'; } - $RawMaterial = array('MaterialName'=>$MaterialName, 'MaterialType'=>$MaterialType, 'UOM'=>$UOM,'Category'=>$MaterialCategory, 'CreatedBy'=>$CreatedBy,'IsActive' => $IsActive,'assetcode'=>$AssetCode,'CostCenterCode'=>$CostCenterCode,'ConversionFactorUnit'=>$ConversionFactor,'ConversionFactorUOM'=>$ConversionFactorUOM,'Remarks'=>$Remarks); + $RawMaterial = array('MaterialName'=>$MaterialName, 'MaterialType'=>$MaterialType, 'UOM'=>$UOM,'Category'=>$MaterialCategory, 'CreatedBy'=>$CreatedBy,'IsActive' => $IsActive,'assetcode'=>$AssetCode,'CostCenterCode'=>$CostCenterCode,'ConversionFactorUnit'=>$ConversionFactor,'ConversionFactorUOM'=>$ConversionFactorUOM,'Remarks'=>$Remarks,'HSNCODE'=>$HSNcode); $result = $this->rawmaterialdetails_model->addNewRawMaterial($RawMaterial); if($result > 0) @@ -235,6 +236,7 @@ class rawmaterialdetails extends BaseController $CostCenterCode = $this->input->post('Costcenter'); $ConversionFactor = $this->input->post('conversionfactor'); $ConversionFactorUOM = $this->input->post('conversionfactorUOM'); + $HSNcode = $this->input->post('HSNcode'); $UpdatedBy = $this->session->userdata ('userId'); $chked = $this->input->post('isactive'); @@ -248,8 +250,8 @@ class rawmaterialdetails extends BaseController } $RawMaterial = array(); - $RawMaterial = array('MaterialName'=>$MaterialName,'MaterialType'=>$MaterialType,'UpdatedBy'=>$UpdatedBy, 'UOM'=>$UOM,'IsActive' => $IsActive,'Category'=>$MaterialCategory,'ConversionFactorUnit'=>$ConversionFactor,'ConversionFactorUOM'=>$ConversionFactorUOM,'Remarks'=>$Remarks,'assetcode'=>$AssetCode,'CostCenterCode'=>$CostCenterCode);//,'RMCode'=>$rmcode); - //print_r($RawMaterial);die(); + $RawMaterial = array('MaterialName'=>$MaterialName,'MaterialType'=>$MaterialType,'UpdatedBy'=>$UpdatedBy, 'UOM'=>$UOM,'IsActive' => $IsActive,'Category'=>$MaterialCategory,'ConversionFactorUnit'=>$ConversionFactor,'ConversionFactorUOM'=>$ConversionFactorUOM,'Remarks'=>$Remarks,'assetcode'=>$AssetCode,'CostCenterCode'=>$CostCenterCode,'HSNCODE'=>$HSNcode);//,'RMCode'=>$rmcode); + //print_r($RawMaterial);//die(); $result = $this->rawmaterialdetails_model->editRawmaterial($RawMaterial, $MaterialCode); if($result == true) diff --git a/application/views/addRawMaterial.php b/application/views/addRawMaterial.php index 253ac0cc..4ba711b3 100755 --- a/application/views/addRawMaterial.php +++ b/application/views/addRawMaterial.php @@ -60,8 +60,8 @@ function BlockSpecial(evt) {