# HG changeset patch
# User Ranjith S R <ranjith@qualiantech.com>
# Date 1491479305 -19800
#      Thu Apr 06 17:18:25 2017 +0530
# Node ID f409066505a3b9d394f602ea92728f1205e4cec9
# Parent  1ca28239cc6e91fbfb0171516544350951ceae03
Related to issue 35691 :  Adding countryId, regionId to BusinessPartnerProperties

diff -r 1ca28239cc6e -r f409066505a3 src/org/openbravo/retail/posterminal/master/BusinessPartnerProperties.java
--- a/src/org/openbravo/retail/posterminal/master/BusinessPartnerProperties.java	Thu Apr 06 09:15:21 2017 +0200
+++ b/src/org/openbravo/retail/posterminal/master/BusinessPartnerProperties.java	Thu Apr 06 17:18:25 2017 +0530
@@ -54,8 +54,10 @@
         add(new HQLProperty("bpsl.locationAddress.cityName", "shipCityName"));
         add(new HQLProperty("bpl.locationAddress.postalCode", "postalCode"));
         add(new HQLProperty("bpsl.locationAddress.postalCode", "shipPostalCode"));
+        add(new HQLProperty("bpl.locationAddress.region.id", "regionId"));
         add(new HQLProperty("bpsl.locationAddress.region.id", "shipRegionId"));
-        add(new HQLProperty("bpl.locationAddress.country.id", "shipCountryId"));
+        add(new HQLProperty("bpl.locationAddress.country.id", "countryId"));
+        add(new HQLProperty("bpsl.locationAddress.country.id", "shipCountryId"));
         add(new HQLProperty("bpl.locationAddress.country.name", "countryName"));
         add(new HQLProperty("bp.businessPartnerCategory.id", "businessPartnerCategory"));
         add(new HQLProperty("bp.businessPartnerCategory.name", "businessPartnerCategory_name"));
diff -r 1ca28239cc6e -r f409066505a3 web/org.openbravo.retail.posterminal/js/model/businesspartner.js
--- a/web/org.openbravo.retail.posterminal/js/model/businesspartner.js	Thu Apr 06 09:15:21 2017 +0200
+++ b/web/org.openbravo.retail.posterminal/js/model/businesspartner.js	Thu Apr 06 17:18:25 2017 +0530
@@ -347,6 +347,14 @@
     filter: true,
     type: 'TEXT'
   }, {
+    name: 'regionId',
+    column: 'regionId',
+    type: 'TEXT'
+  }, {
+    name: 'countryId',
+    column: 'countryId',
+    type: 'TEXT'
+  }, {
     name: 'countryName',
     column: 'countryName',
     type: 'TEXT'