From f0858cd5541fae9001f1fe80dd5cbed4cebd5359 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Fri, 8 Sep 2017 12:12:10 +0530
Subject: [PATCH] amendment per value

---
 .../controllers/amendmentpurchaseorder.php     | 13 ++++++++++++-
 application/views/editImportAmendPO.php        | 18 +++++++++++++++++-
 2 files changed, 29 insertions(+), 2 deletions(-)

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 ."</br>";
+									$rowspanvalue++;
+								$CAD=$CAD."<tr><td>Amended Per Value: ".$beforeper ."</td><td>Current Per Value:".$per."</td></tr>";
+								}
+
+
 
 								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))
 <input type="hidden" name="<?php echo 'beforeAfterFreightValue'.$index ?>" id="<?php echo 'beforeAfterFreightValue'.$index ?>" value="<?php echo $record->AfterFreightValue; ?>" />
 
 
+<input type="hidden" name="<?php echo 'Per'.$index ?>" id="<?php echo 'Per'.$index ?>" value="<?php echo $record->Per; ?>" />
+<input type="hidden" name="<?php echo 'beforePer'.$index ?>" id="<?php echo 'beforePer'.$index ?>" value="<?php echo $record->Per; ?>" />
+
+
 
 
 
@@ -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();