# HG changeset patch
# User Silambarasan Sekar <silambarasan@qualiantech.com>
# Date 1468949176 -19800
#      Tue Jul 19 22:56:16 2016 +0530
# Node ID ca89c727f0f84dcef9e454d0e56eeabd693189ae
# Parent  53c74c143edb36e643b4e86f6f1ea33c26910ff6
Error loading posterminal if one address is inactive

diff -r 53c74c143edb -r ca89c727f0f8 src/org/openbravo/retail/posterminal/master/BusinessPartner.java
--- a/src/org/openbravo/retail/posterminal/master/BusinessPartner.java	Fri Jun 10 11:49:51 2016 +0000
+++ b/src/org/openbravo/retail/posterminal/master/BusinessPartner.java	Tue Jul 19 22:56:16 2016 +0530
@@ -67,7 +67,7 @@
         + "(bpl.$incrementalUpdateCriteria"
         + operator
         + "bpl.businessPartner.$incrementalUpdateCriteria) "
-        + " and bpl.id in (select max(bpls.id) as bpLocId from BusinessPartnerLocation AS bpls where bpls.businessPartner.id=bpl.businessPartner.id and bpls.invoiceToAddress = true and bpls.$readableSimpleClientCriteria AND "
+        + " and bpl.id in (select max(bpls.id) as bpLocId from BusinessPartnerLocation AS bpls where bpls.active=true and bpls.businessPartner.id=bpl.businessPartner.id and bpls.invoiceToAddress = true and bpls.$readableSimpleClientCriteria AND "
         + " bpls.$naturalOrgCriteria group by bpls.businessPartner.id)"
         + " and (not exists (select 1 from ADUser usr where usr.businessPartner = bpl.businessPartner)) "
         + " ORDER BY bpl.businessPartner.name";
@@ -84,10 +84,11 @@
         + "(bpl.$incrementalUpdateCriteria"
         + operator
         + "bpl.businessPartner.$incrementalUpdateCriteria) "
-        + " and bpl.id in (select max(bpls.id) as bpLocId from BusinessPartnerLocation AS bpls where bpls.businessPartner.id=bpl.businessPartner.id and bpls.invoiceToAddress = true and bpls.$readableSimpleClientCriteria AND "
+        + " and bpl.id in (select max(bpls.id) as bpLocId from BusinessPartnerLocation AS bpls where bpls.active=true and bpls.businessPartner.id=bpl.businessPartner.id and bpls.invoiceToAddress = true and bpls.$readableSimpleClientCriteria AND "
         + " bpls.$naturalOrgCriteria group by bpls.businessPartner.id)"
         + " and (ulist.id in (select max(ulist2.id) from ADUser as ulist2 where ulist2.businessPartner=bpl.businessPartner  group by ulist2.businessPartner))"
         + " ORDER BY bpl.businessPartner.name";
     return Arrays.asList(new String[] { hql, hql2 });
   }
 
