[OBCQL] Included org filter, org optional parameter and currency column.
authorMikel Irurita <mikel.irurita@openbravo.com>
Thu, 03 Feb 2011 09:31:31 +0100
changeset 10349 91555b05f01d
parent 10348 b5b9025d652d
child 10350 a6885803e458
[OBCQL] Included org filter, org optional parameter and currency column.
Include filtering for only readable organizations and the organization column in max view.
Include a new organization optional paratmeter.
Include currency column in widget view at last position.
modules/org.openbravo.client.querylist/src-db/database/sourcedata/OBCQL_QUERY_COLUMN.xml
modules/org.openbravo.client.querylist/src-db/database/sourcedata/OBCQL_WIDGET_QUERY.xml
modules/org.openbravo.client.querylist/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
--- a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/OBCQL_QUERY_COLUMN.xml	Thu Feb 03 09:21:58 2011 +0100
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/OBCQL_QUERY_COLUMN.xml	Thu Feb 03 09:31:31 2011 +0100
@@ -9,7 +9,7 @@
 <!--01AA894DAA8040218F90CC3B9E73344B-->  <DISPLAY_EXPRESSION><![CDATA[outstandingAmount]]></DISPLAY_EXPRESSION>
 <!--01AA894DAA8040218F90CC3B9E73344B-->  <NAME><![CDATA[Outstanding amount]]></NAME>
 <!--01AA894DAA8040218F90CC3B9E73344B-->  <WIDTH><![CDATA[20]]></WIDTH>
-<!--01AA894DAA8040218F90CC3B9E73344B-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--01AA894DAA8040218F90CC3B9E73344B-->  <SEQNO><![CDATA[80]]></SEQNO>
 <!--01AA894DAA8040218F90CC3B9E73344B-->  <AD_REFERENCE_ID><![CDATA[12]]></AD_REFERENCE_ID>
 <!--01AA894DAA8040218F90CC3B9E73344B-->  <INCLUDE_IN><![CDATA[M]]></INCLUDE_IN>
 <!--01AA894DAA8040218F90CC3B9E73344B-->  <HAS_LINK><![CDATA[N]]></HAS_LINK>
@@ -17,6 +17,23 @@
 <!--01AA894DAA8040218F90CC3B9E73344B-->  <WHERECLAUSE_LEFT_PART><![CDATA[inv.outstandingAmount]]></WHERECLAUSE_LEFT_PART>
 <!--01AA894DAA8040218F90CC3B9E73344B--></OBCQL_QUERY_COLUMN>
 
+<!--0600761021A34EB3BE58351A91A9EA14--><OBCQL_QUERY_COLUMN>
+<!--0600761021A34EB3BE58351A91A9EA14-->  <OBCQL_QUERY_COLUMN_ID><![CDATA[0600761021A34EB3BE58351A91A9EA14]]></OBCQL_QUERY_COLUMN_ID>
+<!--0600761021A34EB3BE58351A91A9EA14-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0600761021A34EB3BE58351A91A9EA14-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0600761021A34EB3BE58351A91A9EA14-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0600761021A34EB3BE58351A91A9EA14-->  <OBCQL_WIDGET_QUERY_ID><![CDATA[1EF87E8E961A4E5BA3B41E1AB772B47C]]></OBCQL_WIDGET_QUERY_ID>
+<!--0600761021A34EB3BE58351A91A9EA14-->  <DISPLAY_EXPRESSION><![CDATA[currency]]></DISPLAY_EXPRESSION>
+<!--0600761021A34EB3BE58351A91A9EA14-->  <NAME><![CDATA[Currency]]></NAME>
+<!--0600761021A34EB3BE58351A91A9EA14-->  <WIDTH><![CDATA[12]]></WIDTH>
+<!--0600761021A34EB3BE58351A91A9EA14-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--0600761021A34EB3BE58351A91A9EA14-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--0600761021A34EB3BE58351A91A9EA14-->  <INCLUDE_IN><![CDATA[W]]></INCLUDE_IN>
+<!--0600761021A34EB3BE58351A91A9EA14-->  <HAS_LINK><![CDATA[N]]></HAS_LINK>
+<!--0600761021A34EB3BE58351A91A9EA14-->  <CAN_BE_FILTERED><![CDATA[Y]]></CAN_BE_FILTERED>
+<!--0600761021A34EB3BE58351A91A9EA14-->  <WHERECLAUSE_LEFT_PART><![CDATA[inv.currency.iSOCode]]></WHERECLAUSE_LEFT_PART>
+<!--0600761021A34EB3BE58351A91A9EA14--></OBCQL_QUERY_COLUMN>
+
 <!--15817E30D88A4E04ACA56D1E92D24FD7--><OBCQL_QUERY_COLUMN>
 <!--15817E30D88A4E04ACA56D1E92D24FD7-->  <OBCQL_QUERY_COLUMN_ID><![CDATA[15817E30D88A4E04ACA56D1E92D24FD7]]></OBCQL_QUERY_COLUMN_ID>
 <!--15817E30D88A4E04ACA56D1E92D24FD7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -26,7 +43,7 @@
 <!--15817E30D88A4E04ACA56D1E92D24FD7-->  <DISPLAY_EXPRESSION><![CDATA[paymentDate]]></DISPLAY_EXPRESSION>
 <!--15817E30D88A4E04ACA56D1E92D24FD7-->  <NAME><![CDATA[Date]]></NAME>
 <!--15817E30D88A4E04ACA56D1E92D24FD7-->  <WIDTH><![CDATA[20]]></WIDTH>
-<!--15817E30D88A4E04ACA56D1E92D24FD7-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--15817E30D88A4E04ACA56D1E92D24FD7-->  <SEQNO><![CDATA[40]]></SEQNO>
 <!--15817E30D88A4E04ACA56D1E92D24FD7-->  <AD_REFERENCE_ID><![CDATA[15]]></AD_REFERENCE_ID>
 <!--15817E30D88A4E04ACA56D1E92D24FD7-->  <INCLUDE_IN><![CDATA[W]]></INCLUDE_IN>
 <!--15817E30D88A4E04ACA56D1E92D24FD7-->  <HAS_LINK><![CDATA[N]]></HAS_LINK>
@@ -34,6 +51,40 @@
 <!--15817E30D88A4E04ACA56D1E92D24FD7-->  <WHERECLAUSE_LEFT_PART><![CDATA[p.paymentDate]]></WHERECLAUSE_LEFT_PART>
 <!--15817E30D88A4E04ACA56D1E92D24FD7--></OBCQL_QUERY_COLUMN>
 
+<!--19E44CB31B56433593B192089455EBBE--><OBCQL_QUERY_COLUMN>
+<!--19E44CB31B56433593B192089455EBBE-->  <OBCQL_QUERY_COLUMN_ID><![CDATA[19E44CB31B56433593B192089455EBBE]]></OBCQL_QUERY_COLUMN_ID>
+<!--19E44CB31B56433593B192089455EBBE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--19E44CB31B56433593B192089455EBBE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--19E44CB31B56433593B192089455EBBE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--19E44CB31B56433593B192089455EBBE-->  <OBCQL_WIDGET_QUERY_ID><![CDATA[E5A0DC8536134185AC8B1897F15DB816]]></OBCQL_WIDGET_QUERY_ID>
+<!--19E44CB31B56433593B192089455EBBE-->  <DISPLAY_EXPRESSION><![CDATA[organizationName]]></DISPLAY_EXPRESSION>
+<!--19E44CB31B56433593B192089455EBBE-->  <NAME><![CDATA[Organization]]></NAME>
+<!--19E44CB31B56433593B192089455EBBE-->  <WIDTH><![CDATA[30]]></WIDTH>
+<!--19E44CB31B56433593B192089455EBBE-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--19E44CB31B56433593B192089455EBBE-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--19E44CB31B56433593B192089455EBBE-->  <INCLUDE_IN><![CDATA[M]]></INCLUDE_IN>
+<!--19E44CB31B56433593B192089455EBBE-->  <HAS_LINK><![CDATA[N]]></HAS_LINK>
+<!--19E44CB31B56433593B192089455EBBE-->  <CAN_BE_FILTERED><![CDATA[Y]]></CAN_BE_FILTERED>
+<!--19E44CB31B56433593B192089455EBBE-->  <WHERECLAUSE_LEFT_PART><![CDATA[p.organization.name]]></WHERECLAUSE_LEFT_PART>
+<!--19E44CB31B56433593B192089455EBBE--></OBCQL_QUERY_COLUMN>
+
+<!--1B141EDF4FEC40218AE4443460BA3F67--><OBCQL_QUERY_COLUMN>
+<!--1B141EDF4FEC40218AE4443460BA3F67-->  <OBCQL_QUERY_COLUMN_ID><![CDATA[1B141EDF4FEC40218AE4443460BA3F67]]></OBCQL_QUERY_COLUMN_ID>
+<!--1B141EDF4FEC40218AE4443460BA3F67-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1B141EDF4FEC40218AE4443460BA3F67-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1B141EDF4FEC40218AE4443460BA3F67-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1B141EDF4FEC40218AE4443460BA3F67-->  <OBCQL_WIDGET_QUERY_ID><![CDATA[E5A0DC8536134185AC8B1897F15DB816]]></OBCQL_WIDGET_QUERY_ID>
+<!--1B141EDF4FEC40218AE4443460BA3F67-->  <DISPLAY_EXPRESSION><![CDATA[currency]]></DISPLAY_EXPRESSION>
+<!--1B141EDF4FEC40218AE4443460BA3F67-->  <NAME><![CDATA[Currency]]></NAME>
+<!--1B141EDF4FEC40218AE4443460BA3F67-->  <WIDTH><![CDATA[12]]></WIDTH>
+<!--1B141EDF4FEC40218AE4443460BA3F67-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--1B141EDF4FEC40218AE4443460BA3F67-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--1B141EDF4FEC40218AE4443460BA3F67-->  <INCLUDE_IN><![CDATA[W]]></INCLUDE_IN>
+<!--1B141EDF4FEC40218AE4443460BA3F67-->  <HAS_LINK><![CDATA[N]]></HAS_LINK>
+<!--1B141EDF4FEC40218AE4443460BA3F67-->  <CAN_BE_FILTERED><![CDATA[Y]]></CAN_BE_FILTERED>
+<!--1B141EDF4FEC40218AE4443460BA3F67-->  <WHERECLAUSE_LEFT_PART><![CDATA[p.currency.iSOCode]]></WHERECLAUSE_LEFT_PART>
+<!--1B141EDF4FEC40218AE4443460BA3F67--></OBCQL_QUERY_COLUMN>
+
 <!--1FCFFA0840074019BF84BBD9E507CB91--><OBCQL_QUERY_COLUMN>
 <!--1FCFFA0840074019BF84BBD9E507CB91-->  <OBCQL_QUERY_COLUMN_ID><![CDATA[1FCFFA0840074019BF84BBD9E507CB91]]></OBCQL_QUERY_COLUMN_ID>
 <!--1FCFFA0840074019BF84BBD9E507CB91-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -43,7 +94,7 @@
 <!--1FCFFA0840074019BF84BBD9E507CB91-->  <DISPLAY_EXPRESSION><![CDATA[invoiceDate]]></DISPLAY_EXPRESSION>
 <!--1FCFFA0840074019BF84BBD9E507CB91-->  <NAME><![CDATA[Date]]></NAME>
 <!--1FCFFA0840074019BF84BBD9E507CB91-->  <WIDTH><![CDATA[20]]></WIDTH>
