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

capital po available budget issues fixed

Browse Source
This commit is contained in:
gandhimathi 2017-10-04 15:20:50 +05:30
parent 806925a5da
commit ccfebbf7c3
2 changed files with 50 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
application/views/editCapitalAmendPO.php
View File

@ -166,10 +166,31 @@ if(!empty($POMaster))
} }
//echo $CapitalRange; //echo $CapitalRange;
if(!empty($POItem) && $CapitalRange=='1')
{
$currentPoBasicAmt=0;
$currentPoDiscountedAmt=0;
foreach ($POItem as $getTotalAmt)
{
$currentPoBasicAmt=$currentPoBasicAmt+($getTotalAmt->Rate * $getTotalAmt->Quantity);
$currentPoDiscountedAmt=$currentPoDiscountedAmt+$getTotalAmt->Afterdiscountval;
}
if(!empty($AvlBudAmt)) if(!empty($AvlBudAmt))
{ {
$AvlAmount = number_format($AvlCapitalBudAmt+$currentPoBasicAmt-$currentPoDiscountedAmt, 2, '.', '');
}
}
else {
$AvlAmount = number_format($AvlCapitalBudAmt+$ExitTotalOrderValue, 2, '.', ''); $AvlAmount = number_format($AvlCapitalBudAmt+$ExitTotalOrderValue, 2, '.', '');
} }
@ -4455,3 +4476,4 @@ function calculateFreight(isEdit)
</script> </script>

33
application/views/editCapitalPo.php
View File

@ -161,15 +161,39 @@ if(!empty($POMaster))
} }
if(!empty($POItem) && $CapitalRange=='1')
if(!empty($AvlBudAmt))
{ {
$AvlAmount = number_format($AvlCapitalBudAmt+$ExitTotalOrderValue, 2, '.', ''); $currentPoBasicAmt=0;
$currentPoDiscountedAmt=0;
foreach ($POItem as $getTotalAmt)
{
$currentPoBasicAmt=$currentPoBasicAmt+($getTotalAmt->Rate * $getTotalAmt->Quantity);
$currentPoDiscountedAmt=$currentPoDiscountedAmt+$getTotalAmt->Afterdiscountval;
} }
if(!empty($AvlBudAmt))
{
$AvlAmount = number_format($AvlCapitalBudAmt+$currentPoBasicAmt-$currentPoDiscountedAmt, 2, '.', '');
}
}
else {
$AvlAmount = number_format($AvlCapitalBudAmt+$ExitTotalOrderValue, 2, '.', '');
}
?> ?>
<style> <style>
@ -7115,3 +7139,4 @@ function updateDiscountValuesChange(totAmt,disType,disAmt){