Merge branch 'release/2023-03-21' into release/2023-03-24

Release/2023 03 17

client/src/components/schedule-calendar/schedule-calendar.component.jsx

@@ -49,7 +49,7 @@ export function ScheduleCalendarComponent({ data, refetch, bodyshop }) {
             filter.employeevacation &&
             !!d.employee)) &&
         (filter.ins_co_nm && filter.ins_co_nm.length > 0
-          ? filter.ins_co_nm.includes(d.job.ins_co_nm)
+          ? filter.ins_co_nm.includes(d.job?.ins_co_nm)
           : true)
     );
   }, [data, filter]);
@@ -69,7 +69,7 @@ export function ScheduleCalendarComponent({ data, refetch, bodyshop }) {
                 placeholder={t("schedule.labels.ins_co_nm_filter")}
                 allowClear
                 onClear={() => setFilter({ ...filter, ins_co_nm: [] })}
-                value={filter?.ins_co_nm}
+                value={filter?.ins_co_nm ? filter.ins_co_nm : []}
                 onChange={(e) => {
                   setFilter({ ...filter, ins_co_nm: e });
                 }}

hasura/metadata/tables.yaml

@@ -2493,6 +2493,7 @@
                       _eq: true
         columns:
           - act_price
+          - act_price_before_ppc
           - ah_detail_line
           - alt_co_id
           - alt_overrd
@@ -2559,6 +2560,7 @@
       permission:
         columns:
           - act_price
+          - act_price_before_ppc
           - ah_detail_line
           - alt_co_id
           - alt_overrd
@@ -2637,6 +2639,7 @@
       permission:
         columns:
           - act_price
+          - act_price_before_ppc
           - ah_detail_line
           - alt_co_id
           - alt_overrd

hasura/migrations/1679343513178_alter_table_public_joblines_add_column_act_price_before_ppc/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."joblines" add column "act_price_before_ppc" numeric
+--  null;

hasura/migrations/1679343513178_alter_table_public_joblines_add_column_act_price_before_ppc/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."joblines" add column "act_price_before_ppc" numeric
+ null;