-<!--1FCFFA0840074019BF84BBD9E507CB91-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--1FCFFA0840074019BF84BBD9E507CB91-->  <SEQNO><![CDATA[40]]></SEQNO>
 <!--1FCFFA0840074019BF84BBD9E507CB91-->  <AD_REFERENCE_ID><![CDATA[15]]></AD_REFERENCE_ID>
 <!--1FCFFA0840074019BF84BBD9E507CB91-->  <INCLUDE_IN><![CDATA[W]]></INCLUDE_IN>
 <!--1FCFFA0840074019BF84BBD9E507CB91-->  <HAS_LINK><![CDATA[N]]></HAS_LINK>
@@ -78,7 +129,7 @@
 <!--379830F53AF44639B79DB5AB113A575F-->  <NAME><![CDATA[Document Number]]></NAME>
 <!--379830F53AF44639B79DB5AB113A575F-->  <WIDTH><![CDATA[20]]></WIDTH>
 <!--379830F53AF44639B79DB5AB113A575F-->  <LINK_EXPRESSION><![CDATA[invoiceId]]></LINK_EXPRESSION>
-<!--379830F53AF44639B79DB5AB113A575F-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--379830F53AF44639B79DB5AB113A575F-->  <SEQNO><![CDATA[20]]></SEQNO>
 <!--379830F53AF44639B79DB5AB113A575F-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
 <!--379830F53AF44639B79DB5AB113A575F-->  <INCLUDE_IN><![CDATA[W]]></INCLUDE_IN>
 <!--379830F53AF44639B79DB5AB113A575F-->  <HAS_LINK><![CDATA[Y]]></HAS_LINK>
@@ -114,7 +165,7 @@
 <!--3C3DBC6021C94CFFA82AF855A7AF6C2F-->  <NAME><![CDATA[Business Partner]]></NAME>
 <!--3C3DBC6021C94CFFA82AF855A7AF6C2F-->  <WIDTH><![CDATA[40]]></WIDTH>
 <!--3C3DBC6021C94CFFA82AF855A7AF6C2F-->  <LINK_EXPRESSION><![CDATA[businessPartnerId]]></LINK_EXPRESSION>
-<!--3C3DBC6021C94CFFA82AF855A7AF6C2F-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--3C3DBC6021C94CFFA82AF855A7AF6C2F-->  <SEQNO><![CDATA[30]]></SEQNO>
 <!--3C3DBC6021C94CFFA82AF855A7AF6C2F-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
 <!--3C3DBC6021C94CFFA82AF855A7AF6C2F-->  <INCLUDE_IN><![CDATA[W]]></INCLUDE_IN>
 <!--3C3DBC6021C94CFFA82AF855A7AF6C2F-->  <HAS_LINK><![CDATA[Y]]></HAS_LINK>
@@ -123,6 +174,23 @@
 <!--3C3DBC6021C94CFFA82AF855A7AF6C2F-->  <WHERECLAUSE_LEFT_PART><![CDATA[inv.businessPartner.name]]></WHERECLAUSE_LEFT_PART>
 <!--3C3DBC6021C94CFFA82AF855A7AF6C2F--></OBCQL_QUERY_COLUMN>
 
+<!--45C959E0C3B54D7BBD1244DF35F852B9--><OBCQL_QUERY_COLUMN>
+<!--45C959E0C3B54D7BBD1244DF35F852B9-->  <OBCQL_QUERY_COLUMN_ID><![CDATA[45C959E0C3B54D7BBD1244DF35F852B9]]></OBCQL_QUERY_COLUMN_ID>
+<!--45C959E0C3B54D7BBD1244DF35F852B9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--45C959E0C3B54D7BBD1244DF35F852B9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--45C959E0C3B54D7BBD1244DF35F852B9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--45C959E0C3B54D7BBD1244DF35F852B9-->  <OBCQL_WIDGET_QUERY_ID><![CDATA[F94AEB4680AD4AD48255071903000A43]]></OBCQL_WIDGET_QUERY_ID>
+<!--45C959E0C3B54D7BBD1244DF35F852B9-->  <DISPLAY_EXPRESSION><![CDATA[organizationName]]></DISPLAY_EXPRESSION>
+<!--45C959E0C3B54D7BBD1244DF35F852B9-->  <NAME><![CDATA[Organization]]></NAME>
+<!--45C959E0C3B54D7BBD1244DF35F852B9-->  <WIDTH><![CDATA[30]]></WIDTH>
+<!--45C959E0C3B54D7BBD1244DF35F852B9-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--45C959E0C3B54D7BBD1244DF35F852B9-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--45C959E0C3B54D7BBD1244DF35F852B9-->  <INCLUDE_IN><![CDATA[M]]></INCLUDE_IN>
+<!--45C959E0C3B54D7BBD1244DF35F852B9-->  <HAS_LINK><![CDATA[N]]></HAS_LINK>
+<!--45C959E0C3B54D7BBD1244DF35F852B9-->  <CAN_BE_FILTERED><![CDATA[Y]]></CAN_BE_FILTERED>
+<!--45C959E0C3B54D7BBD1244DF35F852B9-->  <WHERECLAUSE_LEFT_PART><![CDATA[p.organization.name]]></WHERECLAUSE_LEFT_PART>
+<!--45C959E0C3B54D7BBD1244DF35F852B9--></OBCQL_QUERY_COLUMN>
+
 <!--493479BFB7D94915889AA9BDD6BB3EA8--><OBCQL_QUERY_COLUMN>
 <!--493479BFB7D94915889AA9BDD6BB3EA8-->  <OBCQL_QUERY_COLUMN_ID><![CDATA[493479BFB7D94915889AA9BDD6BB3EA8]]></OBCQL_QUERY_COLUMN_ID>
 <!--493479BFB7D94915889AA9BDD6BB3EA8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -132,7 +200,7 @@
 <!--493479BFB7D94915889AA9BDD6BB3EA8-->  <DISPLAY_EXPRESSION><![CDATA[daysTillDue]]></DISPLAY_EXPRESSION>
 <!--493479BFB7D94915889AA9BDD6BB3EA8-->  <NAME><![CDATA[Days till due]]></NAME>
 <!--493479BFB7D94915889AA9BDD6BB3EA8-->  <WIDTH><![CDATA[20]]></WIDTH>
-<!--493479BFB7D94915889AA9BDD6BB3EA8-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--493479BFB7D94915889AA9BDD6BB3EA8-->  <SEQNO><![CDATA[90]]></SEQNO>
 <!--493479BFB7D94915889AA9BDD6BB3EA8-->  <AD_REFERENCE_ID><![CDATA[11]]></AD_REFERENCE_ID>
 <!--493479BFB7D94915889AA9BDD6BB3EA8-->  <INCLUDE_IN><![CDATA[M]]></INCLUDE_IN>
 <!--493479BFB7D94915889AA9BDD6BB3EA8-->  <HAS_LINK><![CDATA[N]]></HAS_LINK>
@@ -150,7 +218,7 @@
 <!--4FE8DE4D7CF94B128CBA09973BD21C1D-->  <NAME><![CDATA[Document Number]]></NAME>
 <!--4FE8DE4D7CF94B128CBA09973BD21C1D-->  <WIDTH><![CDATA[20]]></WIDTH>
 <!--4FE8DE4D7CF94B128CBA09973BD21C1D-->  <LINK_EXPRESSION><![CDATA[finpaymentId]]></LINK_EXPRESSION>
-<!--4FE8DE4D7CF94B128CBA09973BD21C1D-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--4FE8DE4D7CF94B128CBA09973BD21C1D-->  <SEQNO><![CDATA[20]]></SEQNO>
 <!--4FE8DE4D7CF94B128CBA09973BD21C1D-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
 <!--4FE8DE4D7CF94B128CBA09973BD21C1D-->  <INCLUDE_IN><![CDATA[W]]></INCLUDE_IN>
 <!--4FE8DE4D7CF94B128CBA09973BD21C1D-->  <HAS_LINK><![CDATA[Y]]></HAS_LINK>
@@ -169,7 +237,7 @@
 <!--51429339D294475986634D7E876F4A53-->  <NAME><![CDATA[Document Number]]></NAME>
 <!--51429339D294475986634D7E876F4A53-->  <WIDTH><![CDATA[20]]></WIDTH>
 <!--51429339D294475986634D7E876F4A53-->  <LINK_EXPRESSION><![CDATA[invoiceId]]></LINK_EXPRESSION>
-<!--51429339D294475986634D7E876F4A53-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--51429339D294475986634D7E876F4A53-->  <SEQNO><![CDATA[20]]></SEQNO>
 <!--51429339D294475986634D7E876F4A53-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
 <!--51429339D294475986634D7E876F4A53-->  <INCLUDE_IN><![CDATA[W]]></INCLUDE_IN>
 <!--51429339D294475986634D7E876F4A53-->  <HAS_LINK><![CDATA[Y]]></HAS_LINK>
