diff --git a/src-db/database/sourcedata/OBUISEL_SELECTOR.xml b/src-db/database/sourcedata/OBUISEL_SELECTOR.xml
--- a/src-db/database/sourcedata/OBUISEL_SELECTOR.xml
+++ b/src-db/database/sourcedata/OBUISEL_SELECTOR.xml
@@ -80,16 +80,10 @@
 <!--862F54CB1B074513BD791C6789F4AA42-->  <DISPLAYFIELD_ID><![CDATA[9835921A3AA54B8D8D0126B3696F8354]]></DISPLAYFIELD_ID>
 <!--862F54CB1B074513BD791C6789F4AA42-->  <SUGGESTIONTEXTMATCHSTYLE><![CDATA[startsWith]]></SUGGESTIONTEXTMATCHSTYLE>
 <!--862F54CB1B074513BD791C6789F4AA42-->  <POPUPTEXTMATCHSTYLE><![CDATA[startsWith]]></POPUPTEXTMATCHSTYLE>
-<!--862F54CB1B074513BD791C6789F4AA42-->  <HQL><![CDATA[SELECT distinct bp.name as name,bp.id as bpid, bp.searchKey as value,
+<!--862F54CB1B074513BD791C6789F4AA42-->  <HQL><![CDATA[SELECT bp.id as bpid,bp.name as name, bp.searchKey as value,
    bp.creditLimit - bp.creditUsed as creditAvailable, bp.creditUsed as creditUsed,
-   COALESCE(contact.name, usercontact.name) as contactname, COALESCE(contact.id, usercontact.id) as contactid,
-   bploc.name as locationname, bploc.id as locationid,
    bp.customer as customer, bp.vendor as vendor, bp.lifetimeRevenueToDate as income
-FROM BusinessPartner bp left join bp.businessPartnerLocationList bploc with bploc.active=true
-                        left join bploc.locationAddress loc with loc.active = true
-                        left join bploc.aDUserList contact with contact.active=true
-                        left join loc.region region
-                        left join bp.aDUserList usercontact with usercontact.partnerAddress.id is null and usercontact.active=true
+FROM BusinessPartner bp
 where @additional_filters@
   and bp.summaryLevel = false and bp.active=true]]></HQL>
 <!--862F54CB1B074513BD791C6789F4AA42-->  <ENTITY_ALIAS><![CDATA[bp]]></ENTITY_ALIAS>
diff --git a/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml b/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
--- a/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
+++ b/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
@@ -24,27 +24,6 @@
 <!--01C1FF0DFB3643EEA2AF93128A057BEF-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
 <!--01C1FF0DFB3643EEA2AF93128A057BEF--></OBUISEL_SELECTOR_FIELD>
 
-<!--097EE62707284BA1ACEA0E3983C99B2D--><OBUISEL_SELECTOR_FIELD>
-<!--097EE62707284BA1ACEA0E3983C99B2D-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[097EE62707284BA1ACEA0E3983C99B2D]]></OBUISEL_SELECTOR_FIELD_ID>
-<!--097EE62707284BA1ACEA0E3983C99B2D-->  <OBUISEL_SELECTOR_ID><![CDATA[862F54CB1B074513BD791C6789F4AA42]]></OBUISEL_SELECTOR_ID>
-<!--097EE62707284BA1ACEA0E3983C99B2D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--097EE62707284BA1ACEA0E3983C99B2D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--097EE62707284BA1ACEA0E3983C99B2D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--097EE62707284BA1ACEA0E3983C99B2D-->  <NAME><![CDATA[Contact]]></NAME>
-<!--097EE62707284BA1ACEA0E3983C99B2D-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--097EE62707284BA1ACEA0E3983C99B2D-->  <SORT><![CDATA[Y]]></SORT>
-<!--097EE62707284BA1ACEA0E3983C99B2D-->  <FILTER><![CDATA[Y]]></FILTER>
-<!--097EE62707284BA1ACEA0E3983C99B2D-->  <SEARCHINSUGGESTIONBOX><![CDATA[N]]></SEARCHINSUGGESTIONBOX>
-<!--097EE62707284BA1ACEA0E3983C99B2D-->  <SHOWINGRID><![CDATA[Y]]></SHOWINGRID>
-<!--097EE62707284BA1ACEA0E3983C99B2D-->  <SORTNO><![CDATA[6]]></SORTNO>
-<!--097EE62707284BA1ACEA0E3983C99B2D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--097EE62707284BA1ACEA0E3983C99B2D-->  <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
-<!--097EE62707284BA1ACEA0E3983C99B2D-->  <DISPLAY_EXPRESSION><![CDATA[contactname]]></DISPLAY_EXPRESSION>
-<!--097EE62707284BA1ACEA0E3983C99B2D-->  <CLAUSE_LEFT_PART><![CDATA[COALESCE(contact.name, usercontact.name)]]></CLAUSE_LEFT_PART>
-<!--097EE62707284BA1ACEA0E3983C99B2D-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
-<!--097EE62707284BA1ACEA0E3983C99B2D-->  <SHOWINPICKLIST><![CDATA[Y]]></SHOWINPICKLIST>
-<!--097EE62707284BA1ACEA0E3983C99B2D--></OBUISEL_SELECTOR_FIELD>
-
 <!--1FFD5B1F3D7248DCAFA8225E92D17606--><OBUISEL_SELECTOR_FIELD>
 <!--1FFD5B1F3D7248DCAFA8225E92D17606-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[1FFD5B1F3D7248DCAFA8225E92D17606]]></OBUISEL_SELECTOR_FIELD_ID>
 <!--1FFD5B1F3D7248DCAFA8225E92D17606-->  <OBUISEL_SELECTOR_ID><![CDATA[4C8BC3E8E56441F4B8C98C684A0C9212]]></OBUISEL_SELECTOR_ID>
