Merged in feature/IO-2349-pbs-ap-cogs-wip (pull request #890)

IO-2349 Change control number for AP to allow RO.

bodyshop_translations.babel

@@ -1,4 +1,4 @@
-<babeledit_project be_version="2.7.1" version="1.2">
+<babeledit_project version="1.2" be_version="2.7.1">
     <!--
 
     BabelEdit project file
@@ -4318,6 +4318,27 @@
                                     <folder_node>
                                         <name>dms</name>
                                         <children>
+                                            <concept_node>
+                                                <name>apcontrol</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
                                             <concept_node>
                                                 <name>appostingaccount</name>
                                                 <definition_loaded>false</definition_loaded>

client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx

@@ -175,6 +175,19 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                 />
               </Form.Item>
             )}
+            {bodyshop.pbs_serialnumber && (
+              <Form.Item
+                label={t("bodyshop.fields.dms.apcontrol")}
+                name={["pbs_configuration", "apcontrol"]}
+              >
+                <Select
+                  options={[
+                    { value: "ro", label: "RO Number" },
+                    { value: "vendordmsid", label: "Vendor DMS ID" },
+                  ]}
+                />
+              </Form.Item>
+            )}
           </LayoutFormRow>
           <LayoutFormRow header={t("bodyshop.labels.dms.cdk.payers")}>
             <Form.List name={["cdk_configuration", "payers"]}>

client/src/translations/en_us/common.json

@@ -269,6 +269,7 @@
 					"templates": "Delivery Templates"
 				},
 				"dms": {
+					"apcontrol": "AP Control Number",
 					"appostingaccount": "AP Posting Account",
 					"cashierid": "Cashier ID",
 					"default_journal": "Default Journal",

client/src/translations/es/common.json

@@ -269,6 +269,7 @@
 					"templates": ""
 				},
 				"dms": {
+					"apcontrol": "",
 					"appostingaccount": "",
 					"cashierid": "",
 					"default_journal": "",

client/src/translations/fr/common.json

@@ -269,6 +269,7 @@
 					"templates": ""
 				},
 				"dms": {
+					"apcontrol": "",
 					"appostingaccount": "",
 					"cashierid": "",
 					"default_journal": "",

server/accounting/pbs/pbs-ap-allocations.js

@@ -127,7 +127,10 @@ async function PbsCalculateAllocationsAp(socket, billids) {
               bodyshop.pbs_configuration.appostingaccount === "wip"
                 ? cc.dms_wip_acctnumber
                 : cc.dms_acctnumber,
-            ControlNumber: bill.vendor.dmsid,
+            ControlNumber:
+              bodyshop.pbs_configuration.apcontrol === "ro"
+                ? bill.job.ro_number
+                : bill.vendor.dmsid,
             Amount: Dinero(),
             // Comment: "String",
             AdditionalInfo: bill.vendor.name,