Merge branch 'release/2023-07-28' into feature/payroll

2023-07-27 11:24:31 -07:00
parent 7b49a94edd a7ad18fae2
commit ab2cf8c8c7
31 changed files with 200 additions and 29 deletions
--- a/server/accounting/pbs/pbs-ap-allocations.js
+++ b/server/accounting/pbs/pbs-ap-allocations.js
@@ -123,8 +123,14 @@ async function PbsCalculateAllocationsAp(socket, billids) {

        if (!billHash[cc.name]) {
          billHash[cc.name] = {
-            Account: cc.dms_acctnumber,
-            ControlNumber: bill.vendor.dmsid,
+            Account:
+              bodyshop.pbs_configuration.appostingaccount === "wip"
+                ? cc.dms_wip_acctnumber
+                : cc.dms_acctnumber,
+            ControlNumber:
+              bodyshop.pbs_configuration.apcontrol === "ro"
+                ? bill.job.ro_number
+                : bill.vendor.dmsid,
            Amount: Dinero(),
            // Comment: "String",
            AdditionalInfo: bill.vendor.name,