diff --git a/application/controllers/rawmaterialdetails.php b/application/controllers/rawmaterialdetails.php index 31e18765..ed81d565 100755 --- a/application/controllers/rawmaterialdetails.php +++ b/application/controllers/rawmaterialdetails.php @@ -160,6 +160,22 @@ else $cfuom = $this->input->post('conversionfactorUOM'); $HSN = $this->input->post('HSNcode'); $CreatedBy = $this->session->userdata('userId'); + $stack = $this->input->post('openstack'); + + $stackdate = $this->input->post('Date'); + if (empty($stackdate)) + { + $stackdate = NULL; + } + else + { + $stackdate = strtotime( $stackdate); + $stackdate = date("Y-m-d ", $stackdate); + } + + + $reorder = $this->input->post('reorder'); + $chked = $this->input->post('isactive'); if($asset == '0') @@ -205,7 +221,7 @@ else $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,'HSNCODE'=>$HSNcode); + $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 ,'stack'=>$stack,'Stackdate'=>$stackdate,'reorder'=>$reorder); //print_r($RawMaterial);die(); $result = $this->rawmaterialdetails_model->addNewRawMaterial($RawMaterial); @@ -313,6 +329,20 @@ else $cfuom = $this->input->post('conversionfactorUOM'); $HSN = $this->input->post('HSNcode'); $UpdatedBy = $this->session->userdata ('userId'); + $stack = $this->input->post('openstack'); + $reorder = $this->input->post('reorder'); + $stackdate = $this->input->post('Date'); + if (empty($stackdate)) + { + $stackdate = NULL; + } + else + { + $stackdate = strtotime( $stackdate); + $stackdate = date("Y-m-d ", $stackdate); + } + + $chked = $this->input->post('isactive'); if($asset == '0') { @@ -357,7 +387,7 @@ else } $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,'HSNCODE'=>$HSNcode);//,'RMCode'=>$rmcode); + $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,'stack'=>$stack,'stackdate'=>$stackdate,'reorder'=>$reorder);//,'RMCode'=>$rmcode); $result = $this->rawmaterialdetails_model->editRawmaterial($RawMaterial, $MaterialCode); diff --git a/application/views/addRawMaterial.php b/application/views/addRawMaterial.php index a52012d4..083c75de 100755 --- a/application/views/addRawMaterial.php +++ b/application/views/addRawMaterial.php @@ -6,6 +6,17 @@ outline: 1px solid slategrey; } +