SIA/CI3_siddharth_application
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

import issue

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2017-07-28 16:48:19 +05:30
parent da49512857
commit 2c218087a0
2 changed files with 42 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
application/controllers/purchaseorder.php
View File

@ -1004,7 +1004,19 @@ public function mrirrevenuepoprint($PONO)
$TotalOrderValue=$data['POItem'][0]->TotalOrderValue; $TotalOrderValue=$data['POItem'][0]->TotalOrderValue;
$totalAmt=sprintf("%.2f", $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",$TotaltoPay);
$data['TotalAmountInWords']= $this->convertNumber($totalAmt); $data['TotalAmountInWords']= $this->convertNumber($totalAmt);
$data['RequistionDetails'] = $this->purchaseorder_model->GetPdfRequistionDetails($PONO); $data['RequistionDetails'] = $this->purchaseorder_model->GetPdfRequistionDetails($PONO);
@ -1030,7 +1042,6 @@ public function mrirrevenuepoprint($PONO)
$this->dompdf->stream("RevenuePOReport.pdf",$data,$php); $this->dompdf->stream("RevenuePOReport.pdf",$data,$php);
} }
public function servicepoprint($PONO) public function servicepoprint($PONO)
{ {
@ -1086,6 +1097,7 @@ public function mrirrevenuepoprint($PONO)
public function mrirservicepoprint($PONO) public function mrirservicepoprint($PONO)
{ {
@ -1109,12 +1121,20 @@ public function mrirservicepoprint($PONO)
$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); $data['TotalAmountInWords']= $this->convertNumber($totalAmt);
@ -1139,7 +1159,6 @@ public function mrirservicepoprint($PONO)
} }
public function importpoprint($PONO) public function importpoprint($PONO)
{ {
@ -1295,6 +1314,16 @@ public function mririmportpoprint($PONO)
$TotalOrderValue=$PO->TotalOrderValue; $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); //$totalAmt=sprintf("%.2f", $ProductPrice);
//$data['TotalAmountInWords']= $this->convertNumber($totalAmt); //$data['TotalAmountInWords']= $this->convertNumber($totalAmt);
//print_r($data['TotalAmountInWords']); //print_r($data['TotalAmountInWords']);
@ -1320,7 +1349,8 @@ public function mririmportpoprint($PONO)
// $TotalOrderValue=$data['POItem'][0]->$TotalOrderValue; // $TotalOrderValue=$data['POItem'][0]->$TotalOrderValue;
//print_r($data['POItem'][0]); //print_r($data['POItem'][0]);
$totalAmt=sprintf("%.2f", $TotalOrderValue); $totalAmt=sprintf("%.2f", $TotaltoPay);
//echo $totalAmt;
$data['TotalAmountInWords']= $this->convertNumber($totalAmt); $data['TotalAmountInWords']= $this->convertNumber($totalAmt);
@ -1338,7 +1368,7 @@ public function mririmportpoprint($PONO)
} }
$TotalOrderValue=$data['POItem'][0]->TotalOrderValue; $TotalOrderValue=$data['POItem'][0]->TotalOrderValue;
$totalAmt=sprintf("%.2f", $TotalOrderValue); $totalAmt=sprintf("%.2f", $TotaltoPay);
$data['TotalAmountInWords']= $this->convertNumberSymbol($totalAmt,$SymbolCurrency,$SymbolCurrencyName,$PaiseVal); $data['TotalAmountInWords']= $this->convertNumberSymbol($totalAmt,$SymbolCurrency,$SymbolCurrencyName,$PaiseVal);

2
application/views/importpo.php
View File

@ -3569,7 +3569,7 @@ $('.EditImport').click(function(){
$('#materialName'+userid).val(edititemname); $('#materialName'+userid).val(edititemname);
$('#uom'+userid).val(editUOM); $('#uom'+userid).val(editUOM);
$('#Quantity'+userid).val(EditQuantity); $('#Quantity'+userid).val(EditQuantity);
$('#itemRate'+userid).val(EditRate); $('#itemRate'+userid).val(itemRate);
$('#BasicAmt'+userid).val(BasicValue); $('#BasicAmt'+userid).val(BasicValue);
$('#BasicPriceinUS'+userid).val(BasicPriceinUS); $('#BasicPriceinUS'+userid).val(BasicPriceinUS);
$('#BasicPriceINR'+userid).val(BasicPriceinINR); $('#BasicPriceINR'+userid).val(BasicPriceinINR);