From f0461270de839d38dd360975b9b8435a19953f98 Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Mon, 2 Dec 2024 08:52:18 -0800 Subject: [PATCH 1/2] IO-3047 Accounting ID on Owner Page Signed-off-by: Allan Carr --- .../owner-detail-form/owner-detail-form.component.jsx | 3 +++ client/src/graphql/owners.queries.js | 1 + client/src/translations/en_us/common.json | 1 + client/src/translations/es/common.json | 1 + client/src/translations/fr/common.json | 1 + 5 files changed, 7 insertions(+) diff --git a/client/src/components/owner-detail-form/owner-detail-form.component.jsx b/client/src/components/owner-detail-form/owner-detail-form.component.jsx index 419de25fa..5de4231f7 100644 --- a/client/src/components/owner-detail-form/owner-detail-form.component.jsx +++ b/client/src/components/owner-detail-form/owner-detail-form.component.jsx @@ -25,6 +25,9 @@ export default function OwnerDetailFormComponent({ form, loading }) { + + + diff --git a/client/src/graphql/owners.queries.js b/client/src/graphql/owners.queries.js index e28fc8aa2..d169263f4 100644 --- a/client/src/graphql/owners.queries.js +++ b/client/src/graphql/owners.queries.js @@ -48,6 +48,7 @@ export const QUERY_OWNER_BY_ID = gql` query QUERY_OWNER_BY_ID($id: uuid!) { owners_by_pk(id: $id) { id + accountingid allow_text_message ownr_addr1 ownr_addr2 diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json index e86e9936e..ab41c29c0 100644 --- a/client/src/translations/en_us/common.json +++ b/client/src/translations/en_us/common.json @@ -2394,6 +2394,7 @@ "selectexistingornew": "Select an existing owner record or create a new one. " }, "fields": { + "accountingid": "Accounting ID", "address": "Address", "allow_text_message": "Permission to Text?", "name": "Name", diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json index 8b9026489..4e0650522 100644 --- a/client/src/translations/es/common.json +++ b/client/src/translations/es/common.json @@ -2394,6 +2394,7 @@ "selectexistingornew": "" }, "fields": { + "accountingid": "", "address": "Dirección", "allow_text_message": "Permiso de texto?", "name": "Nombre", diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json index 8f9330ea0..edab92e9b 100644 --- a/client/src/translations/fr/common.json +++ b/client/src/translations/fr/common.json @@ -2394,6 +2394,7 @@ "selectexistingornew": "" }, "fields": { + "accountingid": "", "address": "Adresse", "allow_text_message": "Autorisation de texte?", "name": "Prénom", From 241322fa307341fb1b0eaef9e1889b69c32a8b39 Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Mon, 2 Dec 2024 11:09:30 -0800 Subject: [PATCH 2/2] IO-3046 purchase_return_ratio_excel Signed-off-by: Allan Carr --- client/src/translations/en_us/common.json | 1 + client/src/translations/es/common.json | 1 + client/src/translations/fr/common.json | 1 + client/src/utils/TemplateConstants.js | 13 +++++++++++++ 4 files changed, 16 insertions(+) diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json index e86e9936e..7ce773a14 100644 --- a/client/src/translations/en_us/common.json +++ b/client/src/translations/en_us/common.json @@ -3057,6 +3057,7 @@ "production_not_production_status": "Production not in Production Status", "production_over_time": "Production Level over Time", "psr_by_make": "Percent of Sales by Vehicle Make", + "purchase_return_ratio_excel": "Purchase & Return Ratio - Excel", "purchase_return_ratio_grouped_by_vendor_detail": "Purchase & Return Ratio by Vendor (Detail)", "purchase_return_ratio_grouped_by_vendor_summary": "Purchase & Return Ratio by Vendor (Summary)", "purchases_by_cost_center_detail": "Purchases by Cost Center (Detail)", diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json index 8b9026489..783b27f7e 100644 --- a/client/src/translations/es/common.json +++ b/client/src/translations/es/common.json @@ -3057,6 +3057,7 @@ "production_not_production_status": "", "production_over_time": "", "psr_by_make": "", + "purchase_return_ratio_excel": "", "purchase_return_ratio_grouped_by_vendor_detail": "", "purchase_return_ratio_grouped_by_vendor_summary": "", "purchases_by_cost_center_detail": "", diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json index 8f9330ea0..bd8466003 100644 --- a/client/src/translations/fr/common.json +++ b/client/src/translations/fr/common.json @@ -3057,6 +3057,7 @@ "production_not_production_status": "", "production_over_time": "", "psr_by_make": "", + "purchase_return_ratio_excel": "", "purchase_return_ratio_grouped_by_vendor_detail": "", "purchase_return_ratio_grouped_by_vendor_summary": "", "purchases_by_cost_center_detail": "", diff --git a/client/src/utils/TemplateConstants.js b/client/src/utils/TemplateConstants.js index 9f80986d2..c193dbb49 100644 --- a/client/src/utils/TemplateConstants.js +++ b/client/src/utils/TemplateConstants.js @@ -2184,6 +2184,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" } } : {}),