Fixes issue 20257: New, more efficient business partner selector
authorAugusto Mauch <augusto.mauch@openbravo.com>
Wed, 30 May 2012 12:09:54 +0200
changeset 16708 8f2d220d1108
parent 16707 3679bfdc36e0
child 16709 5c1d94ab89b2
Fixes issue 20257: New, more efficient business partner selector

The default business partner selector has been changed:
- It does not contain location, contact and income fields
- It contains business partner category field

The previous behaviour can be found in a new Reference called Business Partner With Location and User

A callout has been modified so it supports both business partner selectors
src-db/database/sourcedata/AD_REFERENCE.xml
src-db/database/sourcedata/AD_REF_SEARCH.xml
src-db/database/sourcedata/OBCLKER_UIDEFINITION.xml
src-db/database/sourcedata/OBUISEL_SELECTOR.xml
src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.java
--- a/src-db/database/sourcedata/AD_REFERENCE.xml	Fri May 25 12:41:23 2012 +0200
+++ b/src-db/database/sourcedata/AD_REFERENCE.xml	Wed May 30 12:09:54 2012 +0200
@@ -4438,6 +4438,18 @@
 <!--4EFC9773F30B4ACE97D225BD13CFF8CB-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
 <!--4EFC9773F30B4ACE97D225BD13CFF8CB--></AD_REFERENCE>
 
+<!--531F166E5A7C437F9438A94AD8DDF212--><AD_REFERENCE>
+<!--531F166E5A7C437F9438A94AD8DDF212-->  <AD_REFERENCE_ID><![CDATA[531F166E5A7C437F9438A94AD8DDF212]]></AD_REFERENCE_ID>
+<!--531F166E5A7C437F9438A94AD8DDF212-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--531F166E5A7C437F9438A94AD8DDF212-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--531F166E5A7C437F9438A94AD8DDF212-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--531F166E5A7C437F9438A94AD8DDF212-->  <NAME><![CDATA[Business Partner With Location And User]]></NAME>
+<!--531F166E5A7C437F9438A94AD8DDF212-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--531F166E5A7C437F9438A94AD8DDF212-->  <ISBASEREFERENCE><![CDATA[N]]></ISBASEREFERENCE>
+<!--531F166E5A7C437F9438A94AD8DDF212-->  <PARENTREFERENCE_ID><![CDATA[30]]></PARENTREFERENCE_ID>
+<!--531F166E5A7C437F9438A94AD8DDF212-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
+<!--531F166E5A7C437F9438A94AD8DDF212--></AD_REFERENCE>
+
 <!--54AC2749F26440F3AEA33378858569E4--><AD_REFERENCE>
 <!--54AC2749F26440F3AEA33378858569E4-->  <AD_REFERENCE_ID><![CDATA[54AC2749F26440F3AEA33378858569E4]]></AD_REFERENCE_ID>
 <!--54AC2749F26440F3AEA33378858569E4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_REF_SEARCH.xml	Fri May 25 12:41:23 2012 +0200
+++ b/src-db/database/sourcedata/AD_REF_SEARCH.xml	Wed May 30 12:09:54 2012 +0200
@@ -180,4 +180,14 @@
 <!--7504B2DE5C1B4B7D875F6D4B60A1AD19-->  <AD_COLUMN_ID><![CDATA[1125]]></AD_COLUMN_ID>
 <!--7504B2DE5C1B4B7D875F6D4B60A1AD19--></AD_REF_SEARCH>
 
+<!--D2057B09D3B24BBBBF0B0F1A581F5C69--><AD_REF_SEARCH>
+<!--D2057B09D3B24BBBBF0B0F1A581F5C69-->  <AD_REF_SEARCH_ID><![CDATA[D2057B09D3B24BBBBF0B0F1A581F5C69]]></AD_REF_SEARCH_ID>
+<!--D2057B09D3B24BBBBF0B0F1A581F5C69-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D2057B09D3B24BBBBF0B0F1A581F5C69-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D2057B09D3B24BBBBF0B0F1A581F5C69-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D2057B09D3B24BBBBF0B0F1A581F5C69-->  <AD_REFERENCE_ID><![CDATA[531F166E5A7C437F9438A94AD8DDF212]]></AD_REFERENCE_ID>
+<!--D2057B09D3B24BBBBF0B0F1A581F5C69-->  <AD_TABLE_ID><![CDATA[291]]></AD_TABLE_ID>
+<!--D2057B09D3B24BBBBF0B0F1A581F5C69-->  <AD_COLUMN_ID><![CDATA[2893]]></AD_COLUMN_ID>
+<!--D2057B09D3B24BBBBF0B0F1A581F5C69--></AD_REF_SEARCH>
+
 </data>
--- a/src-db/database/sourcedata/OBCLKER_UIDEFINITION.xml	Fri May 25 12:41:23 2012 +0200
+++ b/src-db/database/sourcedata/OBCLKER_UIDEFINITION.xml	Wed May 30 12:09:54 2012 +0200
@@ -10,6 +10,16 @@
 <!--5689322B3F104A19A15ACDB331052991-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--5689322B3F104A19A15ACDB331052991--></OBCLKER_UIDEFINITION>
 
+<!--73C57D2D7A82431680EF6D5214A64902--><OBCLKER_UIDEFINITION>
+<!--73C57D2D7A82431680EF6D5214A64902-->  <OBCLKER_UIDEFINITION_ID><![CDATA[73C57D2D7A82431680EF6D5214A64902]]></OBCLKER_UIDEFINITION_ID>
+<!--73C57D2D7A82431680EF6D5214A64902-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--73C57D2D7A82431680EF6D5214A64902-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--73C57D2D7A82431680EF6D5214A64902-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--73C57D2D7A82431680EF6D5214A64902-->  <AD_REFERENCE_ID><![CDATA[531F166E5A7C437F9438A94AD8DDF212]]></AD_REFERENCE_ID>
+<!--73C57D2D7A82431680EF6D5214A64902-->  <CLASSNAME><![CDATA[org.openbravo.userinterface.selector.reference.FKSelectorUIDefinition]]></CLASSNAME>
+<!--73C57D2D7A82431680EF6D5214A64902-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--73C57D2D7A82431680EF6D5214A64902--></OBCLKER_UIDEFINITION>
+
 <!--A296BFCB707047C6AC7CDFFFADACD64D--><OBCLKER_UIDEFINITION>
 <!--A296BFCB707047C6AC7CDFFFADACD64D-->  <OBCLKER_UIDEFINITION_ID><![CDATA[A296BFCB707047C6AC7CDFFFADACD64D]]></OBCLKER_UIDEFINITION_ID>
 <!--A296BFCB707047C6AC7CDFFFADACD64D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/OBUISEL_SELECTOR.xml	Fri May 25 12:41:23 2012 +0200