@@ -467,27 +446,6 @@
 <!--63507B832CF94D8BB30286ED4369E55B-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
 <!--63507B832CF94D8BB30286ED4369E55B--></OBUISEL_SELECTOR_FIELD>
 
-<!--6EE86F97BE094992BC832846CCB9093D--><OBUISEL_SELECTOR_FIELD>
-<!--6EE86F97BE094992BC832846CCB9093D-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[6EE86F97BE094992BC832846CCB9093D]]></OBUISEL_SELECTOR_FIELD_ID>
-<!--6EE86F97BE094992BC832846CCB9093D-->  <OBUISEL_SELECTOR_ID><![CDATA[862F54CB1B074513BD791C6789F4AA42]]></OBUISEL_SELECTOR_ID>
-<!--6EE86F97BE094992BC832846CCB9093D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--6EE86F97BE094992BC832846CCB9093D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--6EE86F97BE094992BC832846CCB9093D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--6EE86F97BE094992BC832846CCB9093D-->  <NAME><![CDATA[location identifier]]></NAME>
-<!--6EE86F97BE094992BC832846CCB9093D-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--6EE86F97BE094992BC832846CCB9093D-->  <SORT><![CDATA[Y]]></SORT>
-<!--6EE86F97BE094992BC832846CCB9093D-->  <FILTER><![CDATA[Y]]></FILTER>
-<!--6EE86F97BE094992BC832846CCB9093D-->  <SEARCHINSUGGESTIONBOX><![CDATA[N]]></SEARCHINSUGGESTIONBOX>
-<!--6EE86F97BE094992BC832846CCB9093D-->  <SHOWINGRID><![CDATA[N]]></SHOWINGRID>
-<!--6EE86F97BE094992BC832846CCB9093D-->  <SORTNO><![CDATA[0]]></SORTNO>
-<!--6EE86F97BE094992BC832846CCB9093D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--6EE86F97BE094992BC832846CCB9093D-->  <ISOUTFIELD><![CDATA[Y]]></ISOUTFIELD>
-<!--6EE86F97BE094992BC832846CCB9093D-->  <SUFFIX><![CDATA[_LOC]]></SUFFIX>
-<!--6EE86F97BE094992BC832846CCB9093D-->  <DISPLAY_EXPRESSION><![CDATA[locationid]]></DISPLAY_EXPRESSION>
-<!--6EE86F97BE094992BC832846CCB9093D-->  <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
-<!--6EE86F97BE094992BC832846CCB9093D-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
-<!--6EE86F97BE094992BC832846CCB9093D--></OBUISEL_SELECTOR_FIELD>
-
 <!--7167B12683FD4B8C99FA777C92A39BC5--><OBUISEL_SELECTOR_FIELD>
 <!--7167B12683FD4B8C99FA777C92A39BC5-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[7167B12683FD4B8C99FA777C92A39BC5]]></OBUISEL_SELECTOR_FIELD_ID>
 <!--7167B12683FD4B8C99FA777C92A39BC5-->  <OBUISEL_SELECTOR_ID><![CDATA[4C8BC3E8E56441F4B8C98C684A0C9212]]></OBUISEL_SELECTOR_ID>
