Merged in release/2021-10-08 (pull request #242)

release/2021-10-08

Approved-by: Patrick Fic

bodyshop_translations.babel

@@ -16920,6 +16920,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>tax_part</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>total</name>
                                         <definition_loaded>false</definition_loaded>

client/src/App/App.styles.scss

@@ -124,3 +124,7 @@
     z-index: 2 !important;
   }
 }
+
+.react-kanban-column {
+  background-color: #ddd !important;
+}

client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.component.jsx

@@ -1,4 +1,4 @@
-import { Form, Input, InputNumber, Modal, Select } from "antd";
+import { Form, Input, InputNumber, Modal, Select, Switch } from "antd";
 import React, { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import InputCurrency from "../form-items-formatted/currency-form-item.component";
@@ -184,9 +184,9 @@ export default function JobLinesUpsertModalComponent({
           >
             <InputNumber precision={0} min={0} />
           </Form.Item>
-          <Form.Item label={t("joblines.fields.db_price")} name="db_price">
+          {/* <Form.Item label={t("joblines.fields.db_price")} name="db_price">
             <InputCurrency precision={2} min={0} />
-          </Form.Item>
+          </Form.Item> */}
           <Form.Item
             label={t("joblines.fields.act_price")}
             name="act_price"
@@ -222,6 +222,13 @@ export default function JobLinesUpsertModalComponent({
           >
             <InputNumber precision={0} min={0} max={100} />
           </Form.Item>
+          <Form.Item
+            label={t("joblines.fields.tax_part")}
+            name="tax_part"
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
         </LayoutFormRow>
       </Form>
     </Modal>

client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.container.jsx

@@ -44,6 +44,7 @@ function JobLinesUpsertModalContainer({
             },
           ],
         },
+        refetchQueries: ["GET_LINE_TICKET_BY_PK"],
       });
       if (!r.errors) {
         await Axios.post("/job/totalsssu", {
@@ -69,6 +70,7 @@ function JobLinesUpsertModalContainer({
           lineId: jobLineEditModal.context.id,
           line: values,
         },
+        refetchQueries: ["GET_LINE_TICKET_BY_PK"],
       });
       if (!r.errors) {
         notification["success"]({

client/src/components/job-reconciliation-bills-table/job-reconciliation-bills-table.component.jsx

@@ -108,6 +108,9 @@ export default function JobReconciliationBillsTable({
         rowSelection={{
           onChange: handleOnRowClick,
           selectedRowKeys: selectedLines,
+          getCheckboxProps: (record) => {
+            return { disabled: record.deductedfromlbr };
+          },
         }}
       />
     </div>

client/src/components/job-reconciliation-totals/job-reconciliation-totals.utility.js

@@ -11,7 +11,7 @@ export const reconcileByAssocLine = (
   const [selectedJobLines, setSelectedJobLines] = jobLineState;
 
   const allJoblinesFromBills = billLines
-    .filter((bl) => bl.joblineid && !(bl.jobline && bl.jobline.removed))
+    .filter((bl) => bl.joblineid && bl.jobline && !bl.jobline.removed)
     .map((bl) => bl.joblineid);
 
   const duplicatedJobLinesbyInvoiceId = _.filter(

client/src/components/production-board-filters/production-board-filters.component.jsx

@@ -38,6 +38,7 @@ export function ProductionBoardFilters({
             }}
           />
           <EmployeeSearchSelectComponent
+            style={{ minWidth: "20rem" }}
             options={bodyshop.employees.filter((e) => e.active)}
             value={filter.employeeId}
             placeholder={t("production.labels.employeesearch")}

client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.component.jsx

@@ -50,7 +50,9 @@ export function TechClockInComponent({ form, bodyshop, technician }) {
             {emps &&
               emps.rates.map((item) => (
                 <Select.Option key={item.cost_center}>
-                  {item.cost_center}
+                  {item.cost_center === "timetickets.labels.shift"
+                    ? t(item.cost_center)
+                    : item.cost_center}
                 </Select.Option>
               ))}
           </Select>

client/src/components/tech-job-clock-out-button/tech-job-clock-out-button.component.jsx

@@ -139,7 +139,9 @@ export function TechClockOffButton({
                     emps &&
                     emps.rates.map((item) => (
                       <Select.Option key={item.cost_center}>
-                        {item.cost_center}
+                        {item.cost_center === "timetickets.labels.shift"
+                          ? t(item.cost_center)
+                          : item.cost_center}
                       </Select.Option>
                     ))
                   )}

client/src/components/tech-job-clocked-in-list/tech-job-clocked-in-list.component.jsx

@@ -83,7 +83,9 @@ export function TechClockedInList({ technician }) {
                     <DateTimeFormatter>{ticket.clockon}</DateTimeFormatter>
                   </DataLabel>
                   <DataLabel label={t("timetickets.fields.cost_center")}>
-                    {ticket.cost_center}
+                    {ticket.cost_center === "timetickets.labels.shift"
+                      ? t(ticket.cost_center)
+                      : ticket.cost_center}
                   </DataLabel>
                 </Card>
               </List.Item>

client/src/graphql/jobs.queries.js

@@ -630,7 +630,7 @@ export const GET_JOB_RECONCILIATION_BY_PK = gql`
       is_credit_memo
       isinhouse
       exported
-      billlines {
+      billlines(where: { deductedfromlbr: { _eq: false } }) {
         actual_price
         quantity
         actual_cost

client/src/translations/en_us/common.json

@@ -1055,6 +1055,7 @@
 				"profitcenter_part": "Profit Center: Part",
 				"prt_dsmk_p": "Line Markup %",
 				"status": "Status",
+				"tax_part": "Tax Part",
 				"total": "Total",
 				"unq_seq": "Seq #"
 			},

client/src/translations/es/common.json

@@ -1055,6 +1055,7 @@
 				"profitcenter_part": "",
 				"prt_dsmk_p": "",
 				"status": "Estado",
+				"tax_part": "",
 				"total": "",
 				"unq_seq": "Seq #"
 			},

client/src/translations/fr/common.json

@@ -1055,6 +1055,7 @@
 				"profitcenter_part": "",
 				"prt_dsmk_p": "",
 				"status": "Statut",
+				"tax_part": "",
 				"total": "",
 				"unq_seq": "Seq #"
 			},