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

Feature/2020 06 04
This commit is contained in:
Patrick Fic
2021-06-01 18:06:51 +00:00
5 changed files with 6780 additions and 6782 deletions

View File

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

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

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(
"reportcenter.templates.hours_sold_detail_closed_source"
"reportcenter.templates.hours_sold_detail_closed_ins_co"
),
description: "",
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",
disabled: false,
rangeFilter: {
@@ -644,15 +644,15 @@ export const TemplateList = (type, context) => {
},
},
hours_sold_summary_closed_source: {
hours_sold_summary_closed_ins_co: {
title: i18n.t(
"reportcenter.templates.hours_sold_summary_closed_source"
"reportcenter.templates.hours_sold_summary_closed_ins_co"
),
description: "",
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",
disabled: false,
rangeFilter: {
@@ -674,15 +674,15 @@ export const TemplateList = (type, context) => {
},
},
hours_sold_detail_open_source: {
hours_sold_detail_open_ins_co: {
title: i18n.t(
"reportcenter.templates.hours_sold_detail_open_source"
"reportcenter.templates.hours_sold_detail_open_ins_co"
),
description: "",
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",
disabled: false,
rangeFilter: {
@@ -704,15 +704,15 @@ export const TemplateList = (type, context) => {
},
},
hours_sold_summary_open_source: {
hours_sold_summary_open_ins_co: {
title: i18n.t(
"reportcenter.templates.hours_sold_summary_open_source"
"reportcenter.templates.hours_sold_summary_open_ins_co"
),
description: "",
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",
disabled: false,
rangeFilter: {
@@ -744,11 +744,11 @@ export const TemplateList = (type, context) => {
field: i18n.t("jobs.fields.date_invoiced"),
},
},
supplement_ratio_source: {
title: i18n.t("reportcenter.templates.supplement_ratio_source"),
supplement_ratio_ins_co: {
title: i18n.t("reportcenter.templates.supplement_ratio_ins_co"),
description: "",
subject: i18n.t("reportcenter.templates.supplement_ratio_source"),
key: "supplement_ratio_source",
subject: i18n.t("reportcenter.templates.supplement_ratio_ins_co"),
key: "supplement_ratio_ins_co",
//idtype: "vendor",
disabled: false,
rangeFilter: {
@@ -782,11 +782,11 @@ export const TemplateList = (type, context) => {
field: i18n.t("jobs.fields.date_invoiced"),
},
},
job_costing_ro_source: {
title: i18n.t("reportcenter.templates.job_costing_ro_source"),
job_costing_ro_ins_co: {
title: i18n.t("reportcenter.templates.job_costing_ro_ins_co"),
description: "",
subject: i18n.t("reportcenter.templates.job_costing_ro_source"),
key: "job_costing_ro_source",
subject: i18n.t("reportcenter.templates.job_costing_ro_ins_co"),
key: "job_costing_ro_ins_co",
//idtype: "vendor",
disabled: false,
rangeFilter: {
@@ -880,11 +880,11 @@ export const TemplateList = (type, context) => {
field: i18n.t("jobs.fields.date_invoiced"),
},
},
gsr_by_source: {
title: i18n.t("reportcenter.templates.gsr_by_source"),
gsr_by_ins_co: {
title: i18n.t("reportcenter.templates.gsr_by_ins_co"),
description: "",
subject: i18n.t("reportcenter.templates.gsr_by_source"),
key: "gsr_by_source",
subject: i18n.t("reportcenter.templates.gsr_by_ins_co"),
key: "gsr_by_ins_co",
//idtype: "vendor",
disabled: false,
rangeFilter: {
@@ -953,11 +953,11 @@ export const TemplateList = (type, context) => {
field: i18n.t("jobs.fields.date_open"),
},
},
open_orders_source: {
title: i18n.t("reportcenter.templates.open_orders_source"),
open_orders_ins_co: {
title: i18n.t("reportcenter.templates.open_orders_ins_co"),
description: "",
subject: i18n.t("reportcenter.templates.open_orders_source"),
key: "open_orders_source",
subject: i18n.t("reportcenter.templates.open_orders_ins_co"),
key: "open_orders_ins_co",
//idtype: "vendor",
disabled: false,
rangeFilter: {
@@ -976,91 +976,89 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.exportlogs"),
field: i18n.t("exportlogs.fields.createdat"),
},
export_payments: {
title: i18n.t("reportcenter.templates.export_payments"),
description: "",
subject: i18n.t("reportcenter.templates.export_payments"),
key: "export_payments",
//idtype: "vendor",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.exportlogs"),
field: i18n.t("exportlogs.fields.createdat"),
},
},
export_payments: {
title: i18n.t("reportcenter.templates.export_payments"),
description: "",
subject: i18n.t("reportcenter.templates.export_payments"),
key: "export_payments",
//idtype: "vendor",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.exportlogs"),
field: i18n.t("exportlogs.fields.createdat"),
},
export_receivables: {
title: i18n.t("reportcenter.templates.export_receivables"),
description: "",
subject: i18n.t("reportcenter.templates.export_receivables"),
key: "export_receivables",
//idtype: "vendor",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.exportlogs"),
field: i18n.t("exportlogs.fields.createdat"),
},
},
export_receivables: {
title: i18n.t("reportcenter.templates.export_receivables"),
description: "",
subject: i18n.t("reportcenter.templates.export_receivables"),
key: "export_receivables",
//idtype: "vendor",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.exportlogs"),
field: i18n.t("exportlogs.fields.createdat"),
},
parts_backorder: {
title: i18n.t("reportcenter.templates.parts_backorder"),
description: "",
subject: i18n.t("reportcenter.templates.parts_backorder"),
key: "parts_backorder",
//idtype: "vendor",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.actual_in"),
},
},
parts_backorder: {
title: i18n.t("reportcenter.templates.parts_backorder"),
description: "",
subject: i18n.t("reportcenter.templates.parts_backorder"),
key: "parts_backorder",
//idtype: "vendor",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.actual_in"),
},
thank_you_date: {
title: i18n.t("reportcenter.templates.thank_you_date"),
description: "",
subject: i18n.t("reportcenter.templates.thank_you_date"),
key: "thank_you_date",
//idtype: "vendor",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_invoiced"),
},
},
thank_you_date: {
title: i18n.t("reportcenter.templates.thank_you_date"),
description: "",
subject: i18n.t("reportcenter.templates.thank_you_date"),
key: "thank_you_date",
//idtype: "vendor",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_invoiced"),
},
unclaimed_hrs: {
title: i18n.t("reportcenter.templates.unclaimed_hrs"),
description: "",
subject: i18n.t("reportcenter.templates.unclaimed_hrs"),
key: "unclaimed_hrs",
//idtype: "vendor",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_open"),
},
},
unclaimed_hrs: {
title: i18n.t("reportcenter.templates.unclaimed_hrs"),
description: "",
subject: i18n.t("reportcenter.templates.unclaimed_hrs"),
key: "unclaimed_hrs",
//idtype: "vendor",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_open"),
},
work_in_progress_labour: {
title: i18n.t("reportcenter.templates.work_in_progress_labour"),
description: "",
subject: i18n.t("reportcenter.templates.work_in_progress_labour"),
key: "work_in_progress_labour",
//idtype: "vendor",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_open"),
},
},
work_in_progress_labour: {
title: i18n.t("reportcenter.templates.work_in_progress_labour"),
description: "",
subject: i18n.t("reportcenter.templates.work_in_progress_labour"),
key: "work_in_progress_labour",
//idtype: "vendor",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_open"),
},
work_in_progress_payables: {
title: i18n.t("reportcenter.templates.work_in_progress_payables"),
description: "",
subject: i18n.t(
"reportcenter.templates.work_in_progress_payables"
),
key: "work_in_progress_payables",
//idtype: "vendor",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_open"),
},
},
work_in_progress_payables: {
title: i18n.t("reportcenter.templates.work_in_progress_payables"),
description: "",
subject: i18n.t("reportcenter.templates.work_in_progress_payables"),
key: "work_in_progress_payables",
//idtype: "vendor",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_open"),
},
},
}