This commit is contained in:
2022-07-11 20:37:01 +00:00
parent 3968fd999a
commit 33b564ad63

View File

@@ -6267,7 +6267,7 @@ namespace AyaNovaQBI
{
foreach (var l in it.Expenses)
{
if (l.ChargeToClient)
if (l.ChargeToCustomer)
{
InvoiceAddCharge(i, QDat.MiscExpenseChargeAs, 1, l.ChargeAmount);
}
@@ -6281,7 +6281,7 @@ namespace AyaNovaQBI
{
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
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