IO-1468 QB and CDK Updates for MCE Markup

client/src/components/jobs-available-table/jobs-available-table.container.jsx

@@ -501,7 +501,7 @@ async function CheckTaxRates(estData, bodyshop) {
 
     //Set markup lines and tax lines as taxable.
     //900510 is a mark up. 900510 is a discount.
-    if (bodyshop.region_config === "CA_SK" && jl.db_ref === "900510") {
+    if (jl.db_ref === "900510") {
       estData.joblines.data[index].tax_part = true;
     }
   });

client/src/components/jobs-close-lines/jobs-close-lines.component.jsx

@@ -31,6 +31,7 @@ export function JobsCloseLines({ bodyshop, job, jobRO }) {
                   <th>{t("joblines.fields.line_desc")}</th>
                   <th>{t("joblines.fields.part_type")}</th>
                   <th>{t("joblines.fields.act_price")}</th>
+                  <th>{t("joblines.fields.prt_dsmk_m")}</th>
                   <th>{t("joblines.fields.op_code_desc")}</th>
                   <th>{t("joblines.fields.mod_lbr_ty")}</th>
                   <th>{t("joblines.fields.mod_lb_hrs")}</th>
@@ -70,6 +71,16 @@ export function JobsCloseLines({ bodyshop, job, jobRO }) {
                         <ReadOnlyFormItem type="currency" />
                       </Form.Item>
                     </td>
+                    <td>
+                      <Form.Item
+                        span={2}
+                        //  label={t("joblines.fields.prt_dsmk_m")}
+                        key={`${index}prt_dsmk_m`}
+                        name={[field.name, "prt_dsmk_m"]}
+                      >
+                        <ReadOnlyFormItem type="currency" />
+                      </Form.Item>
+                    </td>
                     <td>
                       <Form.Item
                         span={2}
@@ -108,7 +119,9 @@ export function JobsCloseLines({ bodyshop, job, jobRO }) {
                         labelCol={{ span: 0 }}
                         rules={[
                           {
-                            required: !!job.joblines[index].act_price,
+                            required:
+                              !!job.joblines[index].act_price ||
+                              !!job.joblines[index].prt_dsmk_m,
                             //message: t("general.validation.required"),
                           },
                         ]}

client/src/graphql/jobs.queries.js

@@ -1769,7 +1769,7 @@ export const QUERY_JOB_CLOSE_DETAILS = gql`
       actual_in
       kmin
       kmout
-      joblines(where: { removed: { _eq: false } }) {
+      joblines(where: { removed: { _eq: false } }, order_by: { line_no: asc }) {
         id
         removed
         tax_part

client/src/translations/en_us/common.json

@@ -1053,7 +1053,8 @@
 				},
 				"profitcenter_labor": "Profit Center: Labor",
 				"profitcenter_part": "Profit Center: Part",
-				"prt_dsmk_p": "Line Markup %",
+				"prt_dsmk_m": "Line Discount/Markup $",
+				"prt_dsmk_p": "Line Discount/Markup %",
 				"status": "Status",
 				"tax_part": "Tax Part",
 				"total": "Total",

client/src/translations/es/common.json

@@ -1053,6 +1053,7 @@
 				},
 				"profitcenter_labor": "",
 				"profitcenter_part": "",
+				"prt_dsmk_m": "",
 				"prt_dsmk_p": "",
 				"status": "Estado",
 				"tax_part": "",

client/src/translations/fr/common.json

@@ -1053,6 +1053,7 @@
 				},
 				"profitcenter_labor": "",
 				"profitcenter_part": "",
+				"prt_dsmk_m": "",
 				"prt_dsmk_p": "",
 				"status": "Statut",
 				"tax_part": "",