Merged in release/2022-11-10 (pull request #622)

Release/2022 11 10

client/src/components/ca-bc-etf-table-modal/ca-bc-etf-table-modal.container.jsx

@@ -39,7 +39,13 @@ export function ContractsFindModalContainer({
       if (!claim || !shortclaim) return;
       const trimmedShortClaim = shortclaim.trim();
       // const trimmedClaim = claim.trim();
-      claimNumbers.push({ claim: trimmedShortClaim, amount });
+      if (amount.slice(-1) === "-") {
+      }
+
+      claimNumbers.push({
+        claim: trimmedShortClaim,
+        amount: amount.slice(-1) === "-" ? parseFloat(amount) * -1 : amount,
+      });
     });
 
     await GenerateDocument(

client/src/components/dms-allocations-summary-ap/dms-allocations-summary-ap.component.jsx

@@ -140,7 +140,10 @@ export function DmsAllocationsSummaryAp({ socket, bodyshop, billids, title }) {
         >
           <Input />
         </Form.Item>
-        <Button disabled={!socket.allocationsSummary} htmlType="submit">
+        <Button
+          disabled={!allocationsSummary || allocationsSummary.length === 0}
+          htmlType="submit"
+        >
           {t("jobs.actions.dms.post")}
         </Button>
       </Form>

client/src/components/header/header.component.jsx

@@ -12,7 +12,7 @@ import Icon, {
   FileAddFilled,
   FileAddOutlined,
   FileFilled,
-  GlobalOutlined,
+  //GlobalOutlined,
   HomeFilled,
   ImportOutlined,
   LineChartOutlined,
@@ -374,25 +374,27 @@ function Header({
           <Menu.Item key="profile">
             <Link to="/manage/profile">{t("menus.currentuser.profile")}</Link>
           </Menu.Item>
-          <Menu.SubMenu
+          {
-            key="langselecter"
+            //  <Menu.SubMenu
-            title={
+            //           key="langselecter"
-              <span>
+            //           title={
-                <GlobalOutlined />
+            //             <span>
-                <span>{t("menus.currentuser.languageselector")}</span>
+            //               <GlobalOutlined />
-              </span>
+            //               <span>{t("menus.currentuser.languageselector")}</span>
-            }
+            //             </span>
-          >
+            //           }
-            <Menu.Item actiontype="lang-select" key="en-US">
+            //         >
-              {t("general.languages.english")}
+            //           <Menu.Item actiontype="lang-select" key="en-US">
-            </Menu.Item>
+            //             {t("general.languages.english")}
-            <Menu.Item actiontype="lang-select" key="fr-CA">
+            //           </Menu.Item>
-              {t("general.languages.french")}
+            //           <Menu.Item actiontype="lang-select" key="fr-CA">
-            </Menu.Item>
+            //             {t("general.languages.french")}
-            <Menu.Item actiontype="lang-select" key="es-MX">
+            //           </Menu.Item>
-              {t("general.languages.spanish")}
+            //           <Menu.Item actiontype="lang-select" key="es-MX">
-            </Menu.Item>
+            //             {t("general.languages.spanish")}
-          </Menu.SubMenu>
+            //           </Menu.Item>
+            //         </Menu.SubMenu>
+          }
         </Menu.SubMenu>
         <Menu.SubMenu key="recent" title={<ClockCircleFilled />}>
           {recentItems.map((i, idx) => (

client/src/graphql/jobs.queries.js

@@ -855,7 +855,7 @@ export const QUERY_JOB_CARD_DETAILS = gql`
         count
         status
       }
-      joblines {
+      joblines(where: { removed: { _eq: false } }) {
         id
         mod_lbr_ty
         mod_lb_hrs

client/src/translations/en_us/common.json

@@ -2099,7 +2099,7 @@
 			},
 			"labels": {
 				"balance": "Balance",
-				"ca_bc_etf_table": "ICBC ETF Table Converter",
+				"ca_bc_etf_table": "ICBC EFT Table Converter",
 				"customer": "Customer",
 				"edit": "Edit Payment",
 				"electronicpayment": "Use Electronic Payment Processing?",
@@ -2275,7 +2275,7 @@
 				"title": "Print Center"
 			},
 			"payments": {
-				"ca_bc_etf_table": "ICBC ETF Table",
+				"ca_bc_etf_table": "ICBC EFT Table",
 				"exported_payroll": "Payroll Table"
 			},
 			"special": {

client/src/utils/DatePickerRanges.js

@@ -22,5 +22,6 @@ const range = {
     moment().startOf("quarter"),
     moment().startOf("quarter").add(1, "quarter").subtract(1, "day"),
   ],
+  "Last 90 Days": [moment().add(-90, "days"), moment()],
 };
 export default range;