@@ -187,7 +255,7 @@
 <!--5410706611F04069A9326D70425EAD22-->  <DISPLAY_EXPRESSION><![CDATA[dueAmount]]></DISPLAY_EXPRESSION>
 <!--5410706611F04069A9326D70425EAD22-->  <NAME><![CDATA[Due amount]]></NAME>
 <!--5410706611F04069A9326D70425EAD22-->  <WIDTH><![CDATA[20]]></WIDTH>
-<!--5410706611F04069A9326D70425EAD22-->  <SEQNO><![CDATA[80]]></SEQNO>
+<!--5410706611F04069A9326D70425EAD22-->  <SEQNO><![CDATA[100]]></SEQNO>
 <!--5410706611F04069A9326D70425EAD22-->  <AD_REFERENCE_ID><![CDATA[12]]></AD_REFERENCE_ID>
 <!--5410706611F04069A9326D70425EAD22-->  <INCLUDE_IN><![CDATA[M]]></INCLUDE_IN>
 <!--5410706611F04069A9326D70425EAD22-->  <HAS_LINK><![CDATA[N]]></HAS_LINK>
@@ -203,9 +271,8 @@
 <!--56DC401F52BF4BE593C782240AE4AB67-->  <OBCQL_WIDGET_QUERY_ID><![CDATA[E5A0DC8536134185AC8B1897F15DB816]]></OBCQL_WIDGET_QUERY_ID>
 <!--56DC401F52BF4BE593C782240AE4AB67-->  <DISPLAY_EXPRESSION><![CDATA[amount]]></DISPLAY_EXPRESSION>
 <!--56DC401F52BF4BE593C782240AE4AB67-->  <NAME><![CDATA[Amount]]></NAME>
-<!--56DC401F52BF4BE593C782240AE4AB67-->  <SUMMARIZE_TYPE><![CDATA[sum]]></SUMMARIZE_TYPE>
 <!--56DC401F52BF4BE593C782240AE4AB67-->  <WIDTH><![CDATA[20]]></WIDTH>
-<!--56DC401F52BF4BE593C782240AE4AB67-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--56DC401F52BF4BE593C782240AE4AB67-->  <SEQNO><![CDATA[50]]></SEQNO>
 <!--56DC401F52BF4BE593C782240AE4AB67-->  <AD_REFERENCE_ID><![CDATA[12]]></AD_REFERENCE_ID>
 <!--56DC401F52BF4BE593C782240AE4AB67-->  <INCLUDE_IN><![CDATA[W]]></INCLUDE_IN>
 <!--56DC401F52BF4BE593C782240AE4AB67-->  <HAS_LINK><![CDATA[N]]></HAS_LINK>
@@ -213,6 +280,23 @@
 <!--56DC401F52BF4BE593C782240AE4AB67-->  <WHERECLAUSE_LEFT_PART><![CDATA[p.amount]]></WHERECLAUSE_LEFT_PART>
 <!--56DC401F52BF4BE593C782240AE4AB67--></OBCQL_QUERY_COLUMN>
 
+<!--5C4E31EC2ACC4F60951D135BABD8F691--><OBCQL_QUERY_COLUMN>
+<!--5C4E31EC2ACC4F60951D135BABD8F691-->  <OBCQL_QUERY_COLUMN_ID><![CDATA[5C4E31EC2ACC4F60951D135BABD8F691]]></OBCQL_QUERY_COLUMN_ID>
+<!--5C4E31EC2ACC4F60951D135BABD8F691-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5C4E31EC2ACC4F60951D135BABD8F691-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5C4E31EC2ACC4F60951D135BABD8F691-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5C4E31EC2ACC4F60951D135BABD8F691-->  <OBCQL_WIDGET_QUERY_ID><![CDATA[1EF87E8E961A4E5BA3B41E1AB772B47C]]></OBCQL_WIDGET_QUERY_ID>
+<!--5C4E31EC2ACC4F60951D135BABD8F691-->  <DISPLAY_EXPRESSION><![CDATA[organizationName]]></DISPLAY_EXPRESSION>
+<!--5C4E31EC2ACC4F60951D135BABD8F691-->  <NAME><![CDATA[Organization]]></NAME>
+<!--5C4E31EC2ACC4F60951D135BABD8F691-->  <WIDTH><![CDATA[30]]></WIDTH>
+<!--5C4E31EC2ACC4F60951D135BABD8F691-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--5C4E31EC2ACC4F60951D135BABD8F691-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--5C4E31EC2ACC4F60951D135BABD8F691-->  <INCLUDE_IN><![CDATA[M]]></INCLUDE_IN>
+<!--5C4E31EC2ACC4F60951D135BABD8F691-->  <HAS_LINK><![CDATA[N]]></HAS_LINK>
+<!--5C4E31EC2ACC4F60951D135BABD8F691-->  <CAN_BE_FILTERED><![CDATA[Y]]></CAN_BE_FILTERED>
+<!--5C4E31EC2ACC4F60951D135BABD8F691-->  <WHERECLAUSE_LEFT_PART><![CDATA[inv.organization.name]]></WHERECLAUSE_LEFT_PART>
+<!--5C4E31EC2ACC4F60951D135BABD8F691--></OBCQL_QUERY_COLUMN>
+
 <!--6B151041105E4DD0805AC2F709A7A81E--><OBCQL_QUERY_COLUMN>
 <!--6B151041105E4DD0805AC2F709A7A81E-->  <OBCQL_QUERY_COLUMN_ID><![CDATA[6B151041105E4DD0805AC2F709A7A81E]]></OBCQL_QUERY_COLUMN_ID>
 <!--6B151041105E4DD0805AC2F709A7A81E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -222,7 +306,7 @@
 <!--6B151041105E4DD0805AC2F709A7A81E-->  <DISPLAY_EXPRESSION><![CDATA[paymentDate]]></DISPLAY_EXPRESSION>
 <!--6B151041105E4DD0805AC2F709A7A81E-->  <NAME><![CDATA[Date]]></NAME>
 <!--6B151041105E4DD0805AC2F709A7A81E-->  <WIDTH><![CDATA[20]]></WIDTH>
-<!--6B151041105E4DD0805AC2F709A7A81E-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--6B151041105E4DD0805AC2F709A7A81E-->  <SEQNO><![CDATA[40]]></SEQNO>
 <!--6B151041105E4DD0805AC2F709A7A81E-->  <AD_REFERENCE_ID><![CDATA[15]]></AD_REFERENCE_ID>
 <!--6B151041105E4DD0805AC2F709A7A81E-->  <INCLUDE_IN><![CDATA[W]]></INCLUDE_IN>
 <!--6B151041105E4DD0805AC2F709A7A81E-->  <HAS_LINK><![CDATA[N]]></HAS_LINK>
@@ -240,7 +324,7 @@
 <!--70CEB497CA254F3C892AE0B68920897D-->  <NAME><![CDATA[Business Partner]]></NAME>
 <!--70CEB497CA254F3C892AE0B68920897D-->  <WIDTH><![CDATA[40]]></WIDTH>
 <!--70CEB497CA254F3C892AE0B68920897D-->  <LINK_EXPRESSION><![CDATA[businessPartnerId]]></LINK_EXPRESSION>
-<!--70CEB497CA254F3C892AE0B68920897D-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--70CEB497CA254F3C892AE0B68920897D-->  <SEQNO><![CDATA[30]]></SEQNO>
 <!--70CEB497CA254F3C892AE0B68920897D-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
 <!--70CEB497CA254F3C892AE0B68920897D-->  <INCLUDE_IN><![CDATA[W]]></INCLUDE_IN>
 <!--70CEB497CA254F3C892AE0B68920897D-->  <HAS_LINK><![CDATA[Y]]></HAS_LINK>
@@ -259,7 +343,7 @@
 <!--742D993ADF7444318F8CAF38DDCB1997-->  <NAME><![CDATA[Business Partner]]></NAME>
 <!--742D993ADF7444318F8CAF38DDCB1997-->  <WIDTH><![CDATA[40]]></WIDTH>
 <!--742D993ADF7444318F8CAF38DDCB1997-->  <LINK_EXPRESSION><![CDATA[businessPartnerId]]></LINK_EXPRESSION>
-<!--742D993ADF7444318F8CAF38DDCB1997-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--742D993ADF7444318F8CAF38DDCB1997-->  <SEQNO><![CDATA[30]]></SEQNO>
 <!--742D993ADF7444318F8CAF38DDCB1997-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
 <!--742D993ADF7444318F8CAF38DDCB1997-->  <INCLUDE_IN><![CDATA[W]]></INCLUDE_IN>
 <!--742D993ADF7444318F8CAF38DDCB1997-->  <HAS_LINK><![CDATA[Y]]></HAS_LINK>
@@ -294,7 +378,7 @@
 <!--7EFCCE042B4841D0B9377B54F11973E7-->  <DISPLAY_EXPRESSION><![CDATA[daysTillDue]]></DISPLAY_EXPRESSION>
 <!--7EFCCE042B4841D0B9377B54F11973E7-->  <NAME><![CDATA[Days till due]]></NAME>
 <!--7EFCCE042B4841D0B9377B54F11973E7-->  <WIDTH><![CDATA[20]]></WIDTH>
-<!--7EFCCE042B4841D0B9377B54F11973E7-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--7EFCCE042B4841D0B9377B54F11973E7-->  <SEQNO><![CDATA[90]]></SEQNO>
 <!--7EFCCE042B4841D0B9377B54F11973E7-->  <AD_REFERENCE_ID><![CDATA[11]]></AD_REFERENCE_ID>
 <!--7EFCCE042B4841D0B9377B54F11973E7-->  <INCLUDE_IN><![CDATA[M]]></INCLUDE_IN>
 <!--7EFCCE042B4841D0B9377B54F11973E7-->  <HAS_LINK><![CDATA[N]]></HAS_LINK>
@@ -302,6 +386,23 @@
 <!--7EFCCE042B4841D0B9377B54F11973E7-->  <WHERECLAUSE_LEFT_PART><![CDATA[inv.daysTillDue]]></WHERECLAUSE_LEFT_PART>
 <!--7EFCCE042B4841D0B9377B54F11973E7--></OBCQL_QUERY_COLUMN>
 