+++ b/src-db/database/sourcedata/OBUISEL_SELECTOR.xml	Wed May 30 12:09:54 2012 +0200
@@ -80,7 +80,31 @@
 <!--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.name as name,bp.id as bpid, bp.searchKey as value,
+   bp.creditLimit - bp.creditUsed as creditAvailable, bp.creditUsed as creditUsed,
+   bp.customer as customer, bp.vendor as vendor, 
+   bp.businessPartnerCategory.name as category
+FROM BusinessPartner bp
+where @additional_filters@
+  and bp.summaryLevel = false and bp.active=true]]></HQL>
+<!--862F54CB1B074513BD791C6789F4AA42-->  <ENTITY_ALIAS><![CDATA[bp]]></ENTITY_ALIAS>
+<!--862F54CB1B074513BD791C6789F4AA42-->  <CUSTOM_QUERY><![CDATA[Y]]></CUSTOM_QUERY>
+<!--862F54CB1B074513BD791C6789F4AA42--></OBUISEL_SELECTOR>
+
+<!--F132874BE0954A9B8C1301BE20704730--><OBUISEL_SELECTOR>
+<!--F132874BE0954A9B8C1301BE20704730-->  <OBUISEL_SELECTOR_ID><![CDATA[F132874BE0954A9B8C1301BE20704730]]></OBUISEL_SELECTOR_ID>
+<!--F132874BE0954A9B8C1301BE20704730-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F132874BE0954A9B8C1301BE20704730-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F132874BE0954A9B8C1301BE20704730-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--F132874BE0954A9B8C1301BE20704730-->  <NAME><![CDATA[Business Partner with contact and location]]></NAME>
+<!--F132874BE0954A9B8C1301BE20704730-->  <AD_REFERENCE_ID><![CDATA[531F166E5A7C437F9438A94AD8DDF212]]></AD_REFERENCE_ID>
+<!--F132874BE0954A9B8C1301BE20704730-->  <AD_TABLE_ID><![CDATA[291]]></AD_TABLE_ID>
+<!--F132874BE0954A9B8C1301BE20704730-->  <OBCLKER_TEMPLATE_ID><![CDATA[9314DE8599AD44E7BFC4CC50699042AB]]></OBCLKER_TEMPLATE_ID>
+<!--F132874BE0954A9B8C1301BE20704730-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F132874BE0954A9B8C1301BE20704730-->  <DISPLAYFIELD_ID><![CDATA[7CA7330BA4864D2FB1FED44CDB88A622]]></DISPLAYFIELD_ID>
+<!--F132874BE0954A9B8C1301BE20704730-->  <SUGGESTIONTEXTMATCHSTYLE><![CDATA[startsWith]]></SUGGESTIONTEXTMATCHSTYLE>
+<!--F132874BE0954A9B8C1301BE20704730-->  <POPUPTEXTMATCHSTYLE><![CDATA[startsWith]]></POPUPTEXTMATCHSTYLE>
+<!--F132874BE0954A9B8C1301BE20704730-->  <HQL><![CDATA[SELECT distinct bp.name as name,bp.id as bpid, 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,
@@ -92,8 +116,8 @@
                         left join bp.aDUserList usercontact with usercontact.partnerAddress.id is null and usercontact.active=true
 where @additional_filters@
   and bp.summaryLevel = false and bp.active=true]]></HQL>
-<!--862F54CB1B074513BD791C6789F4AA42-->  <ENTITY_ALIAS><![CDATA[bp]]></ENTITY_ALIAS>
-<!--862F54CB1B074513BD791C6789F4AA42-->  <CUSTOM_QUERY><![CDATA[Y]]></CUSTOM_QUERY>
-<!--862F54CB1B074513BD791C6789F4AA42--></OBUISEL_SELECTOR>
+<!--F132874BE0954A9B8C1301BE20704730-->  <ENTITY_ALIAS><![CDATA[bp]]></ENTITY_ALIAS>
+<!--F132874BE0954A9B8C1301BE20704730-->  <CUSTOM_QUERY><![CDATA[Y]]></CUSTOM_QUERY>
+<!--F132874BE0954A9B8C1301BE20704730--></OBUISEL_SELECTOR>
 
 </data>
--- a/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml	Fri May 25 12:41:23 2012 +0200
+++ b/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml	Wed May 30 12:09:54 2012 +0200
@@ -24,26 +24,48 @@
 <!--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>
