diff --git a/client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.component.jsx b/client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.component.jsx
index 4fed7188b..fdf5207db 100644
--- a/client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.component.jsx
+++ b/client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.component.jsx
@@ -289,7 +289,7 @@ export function JobLinesUpsertModalComponent({
name="prt_dsmk_p"
initialValue={0}
>
-
+
= 0 ? 1 : -1)
+ .toFormat(0.0),
+ }),
},
],
},
@@ -68,7 +77,15 @@ function JobLinesUpsertModalContainer({
const r = await updateJobLine({
variables: {
lineId: jobLineEditModal.context.id,
- line: values,
+ line: {
+ ...values,
+ prt_dsmk_m: Dinero({
+ amount: Math.round(values.act_price * 100),
+ })
+ .percentage(Math.abs(values.prt_dsmk_p || 0))
+ .multiply(values.prt_dsmk_p >= 0 ? 1 : -1)
+ .toFormat(0.0),
+ },
},
refetchQueries: ["GET_LINE_TICKET_BY_PK"],
});
diff --git a/hasura/migrations/1676311861487_create_index_jobs_idx_date_open/down.sql b/hasura/migrations/1676311861487_create_index_jobs_idx_date_open/down.sql
new file mode 100644
index 000000000..b4a6d136e
--- /dev/null
+++ b/hasura/migrations/1676311861487_create_index_jobs_idx_date_open/down.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."jobs_idx_date_open";
diff --git a/hasura/migrations/1676311861487_create_index_jobs_idx_date_open/up.sql b/hasura/migrations/1676311861487_create_index_jobs_idx_date_open/up.sql
new file mode 100644
index 000000000..d13cafa6c
--- /dev/null
+++ b/hasura/migrations/1676311861487_create_index_jobs_idx_date_open/up.sql
@@ -0,0 +1,2 @@
+CREATE INDEX "jobs_idx_date_open" on
+ "public"."jobs" using btree ("date_open");
diff --git a/hasura/migrations/1676311892023_create_index_jobs_idx_date_invoiced/down.sql b/hasura/migrations/1676311892023_create_index_jobs_idx_date_invoiced/down.sql
new file mode 100644
index 000000000..2131c2407
--- /dev/null
+++ b/hasura/migrations/1676311892023_create_index_jobs_idx_date_invoiced/down.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."jobs_idx_date_invoiced";
diff --git a/hasura/migrations/1676311892023_create_index_jobs_idx_date_invoiced/up.sql b/hasura/migrations/1676311892023_create_index_jobs_idx_date_invoiced/up.sql
new file mode 100644
index 000000000..946ca1cd4
--- /dev/null
+++ b/hasura/migrations/1676311892023_create_index_jobs_idx_date_invoiced/up.sql
@@ -0,0 +1,2 @@
+CREATE INDEX "jobs_idx_date_invoiced" on
+ "public"."jobs" using btree ("date_invoiced");
diff --git a/hasura/migrations/1676312062111_create_index_idx_bills_vendorid/down.sql b/hasura/migrations/1676312062111_create_index_idx_bills_vendorid/down.sql
new file mode 100644
index 000000000..c918b314b
--- /dev/null
+++ b/hasura/migrations/1676312062111_create_index_idx_bills_vendorid/down.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_bills_vendorid";
diff --git a/hasura/migrations/1676312062111_create_index_idx_bills_vendorid/up.sql b/hasura/migrations/1676312062111_create_index_idx_bills_vendorid/up.sql
new file mode 100644
index 000000000..b5d6c91b5
--- /dev/null
+++ b/hasura/migrations/1676312062111_create_index_idx_bills_vendorid/up.sql
@@ -0,0 +1,2 @@
+CREATE INDEX "idx_bills_vendorid" on
+ "public"."bills" using btree ("vendorid");
diff --git a/hasura/migrations/1676312093483_create_index_idx_parts_orders_vendorid/down.sql b/hasura/migrations/1676312093483_create_index_idx_parts_orders_vendorid/down.sql
new file mode 100644
index 000000000..10a22a2c1
--- /dev/null
+++ b/hasura/migrations/1676312093483_create_index_idx_parts_orders_vendorid/down.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_parts_orders_vendorid";
diff --git a/hasura/migrations/1676312093483_create_index_idx_parts_orders_vendorid/up.sql b/hasura/migrations/1676312093483_create_index_idx_parts_orders_vendorid/up.sql
new file mode 100644
index 000000000..31b330a5c
--- /dev/null
+++ b/hasura/migrations/1676312093483_create_index_idx_parts_orders_vendorid/up.sql
@@ -0,0 +1,2 @@
+CREATE INDEX "idx_parts_orders_vendorid" on
+ "public"."parts_orders" using btree ("vendorid");
diff --git a/hasura/migrations/1676312128665_create_index_idx_ccc_jobid/down.sql b/hasura/migrations/1676312128665_create_index_idx_ccc_jobid/down.sql
new file mode 100644
index 000000000..ef80b76b5
--- /dev/null
+++ b/hasura/migrations/1676312128665_create_index_idx_ccc_jobid/down.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_ccc_jobid";
diff --git a/hasura/migrations/1676312128665_create_index_idx_ccc_jobid/up.sql b/hasura/migrations/1676312128665_create_index_idx_ccc_jobid/up.sql
new file mode 100644
index 000000000..cf652183b
--- /dev/null
+++ b/hasura/migrations/1676312128665_create_index_idx_ccc_jobid/up.sql
@@ -0,0 +1,2 @@
+CREATE INDEX "idx_ccc_jobid" on
+ "public"."cccontracts" using btree ("jobid");
diff --git a/hasura/migrations/1676312151899_create_index_idx_ccc_courtesycarid/down.sql b/hasura/migrations/1676312151899_create_index_idx_ccc_courtesycarid/down.sql
new file mode 100644
index 000000000..578ff779d
--- /dev/null
+++ b/hasura/migrations/1676312151899_create_index_idx_ccc_courtesycarid/down.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_ccc_courtesycarid";
diff --git a/hasura/migrations/1676312151899_create_index_idx_ccc_courtesycarid/up.sql b/hasura/migrations/1676312151899_create_index_idx_ccc_courtesycarid/up.sql
new file mode 100644
index 000000000..0f9a67fb1
--- /dev/null
+++ b/hasura/migrations/1676312151899_create_index_idx_ccc_courtesycarid/up.sql
@@ -0,0 +1,2 @@
+CREATE INDEX "idx_ccc_courtesycarid" on
+ "public"."cccontracts" using btree ("courtesycarid");
diff --git a/hasura/migrations/1676312254069_create_index_idx_jobs_actual_completion/down.sql b/hasura/migrations/1676312254069_create_index_idx_jobs_actual_completion/down.sql
new file mode 100644
index 000000000..90ab9e278
--- /dev/null
+++ b/hasura/migrations/1676312254069_create_index_idx_jobs_actual_completion/down.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_jobs_actual_completion";
diff --git a/hasura/migrations/1676312254069_create_index_idx_jobs_actual_completion/up.sql b/hasura/migrations/1676312254069_create_index_idx_jobs_actual_completion/up.sql
new file mode 100644
index 000000000..c017e456e
--- /dev/null
+++ b/hasura/migrations/1676312254069_create_index_idx_jobs_actual_completion/up.sql
@@ -0,0 +1,2 @@
+CREATE INDEX "idx_jobs_actual_completion" on
+ "public"."jobs" using btree ("actual_completion");
diff --git a/hasura/migrations/1676312270714_create_index_idx_jobs_actual_in/down.sql b/hasura/migrations/1676312270714_create_index_idx_jobs_actual_in/down.sql
new file mode 100644
index 000000000..35622d565
--- /dev/null
+++ b/hasura/migrations/1676312270714_create_index_idx_jobs_actual_in/down.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_jobs_actual_in";
diff --git a/hasura/migrations/1676312270714_create_index_idx_jobs_actual_in/up.sql b/hasura/migrations/1676312270714_create_index_idx_jobs_actual_in/up.sql
new file mode 100644
index 000000000..126131e83
--- /dev/null
+++ b/hasura/migrations/1676312270714_create_index_idx_jobs_actual_in/up.sql
@@ -0,0 +1,2 @@
+CREATE INDEX "idx_jobs_actual_in" on
+ "public"."jobs" using btree ("actual_in");
diff --git a/hasura/migrations/1676312432487_create_index_idx_jobs_employee_csr/down.sql b/hasura/migrations/1676312432487_create_index_idx_jobs_employee_csr/down.sql
new file mode 100644
index 000000000..0c68e5bc6
--- /dev/null
+++ b/hasura/migrations/1676312432487_create_index_idx_jobs_employee_csr/down.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_jobs_employee_csr";
diff --git a/hasura/migrations/1676312432487_create_index_idx_jobs_employee_csr/up.sql b/hasura/migrations/1676312432487_create_index_idx_jobs_employee_csr/up.sql
new file mode 100644
index 000000000..43c24db44
--- /dev/null
+++ b/hasura/migrations/1676312432487_create_index_idx_jobs_employee_csr/up.sql
@@ -0,0 +1,2 @@
+CREATE INDEX "idx_jobs_employee_csr" on
+ "public"."jobs" using btree ("employee_csr");
diff --git a/hasura/migrations/1676312451545_create_index_idx_jobs_body_csr/down.sql b/hasura/migrations/1676312451545_create_index_idx_jobs_body_csr/down.sql
new file mode 100644
index 000000000..459da62c8
--- /dev/null
+++ b/hasura/migrations/1676312451545_create_index_idx_jobs_body_csr/down.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_jobs_body_csr";
diff --git a/hasura/migrations/1676312451545_create_index_idx_jobs_body_csr/up.sql b/hasura/migrations/1676312451545_create_index_idx_jobs_body_csr/up.sql
new file mode 100644
index 000000000..c86c53041
--- /dev/null
+++ b/hasura/migrations/1676312451545_create_index_idx_jobs_body_csr/up.sql
@@ -0,0 +1,2 @@
+CREATE INDEX "idx_jobs_body_csr" on
+ "public"."jobs" using btree ("employee_body");
diff --git a/hasura/migrations/1676312468816_create_index_idx_jobs_employee_refinish/down.sql b/hasura/migrations/1676312468816_create_index_idx_jobs_employee_refinish/down.sql
new file mode 100644
index 000000000..1197ee8a5
--- /dev/null
+++ b/hasura/migrations/1676312468816_create_index_idx_jobs_employee_refinish/down.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_jobs_employee_refinish";
diff --git a/hasura/migrations/1676312468816_create_index_idx_jobs_employee_refinish/up.sql b/hasura/migrations/1676312468816_create_index_idx_jobs_employee_refinish/up.sql
new file mode 100644
index 000000000..d740ff652
--- /dev/null
+++ b/hasura/migrations/1676312468816_create_index_idx_jobs_employee_refinish/up.sql
@@ -0,0 +1,2 @@
+CREATE INDEX "idx_jobs_employee_refinish" on
+ "public"."jobs" using btree ("employee_refinish");
diff --git a/hasura/migrations/1676312526720_create_index_idx_timetickets_employeeid/down.sql b/hasura/migrations/1676312526720_create_index_idx_timetickets_employeeid/down.sql
new file mode 100644
index 000000000..2fbbfaeee
--- /dev/null
+++ b/hasura/migrations/1676312526720_create_index_idx_timetickets_employeeid/down.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_timetickets_employeeid";
diff --git a/hasura/migrations/1676312526720_create_index_idx_timetickets_employeeid/up.sql b/hasura/migrations/1676312526720_create_index_idx_timetickets_employeeid/up.sql
new file mode 100644
index 000000000..29643ac97
--- /dev/null
+++ b/hasura/migrations/1676312526720_create_index_idx_timetickets_employeeid/up.sql
@@ -0,0 +1,2 @@
+CREATE INDEX "idx_timetickets_employeeid" on
+ "public"."timetickets" using btree ("employeeid");
diff --git a/hasura/migrations/1676312560280_create_index_idx_timetickets_cost_center/down.sql b/hasura/migrations/1676312560280_create_index_idx_timetickets_cost_center/down.sql
new file mode 100644
index 000000000..1347b458b
--- /dev/null
+++ b/hasura/migrations/1676312560280_create_index_idx_timetickets_cost_center/down.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_timetickets_cost_center";
diff --git a/hasura/migrations/1676312560280_create_index_idx_timetickets_cost_center/up.sql b/hasura/migrations/1676312560280_create_index_idx_timetickets_cost_center/up.sql
new file mode 100644
index 000000000..360b1b7b1
--- /dev/null
+++ b/hasura/migrations/1676312560280_create_index_idx_timetickets_cost_center/up.sql
@@ -0,0 +1,2 @@
+CREATE INDEX "idx_timetickets_cost_center" on
+ "public"."timetickets" using btree ("cost_center");
diff --git a/hasura/migrations/1676312770241_create_index_idx_scoreboard_jobid/down.sql b/hasura/migrations/1676312770241_create_index_idx_scoreboard_jobid/down.sql
new file mode 100644
index 000000000..4bcb3fb3b
--- /dev/null
+++ b/hasura/migrations/1676312770241_create_index_idx_scoreboard_jobid/down.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_scoreboard_jobid";
diff --git a/hasura/migrations/1676312770241_create_index_idx_scoreboard_jobid/up.sql b/hasura/migrations/1676312770241_create_index_idx_scoreboard_jobid/up.sql
new file mode 100644
index 000000000..dd2ebd94b
--- /dev/null
+++ b/hasura/migrations/1676312770241_create_index_idx_scoreboard_jobid/up.sql
@@ -0,0 +1,2 @@
+CREATE INDEX "idx_scoreboard_jobid" on
+ "public"."scoreboard" using btree ("jobid");
diff --git a/hasura/migrations/1676312783297_create_index_idx_scoreboard_date/down.sql b/hasura/migrations/1676312783297_create_index_idx_scoreboard_date/down.sql
new file mode 100644
index 000000000..9e8280044
--- /dev/null
+++ b/hasura/migrations/1676312783297_create_index_idx_scoreboard_date/down.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_scoreboard_date";
diff --git a/hasura/migrations/1676312783297_create_index_idx_scoreboard_date/up.sql b/hasura/migrations/1676312783297_create_index_idx_scoreboard_date/up.sql
new file mode 100644
index 000000000..a1bba7bc2
--- /dev/null
+++ b/hasura/migrations/1676312783297_create_index_idx_scoreboard_date/up.sql
@@ -0,0 +1,2 @@
+CREATE INDEX "idx_scoreboard_date" on
+ "public"."scoreboard" using btree ("date");
diff --git a/hasura/migrations/1676312895007_create_index_idx_payments_date/down.sql b/hasura/migrations/1676312895007_create_index_idx_payments_date/down.sql
new file mode 100644
index 000000000..b6dd8dd9b
--- /dev/null
+++ b/hasura/migrations/1676312895007_create_index_idx_payments_date/down.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_payments_date";
diff --git a/hasura/migrations/1676312895007_create_index_idx_payments_date/up.sql b/hasura/migrations/1676312895007_create_index_idx_payments_date/up.sql
new file mode 100644
index 000000000..4092265bd
--- /dev/null
+++ b/hasura/migrations/1676312895007_create_index_idx_payments_date/up.sql
@@ -0,0 +1,2 @@
+CREATE INDEX "idx_payments_date" on
+ "public"."payments" using btree ("date");
diff --git a/hasura/migrations/1676313363752_create_index_exportlog_createdat/down.sql b/hasura/migrations/1676313363752_create_index_exportlog_createdat/down.sql
new file mode 100644
index 000000000..8d1d6d86c
--- /dev/null
+++ b/hasura/migrations/1676313363752_create_index_exportlog_createdat/down.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."exportlog_createdat";
diff --git a/hasura/migrations/1676313363752_create_index_exportlog_createdat/up.sql b/hasura/migrations/1676313363752_create_index_exportlog_createdat/up.sql
new file mode 100644
index 000000000..acf610ce7
--- /dev/null
+++ b/hasura/migrations/1676313363752_create_index_exportlog_createdat/up.sql
@@ -0,0 +1,2 @@
+CREATE INDEX "exportlog_createdat" on
+ "public"."exportlog" using btree ("created_at");
diff --git a/hasura/migrations/1676314283711_create_index_idx_transitions_jobid/down.sql b/hasura/migrations/1676314283711_create_index_idx_transitions_jobid/down.sql
new file mode 100644
index 000000000..6db0598c0
--- /dev/null
+++ b/hasura/migrations/1676314283711_create_index_idx_transitions_jobid/down.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_transitions_jobid";
diff --git a/hasura/migrations/1676314283711_create_index_idx_transitions_jobid/up.sql b/hasura/migrations/1676314283711_create_index_idx_transitions_jobid/up.sql
new file mode 100644
index 000000000..fa0805f87
--- /dev/null
+++ b/hasura/migrations/1676314283711_create_index_idx_transitions_jobid/up.sql
@@ -0,0 +1,2 @@
+CREATE INDEX "idx_transitions_jobid" on
+ "public"."transitions" using btree ("jobid");
diff --git a/hasura/migrations/1676314300650_create_index_idx_transitions_start/down.sql b/hasura/migrations/1676314300650_create_index_idx_transitions_start/down.sql
new file mode 100644
index 000000000..83ac00b80
--- /dev/null
+++ b/hasura/migrations/1676314300650_create_index_idx_transitions_start/down.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_transitions_start";
diff --git a/hasura/migrations/1676314300650_create_index_idx_transitions_start/up.sql b/hasura/migrations/1676314300650_create_index_idx_transitions_start/up.sql
new file mode 100644
index 000000000..1105a9bfb
--- /dev/null
+++ b/hasura/migrations/1676314300650_create_index_idx_transitions_start/up.sql
@@ -0,0 +1,2 @@
+CREATE INDEX "idx_transitions_start" on
+ "public"."transitions" using btree ("start");
diff --git a/hasura/migrations/1676314314574_create_index_idx_transitions_end/down.sql b/hasura/migrations/1676314314574_create_index_idx_transitions_end/down.sql
new file mode 100644
index 000000000..e5910f089
--- /dev/null
+++ b/hasura/migrations/1676314314574_create_index_idx_transitions_end/down.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_transitions_end";
diff --git a/hasura/migrations/1676314314574_create_index_idx_transitions_end/up.sql b/hasura/migrations/1676314314574_create_index_idx_transitions_end/up.sql
new file mode 100644
index 000000000..53b208383
--- /dev/null
+++ b/hasura/migrations/1676314314574_create_index_idx_transitions_end/up.sql
@@ -0,0 +1,2 @@
+CREATE INDEX "idx_transitions_end" on
+ "public"."transitions" using btree ("end");
diff --git a/hasura/migrations/1676314562876_create_index_idx_audit_bodyshopid/down.sql b/hasura/migrations/1676314562876_create_index_idx_audit_bodyshopid/down.sql
new file mode 100644
index 000000000..705f82c31
--- /dev/null
+++ b/hasura/migrations/1676314562876_create_index_idx_audit_bodyshopid/down.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_audit_bodyshopid";
diff --git a/hasura/migrations/1676314562876_create_index_idx_audit_bodyshopid/up.sql b/hasura/migrations/1676314562876_create_index_idx_audit_bodyshopid/up.sql
new file mode 100644
index 000000000..4d0f4ffbc
--- /dev/null
+++ b/hasura/migrations/1676314562876_create_index_idx_audit_bodyshopid/up.sql
@@ -0,0 +1,2 @@
+CREATE INDEX "idx_audit_bodyshopid" on
+ "public"."audit_trail" using btree ("bodyshopid");
diff --git a/hasura/migrations/1676314573827_create_index_idx_audit_jobid/down.sql b/hasura/migrations/1676314573827_create_index_idx_audit_jobid/down.sql
new file mode 100644
index 000000000..935c7dc0f
--- /dev/null
+++ b/hasura/migrations/1676314573827_create_index_idx_audit_jobid/down.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_audit_jobid";
diff --git a/hasura/migrations/1676314573827_create_index_idx_audit_jobid/up.sql b/hasura/migrations/1676314573827_create_index_idx_audit_jobid/up.sql
new file mode 100644
index 000000000..dd88a8429
--- /dev/null
+++ b/hasura/migrations/1676314573827_create_index_idx_audit_jobid/up.sql
@@ -0,0 +1,2 @@
+CREATE INDEX "idx_audit_jobid" on
+ "public"."audit_trail" using btree ("jobid");
diff --git a/hasura/migrations/1676314593147_create_index_idx_audit_billid/down.sql b/hasura/migrations/1676314593147_create_index_idx_audit_billid/down.sql
new file mode 100644
index 000000000..cc231b035
--- /dev/null
+++ b/hasura/migrations/1676314593147_create_index_idx_audit_billid/down.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_audit_billid";
diff --git a/hasura/migrations/1676314593147_create_index_idx_audit_billid/up.sql b/hasura/migrations/1676314593147_create_index_idx_audit_billid/up.sql
new file mode 100644
index 000000000..88c77ecd7
--- /dev/null
+++ b/hasura/migrations/1676314593147_create_index_idx_audit_billid/up.sql
@@ -0,0 +1,2 @@
+CREATE INDEX "idx_audit_billid" on
+ "public"."audit_trail" using btree ("billid");