+<!--879667D64C66466297E4113CBABEACA5--><OBCQL_QUERY_COLUMN>
+<!--879667D64C66466297E4113CBABEACA5-->  <OBCQL_QUERY_COLUMN_ID><![CDATA[879667D64C66466297E4113CBABEACA5]]></OBCQL_QUERY_COLUMN_ID>
+<!--879667D64C66466297E4113CBABEACA5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--879667D64C66466297E4113CBABEACA5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--879667D64C66466297E4113CBABEACA5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--879667D64C66466297E4113CBABEACA5-->  <OBCQL_WIDGET_QUERY_ID><![CDATA[58BCB96595FA45678CC1423402238309]]></OBCQL_WIDGET_QUERY_ID>
+<!--879667D64C66466297E4113CBABEACA5-->  <DISPLAY_EXPRESSION><![CDATA[currency]]></DISPLAY_EXPRESSION>
+<!--879667D64C66466297E4113CBABEACA5-->  <NAME><![CDATA[Currency]]></NAME>
+<!--879667D64C66466297E4113CBABEACA5-->  <WIDTH><![CDATA[12]]></WIDTH>
+<!--879667D64C66466297E4113CBABEACA5-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--879667D64C66466297E4113CBABEACA5-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--879667D64C66466297E4113CBABEACA5-->  <INCLUDE_IN><![CDATA[W]]></INCLUDE_IN>
+<!--879667D64C66466297E4113CBABEACA5-->  <HAS_LINK><![CDATA[N]]></HAS_LINK>
+<!--879667D64C66466297E4113CBABEACA5-->  <CAN_BE_FILTERED><![CDATA[Y]]></CAN_BE_FILTERED>
+<!--879667D64C66466297E4113CBABEACA5-->  <WHERECLAUSE_LEFT_PART><![CDATA[inv.currency.iSOCode]]></WHERECLAUSE_LEFT_PART>
+<!--879667D64C66466297E4113CBABEACA5--></OBCQL_QUERY_COLUMN>
+
 <!--88104CDF6CC2418FB405A4B5BA74265D--><OBCQL_QUERY_COLUMN>
 <!--88104CDF6CC2418FB405A4B5BA74265D-->  <OBCQL_QUERY_COLUMN_ID><![CDATA[88104CDF6CC2418FB405A4B5BA74265D]]></OBCQL_QUERY_COLUMN_ID>
 <!--88104CDF6CC2418FB405A4B5BA74265D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -346,7 +447,7 @@
 <!--94B1051270614629B02531C5F894BCF1-->  <NAME><![CDATA[Business Partner]]></NAME>
 <!--94B1051270614629B02531C5F894BCF1-->  <WIDTH><![CDATA[40]]></WIDTH>
 <!--94B1051270614629B02531C5F894BCF1-->  <LINK_EXPRESSION><![CDATA[businessPartnerId]]></LINK_EXPRESSION>
-<!--94B1051270614629B02531C5F894BCF1-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--94B1051270614629B02531C5F894BCF1-->  <SEQNO><![CDATA[30]]></SEQNO>
 <!--94B1051270614629B02531C5F894BCF1-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
 <!--94B1051270614629B02531C5F894BCF1-->  <INCLUDE_IN><![CDATA[W]]></INCLUDE_IN>
 <!--94B1051270614629B02531C5F894BCF1-->  <HAS_LINK><![CDATA[Y]]></HAS_LINK>
@@ -355,6 +456,23 @@
 <!--94B1051270614629B02531C5F894BCF1-->  <WHERECLAUSE_LEFT_PART><![CDATA[p.businessPartner.name]]></WHERECLAUSE_LEFT_PART>
 <!--94B1051270614629B02531C5F894BCF1--></OBCQL_QUERY_COLUMN>
 
+<!--99076BD44F06465DACC0C4BAE01773DC--><OBCQL_QUERY_COLUMN>
+<!--99076BD44F06465DACC0C4BAE01773DC-->  <OBCQL_QUERY_COLUMN_ID><![CDATA[99076BD44F06465DACC0C4BAE01773DC]]></OBCQL_QUERY_COLUMN_ID>
+<!--99076BD44F06465DACC0C4BAE01773DC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--99076BD44F06465DACC0C4BAE01773DC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--99076BD44F06465DACC0C4BAE01773DC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--99076BD44F06465DACC0C4BAE01773DC-->  <OBCQL_WIDGET_QUERY_ID><![CDATA[58BCB96595FA45678CC1423402238309]]></OBCQL_WIDGET_QUERY_ID>
+<!--99076BD44F06465DACC0C4BAE01773DC-->  <DISPLAY_EXPRESSION><![CDATA[organizationName]]></DISPLAY_EXPRESSION>
+<!--99076BD44F06465DACC0C4BAE01773DC-->  <NAME><![CDATA[Organization]]></NAME>
+<!--99076BD44F06465DACC0C4BAE01773DC-->  <WIDTH><![CDATA[30]]></WIDTH>
+<!--99076BD44F06465DACC0C4BAE01773DC-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--99076BD44F06465DACC0C4BAE01773DC-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--99076BD44F06465DACC0C4BAE01773DC-->  <INCLUDE_IN><![CDATA[M]]></INCLUDE_IN>
+<!--99076BD44F06465DACC0C4BAE01773DC-->  <HAS_LINK><![CDATA[N]]></HAS_LINK>
+<!--99076BD44F06465DACC0C4BAE01773DC-->  <CAN_BE_FILTERED><![CDATA[Y]]></CAN_BE_FILTERED>
+<!--99076BD44F06465DACC0C4BAE01773DC-->  <WHERECLAUSE_LEFT_PART><![CDATA[inv.organization.name]]></WHERECLAUSE_LEFT_PART>
+<!--99076BD44F06465DACC0C4BAE01773DC--></OBCQL_QUERY_COLUMN>
+
 <!--9F88542C3F944CDF867298D292C8113C--><OBCQL_QUERY_COLUMN>
 <!--9F88542C3F944CDF867298D292C8113C-->  <OBCQL_QUERY_COLUMN_ID><![CDATA[9F88542C3F944CDF867298D292C8113C]]></OBCQL_QUERY_COLUMN_ID>
 <!--9F88542C3F944CDF867298D292C8113C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -364,7 +482,7 @@
 <!--9F88542C3F944CDF867298D292C8113C-->  <DISPLAY_EXPRESSION><![CDATA[paymentTerms]]></DISPLAY_EXPRESSION>
 <!--9F88542C3F944CDF867298D292C8113C-->  <NAME><![CDATA[Payment Terms]]></NAME>
 <!--9F88542C3F944CDF867298D292C8113C-->  <WIDTH><![CDATA[30]]></WIDTH>
-<!--9F88542C3F944CDF867298D292C8113C-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--9F88542C3F944CDF867298D292C8113C-->  <SEQNO><![CDATA[70]]></SEQNO>
 <!--9F88542C3F944CDF867298D292C8113C-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
 <!--9F88542C3F944CDF867298D292C8113C-->  <INCLUDE_IN><![CDATA[M]]></INCLUDE_IN>
 <!--9F88542C3F944CDF867298D292C8113C-->  <HAS_LINK><![CDATA[N]]></HAS_LINK>
@@ -382,7 +500,7 @@
 <!--9FC7E75A21F34920AA2695261935FD06-->  <NAME><![CDATA[Document Number]]></NAME>
 <!--9FC7E75A21F34920AA2695261935FD06-->  <WIDTH><![CDATA[20]]></WIDTH>
 <!--9FC7E75A21F34920AA2695261935FD06-->  <LINK_EXPRESSION><![CDATA[finpaymentId]]></LINK_EXPRESSION>
-<!--9FC7E75A21F34920AA2695261935FD06-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--9FC7E75A21F34920AA2695261935FD06-->  <SEQNO><![CDATA[20]]></SEQNO>
 <!--9FC7E75A21F34920AA2695261935FD06-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
 <!--9FC7E75A21F34920AA2695261935FD06-->  <INCLUDE_IN><![CDATA[W]]></INCLUDE_IN>
 <!--9FC7E75A21F34920AA2695261935FD06-->  <HAS_LINK><![CDATA[Y]]></HAS_LINK>
@@ -434,7 +552,7 @@
 <!--BBBF2F44391C43F98B4FDEAF62BE81D1-->  <DISPLAY_EXPRESSION><![CDATA[invoiceDate]]></DISPLAY_EXPRESSION>
 <!--BBBF2F44391C43F98B4FDEAF62BE81D1-->  <NAME><![CDATA[Date]]></NAME>
 <!--BBBF2F44391C43F98B4FDEAF62BE81D1-->  <WIDTH><![CDATA[20]]></WIDTH>
-<!--BBBF2F44391C43F98B4FDEAF62BE81D1-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--BBBF2F44391C43F98B4FDEAF62BE81D1-->  <SEQNO><![CDATA[40]]></SEQNO>
 <!--BBBF2F44391C43F98B4FDEAF62BE81D1-->  <AD_REFERENCE_ID><![CDATA[15]]></AD_REFERENCE_ID>
 <!--BBBF2F44391C43F98B4FDEAF62BE81D1-->  <INCLUDE_IN><![CDATA[W]]></INCLUDE_IN>
 <!--BBBF2F44391C43F98B4FDEAF62BE81D1-->  <HAS_LINK><![CDATA[N]]></HAS_LINK>
@@ -486,9 +604,8 @@
 <!--CDC05CE5642E4327BA12FEA50597A8A3-->  <OBCQL_WIDGET_QUERY_ID><![CDATA[1EF87E8E961A4E5BA3B41E1AB772B47C]]></OBCQL_WIDGET_QUERY_ID>
 <!--CDC05CE5642E4327BA12FEA50597A8A3-->  <DISPLAY_EXPRESSION><![CDATA[grandTotalAmount]]></DISPLAY_EXPRESSION>
 <!--CDC05CE5642E4327BA12FEA50597A8A3-->  <NAME><![CDATA[Amount]]></NAME>
-<!--CDC05CE5642E4327BA12FEA50597A8A3-->  <SUMMARIZE_TYPE><![CDATA[sum]]></SUMMARIZE_TYPE>
 <!--CDC05CE5642E4327BA12FEA50597A8A3-->  <WIDTH><![CDATA[20]]></WIDTH>