+<!--082C760C3435477B9A20B9990749F6C7--><OBUISEL_SELECTOR_FIELD>
+<!--082C760C3435477B9A20B9990749F6C7-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[082C760C3435477B9A20B9990749F6C7]]></OBUISEL_SELECTOR_FIELD_ID>
+<!--082C760C3435477B9A20B9990749F6C7-->  <OBUISEL_SELECTOR_ID><![CDATA[F132874BE0954A9B8C1301BE20704730]]></OBUISEL_SELECTOR_ID>
+<!--082C760C3435477B9A20B9990749F6C7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--082C760C3435477B9A20B9990749F6C7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--082C760C3435477B9A20B9990749F6C7-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--082C760C3435477B9A20B9990749F6C7-->  <NAME><![CDATA[Location]]></NAME>
+<!--082C760C3435477B9A20B9990749F6C7-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--082C760C3435477B9A20B9990749F6C7-->  <SORT><![CDATA[Y]]></SORT>
+<!--082C760C3435477B9A20B9990749F6C7-->  <FILTER><![CDATA[Y]]></FILTER>
+<!--082C760C3435477B9A20B9990749F6C7-->  <SEARCHINSUGGESTIONBOX><![CDATA[N]]></SEARCHINSUGGESTIONBOX>
+<!--082C760C3435477B9A20B9990749F6C7-->  <SHOWINGRID><![CDATA[Y]]></SHOWINGRID>
+<!--082C760C3435477B9A20B9990749F6C7-->  <SORTNO><![CDATA[5]]></SORTNO>
+<!--082C760C3435477B9A20B9990749F6C7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--082C760C3435477B9A20B9990749F6C7-->  <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--082C760C3435477B9A20B9990749F6C7-->  <DISPLAY_EXPRESSION><![CDATA[locationname]]></DISPLAY_EXPRESSION>
+<!--082C760C3435477B9A20B9990749F6C7-->  <CLAUSE_LEFT_PART><![CDATA[bploc.name]]></CLAUSE_LEFT_PART>
+<!--082C760C3435477B9A20B9990749F6C7-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--082C760C3435477B9A20B9990749F6C7-->  <SHOWINPICKLIST><![CDATA[Y]]></SHOWINPICKLIST>
+<!--082C760C3435477B9A20B9990749F6C7--></OBUISEL_SELECTOR_FIELD>
+
+<!--1A3CADEA9ED94D039A6667599E0E63C0--><OBUISEL_SELECTOR_FIELD>
+<!--1A3CADEA9ED94D039A6667599E0E63C0-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[1A3CADEA9ED94D039A6667599E0E63C0]]></OBUISEL_SELECTOR_FIELD_ID>
+<!--1A3CADEA9ED94D039A6667599E0E63C0-->  <OBUISEL_SELECTOR_ID><![CDATA[F132874BE0954A9B8C1301BE20704730]]></OBUISEL_SELECTOR_ID>
+<!--1A3CADEA9ED94D039A6667599E0E63C0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1A3CADEA9ED94D039A6667599E0E63C0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1A3CADEA9ED94D039A6667599E0E63C0-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--1A3CADEA9ED94D039A6667599E0E63C0-->  <NAME><![CDATA[Vendor]]></NAME>
+<!--1A3CADEA9ED94D039A6667599E0E63C0-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--1A3CADEA9ED94D039A6667599E0E63C0-->  <SORT><![CDATA[Y]]></SORT>
+<!--1A3CADEA9ED94D039A6667599E0E63C0-->  <FILTER><![CDATA[Y]]></FILTER>
+<!--1A3CADEA9ED94D039A6667599E0E63C0-->  <SEARCHINSUGGESTIONBOX><![CDATA[N]]></SEARCHINSUGGESTIONBOX>
+<!--1A3CADEA9ED94D039A6667599E0E63C0-->  <SHOWINGRID><![CDATA[Y]]></SHOWINGRID>
+<!--1A3CADEA9ED94D039A6667599E0E63C0-->  <SORTNO><![CDATA[8]]></SORTNO>
+<!--1A3CADEA9ED94D039A6667599E0E63C0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1A3CADEA9ED94D039A6667599E0E63C0-->  <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--1A3CADEA9ED94D039A6667599E0E63C0-->  <DEFAULT_EXPRESSION><![CDATA[if (OB.isSalesTransaction() == true) { '' } else {'true'}]]></DEFAULT_EXPRESSION>
+<!--1A3CADEA9ED94D039A6667599E0E63C0-->  <DISPLAY_EXPRESSION><![CDATA[vendor]]></DISPLAY_EXPRESSION>
+<!--1A3CADEA9ED94D039A6667599E0E63C0-->  <CLAUSE_LEFT_PART><![CDATA[bp.vendor]]></CLAUSE_LEFT_PART>
+<!--1A3CADEA9ED94D039A6667599E0E63C0-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--1A3CADEA9ED94D039A6667599E0E63C0-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
+<!--1A3CADEA9ED94D039A6667599E0E63C0--></OBUISEL_SELECTOR_FIELD>
 
 <!--1FFD5B1F3D7248DCAFA8225E92D17606--><OBUISEL_SELECTOR_FIELD>
 <!--1FFD5B1F3D7248DCAFA8225E92D17606-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[1FFD5B1F3D7248DCAFA8225E92D17606]]></OBUISEL_SELECTOR_FIELD_ID>
@@ -133,6 +155,89 @@
 <!--3425E56A245B47519498AFD14B8C1408-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
 <!--3425E56A245B47519498AFD14B8C1408--></OBUISEL_SELECTOR_FIELD>
 
