From ff8bef0b41854ad9a1a44d1d8285ba5ed44e3613 Mon Sep 17 00:00:00 2001 From: Elsio Sanchez <45974454+elsiosanchez@users.noreply.github.com> Date: Wed, 2 Jun 2021 21:36:28 -0400 Subject: [PATCH] Fix error when closing popover of amount to be converted (#895) * fixe Point of Sales * fix error when closing popover of amount to be converted Co-authored-by: elsiosanchez --- .../convertAmount/fieldsListConvertAmountCollection.js | 2 +- .../ADempiere/Form/VPOS/Collection/convertAmount/index.vue | 2 +- src/components/ADempiere/Form/VPOS/Order/index.vue | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/components/ADempiere/Form/VPOS/Collection/convertAmount/fieldsListConvertAmountCollection.js b/src/components/ADempiere/Form/VPOS/Collection/convertAmount/fieldsListConvertAmountCollection.js index 98c21a31..c3a1e18a 100644 --- a/src/components/ADempiere/Form/VPOS/Collection/convertAmount/fieldsListConvertAmountCollection.js +++ b/src/components/ADempiere/Form/VPOS/Collection/convertAmount/fieldsListConvertAmountCollection.js @@ -26,7 +26,7 @@ export default [ size: 24, handleActionKeyPerformed: true, handleActionPerformed: true, - validationCode: 'C_Currency.C_Currency_ID = 100', + validationCode: 'C_Currency.C_Currency_ID = 100 OR C_Currency.C_Currency_ID = 50001', isActiveLogics: true, isMandatory: true } diff --git a/src/components/ADempiere/Form/VPOS/Collection/convertAmount/index.vue b/src/components/ADempiere/Form/VPOS/Collection/convertAmount/index.vue index 197d854b..a0e250b0 100644 --- a/src/components/ADempiere/Form/VPOS/Collection/convertAmount/index.vue +++ b/src/components/ADempiere/Form/VPOS/Collection/convertAmount/index.vue @@ -89,7 +89,7 @@ export default { data() { return { fieldsList: fieldsListConvertAmountCollection, - amountConvertionTotal: 0 + amountConvertionTotal: this.amount } }, computed: { diff --git a/src/components/ADempiere/Form/VPOS/Order/index.vue b/src/components/ADempiere/Form/VPOS/Order/index.vue index a28a30d8..161b55b5 100644 --- a/src/components/ADempiere/Form/VPOS/Order/index.vue +++ b/src/components/ADempiere/Form/VPOS/Order/index.vue @@ -243,6 +243,8 @@