-<!--CDC05CE5642E4327BA12FEA50597A8A3-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--CDC05CE5642E4327BA12FEA50597A8A3-->  <SEQNO><![CDATA[50]]></SEQNO>
 <!--CDC05CE5642E4327BA12FEA50597A8A3-->  <AD_REFERENCE_ID><![CDATA[12]]></AD_REFERENCE_ID>
 <!--CDC05CE5642E4327BA12FEA50597A8A3-->  <INCLUDE_IN><![CDATA[W]]></INCLUDE_IN>
 <!--CDC05CE5642E4327BA12FEA50597A8A3-->  <HAS_LINK><![CDATA[N]]></HAS_LINK>
@@ -505,7 +622,7 @@
 <!--D8C77A2A8B934351ACF38542FD807183-->  <DISPLAY_EXPRESSION><![CDATA[outstandingAmount]]></DISPLAY_EXPRESSION>
 <!--D8C77A2A8B934351ACF38542FD807183-->  <NAME><![CDATA[Outstanding amount]]></NAME>
 <!--D8C77A2A8B934351ACF38542FD807183-->  <WIDTH><![CDATA[20]]></WIDTH>
-<!--D8C77A2A8B934351ACF38542FD807183-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--D8C77A2A8B934351ACF38542FD807183-->  <SEQNO><![CDATA[80]]></SEQNO>
 <!--D8C77A2A8B934351ACF38542FD807183-->  <AD_REFERENCE_ID><![CDATA[12]]></AD_REFERENCE_ID>
 <!--D8C77A2A8B934351ACF38542FD807183-->  <INCLUDE_IN><![CDATA[M]]></INCLUDE_IN>
 <!--D8C77A2A8B934351ACF38542FD807183-->  <HAS_LINK><![CDATA[N]]></HAS_LINK>
@@ -530,6 +647,23 @@
 <!--DFFE8FF0D0D8414796B134FA89E07F43-->  <WHERECLAUSE_LEFT_PART><![CDATA[ol.salesOrder.orderDate]]></WHERECLAUSE_LEFT_PART>
 <!--DFFE8FF0D0D8414796B134FA89E07F43--></OBCQL_QUERY_COLUMN>
 
+<!--E124D5EEE43A4E1FA0CB7CBC5A87483D--><OBCQL_QUERY_COLUMN>
+<!--E124D5EEE43A4E1FA0CB7CBC5A87483D-->  <OBCQL_QUERY_COLUMN_ID><![CDATA[E124D5EEE43A4E1FA0CB7CBC5A87483D]]></OBCQL_QUERY_COLUMN_ID>
+<!--E124D5EEE43A4E1FA0CB7CBC5A87483D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E124D5EEE43A4E1FA0CB7CBC5A87483D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E124D5EEE43A4E1FA0CB7CBC5A87483D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E124D5EEE43A4E1FA0CB7CBC5A87483D-->  <OBCQL_WIDGET_QUERY_ID><![CDATA[F94AEB4680AD4AD48255071903000A43]]></OBCQL_WIDGET_QUERY_ID>
+<!--E124D5EEE43A4E1FA0CB7CBC5A87483D-->  <DISPLAY_EXPRESSION><![CDATA[currency]]></DISPLAY_EXPRESSION>
+<!--E124D5EEE43A4E1FA0CB7CBC5A87483D-->  <NAME><![CDATA[Currency]]></NAME>
+<!--E124D5EEE43A4E1FA0CB7CBC5A87483D-->  <WIDTH><![CDATA[12]]></WIDTH>
+<!--E124D5EEE43A4E1FA0CB7CBC5A87483D-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--E124D5EEE43A4E1FA0CB7CBC5A87483D-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--E124D5EEE43A4E1FA0CB7CBC5A87483D-->  <INCLUDE_IN><![CDATA[W]]></INCLUDE_IN>
+<!--E124D5EEE43A4E1FA0CB7CBC5A87483D-->  <HAS_LINK><![CDATA[N]]></HAS_LINK>
+<!--E124D5EEE43A4E1FA0CB7CBC5A87483D-->  <CAN_BE_FILTERED><![CDATA[Y]]></CAN_BE_FILTERED>
+<!--E124D5EEE43A4E1FA0CB7CBC5A87483D-->  <WHERECLAUSE_LEFT_PART><![CDATA[p.currency.iSOCode]]></WHERECLAUSE_LEFT_PART>
+<!--E124D5EEE43A4E1FA0CB7CBC5A87483D--></OBCQL_QUERY_COLUMN>
+
 <!--F582F7725D3F40469A956945A85A67AD--><OBCQL_QUERY_COLUMN>
 <!--F582F7725D3F40469A956945A85A67AD-->  <OBCQL_QUERY_COLUMN_ID><![CDATA[F582F7725D3F40469A956945A85A67AD]]></OBCQL_QUERY_COLUMN_ID>
 <!--F582F7725D3F40469A956945A85A67AD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -539,7 +673,7 @@
 <!--F582F7725D3F40469A956945A85A67AD-->  <DISPLAY_EXPRESSION><![CDATA[dueAmount]]></DISPLAY_EXPRESSION>
 <!--F582F7725D3F40469A956945A85A67AD-->  <NAME><![CDATA[Due amount]]></NAME>
 <!--F582F7725D3F40469A956945A85A67AD-->  <WIDTH><![CDATA[20]]></WIDTH>
-<!--F582F7725D3F40469A956945A85A67AD-->  <SEQNO><![CDATA[80]]></SEQNO>
+<!--F582F7725D3F40469A956945A85A67AD-->  <SEQNO><![CDATA[100]]></SEQNO>
 <!--F582F7725D3F40469A956945A85A67AD-->  <AD_REFERENCE_ID><![CDATA[12]]></AD_REFERENCE_ID>
 <!--F582F7725D3F40469A956945A85A67AD-->  <INCLUDE_IN><![CDATA[M]]></INCLUDE_IN>
 <!--F582F7725D3F40469A956945A85A67AD-->  <HAS_LINK><![CDATA[N]]></HAS_LINK>
@@ -556,7 +690,7 @@
 <!--F62EBD9018364D61A8F6D4A5CC0E52E6-->  <DISPLAY_EXPRESSION><![CDATA[paymentTerms]]></DISPLAY_EXPRESSION>
 <!--F62EBD9018364D61A8F6D4A5CC0E52E6-->  <NAME><![CDATA[Payment terms]]></NAME>
 <!--F62EBD9018364D61A8F6D4A5CC0E52E6-->  <WIDTH><![CDATA[30]]></WIDTH>
-<!--F62EBD9018364D61A8F6D4A5CC0E52E6-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--F62EBD9018364D61A8F6D4A5CC0E52E6-->  <SEQNO><![CDATA[70]]></SEQNO>
 <!--F62EBD9018364D61A8F6D4A5CC0E52E6-->  <AD_REFERENCE_ID><![CDATA[14]]></AD_REFERENCE_ID>
 <!--F62EBD9018364D61A8F6D4A5CC0E52E6-->  <INCLUDE_IN><![CDATA[M]]></INCLUDE_IN>
 <!--F62EBD9018364D61A8F6D4A5CC0E52E6-->  <HAS_LINK><![CDATA[N]]></HAS_LINK>
@@ -572,9 +706,8 @@
 <!--FAB0DB1A67D948DB85AD5918B7845ABF-->  <OBCQL_WIDGET_QUERY_ID><![CDATA[58BCB96595FA45678CC1423402238309]]></OBCQL_WIDGET_QUERY_ID>
 <!--FAB0DB1A67D948DB85AD5918B7845ABF-->  <DISPLAY_EXPRESSION><![CDATA[grandTotalAmount]]></DISPLAY_EXPRESSION>
 <!--FAB0DB1A67D948DB85AD5918B7845ABF-->  <NAME><![CDATA[Amount]]></NAME>
-<!--FAB0DB1A67D948DB85AD5918B7845ABF-->  <SUMMARIZE_TYPE><![CDATA[sum]]></SUMMARIZE_TYPE>
 <!--FAB0DB1A67D948DB85AD5918B7845ABF-->  <WIDTH><![CDATA[20]]></WIDTH>
-<!--FAB0DB1A67D948DB85AD5918B7845ABF-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--FAB0DB1A67D948DB85AD5918B7845ABF-->  <SEQNO><![CDATA[50]]></SEQNO>
 <!--FAB0DB1A67D948DB85AD5918B7845ABF-->  <AD_REFERENCE_ID><![CDATA[12]]></AD_REFERENCE_ID>
 <!--FAB0DB1A67D948DB85AD5918B7845ABF-->  <INCLUDE_IN><![CDATA[W]]></INCLUDE_IN>
 <!--FAB0DB1A67D948DB85AD5918B7845ABF-->  <HAS_LINK><![CDATA[N]]></HAS_LINK>
@@ -590,9 +723,8 @@
 <!--FE9812790C0943C584999CEAAD93E95D-->  <OBCQL_WIDGET_QUERY_ID><![CDATA[F94AEB4680AD4AD48255071903000A43]]></OBCQL_WIDGET_QUERY_ID>
 <!--FE9812790C0943C584999CEAAD93E95D-->  <DISPLAY_EXPRESSION><![CDATA[amount]]></DISPLAY_EXPRESSION>
 <!--FE9812790C0943C584999CEAAD93E95D-->  <NAME><![CDATA[Amount]]></NAME>
-<!--FE9812790C0943C584999CEAAD93E95D-->  <SUMMARIZE_TYPE><![CDATA[sum]]></SUMMARIZE_TYPE>
 <!--FE9812790C0943C584999CEAAD93E95D-->  <WIDTH><![CDATA[20]]></WIDTH>
-<!--FE9812790C0943C584999CEAAD93E95D-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--FE9812790C0943C584999CEAAD93E95D-->  <SEQNO><![CDATA[50]]></SEQNO>
 <!--FE9812790C0943C584999CEAAD93E95D-->  <AD_REFERENCE_ID><![CDATA[12]]></AD_REFERENCE_ID>
 <!--FE9812790C0943C584999CEAAD93E95D-->  <INCLUDE_IN><![CDATA[W]]></INCLUDE_IN>
 <!--FE9812790C0943C584999CEAAD93E95D-->  <HAS_LINK><![CDATA[N]]></HAS_LINK>
