From f9df66b6c1a43628e8a2ca146d7a1c39853dbc60 Mon Sep 17 00:00:00 2001
From: Javier Etxarri <javier.echarri@openbravo.com>
Date: Thu, 4 Nov 2021 11:22:47 +0100
Subject: [PATCH] Fixes issue NOE-1947: The credit note search result screen
 displays the initial amount and not the remaining amount / Credit note:
 search results display initial amount instead of remaining amount

---
 src-db/database/sourcedata/AD_PREFERENCE.xml    | 11 +++++++++++
 src-db/database/sourcedata/AD_REF_LIST.xml      | 11 +++++++++++
 .../js/components/GiftCardDialog.js             | 17 ++++++++++++++++-
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/src-db/database/sourcedata/AD_PREFERENCE.xml b/src-db/database/sourcedata/AD_PREFERENCE.xml
index fb8e426..0434ca7 100644
--- a/src-db/database/sourcedata/AD_PREFERENCE.xml
+++ b/src-db/database/sourcedata/AD_PREFERENCE.xml
@@ -1,5 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <data>
+<!--0D86B72D33784AEE8FA831F0965880AF--><AD_PREFERENCE>
+<!--0D86B72D33784AEE8FA831F0965880AF-->  <AD_PREFERENCE_ID><![CDATA[0D86B72D33784AEE8FA831F0965880AF]]></AD_PREFERENCE_ID>
+<!--0D86B72D33784AEE8FA831F0965880AF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0D86B72D33784AEE8FA831F0965880AF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0D86B72D33784AEE8FA831F0965880AF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0D86B72D33784AEE8FA831F0965880AF-->  <VALUE><![CDATA[N]]></VALUE>
+<!--0D86B72D33784AEE8FA831F0965880AF-->  <PROPERTY><![CDATA[GCNV_ShowCurrentAmountInsteadOfAmount]]></PROPERTY>
+<!--0D86B72D33784AEE8FA831F0965880AF-->  <ISPROPERTYLIST><![CDATA[Y]]></ISPROPERTYLIST>
+<!--0D86B72D33784AEE8FA831F0965880AF-->  <AD_MODULE_ID><![CDATA[17B5337C4B1948DF857B12FD3ABE5094]]></AD_MODULE_ID>
+<!--0D86B72D33784AEE8FA831F0965880AF--></AD_PREFERENCE>
+
 <!--4D1C7267263447E4B9C9477931A83EDA--><AD_PREFERENCE>
 <!--4D1C7267263447E4B9C9477931A83EDA-->  <AD_PREFERENCE_ID><![CDATA[4D1C7267263447E4B9C9477931A83EDA]]></AD_PREFERENCE_ID>
 <!--4D1C7267263447E4B9C9477931A83EDA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/src-db/database/sourcedata/AD_REF_LIST.xml b/src-db/database/sourcedata/AD_REF_LIST.xml
index 0d066b5..92ce774 100644
--- a/src-db/database/sourcedata/AD_REF_LIST.xml
+++ b/src-db/database/sourcedata/AD_REF_LIST.xml
@@ -374,6 +374,17 @@
 <!--974BD8D2A7F34EED9B88EF4F6269ED25-->  <AD_MODULE_ID><![CDATA[17B5337C4B1948DF857B12FD3ABE5094]]></AD_MODULE_ID>
 <!--974BD8D2A7F34EED9B88EF4F6269ED25--></AD_REF_LIST>
 
+<!--9E1D54FC9CE347C4BB00C87561289D5B--><AD_REF_LIST>
+<!--9E1D54FC9CE347C4BB00C87561289D5B-->  <AD_REF_LIST_ID><![CDATA[9E1D54FC9CE347C4BB00C87561289D5B]]></AD_REF_LIST_ID>
+<!--9E1D54FC9CE347C4BB00C87561289D5B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9E1D54FC9CE347C4BB00C87561289D5B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9E1D54FC9CE347C4BB00C87561289D5B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9E1D54FC9CE347C4BB00C87561289D5B-->  <VALUE><![CDATA[GCNV_ShowCurrentAmountInsteadOfAmount]]></VALUE>
+<!--9E1D54FC9CE347C4BB00C87561289D5B-->  <NAME><![CDATA[Show Current Amount Instead of Initial Amount]]></NAME>
+<!--9E1D54FC9CE347C4BB00C87561289D5B-->  <AD_REFERENCE_ID><![CDATA[A26BA480E2014707B47257024C3CBFF7]]></AD_REFERENCE_ID>
+<!--9E1D54FC9CE347C4BB00C87561289D5B-->  <AD_MODULE_ID><![CDATA[17B5337C4B1948DF857B12FD3ABE5094]]></AD_MODULE_ID>
+<!--9E1D54FC9CE347C4BB00C87561289D5B--></AD_REF_LIST>
+
 <!--9EB05A5FF291479AB2F41E94B2B8C32E--><AD_REF_LIST>
 <!--9EB05A5FF291479AB2F41E94B2B8C32E-->  <AD_REF_LIST_ID><![CDATA[9EB05A5FF291479AB2F41E94B2B8C32E]]></AD_REF_LIST_ID>
 <!--9EB05A5FF291479AB2F41E94B2B8C32E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/web/org.openbravo.retail.giftcards/js/components/GiftCardDialog.js b/web/org.openbravo.retail.giftcards/js/components/GiftCardDialog.js
index a1f54b0..70fb309 100644
--- a/web/org.openbravo.retail.giftcards/js/components/GiftCardDialog.js
+++ b/web/org.openbravo.retail.giftcards/js/components/GiftCardDialog.js
@@ -573,7 +573,22 @@
             : '-') +
           ')'
       );
-      this.$.amount.setContent(OB.I18N.formatCurrency(me.model.get('amount')));
+
+      if (
+        OB.MobileApp.model.hasPermission(
+          'GCNV_ShowCurrentAmountInsteadOfAmount',
+          true
+        )
+      ) {
+        this.$.amount.setContent(
+          OB.I18N.formatCurrency(me.model.get('currentamount'))
+        );
+      } else {
+        this.$.amount.setContent(
+          OB.I18N.formatCurrency(me.model.get('amount'))
+        );
+      }
+
       if (me.model.get('obgcneExpirationdate')) {
         this.$.expdate.setContent(
           OB.I18N.formatDate(
-- 
2.31.0