From 10bd7bf4b46fba4b18d3798678cd18057ccec996 Mon Sep 17 00:00:00 2001
From: Prakash M <prakash@qualiantech.com>
Date: Fri, 4 Dec 2020 10:45:44 +0530
Subject: [PATCH] Fixed BUG-45526: Fixes Contact Info - Business Partner
 Address not loaded  in Item Declaration Popup * Fixes js error where model is
 used before model is created * Added missing property based on which Business
 Partner Address is loaded

---
 .../js/modalItemDeclaration.js                              | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/web/org.openbravo.retail.contactinfoforproduct/js/modalItemDeclaration.js b/web/org.openbravo.retail.contactinfoforproduct/js/modalItemDeclaration.js
index 13c86a6..778a937 100644
--- a/web/org.openbravo.retail.contactinfoforproduct/js/modalItemDeclaration.js
+++ b/web/org.openbravo.retail.contactinfoforproduct/js/modalItemDeclaration.js
@@ -633,7 +633,7 @@ enyo.kind({
         purposeUse = _.find(
           OB.MobileApp.model.get('obrcifpPurposeUse'),
           function(pu) {
-            return pu.id === me.model.get('obrcifpPurposeUse');
+            return pu.id === purposeUse;
           }
         );
         purposeUseName = purposeUse ? purposeUse.name : '';
@@ -652,6 +652,8 @@ enyo.kind({
               function(bpLocModel) {
                 me.bPartner = bpModel;
                 me.bPartnerLoc = bpLocModel;
+                me.bPartner.set('locId', bpLocModel.get('id'));
+                me.bPartner.set('locName', bpLocModel.get('_identifier'));
                 updateCallbackModel(me.bPartner, me.bPartnerLoc, {
                   description: description,
                   purposeUse: purposeUse,
@@ -670,6 +672,8 @@ enyo.kind({
       } else {
         me.bPartner = bp;
         me.bPartnerLoc = bpLoc;
+        me.bPartner.set('locId', me.bPartnerLoc.get('id'));
+        me.bPartner.set('locName', me.bPartnerLoc.get('_identifier'));
         updateCallbackModel(me.bPartner, me.bPartnerLoc, {
           description: description,
           purposeUse: purposeUse,
-- 
2.20.1