--- a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/OBCQL_WIDGET_QUERY.xml	Thu Feb 03 09:21:58 2011 +0100
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/OBCQL_WIDGET_QUERY.xml	Thu Feb 03 09:31:31 2011 +0100
@@ -9,8 +9,9 @@
 <!--1EF87E8E961A4E5BA3B41E1AB772B47C-->  <HQL><![CDATA[select inv.id as invoiceId, inv.documentNo as documentNo,
        inv.businessPartner.id as businessPartnerId, inv.businessPartner.name as businessPartnerName,
        inv.invoiceDate as invoiceDate, inv.grandTotalAmount as grandTotalAmount,
-       inv.paymentTerms.name as paymentTerms, inv.outstandingAmount as outstandingAmount,
-       inv.daysTillDue as daysTillDue, inv.dueAmount as dueAmount
+       inv.currency.iSOCode as currency, inv.paymentTerms.name as paymentTerms,
+       inv.outstandingAmount as outstandingAmount, inv.daysTillDue as daysTillDue,
+       inv.dueAmount as dueAmount, inv.organization.name as organizationName
 from Invoice as inv
 where inv.businessPartner.name like :businessPartnerName
       and inv.documentNo like :documentNo
@@ -18,6 +19,8 @@
       and inv.paymentComplete = false
       and inv.salesTransaction = true
       and inv.client.id = :client
+      and inv.organization.id in (:organizationList)
+      and inv.organization.name like :organizationName
       and @optional_filters@
 order by inv.invoiceDate]]></HQL>
 <!--1EF87E8E961A4E5BA3B41E1AB772B47C--></OBCQL_WIDGET_QUERY>
@@ -31,8 +34,9 @@
 <!--58BCB96595FA45678CC1423402238309-->  <HQL><![CDATA[select inv.id as invoiceId, inv.documentNo as documentNo,
        inv.businessPartner.id as businessPartnerId, inv.businessPartner.name as businessPartnerName,
        inv.invoiceDate as invoiceDate, inv.grandTotalAmount as grandTotalAmount,
-       inv.paymentTerms.name as paymentTerms, inv.outstandingAmount as outstandingAmount,
-       inv.daysTillDue as daysTillDue, inv.dueAmount as dueAmount
+       inv.currency.iSOCode as currency, inv.paymentTerms.name as paymentTerms,
+       inv.outstandingAmount as outstandingAmount, inv.daysTillDue as daysTillDue,
+       inv.dueAmount as dueAmount, inv.organization.name as organizationName
 from Invoice as inv
 where inv.businessPartner.name like :businessPartnerName
       and inv.documentNo like :documentNo
@@ -40,6 +44,8 @@
       and inv.paymentComplete = false
       and inv.salesTransaction = false
       and inv.client.id = :client
+      and inv.organization.id in (:organizationList)
+      and inv.organization.name like :organizationName
       and @optional_filters@
 order by inv.invoiceDate]]></HQL>
 <!--58BCB96595FA45678CC1423402238309--></OBCQL_WIDGET_QUERY>
@@ -52,7 +58,8 @@
 <!--E5A0DC8536134185AC8B1897F15DB816-->  <OBKMO_WIDGET_CLASS_ID><![CDATA[2662490B7D3B4F80AF308C88F6DB68C0]]></OBKMO_WIDGET_CLASS_ID>
 <!--E5A0DC8536134185AC8B1897F15DB816-->  <HQL><![CDATA[select p.id as finpaymentId, p.documentNo as documentNo,
        p.businessPartner.id as businessPartnerId, p.businessPartner.name as businessPartnerName,
-       p.paymentDate as paymentDate, p.amount as amount
+       p.paymentDate as paymentDate, p.amount as amount,
+       p.currency.iSOCode as currency, p.organization.name as organizationName
 from FIN_Payment as p
 where p.businessPartner.name like :businessPartnerName
       and p.documentNo like :documentNo
@@ -60,6 +67,8 @@
       and p.processed = true
       and p.receipt = true
       and p.status = 'RPAE'
+      and p.organization.id in (:organizationList)
+      and p.organization.name like :organizationName
       and @optional_filters@
 order by p.paymentDate]]></HQL>
 <!--E5A0DC8536134185AC8B1897F15DB816--></OBCQL_WIDGET_QUERY>
@@ -105,7 +114,8 @@
 <!--F94AEB4680AD4AD48255071903000A43-->  <OBKMO_WIDGET_CLASS_ID><![CDATA[F8E4F382BCFB441CADBB4AC693C41C93]]></OBKMO_WIDGET_CLASS_ID>
 <!--F94AEB4680AD4AD48255071903000A43-->  <HQL><![CDATA[select p.id as finpaymentId, p.documentNo as documentNo,
        p.businessPartner.id as businessPartnerId, p.businessPartner.name as businessPartnerName,
-       p.paymentDate as paymentDate, p.amount as amount
+       p.paymentDate as paymentDate, p.amount as amount,
+       p.currency.iSOCode as currency, p.organization.name as organizationName
 from FIN_Payment as p
 where p.businessPartner.name like :businessPartnerName
       and p.documentNo like :documentNo
@@ -113,6 +123,8 @@
       and p.processed = true
       and p.receipt = false
       and p.status = 'RPAE'
+      and p.organization.id in (:organizationList)
+      and p.organization.name like :organizationName
       and @optional_filters@
 order by p.paymentDate]]></HQL>
 <!--F94AEB4680AD4AD48255071903000A43--></OBCQL_WIDGET_QUERY>
--- a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml	Thu Feb 03 09:21:58 2011 +0100
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml	Thu Feb 03 09:31:31 2011 +0100
@@ -141,6 +141,28 @@
 <!--49F3E4DE139D429997B272E51459F782-->  <EM_OBKMO_WIDGET_CLASS_ID><![CDATA[8267FB3F59D7401980DDDEFF51FE55C3]]></EM_OBKMO_WIDGET_CLASS_ID>
 <!--49F3E4DE139D429997B272E51459F782--></OBUIAPP_PARAMETER>
 
+<!--4DB58FD3F20C49B69D365EDF261A0DB4--><OBUIAPP_PARAMETER>
+<!--4DB58FD3F20C49B69D365EDF261A0DB4-->  <OBUIAPP_PARAMETER_ID><![CDATA[4DB58FD3F20C49B69D365EDF261A0DB4]]></OBUIAPP_PARAMETER_ID>
+<!--4DB58FD3F20C49B69D365EDF261A0DB4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4DB58FD3F20C49B69D365EDF261A0DB4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4DB58FD3F20C49B69D365EDF261A0DB4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4DB58FD3F20C49B69D365EDF261A0DB4-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
+<!--4DB58FD3F20C49B69D365EDF261A0DB4-->  <NAME><![CDATA[Organization List]]></NAME>
+<!--4DB58FD3F20C49B69D365EDF261A0DB4-->  <DESCRIPTION><![CDATA[List of Organizations this Role can access]]></DESCRIPTION>
+<!--4DB58FD3F20C49B69D365EDF261A0DB4-->  <HELP><![CDATA[The Organization List indicates the Organizations (by organization id) that this Role can access.  Multiple Organizations are delimited by a comma ','.]]></HELP>
+<!--4DB58FD3F20C49B69D365EDF261A0DB4-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--4DB58FD3F20C49B69D365EDF261A0DB4-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--4DB58FD3F20C49B69D365EDF261A0DB4-->  <COLUMNNAME><![CDATA[organizationList]]></COLUMNNAME>
+<!--4DB58FD3F20C49B69D365EDF261A0DB4-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--4DB58FD3F20C49B69D365EDF261A0DB4-->  <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
+<!--4DB58FD3F20C49B69D365EDF261A0DB4-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--4DB58FD3F20C49B69D365EDF261A0DB4-->  <AD_ELEMENT_ID><![CDATA[478]]></AD_ELEMENT_ID>
+<!--4DB58FD3F20C49B69D365EDF261A0DB4-->  <ISFIXED><![CDATA[Y]]></ISFIXED>
+<!--4DB58FD3F20C49B69D365EDF261A0DB4-->  <FIXEDVALUE><![CDATA[OB.getContext().getReadableOrganizations()]]></FIXEDVALUE>
+<!--4DB58FD3F20C49B69D365EDF261A0DB4-->  <EVALUATEFIXEDVALUE><![CDATA[Y]]></EVALUATEFIXEDVALUE>
+<!--4DB58FD3F20C49B69D365EDF261A0DB4-->  <EM_OBKMO_WIDGET_CLASS_ID><![CDATA[F8E4F382BCFB441CADBB4AC693C41C93]]></EM_OBKMO_WIDGET_CLASS_ID>
+<!--4DB58FD3F20C49B69D365EDF261A0DB4--></OBUIAPP_PARAMETER>
+
 <!--4FD80623A37C42478E5F71570F98DD05--><OBUIAPP_PARAMETER>
 <!--4FD80623A37C42478E5F71570F98DD05-->  <OBUIAPP_PARAMETER_ID><![CDATA[4FD80623A37C42478E5F71570F98DD05]]></OBUIAPP_PARAMETER_ID>
 <!--4FD80623A37C42478E5F71570F98DD05-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -183,6 +205,28 @@
 <!--5BC2F2EC1140442CA332446CFB9B84BE-->  <EM_OBKMO_WIDGET_CLASS_ID><![CDATA[2662490B7D3B4F80AF308C88F6DB68C0]]></EM_OBKMO_WIDGET_CLASS_ID>
 <!--5BC2F2EC1140442CA332446CFB9B84BE--></OBUIAPP_PARAMETER>
 
