From 8542714daf3d3442db22f514b8637d168997b017 Mon Sep 17 00:00:00 2001
From: Elsio Sanchez <45974454+elsiosanchez@users.noreply.github.com>
Date: Fri, 6 Aug 2021 19:37:19 -0400
Subject: [PATCH] adding converted currency symbol (#1026)

Co-authored-by: elsiosanchez <elsiossanches@gmail.com>
---
 src/components/ADempiere/Form/PriceChecking/index.vue      | 2 +-
 .../ADempiere/Form/VPOS/Collection/convertAmount/index.vue | 7 +++++--
 src/components/ADempiere/Form/VPOS/Order/orderLineMixin.js | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/components/ADempiere/Form/PriceChecking/index.vue b/src/components/ADempiere/Form/PriceChecking/index.vue
index 17536a95..c3b5fe1c 100644
--- a/src/components/ADempiere/Form/PriceChecking/index.vue
+++ b/src/components/ADempiere/Form/PriceChecking/index.vue
@@ -90,7 +90,7 @@
           <el-row>
             <el-col>
               <div v-if="!isEmptyValue(currentConvertion)" class="rate-date">
-                {{ $t('form.pos.collect.dayRate') }}: {{ formatQuantity(currentConvertion.divideRate) }} ~ ({{ formatPrice(1, productPrice.currency.iSOCode) }} = {{ formatPrice(currentConvertion.divideRate) }} {{ currentPointOfSales.displayCurrency.iso_code }})
+                {{ $t('form.pos.collect.dayRate') }}: {{ formatConversionCurrenty(currentConvertion.divideRate) }} ~ ({{ formatPrice(1, productPrice.currency.iSOCode) }} = {{ formatPrice(currentConvertion.divideRate) }} {{ currentPointOfSales.displayCurrency.iso_code }})
               </div>
               <div v-else class="rate-date">
                 {{ $t('form.pos.collect.noDayRate') }} {{ currentPointOfSales.displayCurrency.description }}
diff --git a/src/components/ADempiere/Form/VPOS/Collection/convertAmount/index.vue b/src/components/ADempiere/Form/VPOS/Collection/convertAmount/index.vue
index 24947ad4..af935027 100644
--- a/src/components/ADempiere/Form/VPOS/Collection/convertAmount/index.vue
+++ b/src/components/ADempiere/Form/VPOS/Collection/convertAmount/index.vue
@@ -33,7 +33,7 @@
             label-width="10px"
             style="float: right; display: flex; line-height: 10px;"
           >
-            <el-form-item :label="fieldsList[0].name">
+            <el-form-item :label="$t('form.pos.collect.Currency')">
               <el-select
                 v-model="currentFieldCurrency"
                 :placeholder="fieldsList[0].help"
@@ -169,7 +169,10 @@ export default {
         }
       })
       if (!this.isEmptyValue(convert)) {
-        return convert
+        return {
+          ...convert,
+          iSOCode: convert.currencyTo.iSOCode
+        }
       }
       return {
         currencyTo: this.currentPointOfSales.currentPriceList.currency,
diff --git a/src/components/ADempiere/Form/VPOS/Order/orderLineMixin.js b/src/components/ADempiere/Form/VPOS/Order/orderLineMixin.js
index 6d5c228d..68af47a1 100644
--- a/src/components/ADempiere/Form/VPOS/Order/orderLineMixin.js
+++ b/src/components/ADempiere/Form/VPOS/Order/orderLineMixin.js
@@ -237,7 +237,7 @@ export default {
       } else if (columnName === 'GrandTotal') {
         return this.formatPrice(row.grandTotal, currency)
       } else if (columnName === 'ConvertedAmount') {
-        return this.formatPrice(row.grandTotal / this.totalAmountConverted)
+        return this.formatPrice(row.grandTotal / this.totalAmountConverted, this.currentPointOfSales.displayCurrency.iso_code)
       }
     },
     productPrice(price, discount) {