admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2021-08-13 16:00:23 +00:00
parent 0af188e1e1
commit 705c3ae0a6
4 changed files with 105 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
server/AyaNova/biz/PMBiz.cs
View File

@@ -1966,16 +1966,16 @@ namespace AyaNova.Biz
if (pct != 0)
{
if (cot == ContractOverrideType.CostMarkup)
o.PriceViz = o.CostViz + (o.CostViz * pct);
o.PriceViz = MoneyUtil.Round(o.CostViz + (o.CostViz * pct));
else if (cot == ContractOverrideType.PriceDiscount)
o.PriceViz = o.ListPriceViz - (o.ListPriceViz * pct);
o.PriceViz = MoneyUtil.Round(o.ListPriceViz - (o.ListPriceViz * pct));
}
}
}
//Calculate totals and taxes
//NET
o.NetViz = o.PriceViz * o.ServiceRateQuantity;
o.NetViz = MoneyUtil.Round(o.PriceViz * o.ServiceRateQuantity);
//TAX
o.TaxAViz = 0;
@@ -1984,17 +1984,17 @@ namespace AyaNova.Biz
{
if (Tax.TaxAPct != 0)
{
o.TaxAViz = o.NetViz * (Tax.TaxAPct / 100);
o.TaxAViz = MoneyUtil.Round(o.NetViz * (Tax.TaxAPct / 100));
}
if (Tax.TaxBPct != 0)
{
if (Tax.TaxOnTax)
{
o.TaxBViz = (o.NetViz + o.TaxAViz) * (Tax.TaxBPct / 100);
o.TaxBViz = MoneyUtil.Round((o.NetViz + o.TaxAViz) * (Tax.TaxBPct / 100));
}
else
{
o.TaxBViz = o.NetViz * (Tax.TaxBPct / 100);
o.TaxBViz = MoneyUtil.Round(o.NetViz * (Tax.TaxBPct / 100));
}
}
}
@@ -2300,7 +2300,7 @@ namespace AyaNova.Biz
//Calculate totals and taxes
//NET
o.NetViz = o.PriceViz * o.Quantity;
o.NetViz = MoneyUtil.Round(o.PriceViz * o.Quantity);
//TAX
o.TaxAViz = 0;
@@ -2309,17 +2309,17 @@ namespace AyaNova.Biz
{
if (Tax.TaxAPct != 0)
{
o.TaxAViz = o.NetViz * (Tax.TaxAPct / 100);
o.TaxAViz = MoneyUtil.Round(o.NetViz * (Tax.TaxAPct / 100));
}
if (Tax.TaxBPct != 0)
{
if (Tax.TaxOnTax)
{
o.TaxBViz = (o.NetViz + o.TaxAViz) * (Tax.TaxBPct / 100);
o.TaxBViz = MoneyUtil.Round((o.NetViz + o.TaxAViz) * (Tax.TaxBPct / 100));
}
else
{
o.TaxBViz = o.NetViz * (Tax.TaxBPct / 100);
o.TaxBViz = MoneyUtil.Round(o.NetViz * (Tax.TaxBPct / 100));
}
}
}
@@ -2695,17 +2695,17 @@ namespace AyaNova.Biz
{
if (Tax.TaxAPct != 0)
{
o.TaxAViz = o.NetViz * (Tax.TaxAPct / 100);
o.TaxAViz = MoneyUtil.Round(o.NetViz * (Tax.TaxAPct / 100));
}
if (Tax.TaxBPct != 0)
{
if (Tax.TaxOnTax)
{
o.TaxBViz = (o.NetViz + o.TaxAViz) * (Tax.TaxBPct / 100);
o.TaxBViz = MoneyUtil.Round((o.NetViz + o.TaxAViz) * (Tax.TaxBPct / 100));
}
else
{
o.TaxBViz = o.NetViz * (Tax.TaxBPct / 100);
o.TaxBViz = MoneyUtil.Round(o.NetViz * (Tax.TaxBPct / 100));
}
}
}
@@ -3064,16 +3064,16 @@ namespace AyaNova.Biz
if (pct != 0)
{
if (cot == ContractOverrideType.CostMarkup)
o.PriceViz = o.Cost + (o.Cost * pct);
o.PriceViz = MoneyUtil.Round(o.Cost + (o.Cost * pct));
else if (cot == ContractOverrideType.PriceDiscount)
o.PriceViz = o.ListPrice - (o.ListPrice * pct);
o.PriceViz = MoneyUtil.Round(o.ListPrice - (o.ListPrice * pct));
}
}
}
//Calculate totals and taxes
//NET
o.NetViz = o.PriceViz * o.Quantity;
o.NetViz = MoneyUtil.Round(o.PriceViz * o.Quantity);
//TAX
o.TaxAViz = 0;
@@ -3082,17 +3082,17 @@ namespace AyaNova.Biz
{
if (Tax.TaxAPct != 0)
{
o.TaxAViz = o.NetViz * (Tax.TaxAPct / 100);
o.TaxAViz = MoneyUtil.Round(o.NetViz * (Tax.TaxAPct / 100));
}
if (Tax.TaxBPct != 0)
{
if (Tax.TaxOnTax)
{
o.TaxBViz = (o.NetViz + o.TaxAViz) * (Tax.TaxBPct / 100);
o.TaxBViz = MoneyUtil.Round((o.NetViz + o.TaxAViz) * (Tax.TaxBPct / 100));
}
else
{
o.TaxBViz = o.NetViz * (Tax.TaxBPct / 100);
o.TaxBViz = MoneyUtil.Round(o.NetViz * (Tax.TaxBPct / 100));
}
}
}
@@ -3969,16 +3969,16 @@ namespace AyaNova.Biz
if (pct != 0)
{
if (cot == ContractOverrideType.CostMarkup)
o.PriceViz = o.CostViz + (o.CostViz * pct);
o.PriceViz = MoneyUtil.Round(o.CostViz + (o.CostViz * pct));
else if (cot == ContractOverrideType.PriceDiscount)
o.PriceViz = o.ListPriceViz - (o.ListPriceViz * pct);
o.PriceViz = MoneyUtil.Round(o.ListPriceViz - (o.ListPriceViz * pct));
}
}
}
//Calculate totals and taxes
//NET
o.NetViz = o.PriceViz * o.TravelRateQuantity;
o.NetViz = MoneyUtil.Round(o.PriceViz * o.TravelRateQuantity);
//TAX
o.TaxAViz = 0;
@@ -3987,17 +3987,17 @@ namespace AyaNova.Biz
{
if (Tax.TaxAPct != 0)
{
o.TaxAViz = o.NetViz * (Tax.TaxAPct / 100);
o.TaxAViz = MoneyUtil.Round(o.NetViz * (Tax.TaxAPct / 100));
}
if (Tax.TaxBPct != 0)
{
if (Tax.TaxOnTax)
{
o.TaxBViz = (o.NetViz + o.TaxAViz) * (Tax.TaxBPct / 100);
o.TaxBViz = MoneyUtil.Round((o.NetViz + o.TaxAViz) * (Tax.TaxBPct / 100));
}
else
{
o.TaxBViz = o.NetViz * (Tax.TaxBPct / 100);
o.TaxBViz = MoneyUtil.Round(o.NetViz * (Tax.TaxBPct / 100));
}
}
}