From b805e31d238fb39b48c51f6d631d10749346f3df Mon Sep 17 00:00:00 2001 From: gandhimathi Bharathirajan Date: Mon, 4 Sep 2017 12:11:17 +0530 Subject: [PATCH] Available budget amount and Service PO status update for requistion screen --- application/controllers/requisitionform.php | 11 +++++------ application/controllers/servicepurchaseorder.php | 9 ++++----- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/application/controllers/requisitionform.php b/application/controllers/requisitionform.php index af11d137..6f35e8de 100755 --- a/application/controllers/requisitionform.php +++ b/application/controllers/requisitionform.php @@ -101,13 +101,13 @@ class requisitionform extends BaseController { $ReqPOType = $POType[0]['POType']; } - $data['ReqPOType'] = $ReqPOType='' ? $ReqType:$ReqPOType; - + + $data['ReqPOType'] = $ReqPOType =='' ? $ReqType:$ReqPOType; $data['LineItem'] = $this->requistion_model->getEditRequistItemList($ReqNo); $data['CostCenter'] = $this->requistion_model->getCostCenterUserID($userID); $data['MaterialCode'] = $this->requistion_model->EditMaterialCode($ReqNo, $ReqType); - $data['ServiceOption'] = $this->requistion_model->getConfigValue('C022'); - $this->loadViews("editrequisitionform", $this->global, $data, NULL); + $data['ServiceOption'] = $this->requistion_model->getConfigValue('C022'); + $this->loadViews("editrequisitionform", $this->global, $data, NULL); } /** @@ -127,8 +127,7 @@ class requisitionform extends BaseController $this->requistion_model->DeleteRequistionLineItem( $ReqNo,$MaterialCode); - echo "Successfully Deleted the Line item".$ReqNo; - + echo "Successfully Deleted the Line item".$ReqNo; } /** diff --git a/application/controllers/servicepurchaseorder.php b/application/controllers/servicepurchaseorder.php index e99f4ec3..3d3d6de7 100755 --- a/application/controllers/servicepurchaseorder.php +++ b/application/controllers/servicepurchaseorder.php @@ -45,8 +45,7 @@ class servicepurchaseorder extends BaseController $this->global['pageTitle'] = 'Siddharth : Update Service PO Status'; $data['PO'] = $this->purchaseorder_model->GetServicePOListforStatusUpdate(); $data['WorkStatus']=$this->purchaseorder_model->getStatus(7); - //print_r($data['PO']); - + $this->loadViews("statusofservicepurchaseorder", $this->global,$data,Null); } @@ -56,7 +55,7 @@ class servicepurchaseorder extends BaseController { $PONO = $this->input->post('id'); $PO=$PONO; -$result = $this->purchaseorder_model->GetPODetailforBillingServicePO($PO); + $result = $this->purchaseorder_model->GetPODetailforBillingServicePO($PO); $HTML=""; for ($i = 0; $i < count($result); $i++) { @@ -110,7 +109,7 @@ $result = $this->purchaseorder_model->GetPODetailforBillingServicePO($PO); $POStatus=PO_SERVICE_COMPLETED; $POList = array('UpdateBY'=>$updatedBy,'UpdatedOn'=>$updateddt,'ServiceWorkStatusRemarks'=>$Remarks,'ServiceWorkStatus'=>$WorkStatus,'Status'=>$POStatus); $ReqList = $this->purchaseorder_model->updateReqDetail($PONO,$POStatus); - $this->purchaseorder_model->UpdateReceivedQtyforServicePO($PONO); + $this->purchaseorder_model->UpdateReceivedQtyforServicePO($PONO,$updateddt,$updatedBy); } else{ $POList = array('UpdateBY'=>$updatedBy,'UpdatedOn'=>$updateddt,'ServiceWorkStatusRemarks'=>$Remarks,'ServiceWorkStatus'=>$WorkStatus); @@ -119,7 +118,7 @@ $result = $this->purchaseorder_model->GetPODetailforBillingServicePO($PO); $POMaster = $this->purchaseorder_model->updatePOMaster($PONO,$POList); - $this->UpdateServicePOStatus(); + $this->UpdateServicePOStatus(); echo ""; } // To get the available Budget Amount