Merge branch 'master' into feature/america

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,

server/graphql-client/queries.js

@@ -1736,6 +1736,7 @@ query GET_PBS_AP_ALLOCATIONS($billids: [uuid!]) {
     md_responsibility_centers
     timezone
     pbs_serialnumber
+    pbs_configuration
     id
   }
   bills(where: {id: {_in: $billids}, exported:{_eq: false}}) {