diff --git a/src/components/ADempiere/Form/VPOS/Collection/index.vue b/src/components/ADempiere/Form/VPOS/Collection/index.vue index 040cb368cc..3c1eb6806c 100644 --- a/src/components/ADempiere/Form/VPOS/Collection/index.vue +++ b/src/components/ADempiere/Form/VPOS/Collection/index.vue @@ -75,7 +75,7 @@ /> - + payment.uuid === value) - if (!this.isEmptyValue(payment.refund_reference_currency)) { - this.changeCurrency(payment.refund_reference_currency.iso_code) + if (!this.isEmptyValue(payment.reference_currency)) { + this.changeCurrency(payment.reference_currency.iso_code) + } else { + this.changeCurrency(this.pointOfSalesCurrency.iSOCode) + } + if (!this.isEmptyValue(this.dayRate)) { + this.showDayRate(this.dayRate) } }, precision() { @@ -657,6 +663,9 @@ export default { this.$store.dispatch('addRateConvertion', this.pointOfSalesCurrency) this.unsubscribe = this.subscribeChanges() this.defaultValueCurrency() + if (!this.isEmptyValue(this.dayRate)) { + this.showDayRate(this.dayRate) + } this.currentFieldPaymentMethods = this.defaulValuePaymentMethods.uuid }, methods: { diff --git a/src/components/ADempiere/Form/VPOS/Order/orderLineMixin.js b/src/components/ADempiere/Form/VPOS/Order/orderLineMixin.js index 26445200c0..969d9bfcac 100644 --- a/src/components/ADempiere/Form/VPOS/Order/orderLineMixin.js +++ b/src/components/ADempiere/Form/VPOS/Order/orderLineMixin.js @@ -181,7 +181,6 @@ export default { break case 'Discount': discountRate = line.value - price = currentLine.price quantity = currentLine.quantity break } diff --git a/src/lang/ADempiere/en.js b/src/lang/ADempiere/en.js index 7a99d2445e..4c3ba74eb6 100644 --- a/src/lang/ADempiere/en.js +++ b/src/lang/ADempiere/en.js @@ -485,6 +485,7 @@ export default { dayRate: 'Day Rate', noDayRate: 'No daily rate has been generated for the currency.', refund: 'Refund', + paymentMethods: 'Payment Methods', emptyRate: 'No conversion rate to date', Currency: 'Currency', TenderType: { diff --git a/src/lang/ADempiere/es.js b/src/lang/ADempiere/es.js index fd9ab3643a..7a9b9fb75b 100644 --- a/src/lang/ADempiere/es.js +++ b/src/lang/ADempiere/es.js @@ -462,6 +462,7 @@ export default { dayRate: 'Tasa del Día', noDayRate: 'No se a generado una tasa del día para la moneda', refund: 'Reembolso', + paymentMethods: 'Métodos de Pago', emptyRate: 'Sin tasa de conversión a la fecha', TenderType: { directDeposit: 'Depósito Directo',