diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php index 3492014a..a7b5d547 100755 --- a/application/controllers/purchaseorder.php +++ b/application/controllers/purchaseorder.php @@ -1002,9 +1002,21 @@ public function mrirrevenuepoprint($PONO) $Currencycode=''; - $TotalOrderValue=$data['POItem'][0]->TotalOrderValue; + $TotalOrderValue=$data['POItem'][0]->TotalOrderValue; + + $AdvanceAmount=0.00; + foreach ($data['POItem'] as $POI) + { + $AdvanceAmount=$POI->AdvanceAmount; + } + + //echo "total $TotalOrderValue"; + //echo "Advance $TotaltoPay"; + $TotaltoPay=0.00; + $TotaltoPay=$TotalOrderValue-$AdvanceAmount; + // echo "$TotaltoPay"; - $totalAmt=sprintf("%.2f", $TotalOrderValue); + $totalAmt=sprintf("%.2f",$TotaltoPay); $data['TotalAmountInWords']= $this->convertNumber($totalAmt); $data['RequistionDetails'] = $this->purchaseorder_model->GetPdfRequistionDetails($PONO); @@ -1030,7 +1042,6 @@ public function mrirrevenuepoprint($PONO) $this->dompdf->stream("RevenuePOReport.pdf",$data,$php); } - public function servicepoprint($PONO) { @@ -1086,6 +1097,7 @@ public function mrirrevenuepoprint($PONO) + public function mrirservicepoprint($PONO) { @@ -1105,16 +1117,24 @@ public function mrirservicepoprint($PONO) $TotalOrderValue=0; $Currencycode=''; foreach ($data['POItem'] as $POValue) - { + { - $TotalOrderValue=$TotalOrderValue + $POValue->TotalValue; + $TotalOrderValue=$TotalOrderValue + $POValue->TotalValue; - - } + } + $Advance=0.00; + foreach ($data['POItem'] as $PO) + { + $Advance=$PO->AdvanceAmount; + } + + $TotaltoPay=0.00; + $TotaltoPay=$TotalOrderValue-$Advance; + //echo $TotaltoPay; - $totalAmt=sprintf("%.2f", $TotalOrderValue); + $totalAmt=sprintf("%.2f", $TotaltoPay); $data['TotalAmountInWords']= $this->convertNumber($totalAmt); @@ -1139,7 +1159,6 @@ public function mrirservicepoprint($PONO) } - public function importpoprint($PONO) { @@ -1294,7 +1313,17 @@ public function mririmportpoprint($PONO) { $TotalOrderValue=$PO->TotalOrderValue; } + + foreach ($data['POItem'] as $POI) + { + $AdvanceAmount=$POI->AdvanceAmount; + } + //echo "Total $TotalOrderValue"; + //echo "Advance $AdvanceAmount"; + //$TotaltoPay=0.00; + $TotaltoPay=$TotalOrderValue-$AdvanceAmount; + //echo "Total to pay $TotaltoPay"; //$totalAmt=sprintf("%.2f", $ProductPrice); //$data['TotalAmountInWords']= $this->convertNumber($totalAmt); //print_r($data['TotalAmountInWords']); @@ -1320,7 +1349,8 @@ public function mririmportpoprint($PONO) // $TotalOrderValue=$data['POItem'][0]->$TotalOrderValue; //print_r($data['POItem'][0]); - $totalAmt=sprintf("%.2f", $TotalOrderValue); + $totalAmt=sprintf("%.2f", $TotaltoPay); + //echo $totalAmt; $data['TotalAmountInWords']= $this->convertNumber($totalAmt); @@ -1338,7 +1368,7 @@ public function mririmportpoprint($PONO) } $TotalOrderValue=$data['POItem'][0]->TotalOrderValue; - $totalAmt=sprintf("%.2f", $TotalOrderValue); + $totalAmt=sprintf("%.2f", $TotaltoPay); $data['TotalAmountInWords']= $this->convertNumberSymbol($totalAmt,$SymbolCurrency,$SymbolCurrencyName,$PaiseVal); diff --git a/application/views/importpo.php b/application/views/importpo.php index e89866aa..b05bdcc4 100755 --- a/application/views/importpo.php +++ b/application/views/importpo.php @@ -3569,7 +3569,7 @@ $('.EditImport').click(function(){ $('#materialName'+userid).val(edititemname); $('#uom'+userid).val(editUOM); $('#Quantity'+userid).val(EditQuantity); - $('#itemRate'+userid).val(EditRate); + $('#itemRate'+userid).val(itemRate); $('#BasicAmt'+userid).val(BasicValue); $('#BasicPriceinUS'+userid).val(BasicPriceinUS); $('#BasicPriceINR'+userid).val(BasicPriceinINR);