+<!--348E946313BF4336ABDA800BA68829CF--><OBUISEL_SELECTOR_FIELD>
+<!--348E946313BF4336ABDA800BA68829CF-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[348E946313BF4336ABDA800BA68829CF]]></OBUISEL_SELECTOR_FIELD_ID>
+<!--348E946313BF4336ABDA800BA68829CF-->  <OBUISEL_SELECTOR_ID><![CDATA[862F54CB1B074513BD791C6789F4AA42]]></OBUISEL_SELECTOR_ID>
+<!--348E946313BF4336ABDA800BA68829CF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--348E946313BF4336ABDA800BA68829CF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--348E946313BF4336ABDA800BA68829CF-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--348E946313BF4336ABDA800BA68829CF-->  <NAME><![CDATA[Category]]></NAME>
+<!--348E946313BF4336ABDA800BA68829CF-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--348E946313BF4336ABDA800BA68829CF-->  <SORT><![CDATA[Y]]></SORT>
+<!--348E946313BF4336ABDA800BA68829CF-->  <FILTER><![CDATA[Y]]></FILTER>
+<!--348E946313BF4336ABDA800BA68829CF-->  <SEARCHINSUGGESTIONBOX><![CDATA[N]]></SEARCHINSUGGESTIONBOX>
+<!--348E946313BF4336ABDA800BA68829CF-->  <SHOWINGRID><![CDATA[Y]]></SHOWINGRID>
+<!--348E946313BF4336ABDA800BA68829CF-->  <SORTNO><![CDATA[9]]></SORTNO>
+<!--348E946313BF4336ABDA800BA68829CF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--348E946313BF4336ABDA800BA68829CF-->  <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--348E946313BF4336ABDA800BA68829CF-->  <DISPLAY_EXPRESSION><![CDATA[category]]></DISPLAY_EXPRESSION>
+<!--348E946313BF4336ABDA800BA68829CF-->  <CLAUSE_LEFT_PART><![CDATA[ bp.businessPartnerCategory.name]]></CLAUSE_LEFT_PART>
+<!--348E946313BF4336ABDA800BA68829CF-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--348E946313BF4336ABDA800BA68829CF-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
+<!--348E946313BF4336ABDA800BA68829CF--></OBUISEL_SELECTOR_FIELD>
+
+<!--36B5DC1CD166494D8221B493042D7CCF--><OBUISEL_SELECTOR_FIELD>
+<!--36B5DC1CD166494D8221B493042D7CCF-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[36B5DC1CD166494D8221B493042D7CCF]]></OBUISEL_SELECTOR_FIELD_ID>
+<!--36B5DC1CD166494D8221B493042D7CCF-->  <OBUISEL_SELECTOR_ID><![CDATA[F132874BE0954A9B8C1301BE20704730]]></OBUISEL_SELECTOR_ID>
+<!--36B5DC1CD166494D8221B493042D7CCF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--36B5DC1CD166494D8221B493042D7CCF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--36B5DC1CD166494D8221B493042D7CCF-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--36B5DC1CD166494D8221B493042D7CCF-->  <NAME><![CDATA[Credit Line available]]></NAME>
+<!--36B5DC1CD166494D8221B493042D7CCF-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--36B5DC1CD166494D8221B493042D7CCF-->  <SORT><![CDATA[Y]]></SORT>
+<!--36B5DC1CD166494D8221B493042D7CCF-->  <FILTER><![CDATA[Y]]></FILTER>
+<!--36B5DC1CD166494D8221B493042D7CCF-->  <SEARCHINSUGGESTIONBOX><![CDATA[N]]></SEARCHINSUGGESTIONBOX>
+<!--36B5DC1CD166494D8221B493042D7CCF-->  <SHOWINGRID><![CDATA[Y]]></SHOWINGRID>
+<!--36B5DC1CD166494D8221B493042D7CCF-->  <SORTNO><![CDATA[3]]></SORTNO>
+<!--36B5DC1CD166494D8221B493042D7CCF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--36B5DC1CD166494D8221B493042D7CCF-->  <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--36B5DC1CD166494D8221B493042D7CCF-->  <DISPLAY_EXPRESSION><![CDATA[creditAvailable]]></DISPLAY_EXPRESSION>
+<!--36B5DC1CD166494D8221B493042D7CCF-->  <CLAUSE_LEFT_PART><![CDATA[bp.creditLimit - bp.creditUsed]]></CLAUSE_LEFT_PART>
+<!--36B5DC1CD166494D8221B493042D7CCF-->  <AD_REFERENCE_ID><![CDATA[12]]></AD_REFERENCE_ID>
+<!--36B5DC1CD166494D8221B493042D7CCF-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
+<!--36B5DC1CD166494D8221B493042D7CCF--></OBUISEL_SELECTOR_FIELD>
+
+<!--38075EEC36C24E3CAB44D1B33D2CE637--><OBUISEL_SELECTOR_FIELD>
+<!--38075EEC36C24E3CAB44D1B33D2CE637-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[38075EEC36C24E3CAB44D1B33D2CE637]]></OBUISEL_SELECTOR_FIELD_ID>
+<!--38075EEC36C24E3CAB44D1B33D2CE637-->  <OBUISEL_SELECTOR_ID><![CDATA[F132874BE0954A9B8C1301BE20704730]]></OBUISEL_SELECTOR_ID>
+<!--38075EEC36C24E3CAB44D1B33D2CE637-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--38075EEC36C24E3CAB44D1B33D2CE637-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--38075EEC36C24E3CAB44D1B33D2CE637-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--38075EEC36C24E3CAB44D1B33D2CE637-->  <NAME><![CDATA[identifier]]></NAME>
+<!--38075EEC36C24E3CAB44D1B33D2CE637-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--38075EEC36C24E3CAB44D1B33D2CE637-->  <SORT><![CDATA[Y]]></SORT>
+<!--38075EEC36C24E3CAB44D1B33D2CE637-->  <FILTER><![CDATA[Y]]></FILTER>
+<!--38075EEC36C24E3CAB44D1B33D2CE637-->  <SEARCHINSUGGESTIONBOX><![CDATA[N]]></SEARCHINSUGGESTIONBOX>
+<!--38075EEC36C24E3CAB44D1B33D2CE637-->  <SHOWINGRID><![CDATA[N]]></SHOWINGRID>
+<!--38075EEC36C24E3CAB44D1B33D2CE637-->  <SORTNO><![CDATA[0]]></SORTNO>
+<!--38075EEC36C24E3CAB44D1B33D2CE637-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--38075EEC36C24E3CAB44D1B33D2CE637-->  <ISOUTFIELD><![CDATA[Y]]></ISOUTFIELD>
+<!--38075EEC36C24E3CAB44D1B33D2CE637-->  <DISPLAY_EXPRESSION><![CDATA[bpid]]></DISPLAY_EXPRESSION>
+<!--38075EEC36C24E3CAB44D1B33D2CE637-->  <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
+<!--38075EEC36C24E3CAB44D1B33D2CE637-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
+<!--38075EEC36C24E3CAB44D1B33D2CE637--></OBUISEL_SELECTOR_FIELD>
+
+<!--3C4C59A1AB77437A959F10D42D32FDE7--><OBUISEL_SELECTOR_FIELD>
+<!--3C4C59A1AB77437A959F10D42D32FDE7-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[3C4C59A1AB77437A959F10D42D32FDE7]]></OBUISEL_SELECTOR_FIELD_ID>
+<!--3C4C59A1AB77437A959F10D42D32FDE7-->  <OBUISEL_SELECTOR_ID><![CDATA[F132874BE0954A9B8C1301BE20704730]]></OBUISEL_SELECTOR_ID>
+<!--3C4C59A1AB77437A959F10D42D32FDE7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3C4C59A1AB77437A959F10D42D32FDE7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3C4C59A1AB77437A959F10D42D32FDE7-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--3C4C59A1AB77437A959F10D42D32FDE7-->  <NAME><![CDATA[location identifier]]></NAME>
+<!--3C4C59A1AB77437A959F10D42D32FDE7-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--3C4C59A1AB77437A959F10D42D32FDE7-->  <SORT><![CDATA[Y]]></SORT>
+<!--3C4C59A1AB77437A959F10D42D32FDE7-->  <FILTER><![CDATA[Y]]></FILTER>
+<!--3C4C59A1AB77437A959F10D42D32FDE7-->  <SEARCHINSUGGESTIONBOX><![CDATA[N]]></SEARCHINSUGGESTIONBOX>
+<!--3C4C59A1AB77437A959F10D42D32FDE7-->  <SHOWINGRID><![CDATA[Y]]></SHOWINGRID>
+<!--3C4C59A1AB77437A959F10D42D32FDE7-->  <SORTNO><![CDATA[0]]></SORTNO>
+<!--3C4C59A1AB77437A959F10D42D32FDE7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3C4C59A1AB77437A959F10D42D32FDE7-->  <ISOUTFIELD><![CDATA[Y]]></ISOUTFIELD>
+<!--3C4C59A1AB77437A959F10D42D32FDE7-->  <SUFFIX><![CDATA[_LOC]]></SUFFIX>
+<!--3C4C59A1AB77437A959F10D42D32FDE7-->  <DISPLAY_EXPRESSION><![CDATA[locationid]]></DISPLAY_EXPRESSION>
+<!--3C4C59A1AB77437A959F10D42D32FDE7-->  <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
+<!--3C4C59A1AB77437A959F10D42D32FDE7-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
+<!--3C4C59A1AB77437A959F10D42D32FDE7--></OBUISEL_SELECTOR_FIELD>
+
 <!--4028E61131FB4B1B0131FB53BDDB0012--><OBUISEL_SELECTOR_FIELD>
 <!--4028E61131FB4B1B0131FB53BDDB0012-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[4028E61131FB4B1B0131FB53BDDB0012]]></OBUISEL_SELECTOR_FIELD_ID>
 <!--4028E61131FB4B1B0131FB53BDDB0012-->  <OBUISEL_SELECTOR_ID><![CDATA[4028E61131FB4B1B0131FB5307F1000C]]></OBUISEL_SELECTOR_ID>
