Merge branch 'release/2024-12-06' into feature/IO-3042-Jobs-Marked-Total-Loss

Signed-off-by: Allan Carr <allan.carr@thinkimex.com>

# Conflicts:
#	client/src/utils/TemplateConstants.js
This commit is contained in:
Allan Carr
2024-12-04 18:33:35 -08:00
6 changed files with 24 additions and 1 deletions

View File

@@ -2185,6 +2185,19 @@ export const TemplateList = (type, context) => {
group: "payroll",
adp_payroll: true
},
purchase_return_ratio_excel: {
title: i18n.t("reportcenter.templates.purchase_return_ratio_excel"),
subject: i18n.t("reportcenter.templates.purchase_return_ratio_excel"),
key: "purchase_return_ratio_excel",
//idtype: "vendor",
reporttype: "excel",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.bills"),
field: i18n.t("bills.fields.date")
},
group: "purchases"
},
total_loss_jobs: {
title: i18n.t("reportcenter.templates.total_loss_jobs"),
subject: i18n.t("reportcenter.templates.total_loss_jobs"),
@@ -2195,7 +2208,7 @@ export const TemplateList = (type, context) => {
field: i18n.t("jobs.fields.date_open")
},
group: "jobs"
},
}
}
: {}),
...(!type || type === "courtesycarcontract"