@@ -579,27 +537,6 @@
 <!--8296CA3FDAB04B698B1EDD4BC76F1512-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
 <!--8296CA3FDAB04B698B1EDD4BC76F1512--></OBUISEL_SELECTOR_FIELD>
 
-<!--8C945B7A165446E591DC15BD10116806--><OBUISEL_SELECTOR_FIELD>
-<!--8C945B7A165446E591DC15BD10116806-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[8C945B7A165446E591DC15BD10116806]]></OBUISEL_SELECTOR_FIELD_ID>
-<!--8C945B7A165446E591DC15BD10116806-->  <OBUISEL_SELECTOR_ID><![CDATA[862F54CB1B074513BD791C6789F4AA42]]></OBUISEL_SELECTOR_ID>
-<!--8C945B7A165446E591DC15BD10116806-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8C945B7A165446E591DC15BD10116806-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8C945B7A165446E591DC15BD10116806-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8C945B7A165446E591DC15BD10116806-->  <NAME><![CDATA[contact identifier]]></NAME>
-<!--8C945B7A165446E591DC15BD10116806-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--8C945B7A165446E591DC15BD10116806-->  <SORT><![CDATA[Y]]></SORT>
-<!--8C945B7A165446E591DC15BD10116806-->  <FILTER><![CDATA[Y]]></FILTER>
-<!--8C945B7A165446E591DC15BD10116806-->  <SEARCHINSUGGESTIONBOX><![CDATA[N]]></SEARCHINSUGGESTIONBOX>
-<!--8C945B7A165446E591DC15BD10116806-->  <SHOWINGRID><![CDATA[N]]></SHOWINGRID>
-<!--8C945B7A165446E591DC15BD10116806-->  <SORTNO><![CDATA[0]]></SORTNO>
-<!--8C945B7A165446E591DC15BD10116806-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8C945B7A165446E591DC15BD10116806-->  <ISOUTFIELD><![CDATA[Y]]></ISOUTFIELD>
-<!--8C945B7A165446E591DC15BD10116806-->  <SUFFIX><![CDATA[_CON]]></SUFFIX>
-<!--8C945B7A165446E591DC15BD10116806-->  <DISPLAY_EXPRESSION><![CDATA[contactid]]></DISPLAY_EXPRESSION>
-<!--8C945B7A165446E591DC15BD10116806-->  <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
-<!--8C945B7A165446E591DC15BD10116806-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
-<!--8C945B7A165446E591DC15BD10116806--></OBUISEL_SELECTOR_FIELD>
-
 <!--8D511502B78143D7A6507B40245A0F76--><OBUISEL_SELECTOR_FIELD>
 <!--8D511502B78143D7A6507B40245A0F76-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[8D511502B78143D7A6507B40245A0F76]]></OBUISEL_SELECTOR_FIELD_ID>
 <!--8D511502B78143D7A6507B40245A0F76-->  <OBUISEL_SELECTOR_ID><![CDATA[4C8BC3E8E56441F4B8C98C684A0C9212]]></OBUISEL_SELECTOR_ID>