@@ -467,27 +572,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>
@@ -536,6 +620,27 @@
 <!--7A814E72DF9240E280BA6B2AEFF9405A-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
 <!--7A814E72DF9240E280BA6B2AEFF9405A--></OBUISEL_SELECTOR_FIELD>
 
+<!--7CA7330BA4864D2FB1FED44CDB88A622--><OBUISEL_SELECTOR_FIELD>
+<!--7CA7330BA4864D2FB1FED44CDB88A622-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[7CA7330BA4864D2FB1FED44CDB88A622]]></OBUISEL_SELECTOR_FIELD_ID>
+<!--7CA7330BA4864D2FB1FED44CDB88A622-->  <OBUISEL_SELECTOR_ID><![CDATA[F132874BE0954A9B8C1301BE20704730]]></OBUISEL_SELECTOR_ID>
+<!--7CA7330BA4864D2FB1FED44CDB88A622-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7CA7330BA4864D2FB1FED44CDB88A622-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7CA7330BA4864D2FB1FED44CDB88A622-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7CA7330BA4864D2FB1FED44CDB88A622-->  <NAME><![CDATA[Name]]></NAME>
+<!--7CA7330BA4864D2FB1FED44CDB88A622-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--7CA7330BA4864D2FB1FED44CDB88A622-->  <SORT><![CDATA[Y]]></SORT>
+<!--7CA7330BA4864D2FB1FED44CDB88A622-->  <FILTER><![CDATA[Y]]></FILTER>
+<!--7CA7330BA4864D2FB1FED44CDB88A622-->  <SEARCHINSUGGESTIONBOX><![CDATA[Y]]></SEARCHINSUGGESTIONBOX>
+<!--7CA7330BA4864D2FB1FED44CDB88A622-->  <SHOWINGRID><![CDATA[Y]]></SHOWINGRID>
+<!--7CA7330BA4864D2FB1FED44CDB88A622-->  <SORTNO><![CDATA[1]]></SORTNO>
+<!--7CA7330BA4864D2FB1FED44CDB88A622-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7CA7330BA4864D2FB1FED44CDB88A622-->  <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--7CA7330BA4864D2FB1FED44CDB88A622-->  <DISPLAY_EXPRESSION><![CDATA[name]]></DISPLAY_EXPRESSION>
+<!--7CA7330BA4864D2FB1FED44CDB88A622-->  <CLAUSE_LEFT_PART><![CDATA[bp.name]]></CLAUSE_LEFT_PART>
+<!--7CA7330BA4864D2FB1FED44CDB88A622-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--7CA7330BA4864D2FB1FED44CDB88A622-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
+<!--7CA7330BA4864D2FB1FED44CDB88A622--></OBUISEL_SELECTOR_FIELD>
+
 <!--7F415E2D50A041CB83BF79EA460DB884--><OBUISEL_SELECTOR_FIELD>
 <!--7F415E2D50A041CB83BF79EA460DB884-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[7F415E2D50A041CB83BF79EA460DB884]]></OBUISEL_SELECTOR_FIELD_ID>
 <!--7F415E2D50A041CB83BF79EA460DB884-->  <OBUISEL_SELECTOR_ID><![CDATA[2E64F551C7C4470C80C29DBA24B34A5F]]></OBUISEL_SELECTOR_ID>
@@ -579,26 +684,26 @@
 <!--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>
+<!--8AB5D5043894438B8AFDBC8491C8F692--><OBUISEL_SELECTOR_FIELD>
+<!--8AB5D5043894438B8AFDBC8491C8F692-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[8AB5D5043894438B8AFDBC8491C8F692]]></OBUISEL_SELECTOR_FIELD_ID>
+<!--8AB5D5043894438B8AFDBC8491C8F692-->  <OBUISEL_SELECTOR_ID><![CDATA[F132874BE0954A9B8C1301BE20704730]]></OBUISEL_SELECTOR_ID>
+<!--8AB5D5043894438B8AFDBC8491C8F692-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8AB5D5043894438B8AFDBC8491C8F692-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8AB5D5043894438B8AFDBC8491C8F692-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--8AB5D5043894438B8AFDBC8491C8F692-->  <NAME><![CDATA[Customer Balance]]></NAME>
+<!--8AB5D5043894438B8AFDBC8491C8F692-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--8AB5D5043894438B8AFDBC8491C8F692-->  <SORT><![CDATA[Y]]></SORT>
+<!--8AB5D5043894438B8AFDBC8491C8F692-->  <FILTER><![CDATA[Y]]></FILTER>
+<!--8AB5D5043894438B8AFDBC8491C8F692-->  <SEARCHINSUGGESTIONBOX><![CDATA[N]]></SEARCHINSUGGESTIONBOX>
+<!--8AB5D5043894438B8AFDBC8491C8F692-->  <SHOWINGRID><![CDATA[Y]]></SHOWINGRID>
+<!--8AB5D5043894438B8AFDBC8491C8F692-->  <SORTNO><![CDATA[4]]></SORTNO>
+<!--8AB5D5043894438B8AFDBC8491C8F692-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8AB5D5043894438B8AFDBC8491C8F692-->  <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--8AB5D5043894438B8AFDBC8491C8F692-->  <DISPLAY_EXPRESSION><![CDATA[creditUsed]]></DISPLAY_EXPRESSION>
+<!--8AB5D5043894438B8AFDBC8491C8F692-->  <CLAUSE_LEFT_PART><![CDATA[bp.creditUsed]]></CLAUSE_LEFT_PART>
+<!--8AB5D5043894438B8AFDBC8491C8F692-->  <AD_REFERENCE_ID><![CDATA[12]]></AD_REFERENCE_ID>
+<!--8AB5D5043894438B8AFDBC8491C8F692-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
+<!--8AB5D5043894438B8AFDBC8491C8F692--></OBUISEL_SELECTOR_FIELD>
 
 <!--8D511502B78143D7A6507B40245A0F76--><OBUISEL_SELECTOR_FIELD>
 <!--8D511502B78143D7A6507B40245A0F76-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[8D511502B78143D7A6507B40245A0F76]]></OBUISEL_SELECTOR_FIELD_ID>
@@ -732,6 +837,27 @@
 <!--9835921A3AA54B8D8D0126B3696F8354-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
 <!--9835921A3AA54B8D8D0126B3696F8354--></OBUISEL_SELECTOR_FIELD>
 
