diff --git a/application/controllers/servicepurchaseorder.php b/application/controllers/servicepurchaseorder.php index eec060e0..e99f4ec3 100755 --- a/application/controllers/servicepurchaseorder.php +++ b/application/controllers/servicepurchaseorder.php @@ -56,10 +56,7 @@ class servicepurchaseorder extends BaseController { $PONO = $this->input->post('id'); $PO=$PONO; - //echo $PO; - $PO1=explode(".", $PO); - $P=current($PO1); - $result = $this->purchaseorder_model->GetPODetailforBillingServicePO($P); +$result = $this->purchaseorder_model->GetPODetailforBillingServicePO($PO); $HTML=""; for ($i = 0; $i < count($result); $i++) { diff --git a/application/views/editServiceAmendPO.php b/application/views/editServiceAmendPO.php index ccd46351..89da94a5 100755 --- a/application/views/editServiceAmendPO.php +++ b/application/views/editServiceAmendPO.php @@ -721,14 +721,14 @@ $(document).ready(function () { foreach ($WorkStatus as $WorkSID): if($WrkStatus==$WorkSID->StatusName){ - $optionsWork[$WorkSID->StatusName] = $WorkSID->StatusName; + $optionsWork[$WorkSID->StatusCode] = $WorkSID->StatusName; } endforeach; foreach ($WorkStatus as $SID): if($WrkStatus!=$SID->StatusName){ - $optionsWork[$SID->StatusName] = $SID->StatusName; + $optionsWork[$SID->StatusCode] = $SID->StatusName; }