admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in feature/2020-06-04 (pull request #86)

Browse Source 
Feature/2020 06 04
This commit is contained in:
Patrick Fic
2021-06-01 18:06:51 +00:00
parent 214d07f2ef 1eb65dbc43
commit 2dbcd203ce
5 changed files with 6780 additions and 6782 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
bodyshop_translations.babel
View File

@@ -31265,7 +31265,7 @@
</translations> </translations>
</concept_node> </concept_node>
<concept_node> <concept_node>
<name>gsr_by_source</name> <name>gsr_by_ins_co</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
<description></description> <description></description>
<comment></comment> <comment></comment>
@@ -31328,7 +31328,7 @@
</translations> </translations>
</concept_node> </concept_node>
<concept_node> <concept_node>
<name>hours_sold_detail_closed_source</name> <name>hours_sold_detail_closed_ins_co</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
<description></description> <description></description>
<comment></comment> <comment></comment>
@@ -31370,7 +31370,7 @@
</translations> </translations>
</concept_node> </concept_node>
<concept_node> <concept_node>
<name>hours_sold_detail_open_source</name> <name>hours_sold_detail_open_ins_co</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
<description></description> <description></description>
<comment></comment> <comment></comment>
@@ -31412,7 +31412,7 @@
</translations> </translations>
</concept_node> </concept_node>
<concept_node> <concept_node>
<name>hours_sold_summary_closed_source</name> <name>hours_sold_summary_closed_ins_co</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
<description></description> <description></description>
<comment></comment> <comment></comment>
@@ -31454,7 +31454,7 @@
</translations> </translations>
</concept_node> </concept_node>
<concept_node> <concept_node>
<name>hours_sold_summary_open_source</name> <name>hours_sold_summary_open_ins_co</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
<description></description> <description></description>
<comment></comment> <comment></comment>
@@ -31538,7 +31538,7 @@
</translations> </translations>
</concept_node> </concept_node>
<concept_node> <concept_node>
<name>job_costing_ro_source</name> <name>job_costing_ro_ins_co</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
<description></description> <description></description>
<comment></comment> <comment></comment>
@@ -31601,7 +31601,7 @@
</translations> </translations>
</concept_node> </concept_node>
<concept_node> <concept_node>
<name>open_orders_source</name> <name>open_orders_ins_co</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
<description></description> <description></description>
<comment></comment> <comment></comment>
@@ -31874,7 +31874,7 @@
</translations> </translations>
</concept_node> </concept_node>
<concept_node> <concept_node>
<name>supplement_ratio_source</name> <name>supplement_ratio_ins_co</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
<description></description> <description></description>
<comment></comment> <comment></comment>

16
client/src/translations/en_us/common.json
View File

@@ -1879,23 +1879,23 @@
"gsr_by_make": "Gross Sales by Vehicle Make", "gsr_by_make": "Gross Sales by Vehicle Make",
"gsr_by_referral": "Gross Sales by Referral Source", "gsr_by_referral": "Gross Sales by Referral Source",
"gsr_by_ro": "Gross Sales by RO", "gsr_by_ro": "Gross Sales by RO",
"gsr_by_source": "Gross Sales by Insurance Company'", "gsr_by_ins_co": "Gross Sales by Insurance Company'",
"gsr_labor_only": "Gross Sales - Labor Only", "gsr_labor_only": "Gross Sales - Labor Only",
"hours_sold_detail_closed": "Hours Sold Detail - Closed", "hours_sold_detail_closed": "Hours Sold Detail - Closed",
"hours_sold_detail_closed_source": "Hours Sold Detail - Closed by Source", "hours_sold_detail_closed_ins_co": "Hours Sold Detail - Closed by Source",
"hours_sold_detail_open": "Hours Sold Detail - Open", "hours_sold_detail_open": "Hours Sold Detail - Open",
"hours_sold_detail_open_source": "Hours Sold Detail - Open by Source", "hours_sold_detail_open_ins_co": "Hours Sold Detail - Open by Source",
"hours_sold_summary_closed": "Hours Sold Summary - Closed", "hours_sold_summary_closed": "Hours Sold Summary - Closed",
"hours_sold_summary_closed_source": "Hours Sold Summary - Closed by Source", "hours_sold_summary_closed_ins_co": "Hours Sold Summary - Closed by Source",
"hours_sold_summary_open": "Hours Sold Summary - Open", "hours_sold_summary_open": "Hours Sold Summary - Open",
"hours_sold_summary_open_source": "Hours Sold Summary - Open by Source", "hours_sold_summary_open_ins_co": "Hours Sold Summary - Open by Source",
"job_costing_ro_date_detail": "Job Costing by RO - Detail", "job_costing_ro_date_detail": "Job Costing by RO - Detail",
"job_costing_ro_date_summary": "Job Costing by RO - Summary", "job_costing_ro_date_summary": "Job Costing by RO - Summary",
"job_costing_ro_estimator": "Job Costing by Estimator", "job_costing_ro_estimator": "Job Costing by Estimator",
"job_costing_ro_source": "Job Costing by RO Source", "job_costing_ro_ins_co": "Job Costing by RO Source",
"open_orders": "Open Orders by Date", "open_orders": "Open Orders by Date",
"open_orders_estimator": "Open Orders by Estimator", "open_orders_estimator": "Open Orders by Estimator",
"open_orders_source": "Open Orders by Insurance Company", "open_orders_ins_co": "Open Orders by Insurance Company",
"parts_backorder": "Backordered Parts", "parts_backorder": "Backordered Parts",
"payments_by_date": "Payments by Date", "payments_by_date": "Payments by Date",
"payments_by_date_type": "Payments by Date Range", "payments_by_date_type": "Payments by Date Range",
@@ -1908,7 +1908,7 @@
"purchases_grouped_by_vendor_detailed": "Purchases Grouped by Vendor - Detailed", "purchases_grouped_by_vendor_detailed": "Purchases Grouped by Vendor - Detailed",
"purchases_grouped_by_vendor_summary": "Purchases Grouped by Vendor - Summary", "purchases_grouped_by_vendor_summary": "Purchases Grouped by Vendor - Summary",
"schedule": "Appointment Schedule", "schedule": "Appointment Schedule",
"supplement_ratio_source": "Supplement Ratio by Source", "supplement_ratio_ins_co": "Supplement Ratio by Source",
"thank_you_date": "Thank You Letters", "thank_you_date": "Thank You Letters",
"timetickets": "Time Tickets", "timetickets": "Time Tickets",
"timetickets_employee": "Employee Time Tickets", "timetickets_employee": "Employee Time Tickets",

16
client/src/translations/es/common.json
View File

@@ -1879,23 +1879,23 @@
"gsr_by_make": "", "gsr_by_make": "",
"gsr_by_referral": "", "gsr_by_referral": "",
"gsr_by_ro": "", "gsr_by_ro": "",
"gsr_by_source": "", "gsr_by_ins_co": "",
"gsr_labor_only": "", "gsr_labor_only": "",
"hours_sold_detail_closed": "", "hours_sold_detail_closed": "",
"hours_sold_detail_closed_source": "", "hours_sold_detail_closed_ins_co": "",
"hours_sold_detail_open": "", "hours_sold_detail_open": "",
"hours_sold_detail_open_source": "", "hours_sold_detail_open_ins_co": "",
"hours_sold_summary_closed": "", "hours_sold_summary_closed": "",
"hours_sold_summary_closed_source": "", "hours_sold_summary_closed_ins_co": "",
"hours_sold_summary_open": "", "hours_sold_summary_open": "",
"hours_sold_summary_open_source": "", "hours_sold_summary_open_ins_co": "",
"job_costing_ro_date_detail": "", "job_costing_ro_date_detail": "",
"job_costing_ro_date_summary": "", "job_costing_ro_date_summary": "",
"job_costing_ro_estimator": "", "job_costing_ro_estimator": "",
"job_costing_ro_source": "", "job_costing_ro_ins_co": "",
"open_orders": "", "open_orders": "",
"open_orders_estimator": "", "open_orders_estimator": "",
"open_orders_source": "", "open_orders_ins_co": "",
"parts_backorder": "", "parts_backorder": "",
"payments_by_date": "", "payments_by_date": "",
"payments_by_date_type": "", "payments_by_date_type": "",
@@ -1908,7 +1908,7 @@
"purchases_grouped_by_vendor_detailed": "", "purchases_grouped_by_vendor_detailed": "",
"purchases_grouped_by_vendor_summary": "", "purchases_grouped_by_vendor_summary": "",
"schedule": "", "schedule": "",
"supplement_ratio_source": "", "supplement_ratio_ins_co": "",
"thank_you_date": "", "thank_you_date": "",
"timetickets": "", "timetickets": "",
"timetickets_employee": "", "timetickets_employee": "",

16
client/src/translations/fr/common.json
View File

@@ -1879,23 +1879,23 @@
"gsr_by_make": "", "gsr_by_make": "",
"gsr_by_referral": "", "gsr_by_referral": "",
"gsr_by_ro": "", "gsr_by_ro": "",
"gsr_by_source": "", "gsr_by_ins_co": "",
"gsr_labor_only": "", "gsr_labor_only": "",
"hours_sold_detail_closed": "", "hours_sold_detail_closed": "",
"hours_sold_detail_closed_source": "", "hours_sold_detail_closed_ins_co": "",
"hours_sold_detail_open": "", "hours_sold_detail_open": "",
"hours_sold_detail_open_source": "", "hours_sold_detail_open_ins_co": "",
"hours_sold_summary_closed": "", "hours_sold_summary_closed": "",
"hours_sold_summary_closed_source": "", "hours_sold_summary_closed_ins_co": "",
"hours_sold_summary_open": "", "hours_sold_summary_open": "",
"hours_sold_summary_open_source": "", "hours_sold_summary_open_ins_co": "",
"job_costing_ro_date_detail": "", "job_costing_ro_date_detail": "",
"job_costing_ro_date_summary": "", "job_costing_ro_date_summary": "",
"job_costing_ro_estimator": "", "job_costing_ro_estimator": "",
"job_costing_ro_source": "", "job_costing_ro_ins_co": "",
"open_orders": "", "open_orders": "",
"open_orders_estimator": "", "open_orders_estimator": "",
"open_orders_source": "", "open_orders_ins_co": "",
"parts_backorder": "", "parts_backorder": "",
"payments_by_date": "", "payments_by_date": "",
"payments_by_date_type": "", "payments_by_date_type": "",
@@ -1908,7 +1908,7 @@
"purchases_grouped_by_vendor_detailed": "", "purchases_grouped_by_vendor_detailed": "",
"purchases_grouped_by_vendor_summary": "", "purchases_grouped_by_vendor_summary": "",
"schedule": "", "schedule": "",
"supplement_ratio_source": "", "supplement_ratio_ins_co": "",
"thank_you_date": "", "thank_you_date": "",
"timetickets": "", "timetickets": "",
"timetickets_employee": "", "timetickets_employee": "",

70
client/src/utils/TemplateConstants.js
View File

@@ -614,15 +614,15 @@ export const TemplateList = (type, context) => {
}, },
}, },
hours_sold_detail_closed_source: { hours_sold_detail_closed_ins_co: {
title: i18n.t( title: i18n.t(
"reportcenter.templates.hours_sold_detail_closed_source" "reportcenter.templates.hours_sold_detail_closed_ins_co"
), ),
description: "", description: "",
subject: i18n.t( subject: i18n.t(
"reportcenter.templates.hours_sold_detail_closed_source" "reportcenter.templates.hours_sold_detail_closed_ins_co"
), ),
key: "hours_sold_detail_closed_source", key: "hours_sold_detail_closed_ins_co",
//idtype: "vendor", //idtype: "vendor",
disabled: false, disabled: false,
rangeFilter: { rangeFilter: {
@@ -644,15 +644,15 @@ export const TemplateList = (type, context) => {
}, },
}, },
hours_sold_summary_closed_source: { hours_sold_summary_closed_ins_co: {
title: i18n.t( title: i18n.t(
"reportcenter.templates.hours_sold_summary_closed_source" "reportcenter.templates.hours_sold_summary_closed_ins_co"
), ),
description: "", description: "",
subject: i18n.t( subject: i18n.t(
"reportcenter.templates.hours_sold_summary_closed_source" "reportcenter.templates.hours_sold_summary_closed_ins_co"
), ),
key: "hours_sold_summary_closed_source", key: "hours_sold_summary_closed_ins_co",
//idtype: "vendor", //idtype: "vendor",
disabled: false, disabled: false,
rangeFilter: { rangeFilter: {
@@ -674,15 +674,15 @@ export const TemplateList = (type, context) => {
}, },
}, },
hours_sold_detail_open_source: { hours_sold_detail_open_ins_co: {
title: i18n.t( title: i18n.t(
"reportcenter.templates.hours_sold_detail_open_source" "reportcenter.templates.hours_sold_detail_open_ins_co"
), ),
description: "", description: "",
subject: i18n.t( subject: i18n.t(
"reportcenter.templates.hours_sold_detail_open_source" "reportcenter.templates.hours_sold_detail_open_ins_co"
), ),
key: "hours_sold_detail_open_source", key: "hours_sold_detail_open_ins_co",
//idtype: "vendor", //idtype: "vendor",
disabled: false, disabled: false,
rangeFilter: { rangeFilter: {
@@ -704,15 +704,15 @@ export const TemplateList = (type, context) => {
}, },
}, },
hours_sold_summary_open_source: { hours_sold_summary_open_ins_co: {
title: i18n.t( title: i18n.t(
"reportcenter.templates.hours_sold_summary_open_source" "reportcenter.templates.hours_sold_summary_open_ins_co"
), ),
description: "", description: "",
subject: i18n.t( subject: i18n.t(
"reportcenter.templates.hours_sold_summary_open_source" "reportcenter.templates.hours_sold_summary_open_ins_cƒo"
), ),
key: "hours_sold_summary_open_source", key: "hours_sold_summary_open_ins_co",
//idtype: "vendor", //idtype: "vendor",
disabled: false, disabled: false,
rangeFilter: { rangeFilter: {
@@ -744,11 +744,11 @@ export const TemplateList = (type, context) => {
field: i18n.t("jobs.fields.date_invoiced"), field: i18n.t("jobs.fields.date_invoiced"),
}, },
}, },
supplement_ratio_source: { supplement_ratio_ins_co: {
title: i18n.t("reportcenter.templates.supplement_ratio_source"), title: i18n.t("reportcenter.templates.supplement_ratio_ins_co"),
description: "", description: "",
subject: i18n.t("reportcenter.templates.supplement_ratio_source"), subject: i18n.t("reportcenter.templates.supplement_ratio_ins_co"),
key: "supplement_ratio_source", key: "supplement_ratio_ins_co",
//idtype: "vendor", //idtype: "vendor",
disabled: false, disabled: false,
rangeFilter: { rangeFilter: {
@@ -782,11 +782,11 @@ export const TemplateList = (type, context) => {
field: i18n.t("jobs.fields.date_invoiced"), field: i18n.t("jobs.fields.date_invoiced"),
}, },
}, },
job_costing_ro_source: { job_costing_ro_ins_co: {
title: i18n.t("reportcenter.templates.job_costing_ro_source"), title: i18n.t("reportcenter.templates.job_costing_ro_ins_co"),
description: "", description: "",
subject: i18n.t("reportcenter.templates.job_costing_ro_source"), subject: i18n.t("reportcenter.templates.job_costing_ro_ins_co"),
key: "job_costing_ro_source", key: "job_costing_ro_ins_co",
//idtype: "vendor", //idtype: "vendor",
disabled: false, disabled: false,
rangeFilter: { rangeFilter: {
@@ -880,11 +880,11 @@ export const TemplateList = (type, context) => {
field: i18n.t("jobs.fields.date_invoiced"), field: i18n.t("jobs.fields.date_invoiced"),
}, },
}, },
gsr_by_source: { gsr_by_ins_co: {
title: i18n.t("reportcenter.templates.gsr_by_source"), title: i18n.t("reportcenter.templates.gsr_by_ins_co"),
description: "", description: "",
subject: i18n.t("reportcenter.templates.gsr_by_source"), subject: i18n.t("reportcenter.templates.gsr_by_ins_co"),
key: "gsr_by_source", key: "gsr_by_ins_co",
//idtype: "vendor", //idtype: "vendor",
disabled: false, disabled: false,
rangeFilter: { rangeFilter: {
@@ -953,11 +953,11 @@ export const TemplateList = (type, context) => {
field: i18n.t("jobs.fields.date_open"), field: i18n.t("jobs.fields.date_open"),
}, },
}, },
open_orders_source: { open_orders_ins_co: {
title: i18n.t("reportcenter.templates.open_orders_source"), title: i18n.t("reportcenter.templates.open_orders_ins_co"),
description: "", description: "",
subject: i18n.t("reportcenter.templates.open_orders_source"), subject: i18n.t("reportcenter.templates.open_orders_ins_co"),
key: "open_orders_source", key: "open_orders_ins_co",
//idtype: "vendor", //idtype: "vendor",
disabled: false, disabled: false,
rangeFilter: { rangeFilter: {
@@ -976,6 +976,7 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.exportlogs"), object: i18n.t("reportcenter.labels.objects.exportlogs"),
field: i18n.t("exportlogs.fields.createdat"), field: i18n.t("exportlogs.fields.createdat"),
}, },
},
export_payments: { export_payments: {
title: i18n.t("reportcenter.templates.export_payments"), title: i18n.t("reportcenter.templates.export_payments"),
description: "", description: "",
@@ -1051,9 +1052,7 @@ export const TemplateList = (type, context) => {
work_in_progress_payables: { work_in_progress_payables: {
title: i18n.t("reportcenter.templates.work_in_progress_payables"), title: i18n.t("reportcenter.templates.work_in_progress_payables"),
description: "", description: "",
subject: i18n.t( subject: i18n.t("reportcenter.templates.work_in_progress_payables"),
"reportcenter.templates.work_in_progress_payables"
),
key: "work_in_progress_payables", key: "work_in_progress_payables",
//idtype: "vendor", //idtype: "vendor",
disabled: false, disabled: false,
@@ -1062,7 +1061,6 @@ export const TemplateList = (type, context) => {
field: i18n.t("jobs.fields.date_open"), field: i18n.t("jobs.fields.date_open"),
}, },
}, },
},
} }
: {}), : {}),
...(!type || type === "courtesycarcontract" ...(!type || type === "courtesycarcontract"