+<!--673A1531AE3742D88A02E5E860B966CE--><OBUIAPP_PARAMETER>
+<!--673A1531AE3742D88A02E5E860B966CE-->  <OBUIAPP_PARAMETER_ID><![CDATA[673A1531AE3742D88A02E5E860B966CE]]></OBUIAPP_PARAMETER_ID>
+<!--673A1531AE3742D88A02E5E860B966CE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--673A1531AE3742D88A02E5E860B966CE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--673A1531AE3742D88A02E5E860B966CE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--673A1531AE3742D88A02E5E860B966CE-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
+<!--673A1531AE3742D88A02E5E860B966CE-->  <NAME><![CDATA[Organization]]></NAME>
+<!--673A1531AE3742D88A02E5E860B966CE-->  <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION>
+<!--673A1531AE3742D88A02E5E860B966CE-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
+<!--673A1531AE3742D88A02E5E860B966CE-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--673A1531AE3742D88A02E5E860B966CE-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--673A1531AE3742D88A02E5E860B966CE-->  <COLUMNNAME><![CDATA[organizationName]]></COLUMNNAME>
+<!--673A1531AE3742D88A02E5E860B966CE-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--673A1531AE3742D88A02E5E860B966CE-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--673A1531AE3742D88A02E5E860B966CE-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--673A1531AE3742D88A02E5E860B966CE-->  <DEFAULTVALUE><![CDATA[%]]></DEFAULTVALUE>
+<!--673A1531AE3742D88A02E5E860B966CE-->  <AD_ELEMENT_ID><![CDATA[113]]></AD_ELEMENT_ID>
+<!--673A1531AE3742D88A02E5E860B966CE-->  <ISFIXED><![CDATA[N]]></ISFIXED>
+<!--673A1531AE3742D88A02E5E860B966CE-->  <EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE>
+<!--673A1531AE3742D88A02E5E860B966CE-->  <EM_OBKMO_WIDGET_CLASS_ID><![CDATA[2662490B7D3B4F80AF308C88F6DB68C0]]></EM_OBKMO_WIDGET_CLASS_ID>
+<!--673A1531AE3742D88A02E5E860B966CE--></OBUIAPP_PARAMETER>
+
 <!--7DC0751F8EA64F738DCD618B244407B7--><OBUIAPP_PARAMETER>
 <!--7DC0751F8EA64F738DCD618B244407B7-->  <OBUIAPP_PARAMETER_ID><![CDATA[7DC0751F8EA64F738DCD618B244407B7]]></OBUIAPP_PARAMETER_ID>
 <!--7DC0751F8EA64F738DCD618B244407B7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -245,6 +289,28 @@
 <!--7EB5F1B2034B433592BAA571F3B45013-->  <EM_OBKMO_WIDGET_CLASS_ID><![CDATA[34F279BBB85945519DC38F21573106C0]]></EM_OBKMO_WIDGET_CLASS_ID>
 <!--7EB5F1B2034B433592BAA571F3B45013--></OBUIAPP_PARAMETER>
 
+<!--82EA1952C11049629EF3FD6BE0FB8788--><OBUIAPP_PARAMETER>
+<!--82EA1952C11049629EF3FD6BE0FB8788-->  <OBUIAPP_PARAMETER_ID><![CDATA[82EA1952C11049629EF3FD6BE0FB8788]]></OBUIAPP_PARAMETER_ID>
+<!--82EA1952C11049629EF3FD6BE0FB8788-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--82EA1952C11049629EF3FD6BE0FB8788-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--82EA1952C11049629EF3FD6BE0FB8788-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--82EA1952C11049629EF3FD6BE0FB8788-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
+<!--82EA1952C11049629EF3FD6BE0FB8788-->  <NAME><![CDATA[Organization]]></NAME>
+<!--82EA1952C11049629EF3FD6BE0FB8788-->  <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION>
+<!--82EA1952C11049629EF3FD6BE0FB8788-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
+<!--82EA1952C11049629EF3FD6BE0FB8788-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--82EA1952C11049629EF3FD6BE0FB8788-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--82EA1952C11049629EF3FD6BE0FB8788-->  <COLUMNNAME><![CDATA[organizationName]]></COLUMNNAME>
+<!--82EA1952C11049629EF3FD6BE0FB8788-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--82EA1952C11049629EF3FD6BE0FB8788-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--82EA1952C11049629EF3FD6BE0FB8788-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--82EA1952C11049629EF3FD6BE0FB8788-->  <DEFAULTVALUE><![CDATA[%]]></DEFAULTVALUE>
+<!--82EA1952C11049629EF3FD6BE0FB8788-->  <AD_ELEMENT_ID><![CDATA[113]]></AD_ELEMENT_ID>
+<!--82EA1952C11049629EF3FD6BE0FB8788-->  <ISFIXED><![CDATA[N]]></ISFIXED>
+<!--82EA1952C11049629EF3FD6BE0FB8788-->  <EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE>
+<!--82EA1952C11049629EF3FD6BE0FB8788-->  <EM_OBKMO_WIDGET_CLASS_ID><![CDATA[147D825456D54D0486C3D7072531C5C9]]></EM_OBKMO_WIDGET_CLASS_ID>
+<!--82EA1952C11049629EF3FD6BE0FB8788--></OBUIAPP_PARAMETER>
+
 <!--85337BACFD654FB682935663BAFE067A--><OBUIAPP_PARAMETER>
 <!--85337BACFD654FB682935663BAFE067A-->  <OBUIAPP_PARAMETER_ID><![CDATA[85337BACFD654FB682935663BAFE067A]]></OBUIAPP_PARAMETER_ID>
 <!--85337BACFD654FB682935663BAFE067A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -347,6 +413,28 @@
 <!--9A19936CAFDB4198BB5D3F1EA9D9BF52-->  <EM_OBKMO_WIDGET_CLASS_ID><![CDATA[8267FB3F59D7401980DDDEFF51FE55C3]]></EM_OBKMO_WIDGET_CLASS_ID>
 <!--9A19936CAFDB4198BB5D3F1EA9D9BF52--></OBUIAPP_PARAMETER>
 
+<!--9A6CC0A824134C0BA5022C74341B2F77--><OBUIAPP_PARAMETER>
+<!--9A6CC0A824134C0BA5022C74341B2F77-->  <OBUIAPP_PARAMETER_ID><![CDATA[9A6CC0A824134C0BA5022C74341B2F77]]></OBUIAPP_PARAMETER_ID>
+<!--9A6CC0A824134C0BA5022C74341B2F77-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9A6CC0A824134C0BA5022C74341B2F77-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9A6CC0A824134C0BA5022C74341B2F77-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9A6CC0A824134C0BA5022C74341B2F77-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
+<!--9A6CC0A824134C0BA5022C74341B2F77-->  <NAME><![CDATA[Organization List]]></NAME>
+<!--9A6CC0A824134C0BA5022C74341B2F77-->  <DESCRIPTION><![CDATA[List of Organizations this Role can access]]></DESCRIPTION>
+<!--9A6CC0A824134C0BA5022C74341B2F77-->  <HELP><![CDATA[The Organization List indicates the Organizations (by organization id) that this Role can access.  Multiple Organizations are delimited by a comma ','.]]></HELP>
+<!--9A6CC0A824134C0BA5022C74341B2F77-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--9A6CC0A824134C0BA5022C74341B2F77-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--9A6CC0A824134C0BA5022C74341B2F77-->  <COLUMNNAME><![CDATA[organizationList]]></COLUMNNAME>
+<!--9A6CC0A824134C0BA5022C74341B2F77-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--9A6CC0A824134C0BA5022C74341B2F77-->  <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
+<!--9A6CC0A824134C0BA5022C74341B2F77-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--9A6CC0A824134C0BA5022C74341B2F77-->  <AD_ELEMENT_ID><![CDATA[478]]></AD_ELEMENT_ID>
+<!--9A6CC0A824134C0BA5022C74341B2F77-->  <ISFIXED><![CDATA[Y]]></ISFIXED>
+<!--9A6CC0A824134C0BA5022C74341B2F77-->  <FIXEDVALUE><![CDATA[OB.getContext().getReadableOrganizations()]]></FIXEDVALUE>
+<!--9A6CC0A824134C0BA5022C74341B2F77-->  <EVALUATEFIXEDVALUE><![CDATA[Y]]></EVALUATEFIXEDVALUE>
+<!--9A6CC0A824134C0BA5022C74341B2F77-->  <EM_OBKMO_WIDGET_CLASS_ID><![CDATA[147D825456D54D0486C3D7072531C5C9]]></EM_OBKMO_WIDGET_CLASS_ID>
+<!--9A6CC0A824134C0BA5022C74341B2F77--></OBUIAPP_PARAMETER>
+
 <!--A0A9C9C09E3E4B3FB139B336B142318C--><OBUIAPP_PARAMETER>
 <!--A0A9C9C09E3E4B3FB139B336B142318C-->  <OBUIAPP_PARAMETER_ID><![CDATA[A0A9C9C09E3E4B3FB139B336B142318C]]></OBUIAPP_PARAMETER_ID>
 <!--A0A9C9C09E3E4B3FB139B336B142318C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -387,6 +475,28 @@
 <!--A7A63C2BB6114D999FE017B516FEF6BD-->  <EM_OBKMO_WIDGET_CLASS_ID><![CDATA[F8E4F382BCFB441CADBB4AC693C41C93]]></EM_OBKMO_WIDGET_CLASS_ID>
 <!--A7A63C2BB6114D999FE017B516FEF6BD--></OBUIAPP_PARAMETER>
 
+<!--A951D8B8F9AC48DEB9A08B79D973F37F--><OBUIAPP_PARAMETER>
+<!--A951D8B8F9AC48DEB9A08B79D973F37F-->  <OBUIAPP_PARAMETER_ID><![CDATA[A951D8B8F9AC48DEB9A08B79D973F37F]]></OBUIAPP_PARAMETER_ID>
+<!--A951D8B8F9AC48DEB9A08B79D973F37F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A951D8B8F9AC48DEB9A08B79D973F37F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A951D8B8F9AC48DEB9A08B79D973F37F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A951D8B8F9AC48DEB9A08B79D973F37F-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
+<!--A951D8B8F9AC48DEB9A08B79D973F37F-->  <NAME><![CDATA[Organization]]></NAME>
+<!--A951D8B8F9AC48DEB9A08B79D973F37F-->  <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION>
+<!--A951D8B8F9AC48DEB9A08B79D973F37F-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
+<!--A951D8B8F9AC48DEB9A08B79D973F37F-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--A951D8B8F9AC48DEB9A08B79D973F37F-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--A951D8B8F9AC48DEB9A08B79D973F37F-->  <COLUMNNAME><![CDATA[organizationName]]></COLUMNNAME>
+<!--A951D8B8F9AC48DEB9A08B79D973F37F-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--A951D8B8F9AC48DEB9A08B79D973F37F-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--A951D8B8F9AC48DEB9A08B79D973F37F-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--A951D8B8F9AC48DEB9A08B79D973F37F-->  <DEFAULTVALUE><![CDATA[%]]></DEFAULTVALUE>
+<!--A951D8B8F9AC48DEB9A08B79D973F37F-->  <AD_ELEMENT_ID><![CDATA[113]]></AD_ELEMENT_ID>
+<!--A951D8B8F9AC48DEB9A08B79D973F37F-->  <ISFIXED><![CDATA[N]]></ISFIXED>
+<!--A951D8B8F9AC48DEB9A08B79D973F37F-->  <EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE>
+<!--A951D8B8F9AC48DEB9A08B79D973F37F-->  <EM_OBKMO_WIDGET_CLASS_ID><![CDATA[F8E4F382BCFB441CADBB4AC693C41C93]]></EM_OBKMO_WIDGET_CLASS_ID>
+<!--A951D8B8F9AC48DEB9A08B79D973F37F--></OBUIAPP_PARAMETER>
+
 <!--B4C48DBD0EDF43E8958DBA507CA1D75D--><OBUIAPP_PARAMETER>
 <!--B4C48DBD0EDF43E8958DBA507CA1D75D-->  <OBUIAPP_PARAMETER_ID><![CDATA[B4C48DBD0EDF43E8958DBA507CA1D75D]]></OBUIAPP_PARAMETER_ID>
 <!--B4C48DBD0EDF43E8958DBA507CA1D75D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -486,6 +596,28 @@
 <!--D0335F9B1A45470A990020CE2ADA3286-->  <EM_OBKMO_WIDGET_CLASS_ID><![CDATA[8267FB3F59D7401980DDDEFF51FE55C3]]></EM_OBKMO_WIDGET_CLASS_ID>
 <!--D0335F9B1A45470A990020CE2ADA3286--></OBUIAPP_PARAMETER>
 
