From 33b564ad638d515ff5de2e843150702927d3225f Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Mon, 11 Jul 2022 20:37:01 +0000
Subject: [PATCH]

---
 AyaNovaQBI/util.cs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/AyaNovaQBI/util.cs b/AyaNovaQBI/util.cs
index b9a54ca..e88b2d6 100644
--- a/AyaNovaQBI/util.cs
+++ b/AyaNovaQBI/util.cs
@@ -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