@@ -906,27 +843,6 @@
 <!--D2331E1502BD481A920747C46865FFA8-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
 <!--D2331E1502BD481A920747C46865FFA8--></OBUISEL_SELECTOR_FIELD>
 
-<!--D49A7A5565364640879292E237408E3A--><OBUISEL_SELECTOR_FIELD>
-<!--D49A7A5565364640879292E237408E3A-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[D49A7A5565364640879292E237408E3A]]></OBUISEL_SELECTOR_FIELD_ID>
-<!--D49A7A5565364640879292E237408E3A-->  <OBUISEL_SELECTOR_ID><![CDATA[862F54CB1B074513BD791C6789F4AA42]]></OBUISEL_SELECTOR_ID>
-<!--D49A7A5565364640879292E237408E3A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--D49A7A5565364640879292E237408E3A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--D49A7A5565364640879292E237408E3A-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--D49A7A5565364640879292E237408E3A-->  <NAME><![CDATA[Location]]></NAME>
-<!--D49A7A5565364640879292E237408E3A-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--D49A7A5565364640879292E237408E3A-->  <SORT><![CDATA[Y]]></SORT>
-<!--D49A7A5565364640879292E237408E3A-->  <FILTER><![CDATA[Y]]></FILTER>
-<!--D49A7A5565364640879292E237408E3A-->  <SEARCHINSUGGESTIONBOX><![CDATA[N]]></SEARCHINSUGGESTIONBOX>
-<!--D49A7A5565364640879292E237408E3A-->  <SHOWINGRID><![CDATA[Y]]></SHOWINGRID>
-<!--D49A7A5565364640879292E237408E3A-->  <SORTNO><![CDATA[5]]></SORTNO>
-<!--D49A7A5565364640879292E237408E3A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--D49A7A5565364640879292E237408E3A-->  <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
-<!--D49A7A5565364640879292E237408E3A-->  <DISPLAY_EXPRESSION><![CDATA[locationname]]></DISPLAY_EXPRESSION>
-<!--D49A7A5565364640879292E237408E3A-->  <CLAUSE_LEFT_PART><![CDATA[bploc.name]]></CLAUSE_LEFT_PART>
-<!--D49A7A5565364640879292E237408E3A-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
-<!--D49A7A5565364640879292E237408E3A-->  <SHOWINPICKLIST><![CDATA[Y]]></SHOWINPICKLIST>
-<!--D49A7A5565364640879292E237408E3A--></OBUISEL_SELECTOR_FIELD>
-
 <!--D56CFF8036B04B60BFC564E21856FB3D--><OBUISEL_SELECTOR_FIELD>
 <!--D56CFF8036B04B60BFC564E21856FB3D-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[D56CFF8036B04B60BFC564E21856FB3D]]></OBUISEL_SELECTOR_FIELD_ID>
 <!--D56CFF8036B04B60BFC564E21856FB3D-->  <OBUISEL_SELECTOR_ID><![CDATA[2E64F551C7C4470C80C29DBA24B34A5F]]></OBUISEL_SELECTOR_ID>
diff --git a/src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.java b/src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.java
+++ b/src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.java
@@ -336,9 +336,9 @@
 
     StringBuilder message = new StringBuilder();
 
-    if (strLocation.equals("")) {
-      message.append(Utility.messageBD(this, "NoBPLocation", info.vars.getLanguage()));
-    }
+    // if (strLocation.equals("")) {
+    // message.append(Utility.messageBD(this, "NoBPLocation", info.vars.getLanguage()));
+    // }
 
     if (data != null && data.length > 0
         && new BigDecimal(data[0].creditavailable).compareTo(BigDecimal.ZERO) < 0