Merged in master (pull request #677)

Integrate master into USA branch.
This commit is contained in:
Patrick Fic
2023-02-14 23:12:48 +00:00
24 changed files with 433 additions and 142 deletions

View File

@@ -1343,6 +1343,32 @@ export const TemplateList = (type, context) => {
},
group: "sales",
},
gsr_by_category: {
title: i18n.t("reportcenter.templates.gsr_by_category"),
description: "",
subject: i18n.t("reportcenter.templates.gsr_by_category"),
key: "gsr_by_category",
//idtype: "vendor",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_invoiced"),
},
group: "sales",
},
gsr_by_ats: {
title: i18n.t("reportcenter.templates.gsr_by_ats"),
description: "",
subject: i18n.t("reportcenter.templates.gsr_by_ats"),
key: "gsr_by_ats",
//idtype: "vendor",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.date_invoiced"),
},
group: "sales",
},
gsr_labor_only: {
title: i18n.t("reportcenter.templates.gsr_labor_only"),
description: "",
@@ -1787,6 +1813,34 @@ export const TemplateList = (type, context) => {
},
group: "jobs",
},
purchase_return_ratio_grouped_by_vendor_detail: {
title: i18n.t("reportcenter.templates.purchase_return_ratio_grouped_by_vendor_detail"),
subject: i18n.t(
"reportcenter.templates.purchase_return_ratio_grouped_by_vendor_detail"
),
key: "purchase_return_ratio_grouped_by_vendor_detail",
//idtype: "vendor",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.bills"),
field: i18n.t("bills.fields.date"),
},
group: "purchases",
},
purchase_return_ratio_grouped_by_vendor_summary: {
title: i18n.t("reportcenter.templates.purchase_return_ratio_grouped_by_vendor_summary"),
subject: i18n.t(
"reportcenter.templates.purchase_return_ratio_grouped_by_vendor_summary"
),
key: "purchase_return_ratio_grouped_by_vendor_summary",
//idtype: "vendor",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.bills"),
field: i18n.t("bills.fields.date"),
},
group: "purchases",
},
}
: {}),
...(!type || type === "courtesycarcontract"