diff --git a/application/controllers/amendmentpurchaseorder.php b/application/controllers/amendmentpurchaseorder.php
index 85629119..e496cd7f 100755
--- a/application/controllers/amendmentpurchaseorder.php
+++ b/application/controllers/amendmentpurchaseorder.php
@@ -1309,12 +1309,15 @@ function UpdateAmendServicePurchaseOrder()
$Freightrate=$this->input->post('FreightValue'.$i);
$Freightamount=$this->input->post('AfterFreightValue'.$i);
+ $per=$this->input->post('Per'.$i);
+
$beforeFreightType=$this->input->post('beforeFreightType'.$i);
$beforeNoOfTrip=$this->input->post('beforeNoOfTrip'.$i);
$beforeFreightrate=$this->input->post('beforeFreightValue'.$i);
$beforeFreightamount=$this->input->post('beforeAfterFreightValue'.$i);
+ $beforeper=$this->input->post('beforePer'.$i);
// if($RMCIncludingCustomersPerKG-$beforeRMCIncludingCustomersPerKG )
// {
@@ -1458,6 +1461,14 @@ function UpdateAmendServicePurchaseOrder()
}
+ if($per!=$beforeper)
+ {
+ //$CAD=$CAD."Amended Additional Excise duty :".$beforeAddAdtional ."";
+ $rowspanvalue++;
+ $CAD=$CAD."
| Amended Per Value: ".$beforeper ." | Current Per Value:".$per." |
";
+ }
+
+
if($rowspanvalue>0)
{
@@ -1476,7 +1487,7 @@ function UpdateAmendServicePurchaseOrder()
- $POLineItemList = array('PONO'=>$NewPO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'CostCenterCode'=>$CostCenter,'AmendedDetails'=>$CAD);
+ $POLineItemList = array('PONO'=>$NewPO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'CostCenterCode'=>$CostCenter,'AmendedDetails'=>$CAD,'Per'=>$per);
//print_r($POLineItemList);
$POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList);
diff --git a/application/views/editImportAmendPO.php b/application/views/editImportAmendPO.php
index 1dd39247..eec0e074 100755
--- a/application/views/editImportAmendPO.php
+++ b/application/views/editImportAmendPO.php
@@ -1624,6 +1624,10 @@ if(!empty($RequistionDetails))
+
+
+
+
@@ -3293,7 +3297,8 @@ $('#editimportpomodel').on("shown.bs.modal", function(e) {
$('#AmendNOOfTrips').val($("#NoOfTrip"+userid).val());
$('#AmendtxtFreight').val($("#FreightValue"+userid).val());
$('#AmendtxtAfterFreight').val($("#AfterFreightValue"+userid).val());
-
+
+ $('#EditAmendPer').val($("#Per"+userid).val());
var FreightType = $('#drpamendFreight').val();
@@ -3421,6 +3426,15 @@ $('.EditImport').click(function(){
}
+
+ var per=$('#EditAmendPer').val();
+
+ if(per=='')
+ {
+ var per=$('#EditUOM').val();
+ }
+
+
// console.log(FreightType);
// console.log(Nooftrip);
// console.log(FreightRate);
@@ -3486,6 +3500,8 @@ $('.EditImport').click(function(){
$('#FreightValue'+userid).val(FreightRate);
$('#AfterFreightValue'+userid).val(FreightRateAmount);
+ $('#Per'+userid).val(per.trim());
+
// var a=$('#FreightType'+userid).val();