diff --git a/application/controllers/requisitionform.php b/application/controllers/requisitionform.php index f41d666d..0007d51d 100755 --- a/application/controllers/requisitionform.php +++ b/application/controllers/requisitionform.php @@ -136,7 +136,18 @@ class requisitionform extends BaseController //print_r($POType); // echo 'ReqType'.$ReqPOType; $data['ReqPOType'] = $ReqPOType =='' ? $ReqType:$ReqPOType; - $data['LineItem'] = $this->requistion_model->getEditRequistItemList($ReqNo); + $data['LineItem'] = $this->requistion_model->getEditRequistItemList($ReqNo); + // print_r($data['LineItem']); + $data['description']=''; + foreach($data['LineItem'] as $line) + { + $description= $line->MaterialDescription; + //echo $description; + + } + + + $data['CostCenter'] = $this->requistion_model->getCostCenterUserID($userID); $data['MaterialCode'] = $this->requistion_model->EditMaterialCode($ReqNo, $ReqType); $data['ServiceOption'] = $this->requistion_model->getConfigValue('C022'); diff --git a/application/views/editrequisitionform.php b/application/views/editrequisitionform.php index 84bbf2ba..db1580c9 100755 --- a/application/views/editrequisitionform.php +++ b/application/views/editrequisitionform.php @@ -33,6 +33,12 @@ if(!empty($ReqDetails)) } } + + +$description=''; + + + if(!empty($ReqPOType)) { @@ -462,7 +468,13 @@ if(!empty($ReqPOType)) MaterialCode ; ?> + MaterialName ; ?> + + + MaterialDescription; ; ?> + UOM ; ?> @@ -474,6 +486,8 @@ if(!empty($ReqPOType)) + + @@ -1046,19 +1060,22 @@ $("#EditItem").on("shown.bs.modal", function(e) { var check=cellval[2].innerHTML; var upcheck= check.toUpperCase(); - var decs= ; + // var decs= ; //alert(decs) + //var desc= cellval[8].innerHTML + + //alert(desc) if(upcheck=='SERVICE') { - $('#EditotherDescription').show(); - $('#EditotherD').val(decs) + $('#EditotherDescription').hide(); + } else { $('#EditotherDescription').hide(); - $('#EditotherD').val('') + }