+<!--9D9998D878F2442BB240A5872C8D6A8E--><OBUISEL_SELECTOR_FIELD>
+<!--9D9998D878F2442BB240A5872C8D6A8E-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[9D9998D878F2442BB240A5872C8D6A8E]]></OBUISEL_SELECTOR_FIELD_ID>
+<!--9D9998D878F2442BB240A5872C8D6A8E-->  <OBUISEL_SELECTOR_ID><![CDATA[F132874BE0954A9B8C1301BE20704730]]></OBUISEL_SELECTOR_ID>
+<!--9D9998D878F2442BB240A5872C8D6A8E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9D9998D878F2442BB240A5872C8D6A8E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9D9998D878F2442BB240A5872C8D6A8E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--9D9998D878F2442BB240A5872C8D6A8E-->  <NAME><![CDATA[Value]]></NAME>
+<!--9D9998D878F2442BB240A5872C8D6A8E-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--9D9998D878F2442BB240A5872C8D6A8E-->  <SORT><![CDATA[Y]]></SORT>
+<!--9D9998D878F2442BB240A5872C8D6A8E-->  <FILTER><![CDATA[Y]]></FILTER>
+<!--9D9998D878F2442BB240A5872C8D6A8E-->  <SEARCHINSUGGESTIONBOX><![CDATA[Y]]></SEARCHINSUGGESTIONBOX>
+<!--9D9998D878F2442BB240A5872C8D6A8E-->  <SHOWINGRID><![CDATA[Y]]></SHOWINGRID>
+<!--9D9998D878F2442BB240A5872C8D6A8E-->  <SORTNO><![CDATA[2]]></SORTNO>
+<!--9D9998D878F2442BB240A5872C8D6A8E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9D9998D878F2442BB240A5872C8D6A8E-->  <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--9D9998D878F2442BB240A5872C8D6A8E-->  <DISPLAY_EXPRESSION><![CDATA[value]]></DISPLAY_EXPRESSION>
+<!--9D9998D878F2442BB240A5872C8D6A8E-->  <CLAUSE_LEFT_PART><![CDATA[bp.searchKey]]></CLAUSE_LEFT_PART>
+<!--9D9998D878F2442BB240A5872C8D6A8E-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--9D9998D878F2442BB240A5872C8D6A8E-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
+<!--9D9998D878F2442BB240A5872C8D6A8E--></OBUISEL_SELECTOR_FIELD>
+
 <!--A246D4AC538E42BE9F0CD8182A558712--><OBUISEL_SELECTOR_FIELD>
 <!--A246D4AC538E42BE9F0CD8182A558712-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[A246D4AC538E42BE9F0CD8182A558712]]></OBUISEL_SELECTOR_FIELD_ID>
 <!--A246D4AC538E42BE9F0CD8182A558712-->  <OBUISEL_SELECTOR_ID><![CDATA[862F54CB1B074513BD791C6789F4AA42]]></OBUISEL_SELECTOR_ID>
@@ -754,6 +880,27 @@
 <!--A246D4AC538E42BE9F0CD8182A558712-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
 <!--A246D4AC538E42BE9F0CD8182A558712--></OBUISEL_SELECTOR_FIELD>
 
+<!--A70124FC61904F7BAD6F8BDF436931B4--><OBUISEL_SELECTOR_FIELD>
+<!--A70124FC61904F7BAD6F8BDF436931B4-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[A70124FC61904F7BAD6F8BDF436931B4]]></OBUISEL_SELECTOR_FIELD_ID>
+<!--A70124FC61904F7BAD6F8BDF436931B4-->  <OBUISEL_SELECTOR_ID><![CDATA[F132874BE0954A9B8C1301BE20704730]]></OBUISEL_SELECTOR_ID>
+<!--A70124FC61904F7BAD6F8BDF436931B4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A70124FC61904F7BAD6F8BDF436931B4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A70124FC61904F7BAD6F8BDF436931B4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--A70124FC61904F7BAD6F8BDF436931B4-->  <NAME><![CDATA[contact identifier]]></NAME>
+<!--A70124FC61904F7BAD6F8BDF436931B4-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--A70124FC61904F7BAD6F8BDF436931B4-->  <SORT><![CDATA[Y]]></SORT>
+<!--A70124FC61904F7BAD6F8BDF436931B4-->  <FILTER><![CDATA[Y]]></FILTER>
+<!--A70124FC61904F7BAD6F8BDF436931B4-->  <SEARCHINSUGGESTIONBOX><![CDATA[N]]></SEARCHINSUGGESTIONBOX>
+<!--A70124FC61904F7BAD6F8BDF436931B4-->  <SHOWINGRID><![CDATA[Y]]></SHOWINGRID>
+<!--A70124FC61904F7BAD6F8BDF436931B4-->  <SORTNO><![CDATA[0]]></SORTNO>
+<!--A70124FC61904F7BAD6F8BDF436931B4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A70124FC61904F7BAD6F8BDF436931B4-->  <ISOUTFIELD><![CDATA[Y]]></ISOUTFIELD>
+<!--A70124FC61904F7BAD6F8BDF436931B4-->  <SUFFIX><![CDATA[_CON]]></SUFFIX>
+<!--A70124FC61904F7BAD6F8BDF436931B4-->  <DISPLAY_EXPRESSION><![CDATA[contactid]]></DISPLAY_EXPRESSION>
+<!--A70124FC61904F7BAD6F8BDF436931B4-->  <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
+<!--A70124FC61904F7BAD6F8BDF436931B4-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
+<!--A70124FC61904F7BAD6F8BDF436931B4--></OBUISEL_SELECTOR_FIELD>
+
 <!--ABC41CB7D7B2447A9A587CACE478D335--><OBUISEL_SELECTOR_FIELD>
 <!--ABC41CB7D7B2447A9A587CACE478D335-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[ABC41CB7D7B2447A9A587CACE478D335]]></OBUISEL_SELECTOR_FIELD_ID>
 <!--ABC41CB7D7B2447A9A587CACE478D335-->  <OBUISEL_SELECTOR_ID><![CDATA[4C8BC3E8E56441F4B8C98C684A0C9212]]></OBUISEL_SELECTOR_ID>
@@ -861,6 +1008,49 @@
 <!--BDD3B034C9D24559BA187C976DFF4498-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
 <!--BDD3B034C9D24559BA187C976DFF4498--></OBUISEL_SELECTOR_FIELD>
 
