From e5a590a9f93b891202baa127a66877103525bb02 Mon Sep 17 00:00:00 2001 From: Jon Date: Tue, 11 Jun 2024 13:48:15 +0200 Subject: [PATCH 1/2] feat: refs #7154 new item descriptor field --- src/i18n/locale/en.yml | 1 + src/i18n/locale/es.yml | 1 + src/pages/Item/Card/ItemDescriptor.vue | 5 +++++ 3 files changed, 7 insertions(+) diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index 8ccdf640f..23c323653 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -1177,6 +1177,7 @@ item: available: Available warehouseText: 'Calculated on the warehouse of { warehouseName }' itemDiary: Item diary + subName: Grower list: id: Identifier grouping: Grouping diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index 452421343..481f043f4 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -1166,6 +1166,7 @@ item: available: Disponible warehouseText: 'Calculado sobre el almacén de { warehouseName }' itemDiary: Registro de compra-venta + subName: Productor list: id: Identificador grouping: Grouping diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue index 305d29b8b..3b57aae8d 100644 --- a/src/pages/Item/Card/ItemDescriptor.vue +++ b/src/pages/Item/Card/ItemDescriptor.vue @@ -16,6 +16,7 @@ import useCardDescription from 'src/composables/useCardDescription'; import { useSession } from 'src/composables/useSession'; import { getUrl } from 'src/composables/getUrl'; import axios from 'axios'; +import { dashIfEmpty } from 'src/filters'; const $props = defineProps({ id: { @@ -182,6 +183,10 @@ const openCloneDialog = async () => { + Date: Tue, 11 Jun 2024 14:29:42 +0200 Subject: [PATCH 2/2] feat: refs #7154 changed label --- src/i18n/locale/en.yml | 2 +- src/i18n/locale/es.yml | 2 +- src/pages/Item/Card/ItemDescriptor.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index 23c323653..e672a16e9 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -1177,7 +1177,7 @@ item: available: Available warehouseText: 'Calculated on the warehouse of { warehouseName }' itemDiary: Item diary - subName: Grower + producer: Producer list: id: Identifier grouping: Grouping diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index 481f043f4..a7f599edb 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -1166,7 +1166,7 @@ item: available: Disponible warehouseText: 'Calculado sobre el almacén de { warehouseName }' itemDiary: Registro de compra-venta - subName: Productor + producer: Productor list: id: Identificador grouping: Grouping diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue index 3b57aae8d..155c9eb4c 100644 --- a/src/pages/Item/Card/ItemDescriptor.vue +++ b/src/pages/Item/Card/ItemDescriptor.vue @@ -184,7 +184,7 @@ const openCloneDialog = async () => {