diff --git a/src/components/ADempiere/Form/VPOS/Order/index.vue b/src/components/ADempiere/Form/VPOS/Order/index.vue index 716684b9978..70022c27a57 100644 --- a/src/components/ADempiere/Form/VPOS/Order/index.vue +++ b/src/components/ADempiere/Form/VPOS/Order/index.vue @@ -139,13 +139,13 @@ width="300" :hide="closeInfo" > - {{ $t('form.productInfo.productInformation') }} + {{ (isEmptyValue(scope.row.product.value) ? $t('form.productInfo.chargerInformation') : $t('form.productInfo.productInformation')) }} - +
- - {{ $t('form.productInfo.code') }}: {{ scope.row.product.value }}
- {{ $t('form.productInfo.name') }}: {{ scope.row.product.name }}
- {{ $t('form.productInfo.description') }}: {{ scope.row.product.description }}
+ + {{ $t('form.productInfo.code') }}: {{ scope.row.product.value }}
+ {{ $t('form.productInfo.name') }}: {{ (isEmptyValue(scope.row.product.name) ? scope.row.charge.name : scope.row.product.name) }}
+ {{ $t('form.productInfo.description') }}: {{ (isEmptyValue(scope.row.product.description) ? scope.row.charge.description : scope.row.product.description) }}
{{ $t('form.productInfo.UM') }}: {{ scope.row.product.uomName }}
diff --git a/src/components/ADempiere/Form/VPOS/Order/orderLineMixin.js b/src/components/ADempiere/Form/VPOS/Order/orderLineMixin.js index 8ec508acff6..2069dda6085 100644 --- a/src/components/ADempiere/Form/VPOS/Order/orderLineMixin.js +++ b/src/components/ADempiere/Form/VPOS/Order/orderLineMixin.js @@ -302,6 +302,7 @@ export default { const { columnName } = orderLine // const iSOCode = this.isEmptyValue(this.currentPointOfSales.displayCurrency) ? '' : this.currentPointOfSales.displayCurrency.iSOCode if (columnName === 'LineDescription') { + if (this.isEmptyValue(row.product.value)) return row.charge.name return row.product.value + ' - ' + row.product.name } const currency = this.pointOfSalesCurrency.iSOCode diff --git a/src/lang/ADempiere/en/index.js b/src/lang/ADempiere/en/index.js index fbb938b930f..a64c65be6e7 100644 --- a/src/lang/ADempiere/en/index.js +++ b/src/lang/ADempiere/en/index.js @@ -569,7 +569,8 @@ export default { productInfo: { product: 'Product', codeProduct: 'Códe Product', - productInformation: 'Product information', + productInformation: 'Product Information', + chargerInformation: 'Charger Information', code: 'Code', name: 'Name', lastName: 'Nombre2', diff --git a/src/lang/ADempiere/es/index.js b/src/lang/ADempiere/es/index.js index 209b7ca3029..1d0a2fe37b2 100644 --- a/src/lang/ADempiere/es/index.js +++ b/src/lang/ADempiere/es/index.js @@ -545,6 +545,7 @@ export default { product: 'Producto', codeProduct: 'Código de Producto', productInformation: 'Información de Producto', + chargerInformation: 'Información del Cargo', code: 'Código', name: 'Nombre', id: 'ID',