+<!--C8D400B2F068460C882BB44977BEAAEF--><OBUISEL_SELECTOR_FIELD>
+<!--C8D400B2F068460C882BB44977BEAAEF-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[C8D400B2F068460C882BB44977BEAAEF]]></OBUISEL_SELECTOR_FIELD_ID>
+<!--C8D400B2F068460C882BB44977BEAAEF-->  <OBUISEL_SELECTOR_ID><![CDATA[F132874BE0954A9B8C1301BE20704730]]></OBUISEL_SELECTOR_ID>
+<!--C8D400B2F068460C882BB44977BEAAEF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C8D400B2F068460C882BB44977BEAAEF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C8D400B2F068460C882BB44977BEAAEF-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--C8D400B2F068460C882BB44977BEAAEF-->  <NAME><![CDATA[Income]]></NAME>
+<!--C8D400B2F068460C882BB44977BEAAEF-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--C8D400B2F068460C882BB44977BEAAEF-->  <SORT><![CDATA[Y]]></SORT>
+<!--C8D400B2F068460C882BB44977BEAAEF-->  <FILTER><![CDATA[Y]]></FILTER>
+<!--C8D400B2F068460C882BB44977BEAAEF-->  <SEARCHINSUGGESTIONBOX><![CDATA[N]]></SEARCHINSUGGESTIONBOX>
+<!--C8D400B2F068460C882BB44977BEAAEF-->  <SHOWINGRID><![CDATA[Y]]></SHOWINGRID>
+<!--C8D400B2F068460C882BB44977BEAAEF-->  <SORTNO><![CDATA[9]]></SORTNO>
+<!--C8D400B2F068460C882BB44977BEAAEF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C8D400B2F068460C882BB44977BEAAEF-->  <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--C8D400B2F068460C882BB44977BEAAEF-->  <DISPLAY_EXPRESSION><![CDATA[income]]></DISPLAY_EXPRESSION>
+<!--C8D400B2F068460C882BB44977BEAAEF-->  <CLAUSE_LEFT_PART><![CDATA[bp.lifetimeRevenueToDate]]></CLAUSE_LEFT_PART>
+<!--C8D400B2F068460C882BB44977BEAAEF-->  <AD_REFERENCE_ID><![CDATA[12]]></AD_REFERENCE_ID>
+<!--C8D400B2F068460C882BB44977BEAAEF-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
+<!--C8D400B2F068460C882BB44977BEAAEF--></OBUISEL_SELECTOR_FIELD>
+
+<!--CA8DF8BBBDA34D5AB299E14E86320BC6--><OBUISEL_SELECTOR_FIELD>
+<!--CA8DF8BBBDA34D5AB299E14E86320BC6-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[CA8DF8BBBDA34D5AB299E14E86320BC6]]></OBUISEL_SELECTOR_FIELD_ID>
+<!--CA8DF8BBBDA34D5AB299E14E86320BC6-->  <OBUISEL_SELECTOR_ID><![CDATA[F132874BE0954A9B8C1301BE20704730]]></OBUISEL_SELECTOR_ID>
+<!--CA8DF8BBBDA34D5AB299E14E86320BC6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--CA8DF8BBBDA34D5AB299E14E86320BC6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--CA8DF8BBBDA34D5AB299E14E86320BC6-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--CA8DF8BBBDA34D5AB299E14E86320BC6-->  <NAME><![CDATA[Customer]]></NAME>
+<!--CA8DF8BBBDA34D5AB299E14E86320BC6-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--CA8DF8BBBDA34D5AB299E14E86320BC6-->  <SORT><![CDATA[Y]]></SORT>
+<!--CA8DF8BBBDA34D5AB299E14E86320BC6-->  <FILTER><![CDATA[Y]]></FILTER>
+<!--CA8DF8BBBDA34D5AB299E14E86320BC6-->  <SEARCHINSUGGESTIONBOX><![CDATA[N]]></SEARCHINSUGGESTIONBOX>
+<!--CA8DF8BBBDA34D5AB299E14E86320BC6-->  <SHOWINGRID><![CDATA[Y]]></SHOWINGRID>
+<!--CA8DF8BBBDA34D5AB299E14E86320BC6-->  <SORTNO><![CDATA[7]]></SORTNO>
+<!--CA8DF8BBBDA34D5AB299E14E86320BC6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--CA8DF8BBBDA34D5AB299E14E86320BC6-->  <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--CA8DF8BBBDA34D5AB299E14E86320BC6-->  <DEFAULT_EXPRESSION><![CDATA[if (OB.isSalesTransaction() == true) { 'true' } else {''}]]></DEFAULT_EXPRESSION>
+<!--CA8DF8BBBDA34D5AB299E14E86320BC6-->  <DISPLAY_EXPRESSION><![CDATA[customer]]></DISPLAY_EXPRESSION>
+<!--CA8DF8BBBDA34D5AB299E14E86320BC6-->  <CLAUSE_LEFT_PART><![CDATA[bp.customer]]></CLAUSE_LEFT_PART>
+<!--CA8DF8BBBDA34D5AB299E14E86320BC6-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--CA8DF8BBBDA34D5AB299E14E86320BC6-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
+<!--CA8DF8BBBDA34D5AB299E14E86320BC6--></OBUISEL_SELECTOR_FIELD>
+
 <!--CD0E2A0608A24055BAE8B765AF211846--><OBUISEL_SELECTOR_FIELD>
 <!--CD0E2A0608A24055BAE8B765AF211846-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[CD0E2A0608A24055BAE8B765AF211846]]></OBUISEL_SELECTOR_FIELD_ID>
 <!--CD0E2A0608A24055BAE8B765AF211846-->  <OBUISEL_SELECTOR_ID><![CDATA[2E64F551C7C4470C80C29DBA24B34A5F]]></OBUISEL_SELECTOR_ID>
@@ -906,27 +1096,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>
@@ -1163,26 +1332,26 @@
 <!--F91FD25B57A74BD587AEDB091A0FD53D-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
 <!--F91FD25B57A74BD587AEDB091A0FD53D--></OBUISEL_SELECTOR_FIELD>
 
