This commit is contained in:
@@ -6267,7 +6267,7 @@ namespace AyaNovaQBI
|
|||||||
{
|
{
|
||||||
foreach (var l in it.Expenses)
|
foreach (var l in it.Expenses)
|
||||||
{
|
{
|
||||||
if (l.ChargeToClient)
|
if (l.ChargeToCustomer)
|
||||||
{
|
{
|
||||||
InvoiceAddCharge(i, QDat.MiscExpenseChargeAs, 1, l.ChargeAmount);
|
InvoiceAddCharge(i, QDat.MiscExpenseChargeAs, 1, l.ChargeAmount);
|
||||||
}
|
}
|
||||||
@@ -6281,7 +6281,7 @@ namespace AyaNovaQBI
|
|||||||
{
|
{
|
||||||
foreach (var l in it.Loans)
|
foreach (var l in it.Loans)
|
||||||
{
|
{
|
||||||
InvoiceAddCharge(i, QDat.WorkorderItemLoanChargeAs, 1, l.Charges);
|
InvoiceAddCharge(i, QDat.WorkorderItemLoanChargeAs, l.Quantity, l.PriceViz);
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -6290,12 +6290,11 @@ namespace AyaNovaQBI
|
|||||||
#region OutsideService charges
|
#region OutsideService charges
|
||||||
foreach (var it in w.Items)
|
foreach (var it in w.Items)
|
||||||
{
|
{
|
||||||
if (it.HasOutsideService && (it.OutsideService.ShippingPrice != 0 || it.OutsideService.RepairPrice != 0))
|
foreach (var os in it.OutsideServices)
|
||||||
{
|
{
|
||||||
InvoiceAddCharge(i, QDat.OutsideServiceChargeAs, 1, it.OutsideService.ShippingPrice + it.OutsideService.RepairPrice);
|
if (os.PriceViz != 0)
|
||||||
|
InvoiceAddCharge(i, QDat.OutsideServiceChargeAs, 1, os.PriceViz);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
#endregion OutsideService charges
|
#endregion OutsideService charges
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user