+<!--D06EBB6A9B8643F1839D69269915A333--><OBUIAPP_PARAMETER>
+<!--D06EBB6A9B8643F1839D69269915A333-->  <OBUIAPP_PARAMETER_ID><![CDATA[D06EBB6A9B8643F1839D69269915A333]]></OBUIAPP_PARAMETER_ID>
+<!--D06EBB6A9B8643F1839D69269915A333-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D06EBB6A9B8643F1839D69269915A333-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D06EBB6A9B8643F1839D69269915A333-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D06EBB6A9B8643F1839D69269915A333-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
+<!--D06EBB6A9B8643F1839D69269915A333-->  <NAME><![CDATA[Organization List]]></NAME>
+<!--D06EBB6A9B8643F1839D69269915A333-->  <DESCRIPTION><![CDATA[List of Organizations this Role can access]]></DESCRIPTION>
+<!--D06EBB6A9B8643F1839D69269915A333-->  <HELP><![CDATA[The Organization List indicates the Organizations (by organization id) that this Role can access.  Multiple Organizations are delimited by a comma ','.]]></HELP>
+<!--D06EBB6A9B8643F1839D69269915A333-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--D06EBB6A9B8643F1839D69269915A333-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--D06EBB6A9B8643F1839D69269915A333-->  <COLUMNNAME><![CDATA[organizationList]]></COLUMNNAME>
+<!--D06EBB6A9B8643F1839D69269915A333-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--D06EBB6A9B8643F1839D69269915A333-->  <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
+<!--D06EBB6A9B8643F1839D69269915A333-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--D06EBB6A9B8643F1839D69269915A333-->  <AD_ELEMENT_ID><![CDATA[478]]></AD_ELEMENT_ID>
+<!--D06EBB6A9B8643F1839D69269915A333-->  <ISFIXED><![CDATA[Y]]></ISFIXED>
+<!--D06EBB6A9B8643F1839D69269915A333-->  <FIXEDVALUE><![CDATA[OB.getContext().getReadableOrganizations()]]></FIXEDVALUE>
+<!--D06EBB6A9B8643F1839D69269915A333-->  <EVALUATEFIXEDVALUE><![CDATA[Y]]></EVALUATEFIXEDVALUE>
+<!--D06EBB6A9B8643F1839D69269915A333-->  <EM_OBKMO_WIDGET_CLASS_ID><![CDATA[2662490B7D3B4F80AF308C88F6DB68C0]]></EM_OBKMO_WIDGET_CLASS_ID>
+<!--D06EBB6A9B8643F1839D69269915A333--></OBUIAPP_PARAMETER>
+
 <!--D5DE165821F24FCC85707DDEA592BB27--><OBUIAPP_PARAMETER>
 <!--D5DE165821F24FCC85707DDEA592BB27-->  <OBUIAPP_PARAMETER_ID><![CDATA[D5DE165821F24FCC85707DDEA592BB27]]></OBUIAPP_PARAMETER_ID>
 <!--D5DE165821F24FCC85707DDEA592BB27-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -546,6 +678,50 @@
 <!--E461447FAC5741098A4824449DA12709-->  <EM_OBKMO_WIDGET_CLASS_ID><![CDATA[147D825456D54D0486C3D7072531C5C9]]></EM_OBKMO_WIDGET_CLASS_ID>
 <!--E461447FAC5741098A4824449DA12709--></OBUIAPP_PARAMETER>
 
+<!--E5824A3DCC9D475EAC49D01BAB9A94C9--><OBUIAPP_PARAMETER>
+<!--E5824A3DCC9D475EAC49D01BAB9A94C9-->  <OBUIAPP_PARAMETER_ID><![CDATA[E5824A3DCC9D475EAC49D01BAB9A94C9]]></OBUIAPP_PARAMETER_ID>
+<!--E5824A3DCC9D475EAC49D01BAB9A94C9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E5824A3DCC9D475EAC49D01BAB9A94C9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E5824A3DCC9D475EAC49D01BAB9A94C9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E5824A3DCC9D475EAC49D01BAB9A94C9-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
+<!--E5824A3DCC9D475EAC49D01BAB9A94C9-->  <NAME><![CDATA[Organization]]></NAME>
+<!--E5824A3DCC9D475EAC49D01BAB9A94C9-->  <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION>
+<!--E5824A3DCC9D475EAC49D01BAB9A94C9-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
+<!--E5824A3DCC9D475EAC49D01BAB9A94C9-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--E5824A3DCC9D475EAC49D01BAB9A94C9-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--E5824A3DCC9D475EAC49D01BAB9A94C9-->  <COLUMNNAME><![CDATA[organizationName]]></COLUMNNAME>
+<!--E5824A3DCC9D475EAC49D01BAB9A94C9-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--E5824A3DCC9D475EAC49D01BAB9A94C9-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--E5824A3DCC9D475EAC49D01BAB9A94C9-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--E5824A3DCC9D475EAC49D01BAB9A94C9-->  <DEFAULTVALUE><![CDATA[%]]></DEFAULTVALUE>
+<!--E5824A3DCC9D475EAC49D01BAB9A94C9-->  <AD_ELEMENT_ID><![CDATA[113]]></AD_ELEMENT_ID>
+<!--E5824A3DCC9D475EAC49D01BAB9A94C9-->  <ISFIXED><![CDATA[N]]></ISFIXED>
+<!--E5824A3DCC9D475EAC49D01BAB9A94C9-->  <EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE>
+<!--E5824A3DCC9D475EAC49D01BAB9A94C9-->  <EM_OBKMO_WIDGET_CLASS_ID><![CDATA[34F279BBB85945519DC38F21573106C0]]></EM_OBKMO_WIDGET_CLASS_ID>
+<!--E5824A3DCC9D475EAC49D01BAB9A94C9--></OBUIAPP_PARAMETER>
+
+<!--F2D289D700814FB7B4E1F746A1C0C101--><OBUIAPP_PARAMETER>
+<!--F2D289D700814FB7B4E1F746A1C0C101-->  <OBUIAPP_PARAMETER_ID><![CDATA[F2D289D700814FB7B4E1F746A1C0C101]]></OBUIAPP_PARAMETER_ID>
+<!--F2D289D700814FB7B4E1F746A1C0C101-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F2D289D700814FB7B4E1F746A1C0C101-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F2D289D700814FB7B4E1F746A1C0C101-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F2D289D700814FB7B4E1F746A1C0C101-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
+<!--F2D289D700814FB7B4E1F746A1C0C101-->  <NAME><![CDATA[Organization List]]></NAME>
+<!--F2D289D700814FB7B4E1F746A1C0C101-->  <DESCRIPTION><![CDATA[List of Organizations this Role can access]]></DESCRIPTION>
+<!--F2D289D700814FB7B4E1F746A1C0C101-->  <HELP><![CDATA[The Organization List indicates the Organizations (by organization id) that this Role can access.  Multiple Organizations are delimited by a comma ','.]]></HELP>
+<!--F2D289D700814FB7B4E1F746A1C0C101-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--F2D289D700814FB7B4E1F746A1C0C101-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--F2D289D700814FB7B4E1F746A1C0C101-->  <COLUMNNAME><![CDATA[organizationList]]></COLUMNNAME>
+<!--F2D289D700814FB7B4E1F746A1C0C101-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--F2D289D700814FB7B4E1F746A1C0C101-->  <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
+<!--F2D289D700814FB7B4E1F746A1C0C101-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--F2D289D700814FB7B4E1F746A1C0C101-->  <AD_ELEMENT_ID><![CDATA[478]]></AD_ELEMENT_ID>
+<!--F2D289D700814FB7B4E1F746A1C0C101-->  <ISFIXED><![CDATA[Y]]></ISFIXED>
+<!--F2D289D700814FB7B4E1F746A1C0C101-->  <FIXEDVALUE><![CDATA[OB.getContext().getReadableOrganizations()]]></FIXEDVALUE>
+<!--F2D289D700814FB7B4E1F746A1C0C101-->  <EVALUATEFIXEDVALUE><![CDATA[Y]]></EVALUATEFIXEDVALUE>
+<!--F2D289D700814FB7B4E1F746A1C0C101-->  <EM_OBKMO_WIDGET_CLASS_ID><![CDATA[34F279BBB85945519DC38F21573106C0]]></EM_OBKMO_WIDGET_CLASS_ID>
+<!--F2D289D700814FB7B4E1F746A1C0C101--></OBUIAPP_PARAMETER>
+
 <!--F6CC88DE80C644F6901F5132CF2919E8--><OBUIAPP_PARAMETER>
 <!--F6CC88DE80C644F6901F5132CF2919E8-->  <OBUIAPP_PARAMETER_ID><![CDATA[F6CC88DE80C644F6901F5132CF2919E8]]></OBUIAPP_PARAMETER_ID>
 <!--F6CC88DE80C644F6901F5132CF2919E8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>