-<!--FF8080812DF02890012DF0CB9ECF0062--><OBUISEL_SELECTOR_FIELD>
-<!--FF8080812DF02890012DF0CB9ECF0062-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[FF8080812DF02890012DF0CB9ECF0062]]></OBUISEL_SELECTOR_FIELD_ID>
-<!--FF8080812DF02890012DF0CB9ECF0062-->  <OBUISEL_SELECTOR_ID><![CDATA[862F54CB1B074513BD791C6789F4AA42]]></OBUISEL_SELECTOR_ID>
-<!--FF8080812DF02890012DF0CB9ECF0062-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--FF8080812DF02890012DF0CB9ECF0062-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--FF8080812DF02890012DF0CB9ECF0062-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--FF8080812DF02890012DF0CB9ECF0062-->  <NAME><![CDATA[Income]]></NAME>
-<!--FF8080812DF02890012DF0CB9ECF0062-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--FF8080812DF02890012DF0CB9ECF0062-->  <SORT><![CDATA[Y]]></SORT>
-<!--FF8080812DF02890012DF0CB9ECF0062-->  <FILTER><![CDATA[Y]]></FILTER>
-<!--FF8080812DF02890012DF0CB9ECF0062-->  <SEARCHINSUGGESTIONBOX><![CDATA[N]]></SEARCHINSUGGESTIONBOX>
-<!--FF8080812DF02890012DF0CB9ECF0062-->  <SHOWINGRID><![CDATA[Y]]></SHOWINGRID>
-<!--FF8080812DF02890012DF0CB9ECF0062-->  <SORTNO><![CDATA[9]]></SORTNO>
-<!--FF8080812DF02890012DF0CB9ECF0062-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--FF8080812DF02890012DF0CB9ECF0062-->  <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
-<!--FF8080812DF02890012DF0CB9ECF0062-->  <DISPLAY_EXPRESSION><![CDATA[income]]></DISPLAY_EXPRESSION>
-<!--FF8080812DF02890012DF0CB9ECF0062-->  <CLAUSE_LEFT_PART><![CDATA[bp.lifetimeRevenueToDate]]></CLAUSE_LEFT_PART>
-<!--FF8080812DF02890012DF0CB9ECF0062-->  <AD_REFERENCE_ID><![CDATA[12]]></AD_REFERENCE_ID>
-<!--FF8080812DF02890012DF0CB9ECF0062-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
-<!--FF8080812DF02890012DF0CB9ECF0062--></OBUISEL_SELECTOR_FIELD>
+<!--FB43216FCC1A473AA41E051E567D9490--><OBUISEL_SELECTOR_FIELD>
+<!--FB43216FCC1A473AA41E051E567D9490-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[FB43216FCC1A473AA41E051E567D9490]]></OBUISEL_SELECTOR_FIELD_ID>
+<!--FB43216FCC1A473AA41E051E567D9490-->  <OBUISEL_SELECTOR_ID><![CDATA[F132874BE0954A9B8C1301BE20704730]]></OBUISEL_SELECTOR_ID>
+<!--FB43216FCC1A473AA41E051E567D9490-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FB43216FCC1A473AA41E051E567D9490-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FB43216FCC1A473AA41E051E567D9490-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--FB43216FCC1A473AA41E051E567D9490-->  <NAME><![CDATA[Contact]]></NAME>
+<!--FB43216FCC1A473AA41E051E567D9490-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--FB43216FCC1A473AA41E051E567D9490-->  <SORT><![CDATA[Y]]></SORT>
+<!--FB43216FCC1A473AA41E051E567D9490-->  <FILTER><![CDATA[Y]]></FILTER>
+<!--FB43216FCC1A473AA41E051E567D9490-->  <SEARCHINSUGGESTIONBOX><![CDATA[N]]></SEARCHINSUGGESTIONBOX>
+<!--FB43216FCC1A473AA41E051E567D9490-->  <SHOWINGRID><![CDATA[Y]]></SHOWINGRID>
+<!--FB43216FCC1A473AA41E051E567D9490-->  <SORTNO><![CDATA[6]]></SORTNO>
+<!--FB43216FCC1A473AA41E051E567D9490-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FB43216FCC1A473AA41E051E567D9490-->  <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--FB43216FCC1A473AA41E051E567D9490-->  <DISPLAY_EXPRESSION><![CDATA[contactname]]></DISPLAY_EXPRESSION>
+<!--FB43216FCC1A473AA41E051E567D9490-->  <CLAUSE_LEFT_PART><![CDATA[COALESCE(contact.name, usercontact.name)]]></CLAUSE_LEFT_PART>
+<!--FB43216FCC1A473AA41E051E567D9490-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--FB43216FCC1A473AA41E051E567D9490-->  <SHOWINPICKLIST><![CDATA[Y]]></SHOWINPICKLIST>
+<!--FB43216FCC1A473AA41E051E567D9490--></OBUISEL_SELECTOR_FIELD>
 
 <!--FF8080812E77708D012E7796A94B0017--><OBUISEL_SELECTOR_FIELD>
 <!--FF8080812E77708D012E7796A94B0017-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[FF8080812E77708D012E7796A94B0017]]></OBUISEL_SELECTOR_FIELD_ID>
--- a/src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.java	Fri May 25 12:41:23 2012 +0200
+++ b/src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.java	Wed May 30 12:09:54 2012 +0200
@@ -103,6 +103,7 @@
     // BPartner Location
 
     FieldProvider[] tdv = null;
+    int nLocations = 0;
     try {
       ComboTableData comboTableData = new ComboTableData(info.vars, this, "TABLEDIR",
           "C_BPartner_Location_ID", "", "C_BPartner Location - Ship To", Utility.getContext(this,
@@ -110,23 +111,25 @@
               info.vars, "#User_Client", info.getWindowId()), 0);
       Utility.fillSQLParameters(this, info.vars, null, comboTableData, info.getWindowId(), "");
       tdv = comboTableData.select(false);
+      nLocations = tdv.length;
       comboTableData = null;
     } catch (Exception ex) {
       throw new ServletException(ex);
     }
 
     String strLocation = info.vars.getStringParameter("inpcBpartnerId_LOC");
+    if (!strLocation.isEmpty()) {
+      if (tdv != null && tdv.length > 0) {
+        info.addSelect("inpcBpartnerLocationId");
 
-    if (tdv != null && tdv.length > 0) {
-      info.addSelect("inpcBpartnerLocationId");
-
-      for (int i = 0; i < tdv.length; i++) {
-        info.addSelectResult(tdv[i].getField("id"), tdv[i].getField("name"), tdv[i].getField("id")
-            .equalsIgnoreCase(strLocation));
+        for (int i = 0; i < tdv.length; i++) {
+          info.addSelectResult(tdv[i].getField("id"), tdv[i].getField("name"), tdv[i]
+              .getField("id").equalsIgnoreCase(strLocation));
+        }
+        info.endSelect();
+      } else {
+        info.addResult("inpcBpartnerLocationId", null);
       }
-      info.endSelect();
-    } else {
-      info.addResult("inpcBpartnerLocationId", null);
     }
     // Warehouses
 
@@ -336,7 +339,7 @@
 
     StringBuilder message = new StringBuilder();
 
-    if (strLocation.equals("")) {
+    if (nLocations == 0) {
       message.append(Utility.messageBD(this, "NoBPLocation", info.vars.getLanguage()));
     }