[P&E] Merge changes from pi
authorIván Perdomo <ivan.perdomo@openbravo.com>
Thu, 17 Nov 2011 13:04:04 +0100
changeset 14627 99d3411b0e69
parent 14626 44577cc0444b (current diff)
parent 14298 e12facb86555 (diff)
child 14628 9b379c20584d
[P&E] Merge changes from pi
modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_PARAMETER.xml
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_WINDOW.xml
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_WINDOW.xml
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_WINDOW.xml
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_WINDOW.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_WINDOW.xml
modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java
src-db/database/sourcedata/AD_COLUMN.xml
src-db/database/sourcedata/AD_FIELD.xml
src-db/database/sourcedata/AD_WINDOW.xml
src/index.jsp
--- a/.hgsigs	Thu Nov 17 12:32:36 2011 +0100
+++ b/.hgsigs	Thu Nov 17 13:04:04 2011 +0100
@@ -45,3 +45,4 @@
 851d60ba120c48644beb5b9469acff1dbdb7368c 0 iEYEABECAAYFAk6daREACgkQCX/oGf+2qkN7twCg2ekW1o6w98p9Bvacblx2q3zOBYIAoJihfu3/n4If7/CHg4um1nqYvBvC
 19fb1243d437ff7490e6ad44018c4e403cf18af4 0 iEYEABECAAYFAk6YPpEACgkQCX/oGf+2qkO6NwCeJdcbggzlqxYL7K1NG98pjnWjH60AoL/aHl5Qi1e2UvFGbAeFcJZmR2AH
 6f5b96ecdf0cb377597c0abad63dc98aacfa3b6d 0 iEYEABECAAYFAk6gfrgACgkQCX/oGf+2qkN7WQCg/WowvRSY1dn1vXn2NRNWg/vL+YIAmwbYIbwrsnLS/rPFsoUDWsEMX2U6
+e3386a2cd54020855bb2b3efa1c0afcfdf30a2b4 0 iEYEABECAAYFAk67/uoACgkQCX/oGf+2qkPXfQCg3lQiuBbJnVsPfnL8LWukEVG5CsIAoKsRfoVp93C1SY2N0iMl1LqT7CmB
--- a/.hgtags	Thu Nov 17 12:32:36 2011 +0100
+++ b/.hgtags	Thu Nov 17 13:04:04 2011 +0100
@@ -56,3 +56,4 @@
 90cf0099c87c7edc0fe925ffc5df21ea55449186 3.0MP3.1
 4e9fa8e7edbc01b25ebaa4aefb7b9cff61a91f98 3.0MP4
 f7371a7182533fe4717596b18262d42176fefe40 3.0MP4.1
+bee1528a5966a4681a86ed0c9f7129f8f8818ab1 3.0MP5
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_AUXILIARINPUT.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_AUXILIARINPUT.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -1,5 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <data>
+<!--21943DF0B89F4AE3AF14A9C06F1181C2--><AD_AUXILIARINPUT>
+<!--21943DF0B89F4AE3AF14A9C06F1181C2-->  <AD_AUXILIARINPUT_ID><![CDATA[21943DF0B89F4AE3AF14A9C06F1181C2]]></AD_AUXILIARINPUT_ID>
+<!--21943DF0B89F4AE3AF14A9C06F1181C2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--21943DF0B89F4AE3AF14A9C06F1181C2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--21943DF0B89F4AE3AF14A9C06F1181C2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--21943DF0B89F4AE3AF14A9C06F1181C2-->  <AD_TAB_ID><![CDATA[FF8080813320657F0133209DE21B0042]]></AD_TAB_ID>
+<!--21943DF0B89F4AE3AF14A9C06F1181C2-->  <NAME><![CDATA[Forced_Table_ID]]></NAME>
+<!--21943DF0B89F4AE3AF14A9C06F1181C2-->  <CODE><![CDATA[@AD_TABLE_ID@]]></CODE>
+<!--21943DF0B89F4AE3AF14A9C06F1181C2-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--21943DF0B89F4AE3AF14A9C06F1181C2--></AD_AUXILIARINPUT>
+
 <!--9D630C9E4C734361BFB09B153EEE3BCB--><AD_AUXILIARINPUT>
 <!--9D630C9E4C734361BFB09B153EEE3BCB-->  <AD_AUXILIARINPUT_ID><![CDATA[9D630C9E4C734361BFB09B153EEE3BCB]]></AD_AUXILIARINPUT_ID>
 <!--9D630C9E4C734361BFB09B153EEE3BCB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -9,6 +9,7 @@
 <!--093017D15DE649259C329641ADC41321-->  <NAME><![CDATA[FIN_Finacc_Transaction_Acct_ID]]></NAME>
 <!--093017D15DE649259C329641ADC41321-->  <PRINTNAME><![CDATA[FIN_Finacc_Transaction_Acct_ID]]></PRINTNAME>
 <!--093017D15DE649259C329641ADC41321-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--093017D15DE649259C329641ADC41321-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--093017D15DE649259C329641ADC41321--></AD_ELEMENT>
 
 <!--36C60E53F1274EDA827ED5146A2B13D1--><AD_ELEMENT>
@@ -20,6 +21,7 @@
 <!--36C60E53F1274EDA827ED5146A2B13D1-->  <NAME><![CDATA[Process Proposal]]></NAME>
 <!--36C60E53F1274EDA827ED5146A2B13D1-->  <PRINTNAME><![CDATA[Process Proposal]]></PRINTNAME>
 <!--36C60E53F1274EDA827ED5146A2B13D1-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--36C60E53F1274EDA827ED5146A2B13D1-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--36C60E53F1274EDA827ED5146A2B13D1--></AD_ELEMENT>
 
 <!--4AC57284C5C745EB9087C105222EDF02--><AD_ELEMENT>
@@ -31,6 +33,7 @@
 <!--4AC57284C5C745EB9087C105222EDF02-->  <NAME><![CDATA[APRM_Rec_Detail_V_ID]]></NAME>
 <!--4AC57284C5C745EB9087C105222EDF02-->  <PRINTNAME><![CDATA[APRM_Rec_Detail_V_ID]]></PRINTNAME>
 <!--4AC57284C5C745EB9087C105222EDF02-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--4AC57284C5C745EB9087C105222EDF02-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--4AC57284C5C745EB9087C105222EDF02--></AD_ELEMENT>
 
 <!--6037A140C2664B6991BFD4EC7561A662--><AD_ELEMENT>
@@ -42,6 +45,7 @@
 <!--6037A140C2664B6991BFD4EC7561A662-->  <NAME><![CDATA[Aprm_Finacc_Trx_Full_Acct_V_ID]]></NAME>
 <!--6037A140C2664B6991BFD4EC7561A662-->  <PRINTNAME><![CDATA[Aprm_Finacc_Trx_Full_Acct_V_ID]]></PRINTNAME>
 <!--6037A140C2664B6991BFD4EC7561A662-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--6037A140C2664B6991BFD4EC7561A662-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--6037A140C2664B6991BFD4EC7561A662--></AD_ELEMENT>
 
 <!--720C4FC08FBD43419FF7EACABECA6AE3--><AD_ELEMENT>
@@ -53,6 +57,7 @@
 <!--720C4FC08FBD43419FF7EACABECA6AE3-->  <NAME><![CDATA[reconciliationId]]></NAME>
 <!--720C4FC08FBD43419FF7EACABECA6AE3-->  <PRINTNAME><![CDATA[reconciliationId]]></PRINTNAME>
 <!--720C4FC08FBD43419FF7EACABECA6AE3-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--720C4FC08FBD43419FF7EACABECA6AE3-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--720C4FC08FBD43419FF7EACABECA6AE3--></AD_ELEMENT>
 
 <!--77E12B7AAB9F45BF9D3263E5967A696A--><AD_ELEMENT>
@@ -64,6 +69,7 @@
 <!--77E12B7AAB9F45BF9D3263E5967A696A-->  <NAME><![CDATA[language]]></NAME>
 <!--77E12B7AAB9F45BF9D3263E5967A696A-->  <PRINTNAME><![CDATA[language]]></PRINTNAME>
 <!--77E12B7AAB9F45BF9D3263E5967A696A-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--77E12B7AAB9F45BF9D3263E5967A696A-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--77E12B7AAB9F45BF9D3263E5967A696A--></AD_ELEMENT>
 
 <!--78A3787B4823C096E040007F0101250E--><AD_ELEMENT>
@@ -77,6 +83,7 @@
 <!--78A3787B4823C096E040007F0101250E-->  <DESCRIPTION><![CDATA[Add Payment In/Out button.]]></DESCRIPTION>
 <!--78A3787B4823C096E040007F0101250E-->  <HELP><![CDATA[Launches a process to add a payment in/out to the selected invoice.]]></HELP>
 <!--78A3787B4823C096E040007F0101250E-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--78A3787B4823C096E040007F0101250E-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--78A3787B4823C096E040007F0101250E--></AD_ELEMENT>
 
 <!--7DC34559B412B45BE040007F0100784A--><AD_ELEMENT>
@@ -88,6 +95,7 @@
 <!--7DC34559B412B45BE040007F0100784A-->  <NAME><![CDATA[Process Payment]]></NAME>
 <!--7DC34559B412B45BE040007F0100784A-->  <PRINTNAME><![CDATA[Process Payment]]></PRINTNAME>
 <!--7DC34559B412B45BE040007F0100784A-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--7DC34559B412B45BE040007F0100784A-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--7DC34559B412B45BE040007F0100784A--></AD_ELEMENT>
 
 <!--7DC34559B413B45BE040007F0100784A--><AD_ELEMENT>
@@ -99,6 +107,7 @@
 <!--7DC34559B413B45BE040007F0100784A-->  <NAME><![CDATA[Reconcile Payment]]></NAME>
 <!--7DC34559B413B45BE040007F0100784A-->  <PRINTNAME><![CDATA[Reconcile Payment]]></PRINTNAME>
 <!--7DC34559B413B45BE040007F0100784A-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--7DC34559B413B45BE040007F0100784A-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--7DC34559B413B45BE040007F0100784A--></AD_ELEMENT>
 
 <!--7FCAAFE989BEA375E040007F01007F0A--><AD_ELEMENT>
@@ -110,6 +119,7 @@
 <!--7FCAAFE989BEA375E040007F01007F0A-->  <NAME><![CDATA[EM_Aprm_Add_Scheduledpayments]]></NAME>
 <!--7FCAAFE989BEA375E040007F01007F0A-->  <PRINTNAME><![CDATA[EM_Aprm_Add_Scheduledpayments]]></PRINTNAME>
 <!--7FCAAFE989BEA375E040007F01007F0A-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--7FCAAFE989BEA375E040007F01007F0A-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--7FCAAFE989BEA375E040007F01007F0A--></AD_ELEMENT>
 
 <!--82EFB8E4045B19C9E040007F01003778--><AD_ELEMENT>
@@ -121,6 +131,7 @@
 <!--82EFB8E4045B19C9E040007F01003778-->  <NAME><![CDATA[Unreconciled Bank Statement Lines Amount]]></NAME>
 <!--82EFB8E4045B19C9E040007F01003778-->  <PRINTNAME><![CDATA[Unreconciled Bank Statement Lines Amount]]></PRINTNAME>
 <!--82EFB8E4045B19C9E040007F01003778-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--82EFB8E4045B19C9E040007F01003778-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--82EFB8E4045B19C9E040007F01003778--></AD_ELEMENT>
 
 <!--82EFB8E4045C19C9E040007F01003778--><AD_ELEMENT>
@@ -132,6 +143,7 @@
 <!--82EFB8E4045C19C9E040007F01003778-->  <NAME><![CDATA[Unreconciled Bank Statement Lines]]></NAME>
 <!--82EFB8E4045C19C9E040007F01003778-->  <PRINTNAME><![CDATA[Unreconciled Bank Statement Lines]]></PRINTNAME>
 <!--82EFB8E4045C19C9E040007F01003778-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--82EFB8E4045C19C9E040007F01003778-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--82EFB8E4045C19C9E040007F01003778--></AD_ELEMENT>
 
 <!--82EFB8E4045D19C9E040007F01003778--><AD_ELEMENT>
@@ -143,6 +155,7 @@
 <!--82EFB8E4045D19C9E040007F01003778-->  <NAME><![CDATA[Outstanding Deposits]]></NAME>
 <!--82EFB8E4045D19C9E040007F01003778-->  <PRINTNAME><![CDATA[Outstanding Deposits]]></PRINTNAME>
 <!--82EFB8E4045D19C9E040007F01003778-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--82EFB8E4045D19C9E040007F01003778-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--82EFB8E4045D19C9E040007F01003778--></AD_ELEMENT>
 
 <!--82EFB8E4045E19C9E040007F01003778--><AD_ELEMENT>
@@ -154,6 +167,7 @@
 <!--82EFB8E4045E19C9E040007F01003778-->  <NAME><![CDATA[Reconciled Items]]></NAME>
 <!--82EFB8E4045E19C9E040007F01003778-->  <PRINTNAME><![CDATA[Reconciled Items]]></PRINTNAME>
 <!--82EFB8E4045E19C9E040007F01003778-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--82EFB8E4045E19C9E040007F01003778-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--82EFB8E4045E19C9E040007F01003778--></AD_ELEMENT>
 
 <!--82EFB8E4045F19C9E040007F01003778--><AD_ELEMENT>
@@ -165,6 +179,7 @@
 <!--82EFB8E4045F19C9E040007F01003778-->  <NAME><![CDATA[Reconciled Items Amount]]></NAME>
 <!--82EFB8E4045F19C9E040007F01003778-->  <PRINTNAME><![CDATA[Reconciled Items Amount]]></PRINTNAME>
 <!--82EFB8E4045F19C9E040007F01003778-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--82EFB8E4045F19C9E040007F01003778-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--82EFB8E4045F19C9E040007F01003778--></AD_ELEMENT>
 
 <!--82EFB8E4046119C9E040007F01003778--><AD_ELEMENT>
@@ -176,6 +191,7 @@
 <!--82EFB8E4046119C9E040007F01003778-->  <NAME><![CDATA[Outstanding Payments Amount]]></NAME>
 <!--82EFB8E4046119C9E040007F01003778-->  <PRINTNAME><![CDATA[Outstanding Payments Amount]]></PRINTNAME>
 <!--82EFB8E4046119C9E040007F01003778-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--82EFB8E4046119C9E040007F01003778-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--82EFB8E4046119C9E040007F01003778--></AD_ELEMENT>
 
 <!--82EFB8E4046219C9E040007F01003778--><AD_ELEMENT>
@@ -187,6 +203,7 @@
 <!--82EFB8E4046219C9E040007F01003778-->  <NAME><![CDATA[Outstanding Deposit Amount]]></NAME>
 <!--82EFB8E4046219C9E040007F01003778-->  <PRINTNAME><![CDATA[Outstanding Deposit Amount]]></PRINTNAME>
 <!--82EFB8E4046219C9E040007F01003778-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--82EFB8E4046219C9E040007F01003778-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--82EFB8E4046219C9E040007F01003778--></AD_ELEMENT>
 
 <!--82EFB8E4046319C9E040007F01003778--><AD_ELEMENT>
@@ -198,6 +215,7 @@
 <!--82EFB8E4046319C9E040007F01003778-->  <NAME><![CDATA[Outstanding Payments]]></NAME>
 <!--82EFB8E4046319C9E040007F01003778-->  <PRINTNAME><![CDATA[Outstanding Payments]]></PRINTNAME>
 <!--82EFB8E4046319C9E040007F01003778-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--82EFB8E4046319C9E040007F01003778-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--82EFB8E4046319C9E040007F01003778--></AD_ELEMENT>
 
 <!--8337CDFBF2904C07AB7F9D69E1536663--><AD_ELEMENT>
@@ -210,6 +228,7 @@
 <!--8337CDFBF2904C07AB7F9D69E1536663-->  <PRINTNAME><![CDATA[Select Expected Payments]]></PRINTNAME>
 <!--8337CDFBF2904C07AB7F9D69E1536663-->  <DESCRIPTION><![CDATA[Select Expected Payments]]></DESCRIPTION>
 <!--8337CDFBF2904C07AB7F9D69E1536663-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--8337CDFBF2904C07AB7F9D69E1536663-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--8337CDFBF2904C07AB7F9D69E1536663--></AD_ELEMENT>
 
 <!--8448D8212AA95824E040007F01001A1B--><AD_ELEMENT>
@@ -223,6 +242,7 @@
 <!--8448D8212AA95824E040007F01001A1B-->  <DESCRIPTION><![CDATA[Hidden column to set the source table id in views.]]></DESCRIPTION>
 <!--8448D8212AA95824E040007F01001A1B-->  <HELP><![CDATA[Hidden column to set the source table id in views. It is needed when creating a tab from a view which will trigger accounting. In that case the original AD_Table_ID is loaded through Forced_Table_ID.]]></HELP>
 <!--8448D8212AA95824E040007F01001A1B-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--8448D8212AA95824E040007F01001A1B-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--8448D8212AA95824E040007F01001A1B--></AD_ELEMENT>
 
 <!--844A9DAD72227690E040007F01003A28--><AD_ELEMENT>
@@ -234,6 +254,7 @@
 <!--844A9DAD72227690E040007F01003A28-->  <NAME><![CDATA[Aprm_Reconciliation_V]]></NAME>
 <!--844A9DAD72227690E040007F01003A28-->  <PRINTNAME><![CDATA[Aprm_Reconciliation_V]]></PRINTNAME>
 <!--844A9DAD72227690E040007F01003A28-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--844A9DAD72227690E040007F01003A28-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--844A9DAD72227690E040007F01003A28--></AD_ELEMENT>
 
 <!--87AA1068F10742CAE040007F010011D5--><AD_ELEMENT>
@@ -245,6 +266,7 @@
 <!--87AA1068F10742CAE040007F010011D5-->  <NAME><![CDATA[Execute Payment]]></NAME>
 <!--87AA1068F10742CAE040007F010011D5-->  <PRINTNAME><![CDATA[Execute Payment]]></PRINTNAME>
 <!--87AA1068F10742CAE040007F010011D5-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--87AA1068F10742CAE040007F010011D5-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--87AA1068F10742CAE040007F010011D5--></AD_ELEMENT>
 
 <!--8B4372E6182C902CE040007F01000EB9--><AD_ELEMENT>
@@ -256,6 +278,7 @@
 <!--8B4372E6182C902CE040007F01000EB9-->  <NAME><![CDATA[EM_APRM_Processinvoice]]></NAME>
 <!--8B4372E6182C902CE040007F01000EB9-->  <PRINTNAME><![CDATA[EM_APRM_Processinvoice]]></PRINTNAME>
 <!--8B4372E6182C902CE040007F01000EB9-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--8B4372E6182C902CE040007F01000EB9-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--8B4372E6182C902CE040007F01000EB9--></AD_ELEMENT>
 
 <!--8BBA8342ED3C20FFE040007F01002E9B--><AD_ELEMENT>
@@ -267,6 +290,7 @@
 <!--8BBA8342ED3C20FFE040007F01002E9B-->  <NAME><![CDATA[Aprm_Pending_Paymentinvoice_ID]]></NAME>
 <!--8BBA8342ED3C20FFE040007F01002E9B-->  <PRINTNAME><![CDATA[Aprm_Pending_Paymentinvoice_ID]]></PRINTNAME>
 <!--8BBA8342ED3C20FFE040007F01002E9B-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--8BBA8342ED3C20FFE040007F01002E9B-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--8BBA8342ED3C20FFE040007F01002E9B--></AD_ELEMENT>
 
 <!--91DD92021CFA438DBBF2ABAFCB2089C5--><AD_ELEMENT>
@@ -280,6 +304,7 @@
 <!--91DD92021CFA438DBBF2ABAFCB2089C5-->  <DESCRIPTION><![CDATA[Modify existing transaction once created]]></DESCRIPTION>
 <!--91DD92021CFA438DBBF2ABAFCB2089C5-->  <HELP><![CDATA[Process to modify transactions GL Item type once they have been created]]></HELP>
 <!--91DD92021CFA438DBBF2ABAFCB2089C5-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--91DD92021CFA438DBBF2ABAFCB2089C5-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--91DD92021CFA438DBBF2ABAFCB2089C5--></AD_ELEMENT>
 
 <!--A0417A0E924ACA28E040007F01003C18--><AD_ELEMENT>
@@ -293,6 +318,7 @@
 <!--A0417A0E924ACA28E040007F01003C18-->  <DESCRIPTION><![CDATA[Delete button]]></DESCRIPTION>
 <!--A0417A0E924ACA28E040007F01003C18-->  <HELP><![CDATA[Delete button]]></HELP>
 <!--A0417A0E924ACA28E040007F01003C18-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--A0417A0E924ACA28E040007F01003C18-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--A0417A0E924ACA28E040007F01003C18--></AD_ELEMENT>
 
 <!--A0417A0E924BCA28E040007F01003C18--><AD_ELEMENT>
@@ -304,6 +330,7 @@
 <!--A0417A0E924BCA28E040007F01003C18-->  <NAME><![CDATA[EM_APRM_MatchTransactions]]></NAME>
 <!--A0417A0E924BCA28E040007F01003C18-->  <PRINTNAME><![CDATA[EM_APRM_MatchTransactions]]></PRINTNAME>
 <!--A0417A0E924BCA28E040007F01003C18-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--A0417A0E924BCA28E040007F01003C18-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--A0417A0E924BCA28E040007F01003C18--></AD_ELEMENT>
 
 <!--A0417A0E924CCA28E040007F01003C18--><AD_ELEMENT>
@@ -316,6 +343,7 @@
 <!--A0417A0E924CCA28E040007F01003C18-->  <PRINTNAME><![CDATA[EM_APRM_AddTransactions]]></PRINTNAME>
 <!--A0417A0E924CCA28E040007F01003C18-->  <DESCRIPTION><![CDATA[Add Transaction From Financial Account]]></DESCRIPTION>
 <!--A0417A0E924CCA28E040007F01003C18-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--A0417A0E924CCA28E040007F01003C18-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--A0417A0E924CCA28E040007F01003C18--></AD_ELEMENT>
 
 <!--A0417A0E924DCA28E040007F01003C18--><AD_ELEMENT>
@@ -328,6 +356,7 @@
 <!--A0417A0E924DCA28E040007F01003C18-->  <PRINTNAME><![CDATA[EM_APRM_ImportBankFile]]></PRINTNAME>
 <!--A0417A0E924DCA28E040007F01003C18-->  <DESCRIPTION><![CDATA[ImportBankFile]]></DESCRIPTION>
 <!--A0417A0E924DCA28E040007F01003C18-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--A0417A0E924DCA28E040007F01003C18-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--A0417A0E924DCA28E040007F01003C18--></AD_ELEMENT>
 
 <!--A0417A0E924ECA28E040007F01003C18--><AD_ELEMENT>
@@ -339,6 +368,7 @@
 <!--A0417A0E924ECA28E040007F01003C18-->  <NAME><![CDATA[EM_APRM_Reconcile]]></NAME>
 <!--A0417A0E924ECA28E040007F01003C18-->  <PRINTNAME><![CDATA[EM_APRM_Reconcile]]></PRINTNAME>
 <!--A0417A0E924ECA28E040007F01003C18-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--A0417A0E924ECA28E040007F01003C18-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--A0417A0E924ECA28E040007F01003C18--></AD_ELEMENT>
 
 <!--A28B183E6A9B34C0E040007F010067F9--><AD_ELEMENT>
@@ -350,6 +380,7 @@
 <!--A28B183E6A9B34C0E040007F010067F9-->  <NAME><![CDATA[EM_APRM_Process Bank Statement]]></NAME>
 <!--A28B183E6A9B34C0E040007F010067F9-->  <PRINTNAME><![CDATA[EM_APRM_Process Bank Statement]]></PRINTNAME>
 <!--A28B183E6A9B34C0E040007F010067F9-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--A28B183E6A9B34C0E040007F010067F9-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--A28B183E6A9B34C0E040007F010067F9--></AD_ELEMENT>
 
 <!--A37C6F84AA423F50E040007F01006E35--><AD_ELEMENT>
@@ -361,6 +392,7 @@
 <!--A37C6F84AA423F50E040007F01006E35-->  <NAME><![CDATA[Financial Account Transaction]]></NAME>
 <!--A37C6F84AA423F50E040007F01006E35-->  <PRINTNAME><![CDATA[Financial Account Transaction]]></PRINTNAME>
 <!--A37C6F84AA423F50E040007F01006E35-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--A37C6F84AA423F50E040007F01006E35-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--A37C6F84AA423F50E040007F01006E35--></AD_ELEMENT>
 
 <!--A37C6F84AA433F50E040007F01006E35--><AD_ELEMENT>
@@ -372,6 +404,7 @@
 <!--A37C6F84AA433F50E040007F01006E35-->  <NAME><![CDATA[Cleared]]></NAME>
 <!--A37C6F84AA433F50E040007F01006E35-->  <PRINTNAME><![CDATA[Cleared]]></PRINTNAME>
 <!--A37C6F84AA433F50E040007F01006E35-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--A37C6F84AA433F50E040007F01006E35-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--A37C6F84AA433F50E040007F01006E35--></AD_ELEMENT>
 
 <!--A37C6F84AA443F50E040007F01006E35--><AD_ELEMENT>
@@ -383,6 +416,7 @@
 <!--A37C6F84AA443F50E040007F01006E35-->  <NAME><![CDATA[Reconciled]]></NAME>
 <!--A37C6F84AA443F50E040007F01006E35-->  <PRINTNAME><![CDATA[Reconciled]]></PRINTNAME>
 <!--A37C6F84AA443F50E040007F01006E35-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--A37C6F84AA443F50E040007F01006E35-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--A37C6F84AA443F50E040007F01006E35--></AD_ELEMENT>
 
 <!--A37C6F84AA453F50E040007F01006E35--><AD_ELEMENT>
@@ -394,6 +428,7 @@
 <!--A37C6F84AA453F50E040007F01006E35-->  <NAME><![CDATA[Delete_Btn]]></NAME>
 <!--A37C6F84AA453F50E040007F01006E35-->  <PRINTNAME><![CDATA[Delete_Btn]]></PRINTNAME>
 <!--A37C6F84AA453F50E040007F01006E35-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--A37C6F84AA453F50E040007F01006E35-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--A37C6F84AA453F50E040007F01006E35--></AD_ELEMENT>
 
 <!--A37C6F84AA463F50E040007F01006E35--><AD_ELEMENT>
@@ -405,6 +440,7 @@
 <!--A37C6F84AA463F50E040007F01006E35-->  <NAME><![CDATA[Payment No.]]></NAME>
 <!--A37C6F84AA463F50E040007F01006E35-->  <PRINTNAME><![CDATA[Payment No.]]></PRINTNAME>
 <!--A37C6F84AA463F50E040007F01006E35-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--A37C6F84AA463F50E040007F01006E35-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--A37C6F84AA463F50E040007F01006E35--></AD_ELEMENT>
 
 <!--B0FA9EF3D10E46FF9D402AB44056363B--><AD_ELEMENT>
@@ -418,6 +454,7 @@
 <!--B0FA9EF3D10E46FF9D402AB44056363B-->  <DESCRIPTION><![CDATA[Print Summary reconciliation report]]></DESCRIPTION>
 <!--B0FA9EF3D10E46FF9D402AB44056363B-->  <HELP><![CDATA[Print Summary reconciliation report]]></HELP>
 <!--B0FA9EF3D10E46FF9D402AB44056363B-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--B0FA9EF3D10E46FF9D402AB44056363B-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--B0FA9EF3D10E46FF9D402AB44056363B--></AD_ELEMENT>
 
 <!--C8E8009C6BF5427EA930515F217F768E--><AD_ELEMENT>
@@ -431,6 +468,7 @@
 <!--C8E8009C6BF5427EA930515F217F768E-->  <DESCRIPTION><![CDATA[Process Reconciliation Document]]></DESCRIPTION>
 <!--C8E8009C6BF5427EA930515F217F768E-->  <HELP><![CDATA[Used to process and reactivate reconciliation documents]]></HELP>
 <!--C8E8009C6BF5427EA930515F217F768E-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--C8E8009C6BF5427EA930515F217F768E-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--C8E8009C6BF5427EA930515F217F768E--></AD_ELEMENT>
 
 <!--D2AC3F75FCDC4BC187A1F492C46D68D1--><AD_ELEMENT>
@@ -446,6 +484,7 @@
 - Invoice document number (default).
 - Supplier reference, which is defined in the invoice's header.]]></HELP>
 <!--D2AC3F75FCDC4BC187A1F492C46D68D1-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--D2AC3F75FCDC4BC187A1F492C46D68D1-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--D2AC3F75FCDC4BC187A1F492C46D68D1--></AD_ELEMENT>
 
 <!--DB85AA94D6DF4D7CB29CE7999B15F9C7--><AD_ELEMENT>
@@ -459,6 +498,7 @@
 <!--DB85AA94D6DF4D7CB29CE7999B15F9C7-->  <DESCRIPTION><![CDATA[Print Detailed reconciliation report]]></DESCRIPTION>
 <!--DB85AA94D6DF4D7CB29CE7999B15F9C7-->  <HELP><![CDATA[Print Detailed reconciliation report]]></HELP>
 <!--DB85AA94D6DF4D7CB29CE7999B15F9C7-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--DB85AA94D6DF4D7CB29CE7999B15F9C7-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--DB85AA94D6DF4D7CB29CE7999B15F9C7--></AD_ELEMENT>
 
 <!--FC780C136EFA4D98B2435A9448FA44AD--><AD_ELEMENT>
@@ -472,6 +512,7 @@
 <!--FC780C136EFA4D98B2435A9448FA44AD-->  <DESCRIPTION><![CDATA[Process Reconciliation Document]]></DESCRIPTION>
 <!--FC780C136EFA4D98B2435A9448FA44AD-->  <HELP><![CDATA[Used to process and reactivate reconciliation documents]]></HELP>
 <!--FC780C136EFA4D98B2435A9448FA44AD-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--FC780C136EFA4D98B2435A9448FA44AD-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--FC780C136EFA4D98B2435A9448FA44AD--></AD_ELEMENT>
 
 </data>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FORM.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FORM.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -10,6 +10,7 @@
 <!--4201E189318E443297F6B23F03CABB9D-->  <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
 <!--4201E189318E443297F6B23F03CABB9D-->  <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.ad_forms.Transactions]]></CLASSNAME>
 <!--4201E189318E443297F6B23F03CABB9D-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--4201E189318E443297F6B23F03CABB9D-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--4201E189318E443297F6B23F03CABB9D--></AD_FORM>
 
 <!--FE9623C32FE749DD803ED7C64CCD7405--><AD_FORM>
@@ -23,6 +24,7 @@
 <!--FE9623C32FE749DD803ED7C64CCD7405-->  <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
 <!--FE9623C32FE749DD803ED7C64CCD7405-->  <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.ad_forms.BatchPaymentExecution]]></CLASSNAME>
 <!--FE9623C32FE749DD803ED7C64CCD7405-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--FE9623C32FE749DD803ED7C64CCD7405-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--FE9623C32FE749DD803ED7C64CCD7405--></AD_FORM>
 
 </data>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -386,6 +386,17 @@
 <!--8A4E2745545245ED81BFBC5324648833-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--8A4E2745545245ED81BFBC5324648833--></AD_MESSAGE>
 
+<!--92EC1935A8B947BA83EF82DBD169CA8B--><AD_MESSAGE>
+<!--92EC1935A8B947BA83EF82DBD169CA8B-->  <AD_MESSAGE_ID><![CDATA[92EC1935A8B947BA83EF82DBD169CA8B]]></AD_MESSAGE_ID>
+<!--92EC1935A8B947BA83EF82DBD169CA8B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--92EC1935A8B947BA83EF82DBD169CA8B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--92EC1935A8B947BA83EF82DBD169CA8B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--92EC1935A8B947BA83EF82DBD169CA8B-->  <VALUE><![CDATA[APRM_CreditCurrency]]></VALUE>
+<!--92EC1935A8B947BA83EF82DBD169CA8B-->  <MSGTEXT><![CDATA[For credit generation and/or credit consumption payment currency should map business partner currency: %s]]></MSGTEXT>
+<!--92EC1935A8B947BA83EF82DBD169CA8B-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--92EC1935A8B947BA83EF82DBD169CA8B-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--92EC1935A8B947BA83EF82DBD169CA8B--></AD_MESSAGE>
+
 <!--9350C57F0C194634B4FC83028AC4D31D--><AD_MESSAGE>
 <!--9350C57F0C194634B4FC83028AC4D31D-->  <AD_MESSAGE_ID><![CDATA[9350C57F0C194634B4FC83028AC4D31D]]></AD_MESSAGE_ID>
 <!--9350C57F0C194634B4FC83028AC4D31D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -551,6 +562,17 @@
 <!--B6F8970C7470421FA5375E61D71A8E73-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--B6F8970C7470421FA5375E61D71A8E73--></AD_MESSAGE>
 
+<!--B9F31E06A19240DE87666454DB8A16E1--><AD_MESSAGE>
+<!--B9F31E06A19240DE87666454DB8A16E1-->  <AD_MESSAGE_ID><![CDATA[B9F31E06A19240DE87666454DB8A16E1]]></AD_MESSAGE_ID>
+<!--B9F31E06A19240DE87666454DB8A16E1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B9F31E06A19240DE87666454DB8A16E1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B9F31E06A19240DE87666454DB8A16E1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B9F31E06A19240DE87666454DB8A16E1-->  <VALUE><![CDATA[APRM_CreditWithoutBPartner]]></VALUE>
+<!--B9F31E06A19240DE87666454DB8A16E1-->  <MSGTEXT><![CDATA[Payments without a business partner can not generate/use credit]]></MSGTEXT>
+<!--B9F31E06A19240DE87666454DB8A16E1-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--B9F31E06A19240DE87666454DB8A16E1-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--B9F31E06A19240DE87666454DB8A16E1--></AD_MESSAGE>
+
 <!--BBB2F06979BA4A84BC67B134F9155862--><AD_MESSAGE>
 <!--BBB2F06979BA4A84BC67B134F9155862-->  <AD_MESSAGE_ID><![CDATA[BBB2F06979BA4A84BC67B134F9155862]]></AD_MESSAGE_ID>
 <!--BBB2F06979BA4A84BC67B134F9155862-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -683,6 +705,17 @@
 <!--F302E4040E1B45318BA270BDFA37179C-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--F302E4040E1B45318BA270BDFA37179C--></AD_MESSAGE>
 
+<!--F381A9CA5B51447286C117C68394C6BA--><AD_MESSAGE>
+<!--F381A9CA5B51447286C117C68394C6BA-->  <AD_MESSAGE_ID><![CDATA[F381A9CA5B51447286C117C68394C6BA]]></AD_MESSAGE_ID>
+<!--F381A9CA5B51447286C117C68394C6BA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F381A9CA5B51447286C117C68394C6BA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F381A9CA5B51447286C117C68394C6BA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F381A9CA5B51447286C117C68394C6BA-->  <VALUE><![CDATA[APRM_CreditNoPricelistCurrency]]></VALUE>
+<!--F381A9CA5B51447286C117C68394C6BA-->  <MSGTEXT><![CDATA[No currency in business partner's price list]]></MSGTEXT>
+<!--F381A9CA5B51447286C117C68394C6BA-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--F381A9CA5B51447286C117C68394C6BA-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--F381A9CA5B51447286C117C68394C6BA--></AD_MESSAGE>
+
 <!--F579E42461DC472AA4F21B14DD3D680B--><AD_MESSAGE>
 <!--F579E42461DC472AA4F21B14DD3D680B-->  <AD_MESSAGE_ID><![CDATA[F579E42461DC472AA4F21B14DD3D680B]]></AD_MESSAGE_ID>
 <!--F579E42461DC472AA4F21B14DD3D680B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -6,7 +6,7 @@
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></NAME>
-<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.14182]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.14253]]></VERSION>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <DESCRIPTION><![CDATA[Managing your finances with an ERP does not have to be difficult. Enjoy a radically improved user experience that combines the power of an enterprise grade financial application with the simplicity and ease of a web 2.0 personal accounting service.]]></DESCRIPTION>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <HELP><![CDATA[Advanced Payables and Receivables Management simplifies and automates the business processes around the management of financial accounts, from the receipt and issue of payment, to the reconciliation of those events with bank statements.
 If you would like to help shape this module you are welcome to take part in the forum discussions or register feature requests or issues in the corresponding (Forum and Bug Tracking) sections in the Advanced Payables and Receivable project in the OB Forge.]]></HELP>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -7,7 +7,7 @@
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID>
-<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.14182]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.14253]]></STARTVERSION>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Selector]]></DEPENDANT_MODULE_NAME>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--B97FC854C6DD41E692161585645A900F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--B97FC854C6DD41E692161585645A900F-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--B97FC854C6DD41E692161585645A900F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--B97FC854C6DD41E692161585645A900F-->  <STARTVERSION><![CDATA[3.0.14182]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->  <STARTVERSION><![CDATA[3.0.14253]]></STARTVERSION>
 <!--B97FC854C6DD41E692161585645A900F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--B97FC854C6DD41E692161585645A900F-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--B97FC854C6DD41E692161585645A900F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -17,6 +17,7 @@
 <!--12016E2EDE0245B5A36B84CBA144DBDF-->  <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE>
 <!--12016E2EDE0245B5A36B84CBA144DBDF-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--12016E2EDE0245B5A36B84CBA144DBDF-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
+<!--12016E2EDE0245B5A36B84CBA144DBDF-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--12016E2EDE0245B5A36B84CBA144DBDF--></AD_PROCESS>
 
 <!--15C8708DFC464C2D91286E59624FDD18--><AD_PROCESS>
@@ -37,6 +38,7 @@
 <!--15C8708DFC464C2D91286E59624FDD18-->  <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE>
 <!--15C8708DFC464C2D91286E59624FDD18-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--15C8708DFC464C2D91286E59624FDD18-->  <UIPATTERN><![CDATA[S]]></UIPATTERN>
+<!--15C8708DFC464C2D91286E59624FDD18-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--15C8708DFC464C2D91286E59624FDD18--></AD_PROCESS>
 
 <!--2EED9BC16DB34D2B80BA40A21564BECF--><AD_PROCESS>
@@ -57,6 +59,7 @@
 <!--2EED9BC16DB34D2B80BA40A21564BECF-->  <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE>
 <!--2EED9BC16DB34D2B80BA40A21564BECF-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--2EED9BC16DB34D2B80BA40A21564BECF-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
+<!--2EED9BC16DB34D2B80BA40A21564BECF-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--2EED9BC16DB34D2B80BA40A21564BECF--></AD_PROCESS>
 
 <!--3C4A5FB206B74C3CA9FE20116FCA0464--><AD_PROCESS>
@@ -75,6 +78,7 @@
 <!--3C4A5FB206B74C3CA9FE20116FCA0464-->  <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE>
 <!--3C4A5FB206B74C3CA9FE20116FCA0464-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--3C4A5FB206B74C3CA9FE20116FCA0464-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
+<!--3C4A5FB206B74C3CA9FE20116FCA0464-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--3C4A5FB206B74C3CA9FE20116FCA0464--></AD_PROCESS>
 
 <!--4A059E4F79294640AD37B1B718C56E5D--><AD_PROCESS>
@@ -95,6 +99,7 @@
 <!--4A059E4F79294640AD37B1B718C56E5D-->  <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE>
 <!--4A059E4F79294640AD37B1B718C56E5D-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--4A059E4F79294640AD37B1B718C56E5D-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
+<!--4A059E4F79294640AD37B1B718C56E5D-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--4A059E4F79294640AD37B1B718C56E5D--></AD_PROCESS>
 
 <!--58A9261BACEF45DDA526F29D8557272D--><AD_PROCESS>
@@ -113,6 +118,7 @@
 <!--58A9261BACEF45DDA526F29D8557272D-->  <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE>
 <!--58A9261BACEF45DDA526F29D8557272D-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--58A9261BACEF45DDA526F29D8557272D-->  <UIPATTERN><![CDATA[S]]></UIPATTERN>
+<!--58A9261BACEF45DDA526F29D8557272D-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--58A9261BACEF45DDA526F29D8557272D--></AD_PROCESS>
 
 <!--6255BE488882480599C81284B70CD9B3--><AD_PROCESS>
@@ -131,6 +137,7 @@
 <!--6255BE488882480599C81284B70CD9B3-->  <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE>
 <!--6255BE488882480599C81284B70CD9B3-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--6255BE488882480599C81284B70CD9B3-->  <UIPATTERN><![CDATA[S]]></UIPATTERN>
+<!--6255BE488882480599C81284B70CD9B3-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--6255BE488882480599C81284B70CD9B3--></AD_PROCESS>
 
 <!--62E6270312534380B9A8BDF603CA8FBB--><AD_PROCESS>
@@ -150,6 +157,7 @@
 <!--62E6270312534380B9A8BDF603CA8FBB-->  <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE>
 <!--62E6270312534380B9A8BDF603CA8FBB-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--62E6270312534380B9A8BDF603CA8FBB-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
+<!--62E6270312534380B9A8BDF603CA8FBB-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--62E6270312534380B9A8BDF603CA8FBB--></AD_PROCESS>
 
 <!--7AC7BE9024E448A0BB863C159DA762F9--><AD_PROCESS>
@@ -169,6 +177,7 @@
 <!--7AC7BE9024E448A0BB863C159DA762F9-->  <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE>
 <!--7AC7BE9024E448A0BB863C159DA762F9-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--7AC7BE9024E448A0BB863C159DA762F9-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
+<!--7AC7BE9024E448A0BB863C159DA762F9-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--7AC7BE9024E448A0BB863C159DA762F9--></AD_PROCESS>
 
 <!--B54318B49E984B9CB855AEFB1F474CD6--><AD_PROCESS>
@@ -188,6 +197,7 @@
 <!--B54318B49E984B9CB855AEFB1F474CD6-->  <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE>
 <!--B54318B49E984B9CB855AEFB1F474CD6-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--B54318B49E984B9CB855AEFB1F474CD6-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
+<!--B54318B49E984B9CB855AEFB1F474CD6-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--B54318B49E984B9CB855AEFB1F474CD6--></AD_PROCESS>
 
 <!--BBA11D1A061346459AF6148920FE6629--><AD_PROCESS>
@@ -206,6 +216,7 @@
 <!--BBA11D1A061346459AF6148920FE6629-->  <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE>
 <!--BBA11D1A061346459AF6148920FE6629-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--BBA11D1A061346459AF6148920FE6629-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
+<!--BBA11D1A061346459AF6148920FE6629-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--BBA11D1A061346459AF6148920FE6629--></AD_PROCESS>
 
 <!--C125EA7C85234D8B89FEA511FCCD2E9E--><AD_PROCESS>
@@ -224,6 +235,7 @@
 <!--C125EA7C85234D8B89FEA511FCCD2E9E-->  <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE>
 <!--C125EA7C85234D8B89FEA511FCCD2E9E-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--C125EA7C85234D8B89FEA511FCCD2E9E-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
+<!--C125EA7C85234D8B89FEA511FCCD2E9E-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--C125EA7C85234D8B89FEA511FCCD2E9E--></AD_PROCESS>
 
 <!--D16966FBF9604A3D91A50DC83C6EA8E3--><AD_PROCESS>
@@ -243,6 +255,7 @@
 <!--D16966FBF9604A3D91A50DC83C6EA8E3-->  <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE>
 <!--D16966FBF9604A3D91A50DC83C6EA8E3-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--D16966FBF9604A3D91A50DC83C6EA8E3-->  <UIPATTERN><![CDATA[S]]></UIPATTERN>
+<!--D16966FBF9604A3D91A50DC83C6EA8E3-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--D16966FBF9604A3D91A50DC83C6EA8E3--></AD_PROCESS>
 
 <!--D5B90B539C254B959045EDCA1DC99BDF--><AD_PROCESS>
@@ -262,6 +275,7 @@
 <!--D5B90B539C254B959045EDCA1DC99BDF-->  <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE>
 <!--D5B90B539C254B959045EDCA1DC99BDF-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--D5B90B539C254B959045EDCA1DC99BDF-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
+<!--D5B90B539C254B959045EDCA1DC99BDF-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--D5B90B539C254B959045EDCA1DC99BDF--></AD_PROCESS>
 
 <!--DC23BB9234174E52879E4B21C8CD1F4B--><AD_PROCESS>
@@ -281,6 +295,7 @@
 <!--DC23BB9234174E52879E4B21C8CD1F4B-->  <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE>
 <!--DC23BB9234174E52879E4B21C8CD1F4B-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--DC23BB9234174E52879E4B21C8CD1F4B-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
+<!--DC23BB9234174E52879E4B21C8CD1F4B-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--DC23BB9234174E52879E4B21C8CD1F4B--></AD_PROCESS>
 
 <!--E011F492B0814A74B63CD1F3B9FF0526--><AD_PROCESS>
@@ -299,6 +314,7 @@
 <!--E011F492B0814A74B63CD1F3B9FF0526-->  <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE>
 <!--E011F492B0814A74B63CD1F3B9FF0526-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--E011F492B0814A74B63CD1F3B9FF0526-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
+<!--E011F492B0814A74B63CD1F3B9FF0526-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--E011F492B0814A74B63CD1F3B9FF0526--></AD_PROCESS>
 
 <!--E3E92E9F08214507958E6875E66F2F99--><AD_PROCESS>
@@ -318,6 +334,7 @@
 <!--E3E92E9F08214507958E6875E66F2F99-->  <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE>
 <!--E3E92E9F08214507958E6875E66F2F99-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--E3E92E9F08214507958E6875E66F2F99-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
+<!--E3E92E9F08214507958E6875E66F2F99-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--E3E92E9F08214507958E6875E66F2F99--></AD_PROCESS>
 
 <!--E54287EE357C493EB127DC3BA1758751--><AD_PROCESS>
@@ -337,6 +354,7 @@
 <!--E54287EE357C493EB127DC3BA1758751-->  <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE>
 <!--E54287EE357C493EB127DC3BA1758751-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--E54287EE357C493EB127DC3BA1758751-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
+<!--E54287EE357C493EB127DC3BA1758751-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--E54287EE357C493EB127DC3BA1758751--></AD_PROCESS>
 
 <!--EB3D56BDD37E4229B67DBAB9F9A9B167--><AD_PROCESS>
@@ -356,6 +374,7 @@
 <!--EB3D56BDD37E4229B67DBAB9F9A9B167-->  <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE>
 <!--EB3D56BDD37E4229B67DBAB9F9A9B167-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--EB3D56BDD37E4229B67DBAB9F9A9B167-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
+<!--EB3D56BDD37E4229B67DBAB9F9A9B167-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--EB3D56BDD37E4229B67DBAB9F9A9B167--></AD_PROCESS>
 
 <!--F68F2890E96D4D85A1DEF0274D105BCE--><AD_PROCESS>
@@ -374,6 +393,7 @@
 <!--F68F2890E96D4D85A1DEF0274D105BCE-->  <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE>
 <!--F68F2890E96D4D85A1DEF0274D105BCE-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--F68F2890E96D4D85A1DEF0274D105BCE-->  <UIPATTERN><![CDATA[S]]></UIPATTERN>
+<!--F68F2890E96D4D85A1DEF0274D105BCE-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--F68F2890E96D4D85A1DEF0274D105BCE--></AD_PROCESS>
 
 <!--FF8080812E2F8EAE012E2F94CF470014--><AD_PROCESS>
@@ -393,6 +413,7 @@
 <!--FF8080812E2F8EAE012E2F94CF470014-->  <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE>
 <!--FF8080812E2F8EAE012E2F94CF470014-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--FF8080812E2F8EAE012E2F94CF470014-->  <UIPATTERN><![CDATA[S]]></UIPATTERN>
+<!--FF8080812E2F8EAE012E2F94CF470014-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--FF8080812E2F8EAE012E2F94CF470014--></AD_PROCESS>
 
 <!--FF8080812F348A97012F349DC24F0007--><AD_PROCESS>
@@ -411,6 +432,7 @@
 <!--FF8080812F348A97012F349DC24F0007-->  <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE>
 <!--FF8080812F348A97012F349DC24F0007-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--FF8080812F348A97012F349DC24F0007-->  <UIPATTERN><![CDATA[S]]></UIPATTERN>
+<!--FF8080812F348A97012F349DC24F0007-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--FF8080812F348A97012F349DC24F0007--></AD_PROCESS>
 
 </data>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS_PARA.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS_PARA.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -10,11 +10,11 @@
 <!--1913962D2952412B84B8CDD3BC17026F-->  <HELP><![CDATA[Identifies an item which is either purchased or sold in this organization.]]></HELP>
 <!--1913962D2952412B84B8CDD3BC17026F-->  <AD_PROCESS_ID><![CDATA[15C8708DFC464C2D91286E59624FDD18]]></AD_PROCESS_ID>
 <!--1913962D2952412B84B8CDD3BC17026F-->  <SEQNO><![CDATA[20]]></SEQNO>
-<!--1913962D2952412B84B8CDD3BC17026F-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
-<!--1913962D2952412B84B8CDD3BC17026F-->  <AD_REFERENCE_VALUE_ID><![CDATA[800011]]></AD_REFERENCE_VALUE_ID>
+<!--1913962D2952412B84B8CDD3BC17026F-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--1913962D2952412B84B8CDD3BC17026F-->  <AD_REFERENCE_VALUE_ID><![CDATA[FF808181312DA8D801312DDDAA750008]]></AD_REFERENCE_VALUE_ID>
 <!--1913962D2952412B84B8CDD3BC17026F-->  <COLUMNNAME><![CDATA[M_Product_ID]]></COLUMNNAME>
 <!--1913962D2952412B84B8CDD3BC17026F-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--1913962D2952412B84B8CDD3BC17026F-->  <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--1913962D2952412B84B8CDD3BC17026F-->  <FIELDLENGTH><![CDATA[100]]></FIELDLENGTH>
 <!--1913962D2952412B84B8CDD3BC17026F-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--1913962D2952412B84B8CDD3BC17026F-->  <ISRANGE><![CDATA[N]]></ISRANGE>
 <!--1913962D2952412B84B8CDD3BC17026F-->  <DEFAULTVALUE><![CDATA[@M_Product_ID@]]></DEFAULTVALUE>
@@ -31,11 +31,11 @@
 <!--4F5EE1017087464EAD95F3CCA4C5AFA5-->  <HELP><![CDATA[Identifier of a project defined within the Project & Service Management module.]]></HELP>
 <!--4F5EE1017087464EAD95F3CCA4C5AFA5-->  <AD_PROCESS_ID><![CDATA[15C8708DFC464C2D91286E59624FDD18]]></AD_PROCESS_ID>
 <!--4F5EE1017087464EAD95F3CCA4C5AFA5-->  <SEQNO><![CDATA[40]]></SEQNO>
-<!--4F5EE1017087464EAD95F3CCA4C5AFA5-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
-<!--4F5EE1017087464EAD95F3CCA4C5AFA5-->  <AD_REFERENCE_VALUE_ID><![CDATA[800061]]></AD_REFERENCE_VALUE_ID>
+<!--4F5EE1017087464EAD95F3CCA4C5AFA5-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--4F5EE1017087464EAD95F3CCA4C5AFA5-->  <AD_REFERENCE_VALUE_ID><![CDATA[FF808181312D569C01312D8FA681005A]]></AD_REFERENCE_VALUE_ID>
 <!--4F5EE1017087464EAD95F3CCA4C5AFA5-->  <COLUMNNAME><![CDATA[C_Project_ID]]></COLUMNNAME>
 <!--4F5EE1017087464EAD95F3CCA4C5AFA5-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--4F5EE1017087464EAD95F3CCA4C5AFA5-->  <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--4F5EE1017087464EAD95F3CCA4C5AFA5-->  <FIELDLENGTH><![CDATA[100]]></FIELDLENGTH>
 <!--4F5EE1017087464EAD95F3CCA4C5AFA5-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--4F5EE1017087464EAD95F3CCA4C5AFA5-->  <ISRANGE><![CDATA[N]]></ISRANGE>
 <!--4F5EE1017087464EAD95F3CCA4C5AFA5-->  <DEFAULTVALUE><![CDATA[@C_Project_ID@]]></DEFAULTVALUE>
@@ -52,11 +52,11 @@
 <!--6EEE4A4DB1BA476BA7929EC7FCF285F8-->  <HELP><![CDATA[A Business Partner is anyone with whom you transact.  This can include a customer, vendor, employee or any combination of these.]]></HELP>
 <!--6EEE4A4DB1BA476BA7929EC7FCF285F8-->  <AD_PROCESS_ID><![CDATA[15C8708DFC464C2D91286E59624FDD18]]></AD_PROCESS_ID>
 <!--6EEE4A4DB1BA476BA7929EC7FCF285F8-->  <SEQNO><![CDATA[30]]></SEQNO>
-<!--6EEE4A4DB1BA476BA7929EC7FCF285F8-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
-<!--6EEE4A4DB1BA476BA7929EC7FCF285F8-->  <AD_REFERENCE_VALUE_ID><![CDATA[800057]]></AD_REFERENCE_VALUE_ID>
+<!--6EEE4A4DB1BA476BA7929EC7FCF285F8-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--6EEE4A4DB1BA476BA7929EC7FCF285F8-->  <AD_REFERENCE_VALUE_ID><![CDATA[56DEFF37A33F46D1AC918C97C4447EAF]]></AD_REFERENCE_VALUE_ID>
 <!--6EEE4A4DB1BA476BA7929EC7FCF285F8-->  <COLUMNNAME><![CDATA[C_BPartner_ID]]></COLUMNNAME>
 <!--6EEE4A4DB1BA476BA7929EC7FCF285F8-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--6EEE4A4DB1BA476BA7929EC7FCF285F8-->  <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--6EEE4A4DB1BA476BA7929EC7FCF285F8-->  <FIELDLENGTH><![CDATA[100]]></FIELDLENGTH>
 <!--6EEE4A4DB1BA476BA7929EC7FCF285F8-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--6EEE4A4DB1BA476BA7929EC7FCF285F8-->  <ISRANGE><![CDATA[N]]></ISRANGE>
 <!--6EEE4A4DB1BA476BA7929EC7FCF285F8-->  <DEFAULTVALUE><![CDATA[@C_Bpartner_ID@]]></DEFAULTVALUE>
@@ -116,10 +116,11 @@
 <!--8BEBA07E78124B2B92B764D9B452B209-->  <HELP><![CDATA[General ledger item.]]></HELP>
 <!--8BEBA07E78124B2B92B764D9B452B209-->  <AD_PROCESS_ID><![CDATA[15C8708DFC464C2D91286E59624FDD18]]></AD_PROCESS_ID>
 <!--8BEBA07E78124B2B92B764D9B452B209-->  <SEQNO><![CDATA[10]]></SEQNO>
-<!--8BEBA07E78124B2B92B764D9B452B209-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--8BEBA07E78124B2B92B764D9B452B209-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--8BEBA07E78124B2B92B764D9B452B209-->  <AD_REFERENCE_VALUE_ID><![CDATA[1A6C5E0A5868417786ECCF3C02B17D65]]></AD_REFERENCE_VALUE_ID>
 <!--8BEBA07E78124B2B92B764D9B452B209-->  <COLUMNNAME><![CDATA[C_GLItem_ID]]></COLUMNNAME>
 <!--8BEBA07E78124B2B92B764D9B452B209-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--8BEBA07E78124B2B92B764D9B452B209-->  <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--8BEBA07E78124B2B92B764D9B452B209-->  <FIELDLENGTH><![CDATA[100]]></FIELDLENGTH>
 <!--8BEBA07E78124B2B92B764D9B452B209-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
 <!--8BEBA07E78124B2B92B764D9B452B209-->  <ISRANGE><![CDATA[N]]></ISRANGE>
 <!--8BEBA07E78124B2B92B764D9B452B209-->  <DEFAULTVALUE><![CDATA[@C_GLItem_ID@]]></DEFAULTVALUE>
@@ -136,10 +137,11 @@
 <!--9728F9CADE45497E9F583A76B7DE3BE6-->  <HELP><![CDATA[The Campaign defines a unique marketing program.  Projects can be associated with a pre defined Marketing Campaign.  You can then report based on a specific Campaign.]]></HELP>
 <!--9728F9CADE45497E9F583A76B7DE3BE6-->  <AD_PROCESS_ID><![CDATA[15C8708DFC464C2D91286E59624FDD18]]></AD_PROCESS_ID>
 <!--9728F9CADE45497E9F583A76B7DE3BE6-->  <SEQNO><![CDATA[50]]></SEQNO>
-<!--9728F9CADE45497E9F583A76B7DE3BE6-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--9728F9CADE45497E9F583A76B7DE3BE6-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--9728F9CADE45497E9F583A76B7DE3BE6-->  <AD_REFERENCE_VALUE_ID><![CDATA[FF808181312D569C01312D8C837E003C]]></AD_REFERENCE_VALUE_ID>
 <!--9728F9CADE45497E9F583A76B7DE3BE6-->  <COLUMNNAME><![CDATA[C_Campaign_ID]]></COLUMNNAME>
 <!--9728F9CADE45497E9F583A76B7DE3BE6-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--9728F9CADE45497E9F583A76B7DE3BE6-->  <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--9728F9CADE45497E9F583A76B7DE3BE6-->  <FIELDLENGTH><![CDATA[100]]></FIELDLENGTH>
 <!--9728F9CADE45497E9F583A76B7DE3BE6-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--9728F9CADE45497E9F583A76B7DE3BE6-->  <ISRANGE><![CDATA[N]]></ISRANGE>
 <!--9728F9CADE45497E9F583A76B7DE3BE6-->  <DEFAULTVALUE><![CDATA[@C_Campaign_ID@]]></DEFAULTVALUE>
@@ -156,10 +158,11 @@
 <!--A7B47A5637A74910ADC70CD66E6C6A29-->  <HELP><![CDATA[The Sales Region indicates a specific area of sales coverage.]]></HELP>
 <!--A7B47A5637A74910ADC70CD66E6C6A29-->  <AD_PROCESS_ID><![CDATA[15C8708DFC464C2D91286E59624FDD18]]></AD_PROCESS_ID>
 <!--A7B47A5637A74910ADC70CD66E6C6A29-->  <SEQNO><![CDATA[70]]></SEQNO>
-<!--A7B47A5637A74910ADC70CD66E6C6A29-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--A7B47A5637A74910ADC70CD66E6C6A29-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--A7B47A5637A74910ADC70CD66E6C6A29-->  <AD_REFERENCE_VALUE_ID><![CDATA[FF808181312D569C01312D8E60800051]]></AD_REFERENCE_VALUE_ID>
 <!--A7B47A5637A74910ADC70CD66E6C6A29-->  <COLUMNNAME><![CDATA[C_SalesRegion_ID]]></COLUMNNAME>
 <!--A7B47A5637A74910ADC70CD66E6C6A29-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--A7B47A5637A74910ADC70CD66E6C6A29-->  <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
+<!--A7B47A5637A74910ADC70CD66E6C6A29-->  <FIELDLENGTH><![CDATA[100]]></FIELDLENGTH>
 <!--A7B47A5637A74910ADC70CD66E6C6A29-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--A7B47A5637A74910ADC70CD66E6C6A29-->  <ISRANGE><![CDATA[N]]></ISRANGE>
 <!--A7B47A5637A74910ADC70CD66E6C6A29-->  <DEFAULTVALUE><![CDATA[@C_Salesregion_ID@]]></DEFAULTVALUE>
@@ -176,10 +179,11 @@
 <!--E2EB0EFA3CE741C1848590D270CEBE2B-->  <HELP><![CDATA[Activities indicate tasks that are performed and used to utilize Activity based Costing]]></HELP>
 <!--E2EB0EFA3CE741C1848590D270CEBE2B-->  <AD_PROCESS_ID><![CDATA[15C8708DFC464C2D91286E59624FDD18]]></AD_PROCESS_ID>
 <!--E2EB0EFA3CE741C1848590D270CEBE2B-->  <SEQNO><![CDATA[60]]></SEQNO>
-<!--E2EB0EFA3CE741C1848590D270CEBE2B-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--E2EB0EFA3CE741C1848590D270CEBE2B-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--E2EB0EFA3CE741C1848590D270CEBE2B-->  <AD_REFERENCE_VALUE_ID><![CDATA[FF808181312D569C01312D846CC40032]]></AD_REFERENCE_VALUE_ID>
 <!--E2EB0EFA3CE741C1848590D270CEBE2B-->  <COLUMNNAME><![CDATA[C_Activity_ID]]></COLUMNNAME>
 <!--E2EB0EFA3CE741C1848590D270CEBE2B-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--E2EB0EFA3CE741C1848590D270CEBE2B-->  <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
+<!--E2EB0EFA3CE741C1848590D270CEBE2B-->  <FIELDLENGTH><![CDATA[100]]></FIELDLENGTH>
 <!--E2EB0EFA3CE741C1848590D270CEBE2B-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--E2EB0EFA3CE741C1848590D270CEBE2B-->  <ISRANGE><![CDATA[N]]></ISRANGE>
 <!--E2EB0EFA3CE741C1848590D270CEBE2B-->  <DEFAULTVALUE><![CDATA[@C_Activity_ID@]]></DEFAULTVALUE>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -129,7 +129,7 @@
 <!--583F20A11FD34C65BEC1F15D5DBF70BA-->  <SORTNO><![CDATA[5]]></SORTNO>
 <!--583F20A11FD34C65BEC1F15D5DBF70BA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--583F20A11FD34C65BEC1F15D5DBF70BA-->  <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
-<!--583F20A11FD34C65BEC1F15D5DBF70BA-->  <DEFAULT_EXPRESSION><![CDATA[if (OB.isSalesTransaction() == true) { '' } else {'true'}]]></DEFAULT_EXPRESSION>
+<!--583F20A11FD34C65BEC1F15D5DBF70BA-->  <DEFAULT_EXPRESSION><![CDATA[if (OB.isSalesTransaction() == false) { 'true' } else {''}]]></DEFAULT_EXPRESSION>
 <!--583F20A11FD34C65BEC1F15D5DBF70BA-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
 <!--583F20A11FD34C65BEC1F15D5DBF70BA--></OBUISEL_SELECTOR_FIELD>
 
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java	Thu Nov 17 13:04:04 2011 +0100
@@ -48,6 +48,7 @@
 import org.openbravo.model.financialmgmt.payment.FIN_PaymentScheduleDetail;
 import org.openbravo.model.financialmgmt.payment.FIN_Payment_Credit;
 import org.openbravo.model.financialmgmt.payment.PaymentExecutionProcess;
+import org.openbravo.model.pricing.pricelist.PriceList;
 import org.openbravo.scheduling.ProcessBundle;
 import org.openbravo.service.db.DalConnectionProvider;
 
@@ -188,6 +189,34 @@
           payment.setWriteoffAmount(paymentWriteOfAmount);
           payment.setProcessed(true);
           payment.setAPRMProcessPayment("R");
+          if (BigDecimal.ZERO.compareTo(payment.getUsedCredit()) != 0
+              || BigDecimal.ZERO.compareTo(payment.getGeneratedCredit()) != 0) {
+            BusinessPartner businessPartner = payment.getBusinessPartner();
+            if (businessPartner == null) {
+              msg.setType("Error");
+              msg.setTitle(Utility.messageBD(conProvider, "Error", language));
+              msg.setMessage(Utility.parseTranslation(conProvider, vars, language,
+                  "@APRM_CreditWithoutBPartner@"));
+              bundle.setResult(msg);
+              OBDal.getInstance().rollbackAndClose();
+              return;
+            }
+            PriceList priceList = payment.isReceipt() ? businessPartner.getPriceList()
+                : businessPartner.getPurchasePricelist();
+            if (!payment.getCurrency().getId()
+                .equals(priceList != null ? priceList.getCurrency().getId() : "")) {
+              msg.setType("Error");
+              msg.setTitle(Utility.messageBD(conProvider, "Error", language));
+              msg.setMessage(String.format(
+                  Utility.parseTranslation(conProvider, vars, language, "@APRM_CreditCurrency@"),
+                  priceList != null ? priceList.getCurrency().getISOCode() : Utility
+                      .parseTranslation(conProvider, vars, language,
+                          "@APRM_CreditNoPricelistCurrency@")));
+              bundle.setResult(msg);
+              OBDal.getInstance().rollbackAndClose();
+              return;
+            }
+          }
           // Execution Process
           if (dao.isAutomatedExecutionPayment(payment.getAccount(), payment.getPaymentMethod(),
               payment.isReceipt())) {
--- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -6,7 +6,7 @@
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <NAME><![CDATA[JBoss Weld]]></NAME>
-<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION><![CDATA[1.1.14182]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION><![CDATA[1.1.14253]]></VERSION>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <DESCRIPTION><![CDATA[JBoss Weld]]></DESCRIPTION>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <HELP><![CDATA[Provides the JBoss Weld framework: Java Contexts and Dependency Injection for the Java EE platform (CDI). For more information see http://seamframework.org/Weld]]></HELP>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <URL><![CDATA[http://forge.openbravo.com/projects/weld]]></URL>
--- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -7,7 +7,7 @@
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <AD_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_MODULE_ID>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <STARTVERSION><![CDATA[3.0.14182]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <STARTVERSION><![CDATA[3.0.14253]]></STARTVERSION>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_VIEW_IMPL.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_VIEW_IMPL.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -53,6 +53,10 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="ISADVANCEDFEATURE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault><![CDATA['N']]></onCreateDefault>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="OBUIAPP_VI_AD_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
@@ -70,6 +74,7 @@
         <unique-column name="AD_MODULE_ID"/>
         <unique-column name="NAME"/>
       </unique>
+      <check name="OBUIAPP_ADV_CHCK"><![CDATA[ISADVANCEDFEATURE IN ('Y', 'N')]]></check>
       <check name="OBUIAPP_VI_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -1516,6 +1516,43 @@
 <!--4B5BBF2C5F48450CBB41899F1FDDC0F6-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
 <!--4B5BBF2C5F48450CBB41899F1FDDC0F6--></AD_COLUMN>
 
+<!--4BCDA6C2EB6C4C6F81B85D845288B81B--><AD_COLUMN>
+<!--4BCDA6C2EB6C4C6F81B85D845288B81B-->  <AD_COLUMN_ID><![CDATA[4BCDA6C2EB6C4C6F81B85D845288B81B]]></AD_COLUMN_ID>
+<!--4BCDA6C2EB6C4C6F81B85D845288B81B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4BCDA6C2EB6C4C6F81B85D845288B81B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4BCDA6C2EB6C4C6F81B85D845288B81B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4BCDA6C2EB6C4C6F81B85D845288B81B-->  <NAME><![CDATA[Advanced Feature]]></NAME>
+<!--4BCDA6C2EB6C4C6F81B85D845288B81B-->  <DESCRIPTION><![CDATA[Is advanced feature]]></DESCRIPTION>
+<!--4BCDA6C2EB6C4C6F81B85D845288B81B-->  <HELP><![CDATA[Automatic roles are granted with all non advanced features defined within application dictionary.
+
+Advanced features are only granted to the automatic roles defined as advanced.]]></HELP>
+<!--4BCDA6C2EB6C4C6F81B85D845288B81B-->  <COLUMNNAME><![CDATA[IsAdvancedFeature]]></COLUMNNAME>
+<!--4BCDA6C2EB6C4C6F81B85D845288B81B-->  <AD_TABLE_ID><![CDATA[79127717F4514B459D9014C91E793CE9]]></AD_TABLE_ID>
+<!--4BCDA6C2EB6C4C6F81B85D845288B81B-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--4BCDA6C2EB6C4C6F81B85D845288B81B-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--4BCDA6C2EB6C4C6F81B85D845288B81B-->  <DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE>
+<!--4BCDA6C2EB6C4C6F81B85D845288B81B-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--4BCDA6C2EB6C4C6F81B85D845288B81B-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--4BCDA6C2EB6C4C6F81B85D845288B81B-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--4BCDA6C2EB6C4C6F81B85D845288B81B-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--4BCDA6C2EB6C4C6F81B85D845288B81B-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--4BCDA6C2EB6C4C6F81B85D845288B81B-->  <SEQNO><![CDATA[140]]></SEQNO>
+<!--4BCDA6C2EB6C4C6F81B85D845288B81B-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--4BCDA6C2EB6C4C6F81B85D845288B81B-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--4BCDA6C2EB6C4C6F81B85D845288B81B-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--4BCDA6C2EB6C4C6F81B85D845288B81B-->  <AD_ELEMENT_ID><![CDATA[103BB98EA3F9464E961E9AE046F7C665]]></AD_ELEMENT_ID>
+<!--4BCDA6C2EB6C4C6F81B85D845288B81B-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--4BCDA6C2EB6C4C6F81B85D845288B81B-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--4BCDA6C2EB6C4C6F81B85D845288B81B-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--4BCDA6C2EB6C4C6F81B85D845288B81B-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--4BCDA6C2EB6C4C6F81B85D845288B81B-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--4BCDA6C2EB6C4C6F81B85D845288B81B-->  <POSITION><![CDATA[14]]></POSITION>
+<!--4BCDA6C2EB6C4C6F81B85D845288B81B-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--4BCDA6C2EB6C4C6F81B85D845288B81B-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--4BCDA6C2EB6C4C6F81B85D845288B81B-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--4BCDA6C2EB6C4C6F81B85D845288B81B-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--4BCDA6C2EB6C4C6F81B85D845288B81B--></AD_COLUMN>
+
 <!--4C3ED602D82A423197313B025FB6076B--><AD_COLUMN>
 <!--4C3ED602D82A423197313B025FB6076B-->  <AD_COLUMN_ID><![CDATA[4C3ED602D82A423197313B025FB6076B]]></AD_COLUMN_ID>
 <!--4C3ED602D82A423197313B025FB6076B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -6451,7 +6488,7 @@
 <!--FF8081813157AED2013157B8620F001C-->  <COLUMNNAME><![CDATA[Value]]></COLUMNNAME>
 <!--FF8081813157AED2013157B8620F001C-->  <AD_TABLE_ID><![CDATA[FF8081813157AED2013157B1F75F0007]]></AD_TABLE_ID>
 <!--FF8081813157AED2013157B8620F001C-->  <AD_REFERENCE_ID><![CDATA[14]]></AD_REFERENCE_ID>
-<!--FF8081813157AED2013157B8620F001C-->  <FIELDLENGTH><![CDATA[40000]]></FIELDLENGTH>
+<!--FF8081813157AED2013157B8620F001C-->  <FIELDLENGTH><![CDATA[1000000]]></FIELDLENGTH>
 <!--FF8081813157AED2013157B8620F001C-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--FF8081813157AED2013157B8620F001C-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--FF8081813157AED2013157B8620F001C-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -11,6 +11,7 @@
 <!--0E87BDD6E59C4B5FB9273E2580CC76B2-->  <DESCRIPTION><![CDATA[Defines which roles have access to which navigation bar components.]]></DESCRIPTION>
 <!--0E87BDD6E59C4B5FB9273E2580CC76B2-->  <HELP><![CDATA[Defines which roles have access to which navigation bar components.]]></HELP>
 <!--0E87BDD6E59C4B5FB9273E2580CC76B2-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--0E87BDD6E59C4B5FB9273E2580CC76B2-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--0E87BDD6E59C4B5FB9273E2580CC76B2--></AD_ELEMENT>
 
 <!--18EA6EC150C545AE8C5E0A3BD4BD4871--><AD_ELEMENT>
@@ -24,6 +25,7 @@
 <!--18EA6EC150C545AE8C5E0A3BD4BD4871-->  <DESCRIPTION><![CDATA[The value for the record.]]></DESCRIPTION>
 <!--18EA6EC150C545AE8C5E0A3BD4BD4871-->  <HELP><![CDATA[The value for the record.]]></HELP>
 <!--18EA6EC150C545AE8C5E0A3BD4BD4871-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--18EA6EC150C545AE8C5E0A3BD4BD4871-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--18EA6EC150C545AE8C5E0A3BD4BD4871--></AD_ELEMENT>
 
 <!--41A5FEDD70F140BF8438B8C8FA03B876--><AD_ELEMENT>
@@ -50,6 +52,7 @@
 <!--4B3999F4700C4C93ABEA49C89A8E484E-->  <DESCRIPTION><![CDATA[Defines that this navigation bar component is available to all roles or that role access is defined specifically by role.]]></DESCRIPTION>
 <!--4B3999F4700C4C93ABEA49C89A8E484E-->  <HELP><![CDATA[Defines that this navigation bar component is available to all roles or that role access is defined specifically by role through the navigation bar role access table.]]></HELP>
 <!--4B3999F4700C4C93ABEA49C89A8E484E-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--4B3999F4700C4C93ABEA49C89A8E484E-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--4B3999F4700C4C93ABEA49C89A8E484E--></AD_ELEMENT>
 
 <!--50069593057E4B64AE1FCF29E2898A74--><AD_ELEMENT>
@@ -61,6 +64,7 @@
 <!--50069593057E4B64AE1FCF29E2898A74-->  <NAME><![CDATA[Obuiapp_Uipersonalization_ID]]></NAME>
 <!--50069593057E4B64AE1FCF29E2898A74-->  <PRINTNAME><![CDATA[Obuiapp_Uipersonalization_ID]]></PRINTNAME>
 <!--50069593057E4B64AE1FCF29E2898A74-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--50069593057E4B64AE1FCF29E2898A74-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--50069593057E4B64AE1FCF29E2898A74--></AD_ELEMENT>
 
 <!--5509E6BF87024E24A53DA324952D33C1--><AD_ELEMENT>
@@ -74,6 +78,7 @@
 <!--5509E6BF87024E24A53DA324952D33C1-->  <DESCRIPTION><![CDATA[The java class name of the view implementation. The java class must extend the org.openbravo.client.kernel.BaseTemplateComponent.]]></DESCRIPTION>
 <!--5509E6BF87024E24A53DA324952D33C1-->  <HELP><![CDATA[The java class name of the view implementation. The java class must extend the org.openbravo.client.kernel.BaseTemplateComponent.]]></HELP>
 <!--5509E6BF87024E24A53DA324952D33C1-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--5509E6BF87024E24A53DA324952D33C1-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--5509E6BF87024E24A53DA324952D33C1--></AD_ELEMENT>
 
 <!--557A756A00364FE5AFF9584D2F1C19FF--><AD_ELEMENT>
@@ -122,6 +127,7 @@
 <!--7F257DE6A0C847A8A121804BC5F9B7A8-->  <DESCRIPTION><![CDATA[A component shown in the navigation bar in the top of the user interface]]></DESCRIPTION>
 <!--7F257DE6A0C847A8A121804BC5F9B7A8-->  <HELP><![CDATA[A navigation bar component is a component which is shown in the navigation bar in the top of the user interface. For example a quick create or an application menu.]]></HELP>
 <!--7F257DE6A0C847A8A121804BC5F9B7A8-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--7F257DE6A0C847A8A121804BC5F9B7A8-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--7F257DE6A0C847A8A121804BC5F9B7A8--></AD_ELEMENT>
 
 <!--7F9BC17EC8B74EE1A19EAF0AE074A44B--><AD_ELEMENT>
@@ -133,6 +139,7 @@
 <!--7F9BC17EC8B74EE1A19EAF0AE074A44B-->  <NAME><![CDATA[Obuiapp_View_Role_Access_ID]]></NAME>
 <!--7F9BC17EC8B74EE1A19EAF0AE074A44B-->  <PRINTNAME><![CDATA[Obuiapp_View_Role_Access_ID]]></PRINTNAME>
 <!--7F9BC17EC8B74EE1A19EAF0AE074A44B-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--7F9BC17EC8B74EE1A19EAF0AE074A44B-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--7F9BC17EC8B74EE1A19EAF0AE074A44B--></AD_ELEMENT>
 
 <!--7FCB281817674667B5E7BA53B464F299--><AD_ELEMENT>
@@ -144,6 +151,7 @@
 <!--7FCB281817674667B5E7BA53B464F299-->  <NAME><![CDATA[Obuiapp_Note_ID]]></NAME>
 <!--7FCB281817674667B5E7BA53B464F299-->  <PRINTNAME><![CDATA[Obuiapp_Note_ID]]></PRINTNAME>
 <!--7FCB281817674667B5E7BA53B464F299-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--7FCB281817674667B5E7BA53B464F299-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--7FCB281817674667B5E7BA53B464F299--></AD_ELEMENT>
 
 <!--927E4DC3105D1526E040A8C0CF072A46--><AD_ELEMENT>
@@ -155,6 +163,7 @@
 <!--927E4DC3105D1526E040A8C0CF072A46-->  <NAME><![CDATA[Fixed Value]]></NAME>
 <!--927E4DC3105D1526E040A8C0CF072A46-->  <PRINTNAME><![CDATA[Fixed Value]]></PRINTNAME>
 <!--927E4DC3105D1526E040A8C0CF072A46-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--927E4DC3105D1526E040A8C0CF072A46-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--927E4DC3105D1526E040A8C0CF072A46--></AD_ELEMENT>
 
 <!--927E4DC3105F1526E040A8C0CF072A46--><AD_ELEMENT>
@@ -166,6 +175,7 @@
 <!--927E4DC3105F1526E040A8C0CF072A46-->  <NAME><![CDATA[Parameter]]></NAME>
 <!--927E4DC3105F1526E040A8C0CF072A46-->  <PRINTNAME><![CDATA[Parameter]]></PRINTNAME>
 <!--927E4DC3105F1526E040A8C0CF072A46-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--927E4DC3105F1526E040A8C0CF072A46-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--927E4DC3105F1526E040A8C0CF072A46--></AD_ELEMENT>
 
 <!--927E4DC310661526E040A8C0CF072A46--><AD_ELEMENT>
@@ -177,6 +187,7 @@
 <!--927E4DC310661526E040A8C0CF072A46-->  <NAME><![CDATA[Obuiapp_Parameter_Trl_ID]]></NAME>
 <!--927E4DC310661526E040A8C0CF072A46-->  <PRINTNAME><![CDATA[Obuiapp_Parameter_Trl_ID]]></PRINTNAME>
 <!--927E4DC310661526E040A8C0CF072A46-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--927E4DC310661526E040A8C0CF072A46-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--927E4DC310661526E040A8C0CF072A46--></AD_ELEMENT>
 
 <!--927FD512FEF6BBA9E040A8C0CF073D3C--><AD_ELEMENT>
@@ -188,6 +199,7 @@
 <!--927FD512FEF6BBA9E040A8C0CF073D3C-->  <NAME><![CDATA[Value Number]]></NAME>
 <!--927FD512FEF6BBA9E040A8C0CF073D3C-->  <PRINTNAME><![CDATA[Value Number]]></PRINTNAME>
 <!--927FD512FEF6BBA9E040A8C0CF073D3C-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--927FD512FEF6BBA9E040A8C0CF073D3C-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--927FD512FEF6BBA9E040A8C0CF073D3C--></AD_ELEMENT>
 
 <!--927FD512FEF8BBA9E040A8C0CF073D3C--><AD_ELEMENT>
@@ -199,6 +211,7 @@
 <!--927FD512FEF8BBA9E040A8C0CF073D3C-->  <NAME><![CDATA[Obuiapp_Parameter_Value_ID]]></NAME>
 <!--927FD512FEF8BBA9E040A8C0CF073D3C-->  <PRINTNAME><![CDATA[Obuiapp_Parameter_Value_ID]]></PRINTNAME>
 <!--927FD512FEF8BBA9E040A8C0CF073D3C-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--927FD512FEF8BBA9E040A8C0CF073D3C-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--927FD512FEF8BBA9E040A8C0CF073D3C--></AD_ELEMENT>
 
 <!--927FD512FEFABBA9E040A8C0CF073D3C--><AD_ELEMENT>
@@ -210,6 +223,7 @@
 <!--927FD512FEFABBA9E040A8C0CF073D3C-->  <NAME><![CDATA[Value Date]]></NAME>
 <!--927FD512FEFABBA9E040A8C0CF073D3C-->  <PRINTNAME><![CDATA[Value Date]]></PRINTNAME>
 <!--927FD512FEFABBA9E040A8C0CF073D3C-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--927FD512FEFABBA9E040A8C0CF073D3C-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--927FD512FEFABBA9E040A8C0CF073D3C--></AD_ELEMENT>
 
 <!--927FD512FEFCBBA9E040A8C0CF073D3C--><AD_ELEMENT>
@@ -221,6 +235,7 @@
 <!--927FD512FEFCBBA9E040A8C0CF073D3C-->  <NAME><![CDATA[Value String]]></NAME>
 <!--927FD512FEFCBBA9E040A8C0CF073D3C-->  <PRINTNAME><![CDATA[Value String]]></PRINTNAME>
 <!--927FD512FEFCBBA9E040A8C0CF073D3C-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--927FD512FEFCBBA9E040A8C0CF073D3C-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--927FD512FEFCBBA9E040A8C0CF073D3C--></AD_ELEMENT>
 
 <!--95680940E12C4271A7AF8F68E92358E6--><AD_ELEMENT>
@@ -234,6 +249,7 @@
 <!--95680940E12C4271A7AF8F68E92358E6-->  <DESCRIPTION><![CDATA[The view implementation which is shown in the tab of a multi-document-interface]]></DESCRIPTION>
 <!--95680940E12C4271A7AF8F68E92358E6-->  <HELP><![CDATA[The view implementation which is shown in the tab of a multi-document-interface. ]]></HELP>
 <!--95680940E12C4271A7AF8F68E92358E6-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--95680940E12C4271A7AF8F68E92358E6-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--95680940E12C4271A7AF8F68E92358E6--></AD_ELEMENT>
 
 <!--969A16E782CF42E797A10365AB76E9D7--><AD_ELEMENT>
@@ -259,6 +275,7 @@
 <!--970F01C5451937C3E040007F01002163-->  <PRINTNAME><![CDATA[Evaluate Fixed Value]]></PRINTNAME>
 <!--970F01C5451937C3E040007F01002163-->  <HELP><![CDATA[When the flag is enabled the Fixed Value is evaluated as a JS expression.]]></HELP>
 <!--970F01C5451937C3E040007F01002163-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--970F01C5451937C3E040007F01002163-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--970F01C5451937C3E040007F01002163--></AD_ELEMENT>
 
 <!--98001F5A0FFD4D21BDE553CF8B2F00F5--><AD_ELEMENT>
@@ -285,6 +302,7 @@
 <!--B7BB240B9AA74817AFD7B8C2602B1CAD-->  <DESCRIPTION><![CDATA[Number of columns this field should occupy in the form]]></DESCRIPTION>
 <!--B7BB240B9AA74817AFD7B8C2602B1CAD-->  <HELP><![CDATA[This value can be used to define, multi-columns fields. So fields occupying more then one column. If this value is not set the normal calculation takes place.]]></HELP>
 <!--B7BB240B9AA74817AFD7B8C2602B1CAD-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--B7BB240B9AA74817AFD7B8C2602B1CAD-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--B7BB240B9AA74817AFD7B8C2602B1CAD--></AD_ELEMENT>
 
 <!--BAF19AAC391C420E9BA1E54641D563D9--><AD_ELEMENT>
@@ -296,6 +314,7 @@
 <!--BAF19AAC391C420E9BA1E54641D563D9-->  <NAME><![CDATA[Obuiapp_Menu_Parameters_ID]]></NAME>
 <!--BAF19AAC391C420E9BA1E54641D563D9-->  <PRINTNAME><![CDATA[Obuiapp_Menu_Parameters_ID]]></PRINTNAME>
 <!--BAF19AAC391C420E9BA1E54641D563D9-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--BAF19AAC391C420E9BA1E54641D563D9-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--BAF19AAC391C420E9BA1E54641D563D9--></AD_ELEMENT>
 
 <!--D407F5CD8D234F738D98EDB872F9377A--><AD_ELEMENT>
@@ -309,6 +328,7 @@
 <!--D407F5CD8D234F738D98EDB872F9377A-->  <DESCRIPTION><![CDATA[The classname of the navigation bar component.]]></DESCRIPTION>
 <!--D407F5CD8D234F738D98EDB872F9377A-->  <HELP><![CDATA[The java class name of the navigation bar component. The java class must extend the org.openbravo.client.kernel.BaseTemplateComponent.]]></HELP>
 <!--D407F5CD8D234F738D98EDB872F9377A-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--D407F5CD8D234F738D98EDB872F9377A-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--D407F5CD8D234F738D98EDB872F9377A--></AD_ELEMENT>
 
 <!--EAC4A032E1AF4EFBBCBE5C8355EDDE74--><AD_ELEMENT>
@@ -322,6 +342,7 @@
 <!--EAC4A032E1AF4EFBBCBE5C8355EDDE74-->  <DESCRIPTION><![CDATA[Number of rows this field should occupy in the form]]></DESCRIPTION>
 <!--EAC4A032E1AF4EFBBCBE5C8355EDDE74-->  <HELP><![CDATA[This value can be used to define, multi-row fields. So fields occupying more then one row. If this value is not set the normal calculation takes place.]]></HELP>
 <!--EAC4A032E1AF4EFBBCBE5C8355EDDE74-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--EAC4A032E1AF4EFBBCBE5C8355EDDE74-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--EAC4A032E1AF4EFBBCBE5C8355EDDE74--></AD_ELEMENT>
 
 <!--F39469FBB4F041BFBC730BB9E0691F29--><AD_ELEMENT>
@@ -346,6 +367,7 @@
 <!--FC093F3F9DD64F81828FE06AB2CC4FEB-->  <DESCRIPTION><![CDATA[Defines the implementation of a view shown in the user interface.]]></DESCRIPTION>
 <!--FC093F3F9DD64F81828FE06AB2CC4FEB-->  <HELP><![CDATA[A view is displayed inside a tab in the multi document interface.]]></HELP>
 <!--FC093F3F9DD64F81828FE06AB2CC4FEB-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--FC093F3F9DD64F81828FE06AB2CC4FEB-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--FC093F3F9DD64F81828FE06AB2CC4FEB--></AD_ELEMENT>
 
 </data>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -180,7 +180,7 @@
 <!--05A90B8FA5104697BFBCB14D3C49C41A-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--05A90B8FA5104697BFBCB14D3C49C41A-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
 <!--05A90B8FA5104697BFBCB14D3C49C41A-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--05A90B8FA5104697BFBCB14D3C49C41A-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--05A90B8FA5104697BFBCB14D3C49C41A-->  <SEQNO><![CDATA[70]]></SEQNO>
 <!--05A90B8FA5104697BFBCB14D3C49C41A-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--05A90B8FA5104697BFBCB14D3C49C41A-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--05A90B8FA5104697BFBCB14D3C49C41A-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -2573,6 +2573,34 @@
 <!--D6FC282E5E614AED8C301C8FEC0436FB-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
 <!--D6FC282E5E614AED8C301C8FEC0436FB--></AD_FIELD>
 
+<!--D9056C5C10E548E1B9BB5FAC9B61AA1B--><AD_FIELD>
+<!--D9056C5C10E548E1B9BB5FAC9B61AA1B-->  <AD_FIELD_ID><![CDATA[D9056C5C10E548E1B9BB5FAC9B61AA1B]]></AD_FIELD_ID>
+<!--D9056C5C10E548E1B9BB5FAC9B61AA1B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D9056C5C10E548E1B9BB5FAC9B61AA1B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D9056C5C10E548E1B9BB5FAC9B61AA1B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D9056C5C10E548E1B9BB5FAC9B61AA1B-->  <NAME><![CDATA[Advanced Feature]]></NAME>
+<!--D9056C5C10E548E1B9BB5FAC9B61AA1B-->  <DESCRIPTION><![CDATA[Is advanced feature]]></DESCRIPTION>
+<!--D9056C5C10E548E1B9BB5FAC9B61AA1B-->  <HELP><![CDATA[Automatic roles are granted with all non advanced features defined within application dictionary.
+Advanced features are only granted to the automatic roles defined as advanced.]]></HELP>
+<!--D9056C5C10E548E1B9BB5FAC9B61AA1B-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--D9056C5C10E548E1B9BB5FAC9B61AA1B-->  <AD_TAB_ID><![CDATA[F648835984F842AF906FA5F97EF6641B]]></AD_TAB_ID>
+<!--D9056C5C10E548E1B9BB5FAC9B61AA1B-->  <AD_COLUMN_ID><![CDATA[4BCDA6C2EB6C4C6F81B85D845288B81B]]></AD_COLUMN_ID>
+<!--D9056C5C10E548E1B9BB5FAC9B61AA1B-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--D9056C5C10E548E1B9BB5FAC9B61AA1B-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--D9056C5C10E548E1B9BB5FAC9B61AA1B-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--D9056C5C10E548E1B9BB5FAC9B61AA1B-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--D9056C5C10E548E1B9BB5FAC9B61AA1B-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--D9056C5C10E548E1B9BB5FAC9B61AA1B-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--D9056C5C10E548E1B9BB5FAC9B61AA1B-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--D9056C5C10E548E1B9BB5FAC9B61AA1B-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--D9056C5C10E548E1B9BB5FAC9B61AA1B-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--D9056C5C10E548E1B9BB5FAC9B61AA1B-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--D9056C5C10E548E1B9BB5FAC9B61AA1B-->  <GRID_SEQNO><![CDATA[0]]></GRID_SEQNO>
+<!--D9056C5C10E548E1B9BB5FAC9B61AA1B-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--D9056C5C10E548E1B9BB5FAC9B61AA1B-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--D9056C5C10E548E1B9BB5FAC9B61AA1B-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--D9056C5C10E548E1B9BB5FAC9B61AA1B--></AD_FIELD>
+
 <!--DAFD5B1C1F994F2FB5D743C9E6D23FF1--><AD_FIELD>
 <!--DAFD5B1C1F994F2FB5D743C9E6D23FF1-->  <AD_FIELD_ID><![CDATA[DAFD5B1C1F994F2FB5D743C9E6D23FF1]]></AD_FIELD_ID>
 <!--DAFD5B1C1F994F2FB5D743C9E6D23FF1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -6,7 +6,7 @@
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <NAME><![CDATA[User Interface Application]]></NAME>
-<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION><![CDATA[2.1.14182]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION><![CDATA[2.1.14253]]></VERSION>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <DESCRIPTION><![CDATA[Provides the main application components for the openbravo user interface]]></DESCRIPTION>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <HELP><![CDATA[Provides the main application components for the openbravo user interface. The main layout incorporates a navigation bar and a main view area.]]></HELP>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <URL><![CDATA[http://forge.openbravo.com/projects/clientapplication]]></URL>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -7,7 +7,7 @@
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID>
-<!--15D7CE8D95D043189162DBABA54A1F61-->  <STARTVERSION><![CDATA[2.1.14182]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->  <STARTVERSION><![CDATA[2.1.14253]]></STARTVERSION>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--60A170212F36499D83B8AD38D01F46B3-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--60A170212F36499D83B8AD38D01F46B3-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--60A170212F36499D83B8AD38D01F46B3-->  <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--60A170212F36499D83B8AD38D01F46B3-->  <STARTVERSION><![CDATA[2.1.14182]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->  <STARTVERSION><![CDATA[2.1.14253]]></STARTVERSION>
 <!--60A170212F36499D83B8AD38D01F46B3-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--60A170212F36499D83B8AD38D01F46B3-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
 <!--60A170212F36499D83B8AD38D01F46B3-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--824D60CB352E4099B1D8C903CA139DAE-->  <STARTVERSION><![CDATA[3.0.14182]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->  <STARTVERSION><![CDATA[3.0.14253]]></STARTVERSION>
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID>
-<!--E8FD820AFE3D4FE08C02FC47769026AD-->  <STARTVERSION><![CDATA[8.1.14182]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->  <STARTVERSION><![CDATA[8.1.14253]]></STARTVERSION>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_WINDOW.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_WINDOW.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -14,6 +14,7 @@
 <!--54AE252A40C34DA285FC48DA94EB3847-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
 <!--54AE252A40C34DA285FC48DA94EB3847-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--54AE252A40C34DA285FC48DA94EB3847-->  <ISTHREADSAFE><![CDATA[N]]></ISTHREADSAFE>
+<!--54AE252A40C34DA285FC48DA94EB3847-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--54AE252A40C34DA285FC48DA94EB3847--></AD_WINDOW>
 
 <!--EBA40241D46D4FA4A24E4A09C61994AA--><AD_WINDOW>
@@ -32,6 +33,7 @@
 <!--EBA40241D46D4FA4A24E4A09C61994AA-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
 <!--EBA40241D46D4FA4A24E4A09C61994AA-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--EBA40241D46D4FA4A24E4A09C61994AA-->  <ISTHREADSAFE><![CDATA[N]]></ISTHREADSAFE>
+<!--EBA40241D46D4FA4A24E4A09C61994AA-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--EBA40241D46D4FA4A24E4A09C61994AA--></AD_WINDOW>
 
 <!--FF8081813157AED2013157BE93460020--><AD_WINDOW>
@@ -48,6 +50,7 @@
 <!--FF8081813157AED2013157BE93460020-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
 <!--FF8081813157AED2013157BE93460020-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--FF8081813157AED2013157BE93460020-->  <ISTHREADSAFE><![CDATA[Y]]></ISTHREADSAFE>
+<!--FF8081813157AED2013157BE93460020-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--FF8081813157AED2013157BE93460020--></AD_WINDOW>
 
 <!--FF80818132D7FB620132D8193C0C0043--><AD_WINDOW>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/OBUIAPP_VIEW_IMPL.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/OBUIAPP_VIEW_IMPL.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -7,6 +7,7 @@
 <!--FF8080812EB90459012EBA225DDB0029-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--FF8080812EB90459012EBA225DDB0029-->  <NAME><![CDATA[OBUIAPP_AlertManagement]]></NAME>
 <!--FF8080812EB90459012EBA225DDB0029-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF8080812EB90459012EBA225DDB0029-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--FF8080812EB90459012EBA225DDB0029--></OBUIAPP_VIEW_IMPL>
 
 <!--FF808081329B023101329B0CE2080013--><OBUIAPP_VIEW_IMPL>
@@ -17,6 +18,7 @@
 <!--FF808081329B023101329B0CE2080013-->  <NAME><![CDATA[OBUIAPP_RegistrationView]]></NAME>
 <!--FF808081329B023101329B0CE2080013-->  <DESCRIPTION><![CDATA[Opens registration popup]]></DESCRIPTION>
 <!--FF808081329B023101329B0CE2080013-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF808081329B023101329B0CE2080013-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--FF808081329B023101329B0CE2080013--></OBUIAPP_VIEW_IMPL>
 
 </data>
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-compatibility.js	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-compatibility.js	Thu Nov 17 13:04:04 2011 +0100
@@ -335,11 +335,15 @@
       // * {{{url}}} type: String - the url to be opened in the popup
       // * {{{title}}} type: String - the title to be displayed in the popup
       // * {{{theOpener}}} type: Window Object - the window object of the opener
+      // * {{{showMinimizeControl}}} type: Boolean - to specify if the popup should show the minimize control or not. The default value is "true" if it is not specified
+      // * {{{showMaximizeControl}}} type: Boolean - to specify if the popup should show the maximize control or not. The default value is "true" if it is not specified
+      // * {{{showCloseControl}}} type: Boolean - to specify if the popup should show the close control or not. The default value is "true" if it is not specified
       // * {{{postParams}}} type: Object - parameters to be sent to the url using POST instead of GET
+      // * {{{isModal}}} type: Boolean - to specify if the popup should be modal or not. The default value is "true" if it is not specified
       // of the popup. Used in window.open to allow IE know which is the opener
       // 
       // returns the created OBClassicPopupWindow
-      open: function(name, width, height, url, title, theOpener, showMinimizeControl, showMaximizeControl, showCloseControl, postParams){
+      open: function(name, width, height, url, title, theOpener, showMinimizeControl, showMaximizeControl, showCloseControl, postParams, isModal){
         if (showMinimizeControl !== false) {
           showMinimizeControl = true;
         }
@@ -349,6 +353,9 @@
         if (showCloseControl !== false) {
           showCloseControl = true;
         }
+        if (isModal !== false) {
+          isModal = true;
+        }
         var cPopup = isc.OBClassicPopup.create({
           ID: name + '_' + cobcomp.Popup.secString,
           width: width,
@@ -356,6 +363,8 @@
           showMinimizeButton: showMinimizeControl,
           showMaximizeButton : showMaximizeControl,
           showCloseButton: showCloseControl,
+          isModal : isModal,
+          showModalMask : isModal,
           theOpener: theOpener,
           areParamsSet: false,
           isFramesetDraw: false,
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js	Thu Nov 17 13:04:04 2011 +0100
@@ -155,6 +155,9 @@
       this.getClass().originalView.viewDefinition = OB.Personalization.getViewDefinition(this, '', false);
       this.getClass().originalView.viewDefinition.name = OB.I18N.getLabel('OBUIAPP_StandardView');
       this.getClass().originalView.canDelete = false;
+      
+      // and clone the original view so that it can't get updated accidentally
+      this.getClass().originalView = isc.clone(this.getClass().originalView);
     }
 
     this.getClass().personalization = personalization;
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form.js	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form.js	Thu Nov 17 13:04:04 2011 +0100
@@ -550,7 +550,7 @@
     restoreButtonProperties = {
       action: function() {
         var i, standardWindow = this.view.getStandardWindow(),
-          viewDefinitions = standardWindow.getClass().originalView,
+          viewDefinitions = standardWindow.getClass().originalView.viewDefinition,
           length = standardWindow.views.length, view, viewTabDefinition;
         for (i = 0; i < length; i++) {
           view = standardWindow.views[i];
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js	Thu Nov 17 13:04:04 2011 +0100
@@ -1175,10 +1175,11 @@
   
   hideShowRightMembers: function(show) {
     var i;
-    for (i = 0; i < this.rightMembers.length; i++) {
-      if (show) {
-        this.rightMembers[i].show();
-      } else {
+    // if showing make sure that they are not always shown
+    if (show) {
+      this.refreshCustomButtons(false);
+    } else {
+      for (i = 0; i < this.rightMembers.length; i++) {
         this.rightMembers[i].hide();
       }
     }
@@ -1526,7 +1527,7 @@
     var popupParams = 'Command=DEFAULT';
     popupParams += '&inpTabId=' + tabId;
     popupParams += '&hideMenu=true&noprefs=true';
-    OB.Layout.ClassicOBCompatibility.Popup.open('tree', 750, 625, OB.Application.contextUrl + 'utility/WindowTree.html?' + popupParams, '', window, false, false, true);
+    OB.Layout.ClassicOBCompatibility.Popup.open('tree', 750, 625, OB.Application.contextUrl + 'utility/WindowTree.html?' + popupParams, '', window, true, true, true, null, false);
   }
   
   view.setContextInfo(view.getContextInfo(true, true, true, true), openPopupTree, true);
--- a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js	Thu Nov 17 13:04:04 2011 +0100
@@ -428,12 +428,6 @@
   titleStyle: 'OBFormFieldLabel'
 });
 
-if (navigator.userAgent.toUpperCase().indexOf("MSIE") >= 0) { //IE hack to avoid item be 12 px below the title
-  OBImageCanvas.addProperties({
-    layoutTopMargin: -12
-  });
-}
-
 isc.OBImageCanvas.addProperties({
   height: '0px', // Hack to avoid second line be desplaced in Firefox and IE
   zoomInCursorSrc: OB.Styles.skinsPath + 'Default/org.openbravo.client.application/images/system/zoomIn.cur',
@@ -490,7 +484,7 @@
   height: 24
 });
 
-isc.ClassFactory.defineClass('OBSectionItemButton', ImgSectionHeader);
+isc.ClassFactory.defineClass('OBSectionItemButton', isc.ImgSectionHeader);
 isc.OBSectionItemButton.changeDefaults('backgroundDefaults', {
   showRollOver: true,
   showDown: false,
--- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -9,6 +9,7 @@
 <!--9A0E1494784DB22CE040007F010037E7-->  <NAME><![CDATA[Height]]></NAME>
 <!--9A0E1494784DB22CE040007F010037E7-->  <PRINTNAME><![CDATA[Height]]></PRINTNAME>
 <!--9A0E1494784DB22CE040007F010037E7-->  <AD_MODULE_ID><![CDATA[D393BE6F22BB44B7B728259B34FC795A]]></AD_MODULE_ID>
+<!--9A0E1494784DB22CE040007F010037E7-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9A0E1494784DB22CE040007F010037E7--></AD_ELEMENT>
 
 <!--9A0E1494784EB22CE040007F010037E7--><AD_ELEMENT>
@@ -20,6 +21,7 @@
 <!--9A0E1494784EB22CE040007F010037E7-->  <NAME><![CDATA[Widget Title]]></NAME>
 <!--9A0E1494784EB22CE040007F010037E7-->  <PRINTNAME><![CDATA[Widget Title]]></PRINTNAME>
 <!--9A0E1494784EB22CE040007F010037E7-->  <AD_MODULE_ID><![CDATA[D393BE6F22BB44B7B728259B34FC795A]]></AD_MODULE_ID>
+<!--9A0E1494784EB22CE040007F010037E7-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9A0E1494784EB22CE040007F010037E7--></AD_ELEMENT>
 
 <!--9A0E1494784FB22CE040007F010037E7--><AD_ELEMENT>
@@ -31,6 +33,7 @@
 <!--9A0E1494784FB22CE040007F010037E7-->  <NAME><![CDATA[Height]]></NAME>
 <!--9A0E1494784FB22CE040007F010037E7-->  <PRINTNAME><![CDATA[Height]]></PRINTNAME>
 <!--9A0E1494784FB22CE040007F010037E7-->  <AD_MODULE_ID><![CDATA[D393BE6F22BB44B7B728259B34FC795A]]></AD_MODULE_ID>
+<!--9A0E1494784FB22CE040007F010037E7-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9A0E1494784FB22CE040007F010037E7--></AD_ELEMENT>
 
 <!--9A0E14947850B22CE040007F010037E7--><AD_ELEMENT>
@@ -42,6 +45,7 @@
 <!--9A0E14947850B22CE040007F010037E7-->  <NAME><![CDATA[HTML Code]]></NAME>
 <!--9A0E14947850B22CE040007F010037E7-->  <PRINTNAME><![CDATA[HTML Code]]></PRINTNAME>
 <!--9A0E14947850B22CE040007F010037E7-->  <AD_MODULE_ID><![CDATA[D393BE6F22BB44B7B728259B34FC795A]]></AD_MODULE_ID>
+<!--9A0E14947850B22CE040007F010037E7-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9A0E14947850B22CE040007F010037E7--></AD_ELEMENT>
 
 <!--9A0E14947851B22CE040007F010037E7--><AD_ELEMENT>
@@ -53,6 +57,7 @@
 <!--9A0E14947851B22CE040007F010037E7-->  <NAME><![CDATA[Widget Title]]></NAME>
 <!--9A0E14947851B22CE040007F010037E7-->  <PRINTNAME><![CDATA[Widget Title]]></PRINTNAME>
 <!--9A0E14947851B22CE040007F010037E7-->  <AD_MODULE_ID><![CDATA[D393BE6F22BB44B7B728259B34FC795A]]></AD_MODULE_ID>
+<!--9A0E14947851B22CE040007F010037E7-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9A0E14947851B22CE040007F010037E7--></AD_ELEMENT>
 
 <!--9A0E14947852B22CE040007F010037E7--><AD_ELEMENT>
@@ -64,6 +69,7 @@
 <!--9A0E14947852B22CE040007F010037E7-->  <NAME><![CDATA[HTML Code]]></NAME>
 <!--9A0E14947852B22CE040007F010037E7-->  <PRINTNAME><![CDATA[HTML Code]]></PRINTNAME>
 <!--9A0E14947852B22CE040007F010037E7-->  <AD_MODULE_ID><![CDATA[D393BE6F22BB44B7B728259B34FC795A]]></AD_MODULE_ID>
+<!--9A0E14947852B22CE040007F010037E7-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9A0E14947852B22CE040007F010037E7--></AD_ELEMENT>
 
 </data>
--- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -6,7 +6,7 @@
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <NAME><![CDATA[HTML Widget]]></NAME>
-<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION><![CDATA[1.0.14182]]></VERSION>
+<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION><![CDATA[1.0.14253]]></VERSION>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <DESCRIPTION><![CDATA[Provides the HTML Widget superclass that allows to create widget classes that embed the html code.]]></DESCRIPTION>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <HELP><![CDATA[With this module you can define your own widget classes just setting up your own html code or the html code provided by third parties.]]></HELP>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <URL><![CDATA[http://forge.openbravo.com/projects/htmlwidget]]></URL>
--- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -7,7 +7,7 @@
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <AD_MODULE_ID><![CDATA[D393BE6F22BB44B7B728259B34FC795A]]></AD_MODULE_ID>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--DCE798FBC5B648F7A3C81A6941720A57-->  <STARTVERSION><![CDATA[2.1.14182]]></STARTVERSION>
+<!--DCE798FBC5B648F7A3C81A6941720A57-->  <STARTVERSION><![CDATA[2.1.14253]]></STARTVERSION>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -11,6 +11,7 @@
 <!--1663D48FCF45475FB6AF23DE940BF7B4-->  <DESCRIPTION><![CDATA[The template source code.]]></DESCRIPTION>
 <!--1663D48FCF45475FB6AF23DE940BF7B4-->  <HELP><![CDATA[The source code of the template. This code gets executed when the template is processed. The language of the source code (freemarker or another) is defined by the template language field. Note that instead of this field it is also possible to use the template class path location field to point to a file containing the source cod]]></HELP>
 <!--1663D48FCF45475FB6AF23DE940BF7B4-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
+<!--1663D48FCF45475FB6AF23DE940BF7B4-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--1663D48FCF45475FB6AF23DE940BF7B4--></AD_ELEMENT>
 
 <!--6F1CAC3037204B29AA6A1BEEEB322DEC--><AD_ELEMENT>
@@ -24,6 +25,7 @@
 <!--6F1CAC3037204B29AA6A1BEEEB322DEC-->  <DESCRIPTION><![CDATA[The template used to generate the visualization of the component.]]></DESCRIPTION>
 <!--6F1CAC3037204B29AA6A1BEEEB322DEC-->  <HELP><![CDATA[Defines the template which is used to generate the (javascript) code to render the component.]]></HELP>
 <!--6F1CAC3037204B29AA6A1BEEEB322DEC-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
+<!--6F1CAC3037204B29AA6A1BEEEB322DEC-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--6F1CAC3037204B29AA6A1BEEEB322DEC--></AD_ELEMENT>
 
 <!--77DBB0D293A34966B10E6AC12F2B4DB9--><AD_ELEMENT>
@@ -35,6 +37,7 @@
 <!--77DBB0D293A34966B10E6AC12F2B4DB9-->  <NAME><![CDATA[Obclker_Uidefinition_ID]]></NAME>
 <!--77DBB0D293A34966B10E6AC12F2B4DB9-->  <PRINTNAME><![CDATA[Obclker_Uidefinition_ID]]></PRINTNAME>
 <!--77DBB0D293A34966B10E6AC12F2B4DB9-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
+<!--77DBB0D293A34966B10E6AC12F2B4DB9-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--77DBB0D293A34966B10E6AC12F2B4DB9--></AD_ELEMENT>
 
 <!--9E248D010B9949AEA6751C2529385EB6--><AD_ELEMENT>
@@ -48,6 +51,7 @@
 <!--9E248D010B9949AEA6751C2529385EB6-->  <DESCRIPTION><![CDATA[Defines the location in the classpath of the template file]]></DESCRIPTION>
 <!--9E248D010B9949AEA6751C2529385EB6-->  <HELP><![CDATA[Defines the location in the classpath of the template file. The template is loaded using the classloader. The path must be an absolute path (so start with a /).]]></HELP>
 <!--9E248D010B9949AEA6751C2529385EB6-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
+<!--9E248D010B9949AEA6751C2529385EB6-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9E248D010B9949AEA6751C2529385EB6--></AD_ELEMENT>
 
 <!--CA00B1284F5F4B988C3B578EDFF32E2E--><AD_ELEMENT>
@@ -61,6 +65,7 @@
 <!--CA00B1284F5F4B988C3B578EDFF32E2E-->  <DESCRIPTION><![CDATA[Name of the java class implementing the functionality.]]></DESCRIPTION>
 <!--CA00B1284F5F4B988C3B578EDFF32E2E-->  <HELP><![CDATA[Name of the java class implementing the functionality.]]></HELP>
 <!--CA00B1284F5F4B988C3B578EDFF32E2E-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
+<!--CA00B1284F5F4B988C3B578EDFF32E2E-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--CA00B1284F5F4B988C3B578EDFF32E2E--></AD_ELEMENT>
 
 <!--CBF6C0089C3E47899CF0EF6CB5808CA0--><AD_ELEMENT>
@@ -74,6 +79,7 @@
 <!--CBF6C0089C3E47899CF0EF6CB5808CA0-->  <DESCRIPTION><![CDATA[The template on which the current template depends]]></DESCRIPTION>
 <!--CBF6C0089C3E47899CF0EF6CB5808CA0-->  <HELP><![CDATA[Defines the template on which the current template depends.]]></HELP>
 <!--CBF6C0089C3E47899CF0EF6CB5808CA0-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
+<!--CBF6C0089C3E47899CF0EF6CB5808CA0-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--CBF6C0089C3E47899CF0EF6CB5808CA0--></AD_ELEMENT>
 
 <!--D5EF1F8B9EBF4639BD6064E551B46B79--><AD_ELEMENT>
@@ -87,6 +93,7 @@
 <!--D5EF1F8B9EBF4639BD6064E551B46B79-->  <DESCRIPTION><![CDATA[Defines the template language used to process this template.]]></DESCRIPTION>
 <!--D5EF1F8B9EBF4639BD6064E551B46B79-->  <HELP><![CDATA[Defines the template language used to process this template.]]></HELP>
 <!--D5EF1F8B9EBF4639BD6064E551B46B79-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
+<!--D5EF1F8B9EBF4639BD6064E551B46B79-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--D5EF1F8B9EBF4639BD6064E551B46B79--></AD_ELEMENT>
 
 <!--D9FC90D101014BFCBC33D29EECC65C1D--><AD_ELEMENT>
@@ -100,6 +107,7 @@
 <!--D9FC90D101014BFCBC33D29EECC65C1D-->  <DESCRIPTION><![CDATA[A type of component for which the template operates.]]></DESCRIPTION>
 <!--D9FC90D101014BFCBC33D29EECC65C1D-->  <HELP><![CDATA[A type of component for which the template operates.]]></HELP>
 <!--D9FC90D101014BFCBC33D29EECC65C1D-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
+<!--D9FC90D101014BFCBC33D29EECC65C1D-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--D9FC90D101014BFCBC33D29EECC65C1D--></AD_ELEMENT>
 
 <!--F65B59C7313C4FDBA800BFDF404698CA--><AD_ELEMENT>
@@ -113,6 +121,7 @@
 <!--F65B59C7313C4FDBA800BFDF404698CA-->  <DESCRIPTION><![CDATA[Template dependency]]></DESCRIPTION>
 <!--F65B59C7313C4FDBA800BFDF404698CA-->  <HELP><![CDATA[Defines a template dependency, that a template depends on another template, i.e. uses functions from the other template.]]></HELP>
 <!--F65B59C7313C4FDBA800BFDF404698CA-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
+<!--F65B59C7313C4FDBA800BFDF404698CA-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--F65B59C7313C4FDBA800BFDF404698CA--></AD_ELEMENT>
 
 <!--FBD6AA3EB93549EBBE6067E3FB649A91--><AD_ELEMENT>
@@ -126,6 +135,7 @@
 <!--FBD6AA3EB93549EBBE6067E3FB649A91-->  <DESCRIPTION><![CDATA[Is used to define that this template overrides another template.]]></DESCRIPTION>
 <!--FBD6AA3EB93549EBBE6067E3FB649A91-->  <HELP><![CDATA[Defines that this template overrides the template which is defined in this field. When processing a user interface component request from the browser, the system searches for the template to handle the request. The 'overrides template' field plays an important role in this process. When a template is selected then the system checks if the template is overridden, if this is the case then the overriding template is used. This search step are done multi-level (so if the overriding template is again overridden then the deepest/last overriding template is used).]]></HELP>
 <!--FBD6AA3EB93549EBBE6067E3FB649A91-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
+<!--FBD6AA3EB93549EBBE6067E3FB649A91-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--FBD6AA3EB93549EBBE6067E3FB649A91--></AD_ELEMENT>
 
 </data>
--- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -6,7 +6,7 @@
 <!--4B828F4D03264080AA1D2057B13F613C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <NAME><![CDATA[User Interface Client Kernel]]></NAME>
-<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION><![CDATA[2.1.14182]]></VERSION>
+<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION><![CDATA[2.1.14253]]></VERSION>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <DESCRIPTION><![CDATA[Provides framework functionality for the Openbravo User Interface]]></DESCRIPTION>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <HELP><![CDATA[The user interface client kernel is a generation framework for generating client (browser) components used in Openbravo. Its components are mainly used by other modules to provide customizable and extendable user interfaces.]]></HELP>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <URL><![CDATA[http://forge.openbravo.com/projects/openbravoclientkernel]]></URL>
--- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -7,7 +7,7 @@
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--26B041893E844A53AFA58BC326C4F0D7-->  <STARTVERSION><![CDATA[3.0.14182]]></STARTVERSION>
+<!--26B041893E844A53AFA58BC326C4F0D7-->  <STARTVERSION><![CDATA[3.0.14253]]></STARTVERSION>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <STARTVERSION><![CDATA[1.1.14182]]></STARTVERSION>
+<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <STARTVERSION><![CDATA[1.1.14253]]></STARTVERSION>
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <AD_DEPENDENT_MODULE_ID><![CDATA[F8D1B3ECB3474E8DA5C216473C840DF1]]></AD_DEPENDENT_MODULE_ID>
-<!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <STARTVERSION><![CDATA[2.0.14182]]></STARTVERSION>
+<!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <STARTVERSION><![CDATA[2.0.14253]]></STARTVERSION>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON REST Webservice]]></DEPENDANT_MODULE_NAME>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_WINDOW.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_WINDOW.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -14,6 +14,7 @@
 <!--CB53174675F84DCEAA13D2BED48F820C-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
 <!--CB53174675F84DCEAA13D2BED48F820C-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
 <!--CB53174675F84DCEAA13D2BED48F820C-->  <ISTHREADSAFE><![CDATA[N]]></ISTHREADSAFE>
+<!--CB53174675F84DCEAA13D2BED48F820C-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--CB53174675F84DCEAA13D2BED48F820C--></AD_WINDOW>
 
 </data>
--- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -11,6 +11,7 @@
 <!--02E4C42C679940D492635804FDF4A86F-->  <DESCRIPTION><![CDATA[Unique identifier for the menu option]]></DESCRIPTION>
 <!--02E4C42C679940D492635804FDF4A86F-->  <HELP><![CDATA[Unique identifier for the menu option]]></HELP>
 <!--02E4C42C679940D492635804FDF4A86F-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
+<!--02E4C42C679940D492635804FDF4A86F-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--02E4C42C679940D492635804FDF4A86F--></AD_ELEMENT>
 
 <!--04E1B3E277464DA2922E96E99703A2D5--><AD_ELEMENT>
@@ -22,6 +23,7 @@
 <!--04E1B3E277464DA2922E96E99703A2D5-->  <NAME><![CDATA[Obkmo_Widget_Class_Menu_Trl_ID]]></NAME>
 <!--04E1B3E277464DA2922E96E99703A2D5-->  <PRINTNAME><![CDATA[Obkmo_Widget_Class_Menu_Trl_ID]]></PRINTNAME>
 <!--04E1B3E277464DA2922E96E99703A2D5-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
+<!--04E1B3E277464DA2922E96E99703A2D5-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--04E1B3E277464DA2922E96E99703A2D5--></AD_ELEMENT>
 
 <!--28DA35447E82453D94A81C25540EFAB3--><AD_ELEMENT>
@@ -35,6 +37,7 @@
 <!--28DA35447E82453D94A81C25540EFAB3-->  <DESCRIPTION><![CDATA[Defines if a menu item is separator in the menu]]></DESCRIPTION>
 <!--28DA35447E82453D94A81C25540EFAB3-->  <HELP><![CDATA[Renders the menu option as separator, there no need for title nor action]]></HELP>
 <!--28DA35447E82453D94A81C25540EFAB3-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
+<!--28DA35447E82453D94A81C25540EFAB3-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--28DA35447E82453D94A81C25540EFAB3--></AD_ELEMENT>
 
 <!--3153A04AAFDD4E4D92ED3F2A84E82EDC--><AD_ELEMENT>
@@ -48,6 +51,7 @@
 <!--3153A04AAFDD4E4D92ED3F2A84E82EDC-->  <DESCRIPTION><![CDATA[If the widget has the hability to maximize]]></DESCRIPTION>
 <!--3153A04AAFDD4E4D92ED3F2A84E82EDC-->  <HELP><![CDATA[When is true, the maximize button appears in the widget's header toolbar, next to the menu options]]></HELP>
 <!--3153A04AAFDD4E4D92ED3F2A84E82EDC-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
+<!--3153A04AAFDD4E4D92ED3F2A84E82EDC-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--3153A04AAFDD4E4D92ED3F2A84E82EDC--></AD_ELEMENT>
 
 <!--3D9BA8FD0DEC4BC8BDE7862EFD0AECC5--><AD_ELEMENT>
@@ -61,6 +65,7 @@
 <!--3D9BA8FD0DEC4BC8BDE7862EFD0AECC5-->  <DESCRIPTION><![CDATA[Widget Title]]></DESCRIPTION>
 <!--3D9BA8FD0DEC4BC8BDE7862EFD0AECC5-->  <HELP><![CDATA[Widget Title is the text that is shown in the widget bar at Workspace tab.]]></HELP>
 <!--3D9BA8FD0DEC4BC8BDE7862EFD0AECC5-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
+<!--3D9BA8FD0DEC4BC8BDE7862EFD0AECC5-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--3D9BA8FD0DEC4BC8BDE7862EFD0AECC5--></AD_ELEMENT>
 
 <!--57DD9A05462444B1A7977E7F9A94DF8A--><AD_ELEMENT>
@@ -74,6 +79,7 @@
 <!--57DD9A05462444B1A7977E7F9A94DF8A-->  <DESCRIPTION><![CDATA[Defines if the field label should be shown on top of the widget]]></DESCRIPTION>
 <!--57DD9A05462444B1A7977E7F9A94DF8A-->  <HELP><![CDATA[This column defines if the a label with the field name should be shown on top of the widget like it is for other fields or if this label should be hidden and the extra space be used for the widget itself. Default is to show the title as for other fields.]]></HELP>
 <!--57DD9A05462444B1A7977E7F9A94DF8A-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
+<!--57DD9A05462444B1A7977E7F9A94DF8A-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--57DD9A05462444B1A7977E7F9A94DF8A--></AD_ELEMENT>
 
 <!--927D0D118B8EEF36E040A8C0CF071CF5--><AD_ELEMENT>
@@ -87,6 +93,7 @@
 <!--927D0D118B8EEF36E040A8C0CF071CF5-->  <DESCRIPTION><![CDATA[Java Class implementing the widget]]></DESCRIPTION>
 <!--927D0D118B8EEF36E040A8C0CF071CF5-->  <HELP><![CDATA[Java Class implementing the widget]]></HELP>
 <!--927D0D118B8EEF36E040A8C0CF071CF5-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
+<!--927D0D118B8EEF36E040A8C0CF071CF5-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--927D0D118B8EEF36E040A8C0CF071CF5--></AD_ELEMENT>
 
 <!--927D0D118B90EF36E040A8C0CF071CF5--><AD_ELEMENT>
@@ -100,6 +107,7 @@
 <!--927D0D118B90EF36E040A8C0CF071CF5-->  <DESCRIPTION><![CDATA[Identifies a widget class definition]]></DESCRIPTION>
 <!--927D0D118B90EF36E040A8C0CF071CF5-->  <HELP><![CDATA[Identifies a widget class definition]]></HELP>
 <!--927D0D118B90EF36E040A8C0CF071CF5-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
+<!--927D0D118B90EF36E040A8C0CF071CF5-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--927D0D118B90EF36E040A8C0CF071CF5--></AD_ELEMENT>
 
 <!--927D0D118B92EF36E040A8C0CF071CF5--><AD_ELEMENT>
@@ -113,6 +121,7 @@
 <!--927D0D118B92EF36E040A8C0CF071CF5-->  <DESCRIPTION><![CDATA[Height in pixels the widget will be represented with.]]></DESCRIPTION>
 <!--927D0D118B92EF36E040A8C0CF071CF5-->  <HELP><![CDATA[Height in pixels the widget will be represented with.]]></HELP>
 <!--927D0D118B92EF36E040A8C0CF071CF5-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
+<!--927D0D118B92EF36E040A8C0CF071CF5-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--927D0D118B92EF36E040A8C0CF071CF5--></AD_ELEMENT>
 
 <!--927D0D118B99EF36E040A8C0CF071CF5--><AD_ELEMENT>
@@ -126,6 +135,7 @@
 <!--927D0D118B99EF36E040A8C0CF071CF5-->  <DESCRIPTION><![CDATA[Column number where the widget is shown in Workspace tab]]></DESCRIPTION>
 <!--927D0D118B99EF36E040A8C0CF071CF5-->  <HELP><![CDATA[Column number where the widget is shown in Workspace tab]]></HELP>
 <!--927D0D118B99EF36E040A8C0CF071CF5-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
+<!--927D0D118B99EF36E040A8C0CF071CF5-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--927D0D118B99EF36E040A8C0CF071CF5--></AD_ELEMENT>
 
 <!--927D0D118B9BEF36E040A8C0CF071CF5--><AD_ELEMENT>
@@ -138,6 +148,7 @@
 <!--927D0D118B9BEF36E040A8C0CF071CF5-->  <PRINTNAME><![CDATA[Visible at User]]></PRINTNAME>
 <!--927D0D118B9BEF36E040A8C0CF071CF5-->  <HELP><![CDATA[Defines which is the preference's visibility at User level.]]></HELP>
 <!--927D0D118B9BEF36E040A8C0CF071CF5-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
+<!--927D0D118B9BEF36E040A8C0CF071CF5-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--927D0D118B9BEF36E040A8C0CF071CF5--></AD_ELEMENT>
 
 <!--927D0D118B9DEF36E040A8C0CF071CF5--><AD_ELEMENT>
@@ -151,6 +162,7 @@
 <!--927D0D118B9DEF36E040A8C0CF071CF5-->  <DESCRIPTION><![CDATA[Position in the column where the widget is shown]]></DESCRIPTION>
 <!--927D0D118B9DEF36E040A8C0CF071CF5-->  <HELP><![CDATA[Position in the column where the widget is shown]]></HELP>
 <!--927D0D118B9DEF36E040A8C0CF071CF5-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
+<!--927D0D118B9DEF36E040A8C0CF071CF5-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--927D0D118B9DEF36E040A8C0CF071CF5--></AD_ELEMENT>
 
 <!--927D0D118B9FEF36E040A8C0CF071CF5--><AD_ELEMENT>
@@ -163,6 +175,7 @@
 <!--927D0D118B9FEF36E040A8C0CF071CF5-->  <PRINTNAME><![CDATA[Widget Instance]]></PRINTNAME>
 <!--927D0D118B9FEF36E040A8C0CF071CF5-->  <HELP><![CDATA[Identifies an instance of a Widget Class]]></HELP>
 <!--927D0D118B9FEF36E040A8C0CF071CF5-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
+<!--927D0D118B9FEF36E040A8C0CF071CF5-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--927D0D118B9FEF36E040A8C0CF071CF5--></AD_ELEMENT>
 
 <!--927D0D118BA1EF36E040A8C0CF071CF5--><AD_ELEMENT>
@@ -175,6 +188,7 @@
 <!--927D0D118BA1EF36E040A8C0CF071CF5-->  <PRINTNAME><![CDATA[Copied From]]></PRINTNAME>
 <!--927D0D118BA1EF36E040A8C0CF071CF5-->  <HELP><![CDATA[Original Widget Instance that this instance was copied from.]]></HELP>
 <!--927D0D118BA1EF36E040A8C0CF071CF5-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
+<!--927D0D118BA1EF36E040A8C0CF071CF5-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--927D0D118BA1EF36E040A8C0CF071CF5--></AD_ELEMENT>
 
 <!--927D156048266E92E040A8C0CF071D3D--><AD_ELEMENT>
@@ -187,6 +201,7 @@
 <!--927D156048266E92E040A8C0CF071D3D-->  <PRINTNAME><![CDATA[Widget Class Translation]]></PRINTNAME>
 <!--927D156048266E92E040A8C0CF071D3D-->  <HELP><![CDATA[Identifies a translation of a Widget Class]]></HELP>
 <!--927D156048266E92E040A8C0CF071D3D-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
+<!--927D156048266E92E040A8C0CF071D3D-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--927D156048266E92E040A8C0CF071D3D--></AD_ELEMENT>
 
 <!--927D156048286E92E040A8C0CF071D3D--><AD_ELEMENT>
@@ -199,6 +214,7 @@
 <!--927D156048286E92E040A8C0CF071D3D-->  <PRINTNAME><![CDATA[Widget Class Access]]></PRINTNAME>
 <!--927D156048286E92E040A8C0CF071D3D-->  <HELP><![CDATA[Identifies a role access to a widget class.]]></HELP>
 <!--927D156048286E92E040A8C0CF071D3D-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
+<!--927D156048286E92E040A8C0CF071D3D-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--927D156048286E92E040A8C0CF071D3D--></AD_ELEMENT>
 
 <!--927DA01A83623AFAE040A8C0CF072B85--><AD_ELEMENT>
@@ -211,6 +227,7 @@
 <!--927DA01A83623AFAE040A8C0CF072B85-->  <PRINTNAME><![CDATA[Widget List]]></PRINTNAME>
 <!--927DA01A83623AFAE040A8C0CF072B85-->  <HELP><![CDATA[Identifies the definition of a List type widget class.]]></HELP>
 <!--927DA01A83623AFAE040A8C0CF072B85-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
+<!--927DA01A83623AFAE040A8C0CF072B85-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--927DA01A83623AFAE040A8C0CF072B85--></AD_ELEMENT>
 
 <!--927DA01A83643AFAE040A8C0CF072B85--><AD_ELEMENT>
@@ -223,6 +240,7 @@
 <!--927DA01A83643AFAE040A8C0CF072B85-->  <PRINTNAME><![CDATA[Widget URL]]></PRINTNAME>
 <!--927DA01A83643AFAE040A8C0CF072B85-->  <HELP><![CDATA[Identifies the definition of a URL type widget class.]]></HELP>
 <!--927DA01A83643AFAE040A8C0CF072B85-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
+<!--927DA01A83643AFAE040A8C0CF072B85-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--927DA01A83643AFAE040A8C0CF072B85--></AD_ELEMENT>
 
 <!--927DA01A83663AFAE040A8C0CF072B85--><AD_ELEMENT>
@@ -235,6 +253,7 @@
 <!--927DA01A83663AFAE040A8C0CF072B85-->  <PRINTNAME><![CDATA[HQL]]></PRINTNAME>
 <!--927DA01A83663AFAE040A8C0CF072B85-->  <HELP><![CDATA[A query HQL code.]]></HELP>
 <!--927DA01A83663AFAE040A8C0CF072B85-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
+<!--927DA01A83663AFAE040A8C0CF072B85-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--927DA01A83663AFAE040A8C0CF072B85--></AD_ELEMENT>
 
 <!--927FD512FF05BBA9E040A8C0CF073D3C--><AD_ELEMENT>
@@ -247,6 +266,7 @@
 <!--927FD512FF05BBA9E040A8C0CF073D3C-->  <PRINTNAME><![CDATA[Widget Instance]]></PRINTNAME>
 <!--927FD512FF05BBA9E040A8C0CF073D3C-->  <HELP><![CDATA[Defines an instance of a widget class.]]></HELP>
 <!--927FD512FF05BBA9E040A8C0CF073D3C-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
+<!--927FD512FF05BBA9E040A8C0CF073D3C-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--927FD512FF05BBA9E040A8C0CF073D3C--></AD_ELEMENT>
 
 <!--927FD512FF07BBA9E040A8C0CF073D3C--><AD_ELEMENT>
@@ -259,6 +279,7 @@
 <!--927FD512FF07BBA9E040A8C0CF073D3C-->  <PRINTNAME><![CDATA[Widget Class]]></PRINTNAME>
 <!--927FD512FF07BBA9E040A8C0CF073D3C-->  <HELP><![CDATA[Identifies a Widget Class definition]]></HELP>
 <!--927FD512FF07BBA9E040A8C0CF073D3C-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
+<!--927FD512FF07BBA9E040A8C0CF073D3C-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--927FD512FF07BBA9E040A8C0CF073D3C--></AD_ELEMENT>
 
 <!--941701CF5ADA6387E040007F010064BB--><AD_ELEMENT>
@@ -271,6 +292,7 @@
 <!--941701CF5ADA6387E040007F010064BB-->  <PRINTNAME><![CDATA[Enable for all Users]]></PRINTNAME>
 <!--941701CF5ADA6387E040007F010064BB-->  <HELP><![CDATA[Determines that the widget class will be available to all users regardless of the roles with access to this class.]]></HELP>
 <!--941701CF5ADA6387E040007F010064BB-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
+<!--941701CF5ADA6387E040007F010064BB-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--941701CF5ADA6387E040007F010064BB--></AD_ELEMENT>
 
 <!--95DE3D7A81FB2B50E040007F01004189--><AD_ELEMENT>
@@ -283,6 +305,7 @@
 <!--95DE3D7A81FB2B50E040007F01004189-->  <PRINTNAME><![CDATA[Superclass]]></PRINTNAME>
 <!--95DE3D7A81FB2B50E040007F01004189-->  <HELP><![CDATA[A Superclass widget is an implementation that can be used by other widget classes so it is not necessary to develop the java class.]]></HELP>
 <!--95DE3D7A81FB2B50E040007F01004189-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
+<!--95DE3D7A81FB2B50E040007F01004189-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--95DE3D7A81FB2B50E040007F01004189--></AD_ELEMENT>
 
 <!--95DE3D7A81FD2B50E040007F01004189--><AD_ELEMENT>
@@ -295,6 +318,7 @@
 <!--95DE3D7A81FD2B50E040007F01004189-->  <PRINTNAME><![CDATA[Widget Superclass]]></PRINTNAME>
 <!--95DE3D7A81FD2B50E040007F01004189-->  <HELP><![CDATA[Identifies the Superclass widget used by this widget class.]]></HELP>
 <!--95DE3D7A81FD2B50E040007F01004189-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
+<!--95DE3D7A81FD2B50E040007F01004189-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--95DE3D7A81FD2B50E040007F01004189--></AD_ELEMENT>
 
 <!--BA20F0A674D64EC2A477EB4CF0F22DE4--><AD_ELEMENT>
@@ -308,6 +332,7 @@
 <!--BA20F0A674D64EC2A477EB4CF0F22DE4-->  <DESCRIPTION><![CDATA[Widget Author URL]]></DESCRIPTION>
 <!--BA20F0A674D64EC2A477EB4CF0F22DE4-->  <HELP><![CDATA[It is the widget author URL which will be shown in the widget about information box.]]></HELP>
 <!--BA20F0A674D64EC2A477EB4CF0F22DE4-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
+<!--BA20F0A674D64EC2A477EB4CF0F22DE4-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--BA20F0A674D64EC2A477EB4CF0F22DE4--></AD_ELEMENT>
 
 <!--D64281ABFB7C4D79BF8BE0F0735677D4--><AD_ELEMENT>
@@ -321,6 +346,7 @@
 <!--D64281ABFB7C4D79BF8BE0F0735677D4-->  <DESCRIPTION><![CDATA[Widget Author Message]]></DESCRIPTION>
 <!--D64281ABFB7C4D79BF8BE0F0735677D4-->  <HELP><![CDATA[It is a message the widget author can define. It will be shown in the widget about information.]]></HELP>
 <!--D64281ABFB7C4D79BF8BE0F0735677D4-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
+<!--D64281ABFB7C4D79BF8BE0F0735677D4-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--D64281ABFB7C4D79BF8BE0F0735677D4--></AD_ELEMENT>
 
 <!--FD98C41ED85042668F523CA0C68C5805--><AD_ELEMENT>
@@ -334,6 +360,7 @@
 <!--FD98C41ED85042668F523CA0C68C5805-->  <DESCRIPTION><![CDATA[Defines the order on which the menu option needs to be shown]]></DESCRIPTION>
 <!--FD98C41ED85042668F523CA0C68C5805-->  <HELP><![CDATA[A number number used to sort the menu options]]></HELP>
 <!--FD98C41ED85042668F523CA0C68C5805-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
+<!--FD98C41ED85042668F523CA0C68C5805-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--FD98C41ED85042668F523CA0C68C5805--></AD_ELEMENT>
 
 </data>
--- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -6,7 +6,7 @@
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <NAME><![CDATA[Workspace & Widgets]]></NAME>
-<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION><![CDATA[2.1.14182]]></VERSION>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION><![CDATA[2.1.14253]]></VERSION>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <DESCRIPTION><![CDATA[Workspace & Widgets]]></DESCRIPTION>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <HELP><![CDATA[Provides the infrastructure of workspace tab (formerly My Openbravo)]]></HELP>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <URL><![CDATA[http://forge.openbravo.com/projects/myopenbravo]]></URL>
--- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -7,7 +7,7 @@
 <!--15F51F03882F444CAB6593B4566DC929-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--15F51F03882F444CAB6593B4566DC929-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
 <!--15F51F03882F444CAB6593B4566DC929-->  <AD_DEPENDENT_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_DEPENDENT_MODULE_ID>
-<!--15F51F03882F444CAB6593B4566DC929-->  <STARTVERSION><![CDATA[2.1.14182]]></STARTVERSION>
+<!--15F51F03882F444CAB6593B4566DC929-->  <STARTVERSION><![CDATA[2.1.14253]]></STARTVERSION>
 <!--15F51F03882F444CAB6593B4566DC929-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--15F51F03882F444CAB6593B4566DC929-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Application]]></DEPENDANT_MODULE_NAME>
 <!--15F51F03882F444CAB6593B4566DC929-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--E71B28FC949D481D9F59C17D01E46EF9-->  <STARTVERSION><![CDATA[3.0.14182]]></STARTVERSION>
+<!--E71B28FC949D481D9F59C17D01E46EF9-->  <STARTVERSION><![CDATA[3.0.14253]]></STARTVERSION>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_WINDOW.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_WINDOW.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -12,6 +12,7 @@
 <!--519E5DF804FD4BC4B0FBE6DD51F3EDA8-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
 <!--519E5DF804FD4BC4B0FBE6DD51F3EDA8-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
 <!--519E5DF804FD4BC4B0FBE6DD51F3EDA8-->  <ISTHREADSAFE><![CDATA[N]]></ISTHREADSAFE>
+<!--519E5DF804FD4BC4B0FBE6DD51F3EDA8-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--519E5DF804FD4BC4B0FBE6DD51F3EDA8--></AD_WINDOW>
 
 <!--F222C5956BC84B538924F626DFC8DBBB--><AD_WINDOW>
@@ -26,6 +27,7 @@
 <!--F222C5956BC84B538924F626DFC8DBBB-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
 <!--F222C5956BC84B538924F626DFC8DBBB-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
 <!--F222C5956BC84B538924F626DFC8DBBB-->  <ISTHREADSAFE><![CDATA[N]]></ISTHREADSAFE>
+<!--F222C5956BC84B538924F626DFC8DBBB-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--F222C5956BC84B538924F626DFC8DBBB--></AD_WINDOW>
 
 </data>
--- a/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-widget.js	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-widget.js	Thu Nov 17 13:04:04 2011 +0100
@@ -50,16 +50,11 @@
 //
 // == OBWidgetMenuItem ==
 //
-isc.defineClass('OBWidgetMenuItem', isc.IMenuButton).addProperties({
+isc.defineClass('OBWidgetMenuItem', isc.MenuButton).addProperties({
   widget: null,
   menu: null,
 
-  // only show the middle image without stretch appended
-  items: [{
-    name: '',
-    width: '*',
-    height: '*'
-  }],
+  title: '',
 
   editFormLayout: null,
   windowContents: null,
--- a/modules/org.openbravo.client.myob/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.myob/ob-widget-styles.js	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.client.myob/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.myob/ob-widget-styles.js	Thu Nov 17 13:04:04 2011 +0100
@@ -29,14 +29,16 @@
   showIcon: false,
   showOver: true,
   showRollOver: true,
+  showRollOverIcon: true,
   showDown: false,
   showFocused: false,
   showFocusedAsOver: false,
-  showTitle: false,
-  imageType: isc.Img.CENTER,
+  iconWidth: 18,
+  iconHeight: 18,
+  iconSpacing: 2,
   width: 24,
-  height: 24,
-  src: OB.Styles.skinsPath + 'Default/org.openbravo.client.myob/images/widget/edit.png',
+  height: 18,
+  menuButtonImage: OB.Styles.skinsPath + 'Default/org.openbravo.client.myob/images/widget/edit.png',
   baseStyle: 'OBWidgetMenuButton',
   overflow: 'visible'
 });
--- a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -10,6 +10,7 @@
 <!--95CC5757ECBCE5B8E040007F010076A5-->  <PRINTNAME><![CDATA[Width]]></PRINTNAME>
 <!--95CC5757ECBCE5B8E040007F010076A5-->  <HELP><![CDATA[Width of the column in percentage. If the sum of the widths is higher than 100 the grid will adapt the values. For example, 3 columns with 100 width will take 33% of the grid width each.]]></HELP>
 <!--95CC5757ECBCE5B8E040007F010076A5-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
+<!--95CC5757ECBCE5B8E040007F010076A5-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--95CC5757ECBCE5B8E040007F010076A5--></AD_ELEMENT>
 
 <!--95CC5757ECBEE5B8E040007F010076A5--><AD_ELEMENT>
@@ -22,6 +23,7 @@
 <!--95CC5757ECBEE5B8E040007F010076A5-->  <PRINTNAME><![CDATA[Query Column]]></PRINTNAME>
 <!--95CC5757ECBEE5B8E040007F010076A5-->  <HELP><![CDATA[Column of the defined query that it is desired to be shown or exported]]></HELP>
 <!--95CC5757ECBEE5B8E040007F010076A5-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
+<!--95CC5757ECBEE5B8E040007F010076A5-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--95CC5757ECBEE5B8E040007F010076A5--></AD_ELEMENT>
 
 <!--95CC5757ECC0E5B8E040007F010076A5--><AD_ELEMENT>
@@ -34,6 +36,7 @@
 <!--95CC5757ECC0E5B8E040007F010076A5-->  <PRINTNAME><![CDATA[Summarize Type]]></PRINTNAME>
 <!--95CC5757ECC0E5B8E040007F010076A5-->  <HELP><![CDATA[Select the desired summarize option in case the column is numeric and it is desired to have the sum, average,..]]></HELP>
 <!--95CC5757ECC0E5B8E040007F010076A5-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
+<!--95CC5757ECC0E5B8E040007F010076A5-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--95CC5757ECC0E5B8E040007F010076A5--></AD_ELEMENT>
 
 <!--95CC5757ECC2E5B8E040007F010076A5--><AD_ELEMENT>
@@ -47,6 +50,7 @@
 <!--95CC5757ECC2E5B8E040007F010076A5-->  <DESCRIPTION><![CDATA[Alias of the HQL Query column with the id required to built the link]]></DESCRIPTION>
 <!--95CC5757ECC2E5B8E040007F010076A5-->  <HELP><![CDATA[Alias of the HQL Query column with the id required to built the link]]></HELP>
 <!--95CC5757ECC2E5B8E040007F010076A5-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
+<!--95CC5757ECC2E5B8E040007F010076A5-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--95CC5757ECC2E5B8E040007F010076A5--></AD_ELEMENT>
 
 <!--95CC5757ECC6E5B8E040007F010076A5--><AD_ELEMENT>
@@ -60,6 +64,7 @@
 <!--95CC5757ECC6E5B8E040007F010076A5-->  <DESCRIPTION><![CDATA[Alias of HQL query column to be shown]]></DESCRIPTION>
 <!--95CC5757ECC6E5B8E040007F010076A5-->  <HELP><![CDATA[Alias of HQL query column to be shown]]></HELP>
 <!--95CC5757ECC6E5B8E040007F010076A5-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
+<!--95CC5757ECC6E5B8E040007F010076A5-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--95CC5757ECC6E5B8E040007F010076A5--></AD_ELEMENT>
 
 <!--95CC63FD04B421F2E040007F010075C1--><AD_ELEMENT>
@@ -73,6 +78,7 @@
 <!--95CC63FD04B421F2E040007F010075C1-->  <DESCRIPTION><![CDATA[Identifier of a HQL Query definition of a widget class implementing the Query/List Superclass]]></DESCRIPTION>
 <!--95CC63FD04B421F2E040007F010075C1-->  <HELP><![CDATA[Identifies the HQL Query definitino of a widget class that implements the Query/List Superclass widget]]></HELP>
 <!--95CC63FD04B421F2E040007F010075C1-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
+<!--95CC63FD04B421F2E040007F010075C1-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--95CC63FD04B421F2E040007F010075C1--></AD_ELEMENT>
 
 <!--966C6C809EF15FAAE040007F0100089F--><AD_ELEMENT>
@@ -88,6 +94,7 @@
 - Maximized view, column is shown only in maximized view and included in the exported file.
 - Exported file, column is only included in the exported file.]]></HELP>
 <!--966C6C809EF15FAAE040007F0100089F-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
+<!--966C6C809EF15FAAE040007F0100089F-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--966C6C809EF15FAAE040007F0100089F--></AD_ELEMENT>
 
 <!--96FCF80A354DB74FE040007F01002B7F--><AD_ELEMENT>
@@ -99,6 +106,7 @@
 <!--96FCF80A354DB74FE040007F01002B7F-->  <NAME><![CDATA[Query Column Translation]]></NAME>
 <!--96FCF80A354DB74FE040007F01002B7F-->  <PRINTNAME><![CDATA[Query Column Translation]]></PRINTNAME>
 <!--96FCF80A354DB74FE040007F01002B7F-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
+<!--96FCF80A354DB74FE040007F01002B7F-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--96FCF80A354DB74FE040007F01002B7F--></AD_ELEMENT>
 
 <!--977365E5A94B3B33E040007F010031AE--><AD_ELEMENT>
@@ -111,6 +119,7 @@
 <!--977365E5A94B3B33E040007F010031AE-->  <PRINTNAME><![CDATA[Has Link]]></PRINTNAME>
 <!--977365E5A94B3B33E040007F010031AE-->  <HELP><![CDATA[Flag to set that the field of the grid will have a link]]></HELP>
 <!--977365E5A94B3B33E040007F010031AE-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
+<!--977365E5A94B3B33E040007F010031AE-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--977365E5A94B3B33E040007F010031AE--></AD_ELEMENT>
 
 <!--998FF6ADFBCD705DE040007F01006349--><AD_ELEMENT>
@@ -125,6 +134,7 @@
 
 For example: having the following HQL "select product.name as prodcutName from product". To be able to filter by product name it is needed to include a  "where @productName@" in the where clause: "select product.name as prodcutName from product where @productName@"]]></HELP>
 <!--998FF6ADFBCD705DE040007F01006349-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
+<!--998FF6ADFBCD705DE040007F01006349-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--998FF6ADFBCD705DE040007F01006349--></AD_ELEMENT>
 
 <!--998FF6ADFBCF705DE040007F01006349--><AD_ELEMENT>
@@ -137,6 +147,7 @@
 <!--998FF6ADFBCF705DE040007F01006349-->  <PRINTNAME><![CDATA[Where Clause Left Part]]></PRINTNAME>
 <!--998FF6ADFBCF705DE040007F01006349-->  <HELP><![CDATA[Left part of the where clause needed to filter by a value of this column on the maximized view.]]></HELP>
 <!--998FF6ADFBCF705DE040007F01006349-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
+<!--998FF6ADFBCF705DE040007F01006349-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--998FF6ADFBCF705DE040007F01006349--></AD_ELEMENT>
 
 <!--9A0C92898CE07AC8E040007F01003160--><AD_ELEMENT>
@@ -148,6 +159,7 @@
 <!--9A0C92898CE07AC8E040007F01003160-->  <NAME><![CDATA[Business Partner]]></NAME>
 <!--9A0C92898CE07AC8E040007F01003160-->  <PRINTNAME><![CDATA[Business Partner]]></PRINTNAME>
 <!--9A0C92898CE07AC8E040007F01003160-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
+<!--9A0C92898CE07AC8E040007F01003160-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9A0C92898CE07AC8E040007F01003160--></AD_ELEMENT>
 
 <!--9A0C92898CE17AC8E040007F01003160--><AD_ELEMENT>
@@ -159,6 +171,7 @@
 <!--9A0C92898CE17AC8E040007F01003160-->  <NAME><![CDATA[Client]]></NAME>
 <!--9A0C92898CE17AC8E040007F01003160-->  <PRINTNAME><![CDATA[Client]]></PRINTNAME>
 <!--9A0C92898CE17AC8E040007F01003160-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
+<!--9A0C92898CE17AC8E040007F01003160-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9A0C92898CE17AC8E040007F01003160--></AD_ELEMENT>
 
 <!--9A0C92898CE27AC8E040007F01003160--><AD_ELEMENT>
@@ -170,6 +183,7 @@
 <!--9A0C92898CE27AC8E040007F01003160-->  <NAME><![CDATA[Show all data]]></NAME>
 <!--9A0C92898CE27AC8E040007F01003160-->  <PRINTNAME><![CDATA[Show all data]]></PRINTNAME>
 <!--9A0C92898CE27AC8E040007F01003160-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
+<!--9A0C92898CE27AC8E040007F01003160-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9A0C92898CE27AC8E040007F01003160--></AD_ELEMENT>
 
 <!--9A0C92898CE37AC8E040007F01003160--><AD_ELEMENT>
@@ -181,6 +195,7 @@
 <!--9A0C92898CE37AC8E040007F01003160-->  <NAME><![CDATA[Number of Rows]]></NAME>
 <!--9A0C92898CE37AC8E040007F01003160-->  <PRINTNAME><![CDATA[Number of Rows]]></PRINTNAME>
 <!--9A0C92898CE37AC8E040007F01003160-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
+<!--9A0C92898CE37AC8E040007F01003160-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9A0C92898CE37AC8E040007F01003160--></AD_ELEMENT>
 
 <!--9A0C92898CE47AC8E040007F01003160--><AD_ELEMENT>
@@ -192,6 +207,7 @@
 <!--9A0C92898CE47AC8E040007F01003160-->  <NAME><![CDATA[Show all data]]></NAME>
 <!--9A0C92898CE47AC8E040007F01003160-->  <PRINTNAME><![CDATA[Show all data]]></PRINTNAME>
 <!--9A0C92898CE47AC8E040007F01003160-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
+<!--9A0C92898CE47AC8E040007F01003160-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9A0C92898CE47AC8E040007F01003160--></AD_ELEMENT>
 
 <!--9A0C92898CE57AC8E040007F01003160--><AD_ELEMENT>
@@ -203,6 +219,7 @@
 <!--9A0C92898CE57AC8E040007F01003160-->  <NAME><![CDATA[Number of Rows]]></NAME>
 <!--9A0C92898CE57AC8E040007F01003160-->  <PRINTNAME><![CDATA[Number of Rows]]></PRINTNAME>
 <!--9A0C92898CE57AC8E040007F01003160-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
+<!--9A0C92898CE57AC8E040007F01003160-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9A0C92898CE57AC8E040007F01003160--></AD_ELEMENT>
 
 <!--9A0C92898CE67AC8E040007F01003160--><AD_ELEMENT>
@@ -214,6 +231,7 @@
 <!--9A0C92898CE67AC8E040007F01003160-->  <NAME><![CDATA[Client]]></NAME>
 <!--9A0C92898CE67AC8E040007F01003160-->  <PRINTNAME><![CDATA[Client]]></PRINTNAME>
 <!--9A0C92898CE67AC8E040007F01003160-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
+<!--9A0C92898CE67AC8E040007F01003160-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9A0C92898CE67AC8E040007F01003160--></AD_ELEMENT>
 
 <!--9A0C92898CE77AC8E040007F01003160--><AD_ELEMENT>
@@ -225,6 +243,7 @@
 <!--9A0C92898CE77AC8E040007F01003160-->  <NAME><![CDATA[Supplier]]></NAME>
 <!--9A0C92898CE77AC8E040007F01003160-->  <PRINTNAME><![CDATA[Supplier]]></PRINTNAME>
 <!--9A0C92898CE77AC8E040007F01003160-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
+<!--9A0C92898CE77AC8E040007F01003160-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9A0C92898CE77AC8E040007F01003160--></AD_ELEMENT>
 
 <!--9A0C92898CE87AC8E040007F01003160--><AD_ELEMENT>
@@ -236,6 +255,7 @@
 <!--9A0C92898CE87AC8E040007F01003160-->  <NAME><![CDATA[Show all data]]></NAME>
 <!--9A0C92898CE87AC8E040007F01003160-->  <PRINTNAME><![CDATA[Show all data]]></PRINTNAME>
 <!--9A0C92898CE87AC8E040007F01003160-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
+<!--9A0C92898CE87AC8E040007F01003160-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9A0C92898CE87AC8E040007F01003160--></AD_ELEMENT>
 
 <!--9A0C92898CE97AC8E040007F01003160--><AD_ELEMENT>
@@ -247,6 +267,7 @@
 <!--9A0C92898CE97AC8E040007F01003160-->  <NAME><![CDATA[Number of Rows]]></NAME>
 <!--9A0C92898CE97AC8E040007F01003160-->  <PRINTNAME><![CDATA[Number of Rows]]></PRINTNAME>
 <!--9A0C92898CE97AC8E040007F01003160-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
+<!--9A0C92898CE97AC8E040007F01003160-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9A0C92898CE97AC8E040007F01003160--></AD_ELEMENT>
 
 <!--9A0C92898CEA7AC8E040007F01003160--><AD_ELEMENT>
@@ -258,6 +279,7 @@
 <!--9A0C92898CEA7AC8E040007F01003160-->  <NAME><![CDATA[Show all data]]></NAME>
 <!--9A0C92898CEA7AC8E040007F01003160-->  <PRINTNAME><![CDATA[Show all data]]></PRINTNAME>
 <!--9A0C92898CEA7AC8E040007F01003160-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
+<!--9A0C92898CEA7AC8E040007F01003160-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9A0C92898CEA7AC8E040007F01003160--></AD_ELEMENT>
 
 <!--9A0C92898CEB7AC8E040007F01003160--><AD_ELEMENT>
@@ -269,6 +291,7 @@
 <!--9A0C92898CEB7AC8E040007F01003160-->  <NAME><![CDATA[Client]]></NAME>
 <!--9A0C92898CEB7AC8E040007F01003160-->  <PRINTNAME><![CDATA[Client]]></PRINTNAME>
 <!--9A0C92898CEB7AC8E040007F01003160-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
+<!--9A0C92898CEB7AC8E040007F01003160-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9A0C92898CEB7AC8E040007F01003160--></AD_ELEMENT>
 
 <!--9A0C92898CEC7AC8E040007F01003160--><AD_ELEMENT>
@@ -280,6 +303,7 @@
 <!--9A0C92898CEC7AC8E040007F01003160-->  <NAME><![CDATA[Client]]></NAME>
 <!--9A0C92898CEC7AC8E040007F01003160-->  <PRINTNAME><![CDATA[Client]]></PRINTNAME>
 <!--9A0C92898CEC7AC8E040007F01003160-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
+<!--9A0C92898CEC7AC8E040007F01003160-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9A0C92898CEC7AC8E040007F01003160--></AD_ELEMENT>
 
 <!--9A0C92898CED7AC8E040007F01003160--><AD_ELEMENT>
@@ -291,6 +315,7 @@
 <!--9A0C92898CED7AC8E040007F01003160-->  <NAME><![CDATA[Show all data]]></NAME>
 <!--9A0C92898CED7AC8E040007F01003160-->  <PRINTNAME><![CDATA[Show all data]]></PRINTNAME>
 <!--9A0C92898CED7AC8E040007F01003160-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
+<!--9A0C92898CED7AC8E040007F01003160-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9A0C92898CED7AC8E040007F01003160--></AD_ELEMENT>
 
 <!--9A0C92898CEE7AC8E040007F01003160--><AD_ELEMENT>
@@ -302,6 +327,7 @@
 <!--9A0C92898CEE7AC8E040007F01003160-->  <NAME><![CDATA[Show all data]]></NAME>
 <!--9A0C92898CEE7AC8E040007F01003160-->  <PRINTNAME><![CDATA[Show all data]]></PRINTNAME>
 <!--9A0C92898CEE7AC8E040007F01003160-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
+<!--9A0C92898CEE7AC8E040007F01003160-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9A0C92898CEE7AC8E040007F01003160--></AD_ELEMENT>
 
 <!--9A0C92898CEF7AC8E040007F01003160--><AD_ELEMENT>
@@ -313,6 +339,7 @@
 <!--9A0C92898CEF7AC8E040007F01003160-->  <NAME><![CDATA[Number of Rows]]></NAME>
 <!--9A0C92898CEF7AC8E040007F01003160-->  <PRINTNAME><![CDATA[Number of Rows]]></PRINTNAME>
 <!--9A0C92898CEF7AC8E040007F01003160-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
+<!--9A0C92898CEF7AC8E040007F01003160-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9A0C92898CEF7AC8E040007F01003160--></AD_ELEMENT>
 
 <!--9A0C92898CF07AC8E040007F01003160--><AD_ELEMENT>
@@ -324,6 +351,7 @@
 <!--9A0C92898CF07AC8E040007F01003160-->  <NAME><![CDATA[Number of Rows]]></NAME>
 <!--9A0C92898CF07AC8E040007F01003160-->  <PRINTNAME><![CDATA[Number of Rows]]></PRINTNAME>
 <!--9A0C92898CF07AC8E040007F01003160-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
+<!--9A0C92898CF07AC8E040007F01003160-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9A0C92898CF07AC8E040007F01003160--></AD_ELEMENT>
 
 <!--9A0C92898CF17AC8E040007F01003160--><AD_ELEMENT>
@@ -335,6 +363,7 @@
 <!--9A0C92898CF17AC8E040007F01003160-->  <NAME><![CDATA[Number of Rows]]></NAME>
 <!--9A0C92898CF17AC8E040007F01003160-->  <PRINTNAME><![CDATA[Number of Rows]]></PRINTNAME>
 <!--9A0C92898CF17AC8E040007F01003160-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
+<!--9A0C92898CF17AC8E040007F01003160-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9A0C92898CF17AC8E040007F01003160--></AD_ELEMENT>
 
 <!--9A0C92898CF27AC8E040007F01003160--><AD_ELEMENT>
@@ -346,6 +375,7 @@
 <!--9A0C92898CF27AC8E040007F01003160-->  <NAME><![CDATA[Business Partner]]></NAME>
 <!--9A0C92898CF27AC8E040007F01003160-->  <PRINTNAME><![CDATA[Business Partner]]></PRINTNAME>
 <!--9A0C92898CF27AC8E040007F01003160-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
+<!--9A0C92898CF27AC8E040007F01003160-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9A0C92898CF27AC8E040007F01003160--></AD_ELEMENT>
 
 <!--9A0C92898CF37AC8E040007F01003160--><AD_ELEMENT>
@@ -357,6 +387,7 @@
 <!--9A0C92898CF37AC8E040007F01003160-->  <NAME><![CDATA[Product]]></NAME>
 <!--9A0C92898CF37AC8E040007F01003160-->  <PRINTNAME><![CDATA[Product]]></PRINTNAME>
 <!--9A0C92898CF37AC8E040007F01003160-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
+<!--9A0C92898CF37AC8E040007F01003160-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9A0C92898CF37AC8E040007F01003160--></AD_ELEMENT>
 
 <!--9A0C92898CF47AC8E040007F01003160--><AD_ELEMENT>
@@ -368,6 +399,7 @@
 <!--9A0C92898CF47AC8E040007F01003160-->  <NAME><![CDATA[Business Partner]]></NAME>
 <!--9A0C92898CF47AC8E040007F01003160-->  <PRINTNAME><![CDATA[Business Partner]]></PRINTNAME>
 <!--9A0C92898CF47AC8E040007F01003160-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
+<!--9A0C92898CF47AC8E040007F01003160-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9A0C92898CF47AC8E040007F01003160--></AD_ELEMENT>
 
 <!--9A0C92898CF57AC8E040007F01003160--><AD_ELEMENT>
@@ -379,6 +411,7 @@
 <!--9A0C92898CF57AC8E040007F01003160-->  <NAME><![CDATA[Client]]></NAME>
 <!--9A0C92898CF57AC8E040007F01003160-->  <PRINTNAME><![CDATA[Client]]></PRINTNAME>
 <!--9A0C92898CF57AC8E040007F01003160-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
+<!--9A0C92898CF57AC8E040007F01003160-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9A0C92898CF57AC8E040007F01003160--></AD_ELEMENT>
 
 <!--9A0C92898CF67AC8E040007F01003160--><AD_ELEMENT>
@@ -390,6 +423,7 @@
 <!--9A0C92898CF67AC8E040007F01003160-->  <NAME><![CDATA[Business Partner]]></NAME>
 <!--9A0C92898CF67AC8E040007F01003160-->  <PRINTNAME><![CDATA[Business Partner]]></PRINTNAME>
 <!--9A0C92898CF67AC8E040007F01003160-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
+<!--9A0C92898CF67AC8E040007F01003160-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9A0C92898CF67AC8E040007F01003160--></AD_ELEMENT>
 
 </data>
--- a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -6,7 +6,7 @@
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <NAME><![CDATA[Query/List Widget]]></NAME>
-<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION><![CDATA[1.0.14182]]></VERSION>
+<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION><![CDATA[1.0.14253]]></VERSION>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <DESCRIPTION><![CDATA[Provides the Query/List superclass widget that allows to create widget classes that prints a grid of data based on a query.]]></DESCRIPTION>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <HELP><![CDATA[With this module you can define your own widget classes that just with simple Application Dictionary shows a grid of data based on a HQL Query.]]></HELP>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <URL><![CDATA[http://forge.openbravo.com/projects/querylistwidget]]></URL>
--- a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -7,7 +7,7 @@
 <!--26558497C31140BFAB067BA4BC47D799-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--26558497C31140BFAB067BA4BC47D799-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
 <!--26558497C31140BFAB067BA4BC47D799-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--26558497C31140BFAB067BA4BC47D799-->  <STARTVERSION><![CDATA[2.1.14182]]></STARTVERSION>
+<!--26558497C31140BFAB067BA4BC47D799-->  <STARTVERSION><![CDATA[2.1.14253]]></STARTVERSION>
 <!--26558497C31140BFAB067BA4BC47D799-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--26558497C31140BFAB067BA4BC47D799-->  <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME>
 <!--26558497C31140BFAB067BA4BC47D799-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -11,6 +11,7 @@
 <!--9C7735D7BEB33C9EE040A8C0EB06271C-->  <DESCRIPTION><![CDATA[Search Term]]></DESCRIPTION>
 <!--9C7735D7BEB33C9EE040A8C0EB06271C-->  <HELP><![CDATA[Search term used to find tweets]]></HELP>
 <!--9C7735D7BEB33C9EE040A8C0EB06271C-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--9C7735D7BEB33C9EE040A8C0EB06271C-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9C7735D7BEB33C9EE040A8C0EB06271C--></AD_ELEMENT>
 
 <!--9C7735D7BEB53C9EE040A8C0EB06271C--><AD_ELEMENT>
@@ -22,6 +23,7 @@
 <!--9C7735D7BEB53C9EE040A8C0EB06271C-->  <NAME><![CDATA[Number of Rows]]></NAME>
 <!--9C7735D7BEB53C9EE040A8C0EB06271C-->  <PRINTNAME><![CDATA[Number of Rows]]></PRINTNAME>
 <!--9C7735D7BEB53C9EE040A8C0EB06271C-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--9C7735D7BEB53C9EE040A8C0EB06271C-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9C7735D7BEB53C9EE040A8C0EB06271C--></AD_ELEMENT>
 
 <!--9C7735D7BEB73C9EE040A8C0EB06271C--><AD_ELEMENT>
@@ -33,6 +35,7 @@
 <!--9C7735D7BEB73C9EE040A8C0EB06271C-->  <NAME><![CDATA[Client]]></NAME>
 <!--9C7735D7BEB73C9EE040A8C0EB06271C-->  <PRINTNAME><![CDATA[Client]]></PRINTNAME>
 <!--9C7735D7BEB73C9EE040A8C0EB06271C-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--9C7735D7BEB73C9EE040A8C0EB06271C-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9C7735D7BEB73C9EE040A8C0EB06271C--></AD_ELEMENT>
 
 <!--9C7735D7BEB93C9EE040A8C0EB06271C--><AD_ELEMENT>
@@ -44,6 +47,7 @@
 <!--9C7735D7BEB93C9EE040A8C0EB06271C-->  <NAME><![CDATA[Number of Rows]]></NAME>
 <!--9C7735D7BEB93C9EE040A8C0EB06271C-->  <PRINTNAME><![CDATA[Number of Rows]]></PRINTNAME>
 <!--9C7735D7BEB93C9EE040A8C0EB06271C-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--9C7735D7BEB93C9EE040A8C0EB06271C-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9C7735D7BEB93C9EE040A8C0EB06271C--></AD_ELEMENT>
 
 <!--9C7735D7BEBB3C9EE040A8C0EB06271C--><AD_ELEMENT>
@@ -55,6 +59,7 @@
 <!--9C7735D7BEBB3C9EE040A8C0EB06271C-->  <NAME><![CDATA[User]]></NAME>
 <!--9C7735D7BEBB3C9EE040A8C0EB06271C-->  <PRINTNAME><![CDATA[User]]></PRINTNAME>
 <!--9C7735D7BEBB3C9EE040A8C0EB06271C-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--9C7735D7BEBB3C9EE040A8C0EB06271C-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9C7735D7BEBB3C9EE040A8C0EB06271C--></AD_ELEMENT>
 
 <!--9C7735D7BEBD3C9EE040A8C0EB06271C--><AD_ELEMENT>
@@ -66,6 +71,7 @@
 <!--9C7735D7BEBD3C9EE040A8C0EB06271C-->  <NAME><![CDATA[Product Name]]></NAME>
 <!--9C7735D7BEBD3C9EE040A8C0EB06271C-->  <PRINTNAME><![CDATA[Product Name]]></PRINTNAME>
 <!--9C7735D7BEBD3C9EE040A8C0EB06271C-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--9C7735D7BEBD3C9EE040A8C0EB06271C-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9C7735D7BEBD3C9EE040A8C0EB06271C--></AD_ELEMENT>
 
 <!--9C7735D7BEBF3C9EE040A8C0EB06271C--><AD_ELEMENT>
@@ -77,6 +83,7 @@
 <!--9C7735D7BEBF3C9EE040A8C0EB06271C-->  <NAME><![CDATA[Client]]></NAME>
 <!--9C7735D7BEBF3C9EE040A8C0EB06271C-->  <PRINTNAME><![CDATA[Client]]></PRINTNAME>
 <!--9C7735D7BEBF3C9EE040A8C0EB06271C-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--9C7735D7BEBF3C9EE040A8C0EB06271C-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9C7735D7BEBF3C9EE040A8C0EB06271C--></AD_ELEMENT>
 
 <!--9C7735D7BEC13C9EE040A8C0EB06271C--><AD_ELEMENT>
@@ -88,6 +95,7 @@
 <!--9C7735D7BEC13C9EE040A8C0EB06271C-->  <NAME><![CDATA[Show all data]]></NAME>
 <!--9C7735D7BEC13C9EE040A8C0EB06271C-->  <PRINTNAME><![CDATA[Show all data]]></PRINTNAME>
 <!--9C7735D7BEC13C9EE040A8C0EB06271C-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--9C7735D7BEC13C9EE040A8C0EB06271C-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9C7735D7BEC13C9EE040A8C0EB06271C--></AD_ELEMENT>
 
 <!--9C7735D7BEC33C9EE040A8C0EB06271C--><AD_ELEMENT>
@@ -99,6 +107,7 @@
 <!--9C7735D7BEC33C9EE040A8C0EB06271C-->  <NAME><![CDATA[Show all data]]></NAME>
 <!--9C7735D7BEC33C9EE040A8C0EB06271C-->  <PRINTNAME><![CDATA[Show all data]]></PRINTNAME>
 <!--9C7735D7BEC33C9EE040A8C0EB06271C-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
+<!--9C7735D7BEC33C9EE040A8C0EB06271C-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9C7735D7BEC33C9EE040A8C0EB06271C--></AD_ELEMENT>
 
 </data>
--- a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -6,7 +6,7 @@
 <!--FF8080812D842086012D844F3CC0003E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FF8080812D842086012D844F3CC0003E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080812D842086012D844F3CC0003E-->  <NAME><![CDATA[Widgets Collection]]></NAME>
-<!--FF8080812D842086012D844F3CC0003E-->  <VERSION><![CDATA[0.0.14182]]></VERSION>
+<!--FF8080812D842086012D844F3CC0003E-->  <VERSION><![CDATA[0.0.14253]]></VERSION>
 <!--FF8080812D842086012D844F3CC0003E-->  <DESCRIPTION><![CDATA[Collection of Workspace Widgets]]></DESCRIPTION>
 <!--FF8080812D842086012D844F3CC0003E-->  <HELP><![CDATA[Collection of Workspace Widgets]]></HELP>
 <!--FF8080812D842086012D844F3CC0003E-->  <URL><![CDATA[http://forge.openbravo.com/projects/widgetscollection]]></URL>
--- a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -7,7 +7,7 @@
 <!--FF8080812D842086012D845002070046-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080812D842086012D845002070046-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
 <!--FF8080812D842086012D845002070046-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080812D842086012D845002070046-->  <STARTVERSION><![CDATA[2.1.14182]]></STARTVERSION>
+<!--FF8080812D842086012D845002070046-->  <STARTVERSION><![CDATA[2.1.14253]]></STARTVERSION>
 <!--FF8080812D842086012D845002070046-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080812D842086012D845002070046-->  <DEPENDANT_MODULE_NAME><![CDATA[Workspace & Widgets]]></DEPENDANT_MODULE_NAME>
 <!--FF8080812D842086012D845002070046-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -6,7 +6,7 @@
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <NAME><![CDATA[Payment Report]]></NAME>
-<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION><![CDATA[3.0.14182]]></VERSION>
+<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION><![CDATA[3.0.14253]]></VERSION>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <DESCRIPTION><![CDATA[Payment Report]]></DESCRIPTION>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <URL><![CDATA[http://forge.openbravo.com/projects/paymentreport]]></URL>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <TYPE><![CDATA[M]]></TYPE>
--- a/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -7,7 +7,7 @@
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_DEPENDENT_MODULE_ID>
-<!--A3B449C4D5FE4D688CC58236FE33B802-->  <STARTVERSION><![CDATA[3.0.14182]]></STARTVERSION>
+<!--A3B449C4D5FE4D688CC58236FE33B802-->  <STARTVERSION><![CDATA[3.0.14253]]></STARTVERSION>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <DEPENDANT_MODULE_NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></DEPENDANT_MODULE_NAME>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_PROCESS.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_PROCESS.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -18,6 +18,7 @@
 <!--6AD04479EC134BD4826077F36B709876-->  <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE>
 <!--6AD04479EC134BD4826077F36B709876-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
 <!--6AD04479EC134BD4826077F36B709876-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
+<!--6AD04479EC134BD4826077F36B709876-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--6AD04479EC134BD4826077F36B709876--></AD_PROCESS>
 
 </data>
--- a/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -66,17 +66,6 @@
 <!--0F3DBFADCE4F42279BA1E29291982E43-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
 <!--0F3DBFADCE4F42279BA1E29291982E43--></AD_TEXTINTERFACES>
 
-<!--1492946E7BF44E5686A61AFD288E9318--><AD_TEXTINTERFACES>
-<!--1492946E7BF44E5686A61AFD288E9318-->  <AD_TEXTINTERFACES_ID><![CDATA[1492946E7BF44E5686A61AFD288E9318]]></AD_TEXTINTERFACES_ID>
-<!--1492946E7BF44E5686A61AFD288E9318-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--1492946E7BF44E5686A61AFD288E9318-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--1492946E7BF44E5686A61AFD288E9318-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--1492946E7BF44E5686A61AFD288E9318-->  <TEXT><![CDATA[Grand Total:]]></TEXT>
-<!--1492946E7BF44E5686A61AFD288E9318-->  <FILENAME><![CDATA[/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportPDF.jrxml]]></FILENAME>
-<!--1492946E7BF44E5686A61AFD288E9318-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--1492946E7BF44E5686A61AFD288E9318-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
-<!--1492946E7BF44E5686A61AFD288E9318--></AD_TEXTINTERFACES>
-
 <!--17234C998EAE47188F5E34F1ECF345C3--><AD_TEXTINTERFACES>
 <!--17234C998EAE47188F5E34F1ECF345C3-->  <AD_TEXTINTERFACES_ID><![CDATA[17234C998EAE47188F5E34F1ECF345C3]]></AD_TEXTINTERFACES_ID>
 <!--17234C998EAE47188F5E34F1ECF345C3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -275,17 +264,6 @@
 <!--3A59F70C2BE548398EEC5134095FA252-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
 <!--3A59F70C2BE548398EEC5134095FA252--></AD_TEXTINTERFACES>
 
-<!--3D64879E7FD745A1B8749BE8F92FA1AB--><AD_TEXTINTERFACES>
-<!--3D64879E7FD745A1B8749BE8F92FA1AB-->  <AD_TEXTINTERFACES_ID><![CDATA[3D64879E7FD745A1B8749BE8F92FA1AB]]></AD_TEXTINTERFACES_ID>
-<!--3D64879E7FD745A1B8749BE8F92FA1AB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--3D64879E7FD745A1B8749BE8F92FA1AB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--3D64879E7FD745A1B8749BE8F92FA1AB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--3D64879E7FD745A1B8749BE8F92FA1AB-->  <TEXT><![CDATA[Sub Total (Grouping Criteria):]]></TEXT>
-<!--3D64879E7FD745A1B8749BE8F92FA1AB-->  <FILENAME><![CDATA[/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportPDF.jrxml]]></FILENAME>
-<!--3D64879E7FD745A1B8749BE8F92FA1AB-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--3D64879E7FD745A1B8749BE8F92FA1AB-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
-<!--3D64879E7FD745A1B8749BE8F92FA1AB--></AD_TEXTINTERFACES>
-
 <!--43C8186236514013ADE1E5C8DB7A043B--><AD_TEXTINTERFACES>
 <!--43C8186236514013ADE1E5C8DB7A043B-->  <AD_TEXTINTERFACES_ID><![CDATA[43C8186236514013ADE1E5C8DB7A043B]]></AD_TEXTINTERFACES_ID>
 <!--43C8186236514013ADE1E5C8DB7A043B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -308,6 +286,17 @@
 <!--47D05363EA0A431E94988745BA473BD1-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
 <!--47D05363EA0A431E94988745BA473BD1--></AD_TEXTINTERFACES>
 
+<!--4A2C074C97E74A55858699F7AC03BBE7--><AD_TEXTINTERFACES>
+<!--4A2C074C97E74A55858699F7AC03BBE7-->  <AD_TEXTINTERFACES_ID><![CDATA[4A2C074C97E74A55858699F7AC03BBE7]]></AD_TEXTINTERFACES_ID>
+<!--4A2C074C97E74A55858699F7AC03BBE7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4A2C074C97E74A55858699F7AC03BBE7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4A2C074C97E74A55858699F7AC03BBE7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4A2C074C97E74A55858699F7AC03BBE7-->  <TEXT><![CDATA[Balance:]]></TEXT>
+<!--4A2C074C97E74A55858699F7AC03BBE7-->  <FILENAME><![CDATA[/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportPDF.jrxml]]></FILENAME>
+<!--4A2C074C97E74A55858699F7AC03BBE7-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--4A2C074C97E74A55858699F7AC03BBE7-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
+<!--4A2C074C97E74A55858699F7AC03BBE7--></AD_TEXTINTERFACES>
+
 <!--4AE673493AE240E5A19DB52BA3FECA21--><AD_TEXTINTERFACES>
 <!--4AE673493AE240E5A19DB52BA3FECA21-->  <AD_TEXTINTERFACES_ID><![CDATA[4AE673493AE240E5A19DB52BA3FECA21]]></AD_TEXTINTERFACES_ID>
 <!--4AE673493AE240E5A19DB52BA3FECA21-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -440,17 +429,6 @@
 <!--8747F91C31704FD0A9EC0C35237158BE-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
 <!--8747F91C31704FD0A9EC0C35237158BE--></AD_TEXTINTERFACES>
 
-<!--885417437D3B47308536AF8ADF3834B4--><AD_TEXTINTERFACES>
-<!--885417437D3B47308536AF8ADF3834B4-->  <AD_TEXTINTERFACES_ID><![CDATA[885417437D3B47308536AF8ADF3834B4]]></AD_TEXTINTERFACES_ID>
-<!--885417437D3B47308536AF8ADF3834B4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--885417437D3B47308536AF8ADF3834B4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--885417437D3B47308536AF8ADF3834B4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--885417437D3B47308536AF8ADF3834B4-->  <TEXT><![CDATA[Grand Total]]></TEXT>
-<!--885417437D3B47308536AF8ADF3834B4-->  <FILENAME><![CDATA[/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.html]]></FILENAME>
-<!--885417437D3B47308536AF8ADF3834B4-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--885417437D3B47308536AF8ADF3834B4-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
-<!--885417437D3B47308536AF8ADF3834B4--></AD_TEXTINTERFACES>
-
 <!--8A613E8D2A304FEF9545C2852FC06EF0--><AD_TEXTINTERFACES>
 <!--8A613E8D2A304FEF9545C2852FC06EF0-->  <AD_TEXTINTERFACES_ID><![CDATA[8A613E8D2A304FEF9545C2852FC06EF0]]></AD_TEXTINTERFACES_ID>
 <!--8A613E8D2A304FEF9545C2852FC06EF0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -704,17 +682,6 @@
 <!--AFBBE094BB59D031E040007F01013B9F-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
 <!--AFBBE094BB59D031E040007F01013B9F--></AD_TEXTINTERFACES>
 
-<!--B682A4F7A92C45A4BE2D04E087F45B6D--><AD_TEXTINTERFACES>
-<!--B682A4F7A92C45A4BE2D04E087F45B6D-->  <AD_TEXTINTERFACES_ID><![CDATA[B682A4F7A92C45A4BE2D04E087F45B6D]]></AD_TEXTINTERFACES_ID>
-<!--B682A4F7A92C45A4BE2D04E087F45B6D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--B682A4F7A92C45A4BE2D04E087F45B6D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--B682A4F7A92C45A4BE2D04E087F45B6D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--B682A4F7A92C45A4BE2D04E087F45B6D-->  <TEXT><![CDATA[Sub Total (Group Crit)]]></TEXT>
-<!--B682A4F7A92C45A4BE2D04E087F45B6D-->  <FILENAME><![CDATA[/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.html]]></FILENAME>
-<!--B682A4F7A92C45A4BE2D04E087F45B6D-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--B682A4F7A92C45A4BE2D04E087F45B6D-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
-<!--B682A4F7A92C45A4BE2D04E087F45B6D--></AD_TEXTINTERFACES>
-
 <!--B973837A2C334DC49973CEE4179F43B7--><AD_TEXTINTERFACES>
 <!--B973837A2C334DC49973CEE4179F43B7-->  <AD_TEXTINTERFACES_ID><![CDATA[B973837A2C334DC49973CEE4179F43B7]]></AD_TEXTINTERFACES_ID>
 <!--B973837A2C334DC49973CEE4179F43B7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.html	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.html	Thu Nov 17 13:04:04 2011 +0100
@@ -1111,9 +1111,7 @@
                           </div>
                           <tr class="DataGrid_Body_Row">
                             <th width="10%" class="DataGrid_Header_Cell"><span class="Bold">Sub Total (Status)</span></th>
-                            <th width="100%" class="DataGrid_Header_Cell_Amount" colspan="10"></th>
-                            <th width="10%" class="DataGrid_Header_Cell_Amount"><span class="Bold" id="subtotalTransAmount"></span></th>
-                            <th width="10%" class="DataGrid_Header_Cell"><span class="Bold" id="fieldTransCurrency"></span></th>
+                            <th width="100%" class="DataGrid_Header_Cell_Amount" colspan="12"></th>
                             <th width="10%" class="DataGrid_Header_Cell_Amount"><span class="Bold" id="subtotalBaseAmount"></span></th>
                             <th width="10%" class="DataGrid_Header_Cell"><span class="Bold" id="fieldBaseCurrency"></span></th>
                           </tr>
@@ -1121,27 +1119,18 @@
                             <th colspan="15" height="25px"/>
                           </tr>
                         </div>
-                        <div id="sectionTotal">
-                          <tr>
-                            <th colspan="15" height="25px"/>
-                          </tr>
-                          <tr class="DataGrid_Body_Row">
-                            <th width="10%" class="DataGrid_Header_Cell"><span class="Bold">Grand Total</span></th>
-                            <th width="100%" class="DataGrid_Header_Cell_Amount" colspan="10"></th>
-                            <th width="10%" class="DataGrid_Header_Cell_Amount"><span class="Bold" id="totalTransAmount"></span></th>
-                            <th width="10%" class="DataGrid_Header_Cell"><span class="Bold" id="fieldTransCurrency"></span></th>
-                            <th width="10%" class="DataGrid_Header_Cell_Amount"><span class="Bold" id="totalBaseAmount"></span></th>
-                            <th width="10%" class="DataGrid_Header_Cell"><span class="Bold" id="fieldBaseCurrency"></th>
-                          </tr>
-                        </div>
                       </table>
                       
 
                       <table cellspacing="0" cellpadding="0" width="90%" class="DataGrid_Header_Table DataGrid_Body_Table" style="table-layout: auto;">
                           <div id="sectionGroupCrit">
                             <tr class="DataGrid_Body_Row">
-                              <th colspan="15" class="DataGrid_Header_Cell">Grouping Criteria<span>:&nbsp;</span>
+                              <th colspan="12" class="DataGrid_Header_Cell">Grouping Criteria<span>:&nbsp;</span>
                                 <span id="fieldGroupCritName">xxGroupCritName</span></th>
+                             <!-- <th class="DataGrid_Header_Cell">Balance</th>
+                              <th class="DataGrid_Header_Cell_Amount"><span id="sumBalanceAmount"></span></th>
+                              <th class="DataGrid_Header_Cell"><span id="fieldBaseCurrency2"></span></th> -->
+                              <th colspan="3" class="DataGrid_Header_Cell">Balance<span>:&nbsp;</span><span id="sumBalanceAmount"></span><span>&nbsp;</span><span id="fieldBaseCurrency2"></span></th>
                             </tr>
                             <div id="sectionStatus2">
                                 <tr class="DataGrid_Body_Row">
@@ -1197,39 +1186,16 @@
                                 </div>
                                 <tr class="DataGrid_Body_Row">
                                   <th width="10%" class="DataGrid_Header_Cell"><span class="Bold">Sub Total (Status)</span></th>
-                                  <th width="100%" class="DataGrid_Header_Cell_Amount" colspan="10"></th>
-                                  <th width="10%" class="DataGrid_Header_Cell_Amount"><span class="Bold" id="subtotalTransAmountStatus"></span></th>
-                                  <th width="10%" class="DataGrid_Header_Cell"><span class="Bold" id="fieldTransCurrency2"></span></th>
+                                  <th width="100%" class="DataGrid_Header_Cell_Amount" colspan="12"></th>
                                   <th width="10%" class="DataGrid_Header_Cell_Amount"><span class="Bold" id="subtotalBaseAmountStatus"></span></th>
                                   <th width="10%" class="DataGrid_Header_Cell"><span class="Bold" id="fieldBaseCurrency2"></span></th>
                                 </tr>
                               
                             </div>
-                            <tr class="DataGrid_Body_Row" id="sectionSubtotalGroupCrit">
-                              <th width="10%" class="DataGrid_Header_Cell"><span class="Bold">Sub Total (Group Crit)</span></th>
-                              <th width="100%" class="DataGrid_Header_Cell_Amount" colspan="10"></th>
-                              <th width="10%" class="DataGrid_Header_Cell_Amount"><span class="Bold" id="subtotalTransAmountGroupCrit"></span></th>
-                              <th width="10%" class="DataGrid_Header_Cell"><span class="Bold" id="fieldTransCurrency2"></span></th>
-                              <th width="10%" class="DataGrid_Header_Cell_Amount"><span class="Bold" id="subtotalBaseAmountGroupCrit"></span></th>
-                              <th width="10%" class="DataGrid_Header_Cell"><span class="Bold" id="fieldBaseCurrency2"></span></th>
-                            </tr>
                             <tr>
                               <th colspan="15" style="height:25px"/>
                             </tr>
                           </div>
-                          <div id="sectionTotal2">
-                            <tr>
-                              <th colspan="15" style="height:25px"/>
-                            </tr>
-                            <tr class="DataGrid_Body_Row">
-                              <th width="10%" class="DataGrid_Header_Cell"><span class="Bold">Grand Total</span></th>
-                              <th width="100%" class="DataGrid_Header_Cell_Amount" colspan="10"></th>
-                              <th width="10%" class="DataGrid_Header_Cell_Amount"><span class="Bold" id="totalTransAmount2"></span></th>
-                              <th width="10%" class="DataGrid_Header_Cell"><span class="Bold" id="fieldTransCurrency2"></span></th>
-                              <th width="10%" class="DataGrid_Header_Cell_Amount"><span class="Bold" id="totalBaseAmount2"></span></th>
-                              <th width="10%" class="DataGrid_Header_Cell"><span class="Bold" id="fieldBaseCurrency2"></th>
-                            </tr>
-                          </div>
                       </table>
                     </td>
                   </tr>
--- a/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.java	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.java	Thu Nov 17 13:04:04 2011 +0100
@@ -624,9 +624,12 @@
       return false;
     boolean showAsterisk = false;
     for (final FieldProvider fp : data) {
-      if (fp.getField("INVOICE_NUMBER") != null && !"".equals(fp.getField("INVOICE_NUMBER"))
+      if (fp.getField("INVOICE_NUMBER") != null
+          && !"".equals(fp.getField("INVOICE_NUMBER"))
           && fp.getField("INVOICE_NUMBER").length() >= asterisk.length()
-          && asterisk.equals(fp.getField("INVOICE_NUMBER").substring(0, asterisk.length()))) {
+          && asterisk.equals(fp.getField("INVOICE_NUMBER").substring(0, asterisk.length()))
+          && !"*".equals(fp.getField("INVOICE_NUMBER").substring(asterisk.length(),
+              asterisk.length() + 1))) {
         showAsterisk = true;
         break;
       }
--- a/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -12,7 +12,7 @@
 * under the License. 
 * The Original Code is Openbravo ERP. 
 * The Initial Developer of the Original Code is Openbravo SL 
-* All portions are Copyright (C) 2009 Openbravo SL 
+* All portions are Copyright (C) 2009-2011 Openbravo SL 
 * All Rights Reserved. 
 * Contributor(s):  ______________________________________.
 ************************************************************************
@@ -147,13 +147,9 @@
     <FIELD id="fieldBaseAmount" format="euroInform">BASE_AMOUNT</FIELD>
     <FIELD id="fieldBaseCurrency">BASE_CURRENCY</FIELD>
 
-<!--     Accumulates Transactional Amount and Base Amount columns values -->
-    <FUNCTION id="subtotalTransAmount" name="SUM" format="euroInform">TRANS_AMOUNT</FUNCTION>
+<!--     Accumulates Base Amount columns values -->
     <FUNCTION id="subtotalBaseAmount" name="SUM" format="euroInform">BASE_AMOUNT</FUNCTION>
     
-    <FUNCTION id="totalTransAmount" name="SUM" format="euroInform">TRANS_AMOUNT</FUNCTION>
-    <FUNCTION id="totalBaseAmount" name="SUM" format="euroInform">BASE_AMOUNT</FUNCTION>
-    
     <SECTION id="sectionStatus" field="STATUS"/>
     <SECTION id="sectionDetail"/>
   </structure>
@@ -191,15 +187,9 @@
     <FIELD id="fieldGroupCritName">GROUP_CRIT_ID</FIELD>
     <FIELD id="fieldGroupCrit">GROUP_CRIT_ID</FIELD>
 
-<!--     Accumulates Transactional Amount and Base Amount columns values -->
-    <FUNCTION id="subtotalTransAmountStatus" name="SUM" format="euroInform">TRANS_AMOUNT</FUNCTION>
+<!--     Base Amount columns values -->
     <FUNCTION id="subtotalBaseAmountStatus" name="SUM" format="euroInform">BASE_AMOUNT</FUNCTION>
-    
-    <FUNCTION id="subtotalTransAmountGroupCrit" name="SUM" format="euroInform">TRANS_AMOUNT</FUNCTION>
-    <FUNCTION id="subtotalBaseAmountGroupCrit" name="SUM" format="euroInform">BASE_AMOUNT</FUNCTION>
-    
-    <FUNCTION id="totalTransAmount2" name="SUM" format="euroInform">TRANS_AMOUNT</FUNCTION>
-    <FUNCTION id="totalBaseAmount2" name="SUM" format="euroInform">BASE_AMOUNT</FUNCTION>
+    <FUNCTION id="sumBalanceAmount" name="SUM" format="euroInform">BALANCE</FUNCTION>
     
     <SECTION id="sectionGroupCrit" field="GROUP_CRIT_ID"/>
     <SECTION id="sectionStatus2" field="STATUS"/>
--- a/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java	Thu Nov 17 13:04:04 2011 +0100
@@ -380,11 +380,9 @@
       }
 
       hsqlScript.append(", fpsd.");
-      hsqlScript.append(FIN_PaymentScheduleDetail.PROPERTY_PAYMENTDETAILS);
+      hsqlScript.append(FIN_PaymentScheduleDetail.PROPERTY_INVOICEPAYMENTSCHEDULE);
       hsqlScript.append(".");
-      hsqlScript.append(FIN_PaymentDetail.PROPERTY_ID);
-      hsqlScript.append(", inv.");
-      hsqlScript.append(Invoice.PROPERTY_ID);
+      hsqlScript.append(FIN_PaymentSchedule.PROPERTY_ID);
 
       final OBQuery<FIN_PaymentScheduleDetail> obqPSD = OBDal.getInstance().createQuery(
           FIN_PaymentScheduleDetail.class, hsqlScript.toString(), parameters);
@@ -400,6 +398,7 @@
       String previousFPSDInvoiceId = null;
       String previousPaymentId = null;
       BigDecimal amountSum = BigDecimal.ZERO;
+      BigDecimal balanceSum = BigDecimal.ZERO;
       FieldProvider previousRow = null;
       ConversionRate previousConvRate = null;
       boolean isReceipt = false;
@@ -631,6 +630,37 @@
         // baseCurrency
         FieldProviderFactory.setField(data[i], "TRANS_CURRENCY", transCurrency.getISOCode());
 
+        // Balance
+        String status = "RPAE";
+        try {
+          status = FIN_PaymentScheduleDetail[i].getPaymentDetails().getFinPayment().getStatus();
+        } catch (NullPointerException e) {
+        }
+        final boolean isCreditPayment = FIN_PaymentScheduleDetail[i].getInvoicePaymentSchedule() == null
+            && FIN_PaymentScheduleDetail[i].getPaymentDetails().getFinPayment() != null;
+
+        BigDecimal balance = BigDecimal.ZERO;
+        if (isCreditPayment && status != null && "PWNC RPR RPPC PPM RDNC".indexOf(status) >= 0) {
+          balance = FIN_PaymentScheduleDetail[i]
+              .getPaymentDetails()
+              .getFinPayment()
+              .getGeneratedCredit()
+              .subtract(
+                  FIN_PaymentScheduleDetail[i].getPaymentDetails().getFinPayment().getUsedCredit());
+          if (isReceipt) {
+            balance = balance.negate();
+          }
+        } else if (!isCreditPayment && status != null
+            && "PWNC RPR RPPC PPM RDNC RPVOID".indexOf(status) == -1) {
+          balance = isReceipt ? transAmount : transAmount.negate();
+        }
+        if (convRate != null) {
+          final int stdPrecission = convRate.getToCurrency().getStandardPrecision().intValue();
+          balance = balance.multiply(convRate.getMultipleRateBy()).setScale(stdPrecission,
+              BigDecimal.ROUND_HALF_UP);
+        }
+        FieldProviderFactory.setField(data[i], "BALANCE", balance.toString());
+
         finPaymDetail = FIN_PaymentScheduleDetail[i].getPaymentDetails();
 
         // Payment Schedule Detail grouping criteria
@@ -660,6 +690,7 @@
 
         if (mustGroup) {
           amountSum = amountSum.add(transAmount);
+          balanceSum = balanceSum.add(balance);
         } else {
           if (previousRow != null) {
             // The current row has nothing to do with the previous one. Because of that, the
@@ -669,6 +700,7 @@
             else
               FieldProviderFactory.setField(previousRow, "TRANS_AMOUNT", amountSum.negate()
                   .toString());
+            FieldProviderFactory.setField(previousRow, "BALANCE", balanceSum.toString());
             if (previousConvRate == null) {
               if (previousRow.getField("ISRECEIPT").equalsIgnoreCase("Y"))
                 FieldProviderFactory.setField(previousRow, "BASE_AMOUNT", amountSum.toString());
@@ -714,6 +746,7 @@
           previousRow = data[i];
           previousConvRate = convRate;
           amountSum = transAmount;
+          balanceSum = balance;
         }
 
         // group_crit_id this is the column that has the ids of the grouping criteria selected
@@ -745,6 +778,7 @@
           FieldProviderFactory.setField(previousRow, "TRANS_AMOUNT", amountSum.toString());
         else
           FieldProviderFactory.setField(previousRow, "TRANS_AMOUNT", amountSum.negate().toString());
+        FieldProviderFactory.setField(previousRow, "BALANCE", balanceSum.toString());
         if (previousConvRate == null) {
           if (previousRow.getField("ISRECEIPT").equalsIgnoreCase("Y"))
             FieldProviderFactory.setField(previousRow, "BASE_AMOUNT", amountSum.toString());
--- a/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportPDF.jrxml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportPDF.jrxml	Thu Nov 17 13:04:04 2011 +0100
@@ -1,214 +1,69 @@
-<?xml version="1.0" encoding="UTF-8"  ?>
-<!-- Created with iReport - A designer for JasperReports -->
-<!DOCTYPE jasperReport PUBLIC "//JasperReports//DTD Report Design//EN" "http://jasperreports.sourceforge.net/dtds/jasperreport.dtd">
-<jasperReport
-		 name="PaymentReportPDF"
-		 columnCount="1"
-		 printOrder="Vertical"
-		 orientation="Landscape"
-		 pageWidth="842"
-		 pageHeight="595"
-		 columnWidth="782"
-		 columnSpacing="0"
-		 leftMargin="30"
-		 rightMargin="30"
-		 topMargin="20"
-		 bottomMargin="20"
-		 whenNoDataType="NoDataSection"
-		 isTitleNewPage="false"
-		 isSummaryNewPage="false">
-	<property name="ireport.scriptlethandling" value="0" />
-	<property name="ireport.encoding" value="UTF-8" />
-	<import value="java.util.*" />
-	<import value="net.sf.jasperreports.engine.*" />
-	<import value="net.sf.jasperreports.engine.data.*" />
-
-	<style 
-		name="default"
-		isDefault="false"
-		vAlign="Middle"
-		fontName="Bitstream Vera Sans"
-		fontSize="8"
-	>
-	</style>
-	<style 
-		name="Report_Title"
-		isDefault="false"
-		fontName="Bitstream Vera Sans"
-		fontSize="18"
-	>
-	</style>
-	<style 
-		name="Report_Subtitle"
-		isDefault="false"
-		forecolor="#555555"
-		fontName="Bitstream Vera Sans"
-		fontSize="14"
-	>
-	</style>
-	<style 
-		name="Report_Data_Label"
-		isDefault="false"
-		fontName="Bitstream Vera Sans"
-		fontSize="11"
-		isBold="true"
-	>
-	</style>
-	<style 
-		name="Report_Data_Field"
-		isDefault="false"
-		fontName="Bitstream Vera Sans"
-		fontSize="11"
-		isBold="false"
-	>
-	</style>
-	<style 
-		name="Total_Field"
-		isDefault="false"
-		mode="Opaque"
-		forecolor="#000000"
-		backcolor="#CCCCCC"
-		vAlign="Middle"
-		fontName="Bitstream Vera Sans"
-		fontSize="11"
-		isBold="true"
-	>
-	</style>
-	<style 
-		name="GroupHeader_DarkGray"
-		isDefault="false"
-		mode="Opaque"
-		forecolor="#FFFFFF"
-		backcolor="#555555"
-		vAlign="Middle"
-		fontName="Bitstream Vera Sans"
-		fontSize="12"
-		isBold="true"
-	>
-	</style>
-	<style 
-		name="Group_Data_Label"
-		isDefault="false"
-		fontName="Bitstream Vera Sans"
-		fontSize="11"
-		isBold="true"
-	>
-	</style>
-	<style 
-		name="Group_Data_Field"
-		isDefault="false"
-		fontName="Bitstream Vera Sans"
-		fontSize="11"
-	>
-	</style>
-	<style 
-		name="Detail_Header"
-		isDefault="false"
-		mode="Opaque"
-		forecolor="#FFFFFF"
-		backcolor="#5D5D5D"
-		vAlign="Middle"
-		fontName="Bitstream Vera Sans"
-		fontSize="10"
-		isBold="true"
-	>
-	</style>
-	<style 
-		name="Detail_Line"
-		isDefault="false"
-		fontName="Bitstream Vera Sans"
-		fontSize="8"
-	>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="PaymentReportPDF" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="782" leftMargin="30" rightMargin="30" topMargin="20" bottomMargin="20">
+	<property name="ireport.scriptlethandling" value="0"/>
+	<property name="ireport.encoding" value="UTF-8"/>
+	<property name="ireport.zoom" value="0.75"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="0"/>
+	<import value="net.sf.jasperreports.engine.*"/>
+	<import value="java.util.*"/>
+	<import value="net.sf.jasperreports.engine.data.*"/>
+	<style name="default" vAlign="Middle" fontName="Bitstream Vera Sans" fontSize="8"/>
+	<style name="Report_Title" fontName="Bitstream Vera Sans" fontSize="18"/>
+	<style name="Report_Subtitle" forecolor="#555555" fontName="Bitstream Vera Sans" fontSize="14"/>
+	<style name="Report_Data_Label" fontName="Bitstream Vera Sans" fontSize="11" isBold="true"/>
+	<style name="Report_Data_Field" fontName="Bitstream Vera Sans" fontSize="11" isBold="false"/>
+	<style name="Total_Field" mode="Opaque" forecolor="#000000" backcolor="#CCCCCC" vAlign="Middle" fontName="Bitstream Vera Sans" fontSize="11" isBold="true"/>
+	<style name="GroupHeader_DarkGray" mode="Opaque" forecolor="#FFFFFF" backcolor="#555555" vAlign="Middle" fontName="Bitstream Vera Sans" fontSize="12" isBold="true"/>
+	<style name="Group_Data_Label" fontName="Bitstream Vera Sans" fontSize="11" isBold="true"/>
+	<style name="Group_Data_Field" fontName="Bitstream Vera Sans" fontSize="11"/>
+	<style name="Detail_Header" mode="Opaque" forecolor="#FFFFFF" backcolor="#5D5D5D" vAlign="Middle" fontName="Bitstream Vera Sans" fontSize="10" isBold="true"/>
+	<style name="Detail_Line" fontName="Bitstream Vera Sans" fontSize="8">
 		<conditionalStyle>
 			<conditionExpression><![CDATA[new Boolean($V{REPORT_COUNT}.intValue()%2==0)]]></conditionExpression>
-			<style 
-				name="Detail_Line"
-				isDefault="false"
-				mode="Opaque"
-				backcolor="#CCCCCC"
-			>
-			</style>
+			<style mode="Opaque" backcolor="#CCCCCC"/>
 		</conditionalStyle>
 	</style>
-	<style 
-		name="Total_Gray"
-		isDefault="false"
-		mode="Opaque"
-		forecolor="#000000"
-		backcolor="#CCCCCC"
-	>
-	</style>
-	<style 
-		name="Detail_Data_Label"
-		isDefault="false"
-		mode="Opaque"
-		backcolor="#CCCCCC"
-		fontName="Bitstream Vera Sans"
-		fontSize="10"
-		isBold="true"
-	>
-	</style>
-	<style 
-		name="Detail_Data_Field"
-		isDefault="false"
-		mode="Opaque"
-		backcolor="#CCCCCC"
-		fontName="Bitstream Vera Sans"
-		fontSize="10"
-	>
-	</style>
-	<style 
-		name="Group_Footer"
-		isDefault="false"
-		fontName="Bitstream Vera Sans"
-		fontSize="11"
-		isBold="true"
-	>
-	</style>
-	<style 
-		name="Report_Footer"
-		isDefault="true"
-		vAlign="Middle"
-		fontName="Bitstream Vera Sans"
-		fontSize="11"
-	>
-	</style>
-
-	<parameter name="GROUP_CRIT" isForPrompting="false" class="java.lang.String"/>
-	<parameter name="ORG_SHOW" isForPrompting="false" class="java.lang.String"/>
-	<parameter name="INCL_SUBORG_SHOW" isForPrompting="false" class="java.lang.String"/>
-	<parameter name="DUEDATEFROM_SHOW" isForPrompting="false" class="java.lang.String"/>
-	<parameter name="DUEDATETO_SHOW" isForPrompting="false" class="java.lang.String"/>
-	<parameter name="AMTFROM_SHOW" isForPrompting="false" class="java.lang.String"/>
-	<parameter name="AMTTO_SHOW" isForPrompting="false" class="java.lang.String"/>
-	<parameter name="DOCDATEFROM_SHOW" isForPrompting="false" class="java.lang.String"/>
-	<parameter name="DOCDATETO_SHOW" isForPrompting="false" class="java.lang.String"/>
-	<parameter name="BPARTNER_SHOW" isForPrompting="false" class="java.lang.String"/>
-	<parameter name="BPGROUP_SHOW" isForPrompting="false" class="java.lang.String"/>
-	<parameter name="PROJECT_SHOW" isForPrompting="false" class="java.lang.String"/>
-	<parameter name="STATUS_SHOW" isForPrompting="false" class="java.lang.String"/>
-	<parameter name="CURRENCY_SHOW" isForPrompting="false" class="java.lang.String"/>
-	<parameter name="CONVERSIONDATE_SHOW" isForPrompting="false" class="java.lang.String"/>
-	<parameter name="PAYMTYPE_SHOW" isForPrompting="false" class="java.lang.String"/>
-	<parameter name="OVERDUE_SHOW" isForPrompting="false" class="java.lang.String"/>
-	<parameter name="GROUPCRIT_SHOW" isForPrompting="false" class="java.lang.String"/>
-	<parameter name="ORDCRIT_SHOW" isForPrompting="false" class="java.lang.String"/>
-	<parameter name="PAYMENT_METHOD_SHOW" isForPrompting="false" class="java.lang.String"/>
-	<parameter name="FINANCIAL_ACCOUNT_SHOW" isForPrompting="false" class="java.lang.String"/>
-	<parameter name="CONVERT_CURRENCY_SHOW" isForPrompting="false" class="java.lang.String"/>
-	<parameter name="INCL_PAYMENTUSINGCREDIT" isForPrompting="false" class="java.lang.String"/>
-	<parameter name="ONE_ASTERISK_SHOW" isForPrompting="false" class="java.lang.Boolean">
-		<defaultValueExpression ><![CDATA[new Boolean(false)]]></defaultValueExpression>
+	<style name="Total_Gray" mode="Opaque" forecolor="#000000" backcolor="#CCCCCC"/>
+	<style name="Detail_Data_Label" mode="Opaque" backcolor="#CCCCCC" fontName="Bitstream Vera Sans" fontSize="10" isBold="true"/>
+	<style name="Detail_Data_Field" mode="Opaque" backcolor="#CCCCCC" fontName="Bitstream Vera Sans" fontSize="10"/>
+	<style name="Group_Footer" fontName="Bitstream Vera Sans" fontSize="11" isBold="true"/>
+	<style name="Report_Footer" isDefault="true" vAlign="Middle" fontName="Bitstream Vera Sans" fontSize="11"/>
+	<parameter name="GROUP_CRIT" class="java.lang.String" isForPrompting="false"/>
+	<parameter name="ORG_SHOW" class="java.lang.String" isForPrompting="false"/>
+	<parameter name="INCL_SUBORG_SHOW" class="java.lang.String" isForPrompting="false"/>
+	<parameter name="DUEDATEFROM_SHOW" class="java.lang.String" isForPrompting="false"/>
+	<parameter name="DUEDATETO_SHOW" class="java.lang.String" isForPrompting="false"/>
+	<parameter name="AMTFROM_SHOW" class="java.lang.String" isForPrompting="false"/>
+	<parameter name="AMTTO_SHOW" class="java.lang.String" isForPrompting="false"/>
+	<parameter name="DOCDATEFROM_SHOW" class="java.lang.String" isForPrompting="false"/>
+	<parameter name="DOCDATETO_SHOW" class="java.lang.String" isForPrompting="false"/>
+	<parameter name="BPARTNER_SHOW" class="java.lang.String" isForPrompting="false"/>
+	<parameter name="BPGROUP_SHOW" class="java.lang.String" isForPrompting="false"/>
+	<parameter name="PROJECT_SHOW" class="java.lang.String" isForPrompting="false"/>
+	<parameter name="STATUS_SHOW" class="java.lang.String" isForPrompting="false"/>
+	<parameter name="CURRENCY_SHOW" class="java.lang.String" isForPrompting="false"/>
+	<parameter name="CONVERSIONDATE_SHOW" class="java.lang.String" isForPrompting="false"/>
+	<parameter name="PAYMTYPE_SHOW" class="java.lang.String" isForPrompting="false"/>
+	<parameter name="OVERDUE_SHOW" class="java.lang.String" isForPrompting="false"/>
+	<parameter name="GROUPCRIT_SHOW" class="java.lang.String" isForPrompting="false"/>
+	<parameter name="ORDCRIT_SHOW" class="java.lang.String" isForPrompting="false"/>
+	<parameter name="PAYMENT_METHOD_SHOW" class="java.lang.String" isForPrompting="false"/>
+	<parameter name="FINANCIAL_ACCOUNT_SHOW" class="java.lang.String" isForPrompting="false"/>
+	<parameter name="CONVERT_CURRENCY_SHOW" class="java.lang.String" isForPrompting="false"/>
+	<parameter name="INCL_PAYMENTUSINGCREDIT" class="java.lang.String" isForPrompting="false"/>
+	<parameter name="ONE_ASTERISK_SHOW" class="java.lang.Boolean" isForPrompting="false">
+		<defaultValueExpression><![CDATA[new Boolean(false)]]></defaultValueExpression>
 	</parameter>
-	<parameter name="TWO_ASTERISK_SHOW" isForPrompting="false" class="java.lang.Boolean">
-		<defaultValueExpression ><![CDATA[new Boolean(false)]]></defaultValueExpression>
+	<parameter name="TWO_ASTERISK_SHOW" class="java.lang.Boolean" isForPrompting="false">
+		<defaultValueExpression><![CDATA[new Boolean(false)]]></defaultValueExpression>
 	</parameter>
-	<queryString><![CDATA[SELECT 'hello' AS BP_GROUP, 'hello' AS BPARTNER, 'hello' AS PROJECT, 'hello' AS PAYMENT, 'hello' AS SALES_PERSON, 1234 AS INVOICE_NUMBER, to_Date('01/01/2010') AS INVOICE_DATE,
+	<queryString>
+		<![CDATA[SELECT 'hello' AS BP_GROUP, 'hello' AS BPARTNER, 'hello' AS PROJECT, 'hello' AS PAYMENT, 'hello' AS SALES_PERSON, 1234 AS INVOICE_NUMBER, to_Date('01/01/2010') AS INVOICE_DATE,
        to_Date('01/03/2010') AS DUE_DATE, 1234 AS PLANNED_DSO, 1234 AS CURRENT_DSO, 1234 AS OVERDUE, 1234 AS DAYS_OVERDUE, 1234 AS AMOUNT,
        'hello' AS CURRENCY, 1234 AS BASE_AMOUNT, 'hello' AS BASE_CURRENCY, 'hello' AS PAYMENT_METHOD, 'hello' AS FINANCIAL_ACCOUNT
-FROM DUAL]]></queryString>
-
+FROM DUAL]]>
+	</queryString>
 	<field name="BP_GROUP" class="java.lang.String"/>
 	<field name="BPARTNER" class="java.lang.String"/>
 	<field name="PROJECT" class="java.lang.String"/>
@@ -229,479 +84,206 @@
 	<field name="FINANCIAL_ACCOUNT" class="java.lang.String"/>
 	<field name="GROUP_CRIT" class="java.lang.String"/>
 	<field name="STATUS" class="java.lang.String"/>
-
+	<field name="BALANCE" class="java.math.BigDecimal"/>
 	<variable name="SUMSUBTOTALSTATUS" class="java.math.BigDecimal" resetType="Group" resetGroup="Status" calculation="Sum">
 		<variableExpression><![CDATA[$F{BASE_AMOUNT}]]></variableExpression>
 		<initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression>
 	</variable>
-	<variable name="SUMSUBTOTALGC" class="java.math.BigDecimal" resetType="Group" resetGroup="GroupingCriteria" calculation="Sum">
-		<variableExpression><![CDATA[$F{BASE_AMOUNT}]]></variableExpression>
+	<variable name="SUMBALANCE" class="java.math.BigDecimal" resetType="Group" resetGroup="GroupingCriteria" calculation="Sum">
+		<variableExpression><![CDATA[$F{BALANCE}]]></variableExpression>
 		<initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression>
 	</variable>
-	<variable name="SUMSUBTOTALGT" class="java.math.BigDecimal" resetType="Report" calculation="Sum">
-		<variableExpression><![CDATA[$F{BASE_AMOUNT}]]></variableExpression>
-		<initialValueExpression><![CDATA[BigDecimal.ZERO]]></initialValueExpression>
-	</variable>
-
-		<group  name="MultipleBusinessPartner" >
-			<groupExpression><![CDATA[$F{GROUP_CRIT}]]></groupExpression>
-			<groupHeader>
-			<band height="20"  isSplitAllowed="true" >
+	<group name="MultipleBusinessPartner">
+		<groupExpression><![CDATA[$F{GROUP_CRIT}]]></groupExpression>
+		<groupHeader>
+			<band height="20" splitType="Stretch">
 				<staticText>
-					<reportElement
-						style="Report_Footer"
-						x="11"
-						y="0"
-						width="179"
-						height="18"
-						key="staticText-32"
-						stretchType="RelativeToBandHeight"/>
-					<box></box>
-					<textElement textAlignment="Right">
-						<font/>
-					</textElement>
-				<text><![CDATA[Business Partner:]]></text>
+					<reportElement key="staticText-32" style="Report_Footer" stretchType="RelativeToBandHeight" x="11" y="0" width="179" height="18"/>
+					<textElement textAlignment="Right"/>
+					<text><![CDATA[Business Partner:]]></text>
 				</staticText>
 				<staticText>
-					<reportElement
-						style="Report_Footer"
-						x="408"
-						y="0"
-						width="179"
-						height="18"
-						key="staticText-33"
-						stretchType="RelativeToBandHeight"/>
-					<box></box>
-					<textElement textAlignment="Right">
-						<font/>
-					</textElement>
-				<text><![CDATA[Business Partner Category:]]></text>
+					<reportElement key="staticText-33" style="Report_Footer" stretchType="RelativeToBandHeight" x="408" y="0" width="179" height="18"/>
+					<textElement textAlignment="Right"/>
+					<text><![CDATA[Business Partner Category:]]></text>
 				</staticText>
-				<textField isStretchWithOverflow="true" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						style="Report_Footer"
-						x="196"
-						y="0"
-						width="179"
-						height="18"
-						key="textField-29"
-						stretchType="RelativeToBandHeight"/>
-					<box></box>
-					<textElement>
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$P{BPARTNER_SHOW}.toString()]]></textFieldExpression>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement key="textField-29" style="Report_Footer" stretchType="RelativeToBandHeight" x="196" y="0" width="179" height="18"/>
+					<textElement/>
+					<textFieldExpression class="java.lang.String"><![CDATA[$P{BPARTNER_SHOW}.toString()]]></textFieldExpression>
 				</textField>
-				<textField isStretchWithOverflow="true" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						style="Report_Footer"
-						x="593"
-						y="0"
-						width="179"
-						height="18"
-						key="textField-40"
-						stretchType="RelativeToBandHeight"/>
-					<box></box>
-					<textElement>
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$P{BPGROUP_SHOW}.toString()]]></textFieldExpression>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement key="textField-40" style="Report_Footer" stretchType="RelativeToBandHeight" x="593" y="0" width="179" height="18"/>
+					<textElement/>
+					<textFieldExpression class="java.lang.String"><![CDATA[$P{BPGROUP_SHOW}.toString()]]></textFieldExpression>
 				</textField>
 			</band>
-			</groupHeader>
-			<groupFooter>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-			</groupFooter>
-		</group>
-		<group  name="MultipleProject" >
-			<groupExpression><![CDATA[$F{GROUP_CRIT}]]></groupExpression>
-			<groupHeader>
-			<band height="20"  isSplitAllowed="true" >
+		</groupHeader>
+		<groupFooter>
+			<band splitType="Stretch"/>
+		</groupFooter>
+	</group>
+	<group name="MultipleProject">
+		<groupExpression><![CDATA[$F{GROUP_CRIT}]]></groupExpression>
+		<groupHeader>
+			<band height="20" splitType="Stretch">
 				<staticText>
-					<reportElement
-						style="Report_Footer"
-						x="11"
-						y="0"
-						width="179"
-						height="18"
-						key="staticText-34"
-						stretchType="RelativeToBandHeight"/>
-					<box></box>
-					<textElement textAlignment="Right">
-						<font/>
-					</textElement>
-				<text><![CDATA[Project:]]></text>
+					<reportElement key="staticText-34" style="Report_Footer" stretchType="RelativeToBandHeight" x="11" y="0" width="179" height="18"/>
+					<textElement textAlignment="Right"/>
+					<text><![CDATA[Project:]]></text>
 				</staticText>
 				<staticText>
-					<reportElement
-						style="Report_Footer"
-						x="408"
-						y="0"
-						width="179"
-						height="18"
-						key="staticText-35"
-						stretchType="RelativeToBandHeight"/>
-					<box></box>
-					<textElement textAlignment="Right">
-						<font/>
-					</textElement>
-				<text><![CDATA[Status:]]></text>
+					<reportElement key="staticText-35" style="Report_Footer" stretchType="RelativeToBandHeight" x="408" y="0" width="179" height="18"/>
+					<textElement textAlignment="Right"/>
+					<text><![CDATA[Status:]]></text>
 				</staticText>
-				<textField isStretchWithOverflow="true" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						style="Report_Footer"
-						x="196"
-						y="0"
-						width="179"
-						height="18"
-						key="textField-30"
-						stretchType="RelativeToBandHeight"/>
-					<box></box>
-					<textElement>
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$P{PROJECT_SHOW}.toString()]]></textFieldExpression>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement key="textField-30" style="Report_Footer" stretchType="RelativeToBandHeight" x="196" y="0" width="179" height="18"/>
+					<textElement/>
+					<textFieldExpression class="java.lang.String"><![CDATA[$P{PROJECT_SHOW}.toString()]]></textFieldExpression>
 				</textField>
-				<textField isStretchWithOverflow="true" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						style="Report_Footer"
-						x="593"
-						y="0"
-						width="179"
-						height="18"
-						key="textField-41"
-						stretchType="RelativeToBandHeight"/>
-					<box></box>
-					<textElement>
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$P{STATUS_SHOW}.toString()]]></textFieldExpression>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement key="textField-41" style="Report_Footer" stretchType="RelativeToBandHeight" x="593" y="0" width="179" height="18"/>
+					<textElement/>
+					<textFieldExpression class="java.lang.String"><![CDATA[$P{STATUS_SHOW}.toString()]]></textFieldExpression>
 				</textField>
 			</band>
-			</groupHeader>
-			<groupFooter>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-			</groupFooter>
-		</group>
-		<group  name="LastFilters" >
-			<groupExpression><![CDATA[$F{GROUP_CRIT}]]></groupExpression>
-			<groupHeader>
-			<band height="100"  isSplitAllowed="true" >
+		</groupHeader>
+		<groupFooter>
+			<band splitType="Stretch"/>
+		</groupFooter>
+	</group>
+	<group name="LastFilters">
+		<groupExpression><![CDATA[$F{GROUP_CRIT}]]></groupExpression>
+		<groupHeader>
+			<band height="100" splitType="Stretch">
 				<staticText>
-					<reportElement
-						style="Report_Footer"
-						x="408"
-						y="20"
-						width="179"
-						height="18"
-						key="staticText-50"/>
-					<box></box>
-					<textElement textAlignment="Right">
-						<font/>
-					</textElement>
-				<text><![CDATA[Include Payments Using Credit:]]></text>
+					<reportElement key="staticText-50" style="Report_Footer" x="408" y="20" width="179" height="18"/>
+					<textElement textAlignment="Right"/>
+					<text><![CDATA[Include Payments Using Credit:]]></text>
 				</staticText>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						style="Report_Footer"
-						x="593"
-						y="20"
-						width="179"
-						height="18"
-						key="textField-46"/>
-					<box></box>
-					<textElement>
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$P{INCL_PAYMENTUSINGCREDIT}.toString()]]></textFieldExpression>
+				<textField isBlankWhenNull="true">
+					<reportElement key="textField-46" style="Report_Footer" x="593" y="20" width="179" height="18"/>
+					<textElement/>
+					<textFieldExpression class="java.lang.String"><![CDATA[$P{INCL_PAYMENTUSINGCREDIT}.toString()]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement
-						style="Report_Footer"
-						x="11"
-						y="40"
-						width="179"
-						height="18"
-						key="staticText-36"/>
-					<box></box>
-					<textElement textAlignment="Right">
-						<font/>
-					</textElement>
-				<text><![CDATA[Convert to currency:]]></text>
+					<reportElement key="staticText-36" style="Report_Footer" x="11" y="40" width="179" height="18"/>
+					<textElement textAlignment="Right"/>
+					<text><![CDATA[Convert to currency:]]></text>
 				</staticText>
 				<staticText>
-					<reportElement
-						style="Report_Footer"
-						x="408"
-						y="40"
-						width="179"
-						height="18"
-						key="staticText-37"/>
-					<box></box>
-					<textElement textAlignment="Right">
-						<font/>
-					</textElement>
-				<text><![CDATA[Conversion Date:]]></text>
+					<reportElement key="staticText-37" style="Report_Footer" x="408" y="40" width="179" height="18"/>
+					<textElement textAlignment="Right"/>
+					<text><![CDATA[Conversion Date:]]></text>
 				</staticText>
 				<staticText>
-					<reportElement
-						style="Report_Footer"
-						x="11"
-						y="60"
-						width="179"
-						height="18"
-						key="staticText-38"/>
-					<box></box>
-					<textElement textAlignment="Right">
-						<font/>
-					</textElement>
-				<text><![CDATA[Payment Type:]]></text>
+					<reportElement key="staticText-38" style="Report_Footer" x="11" y="60" width="179" height="18"/>
+					<textElement textAlignment="Right"/>
+					<text><![CDATA[Payment Type:]]></text>
 				</staticText>
 				<staticText>
-					<reportElement
-						style="Report_Footer"
-						x="408"
-						y="60"
-						width="179"
-						height="18"
-						key="staticText-39"/>
-					<box></box>
-					<textElement textAlignment="Right">
-						<font/>
-					</textElement>
-				<text><![CDATA[Overdue:]]></text>
+					<reportElement key="staticText-39" style="Report_Footer" x="408" y="60" width="179" height="18"/>
+					<textElement textAlignment="Right"/>
+					<text><![CDATA[Overdue:]]></text>
 				</staticText>
 				<staticText>
-					<reportElement
-						style="Report_Footer"
-						x="11"
-						y="80"
-						width="179"
-						height="18"
-						key="staticText-41"/>
-					<box></box>
-					<textElement textAlignment="Right">
-						<font/>
-					</textElement>
-				<text><![CDATA[Grouping Criteria:]]></text>
+					<reportElement key="staticText-41" style="Report_Footer" x="11" y="80" width="179" height="18"/>
+					<textElement textAlignment="Right"/>
+					<text><![CDATA[Grouping Criteria:]]></text>
 				</staticText>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						style="Report_Footer"
-						x="196"
-						y="40"
-						width="179"
-						height="18"
-						key="textField-31"/>
-					<box></box>
-					<textElement>
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$P{CONVERT_CURRENCY_SHOW}.toString()]]></textFieldExpression>
+				<textField isBlankWhenNull="true">
+					<reportElement key="textField-31" style="Report_Footer" x="196" y="40" width="179" height="18"/>
+					<textElement/>
+					<textFieldExpression class="java.lang.String"><![CDATA[$P{CONVERT_CURRENCY_SHOW}.toString()]]></textFieldExpression>
 				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						style="Report_Footer"
-						x="196"
-						y="60"
-						width="179"
-						height="18"
-						key="textField-32"/>
-					<box></box>
-					<textElement>
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$P{PAYMTYPE_SHOW}.toString()]]></textFieldExpression>
+				<textField isBlankWhenNull="true">
+					<reportElement key="textField-32" style="Report_Footer" x="196" y="60" width="179" height="18"/>
+					<textElement/>
+					<textFieldExpression class="java.lang.String"><![CDATA[$P{PAYMTYPE_SHOW}.toString()]]></textFieldExpression>
 				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						style="Report_Footer"
-						x="196"
-						y="80"
-						width="179"
-						height="18"
-						key="textField-33"/>
-					<box></box>
-					<textElement>
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$P{GROUPCRIT_SHOW}.toString()]]></textFieldExpression>
+				<textField isBlankWhenNull="true">
+					<reportElement key="textField-33" style="Report_Footer" x="196" y="80" width="179" height="18"/>
+					<textElement/>
+					<textFieldExpression class="java.lang.String"><![CDATA[$P{GROUPCRIT_SHOW}.toString()]]></textFieldExpression>
 				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						style="Report_Footer"
-						x="593"
-						y="60"
-						width="179"
-						height="18"
-						key="textField-35"/>
-					<box></box>
-					<textElement>
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$P{OVERDUE_SHOW}.toString()]]></textFieldExpression>
+				<textField isBlankWhenNull="true">
+					<reportElement key="textField-35" style="Report_Footer" x="593" y="60" width="179" height="18"/>
+					<textElement/>
+					<textFieldExpression class="java.lang.String"><![CDATA[$P{OVERDUE_SHOW}.toString()]]></textFieldExpression>
 				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						style="Report_Footer"
-						x="593"
-						y="40"
-						width="179"
-						height="18"
-						key="textField-42"/>
-					<box></box>
-					<textElement>
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$P{CONVERSIONDATE_SHOW}.toString()]]></textFieldExpression>
+				<textField isBlankWhenNull="true">
+					<reportElement key="textField-42" style="Report_Footer" x="593" y="40" width="179" height="18"/>
+					<textElement/>
+					<textFieldExpression class="java.lang.String"><![CDATA[$P{CONVERSIONDATE_SHOW}.toString()]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement
-						style="Report_Footer"
-						x="11"
-						y="0"
-						width="179"
-						height="18"
-						key="staticText-47"/>
-					<box></box>
-					<textElement textAlignment="Right">
-						<font/>
-					</textElement>
-				<text><![CDATA[Payment Method:]]></text>
+					<reportElement key="staticText-47" style="Report_Footer" x="11" y="0" width="179" height="18"/>
+					<textElement textAlignment="Right"/>
+					<text><![CDATA[Payment Method:]]></text>
 				</staticText>
 				<staticText>
-					<reportElement
-						style="Report_Footer"
-						x="408"
-						y="0"
-						width="179"
-						height="18"
-						key="staticText-48"/>
-					<box></box>
-					<textElement textAlignment="Right">
-						<font/>
-					</textElement>
-				<text><![CDATA[Financial Account:]]></text>
+					<reportElement key="staticText-48" style="Report_Footer" x="408" y="0" width="179" height="18"/>
+					<textElement textAlignment="Right"/>
+					<text><![CDATA[Financial Account:]]></text>
 				</staticText>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						style="Report_Footer"
-						x="196"
-						y="0"
-						width="179"
-						height="18"
-						key="textField-43"/>
-					<box></box>
-					<textElement>
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$P{PAYMENT_METHOD_SHOW}.toString()]]></textFieldExpression>
+				<textField isBlankWhenNull="true">
+					<reportElement key="textField-43" style="Report_Footer" x="196" y="0" width="179" height="18"/>
+					<textElement/>
+					<textFieldExpression class="java.lang.String"><![CDATA[$P{PAYMENT_METHOD_SHOW}.toString()]]></textFieldExpression>
 				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						style="Report_Footer"
-						x="593"
-						y="0"
-						width="179"
-						height="18"
-						key="textField-44"/>
-					<box></box>
-					<textElement>
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$P{FINANCIAL_ACCOUNT_SHOW}.toString()]]></textFieldExpression>
+				<textField isBlankWhenNull="true">
+					<reportElement key="textField-44" style="Report_Footer" x="593" y="0" width="179" height="18"/>
+					<textElement/>
+					<textFieldExpression class="java.lang.String"><![CDATA[$P{FINANCIAL_ACCOUNT_SHOW}.toString()]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement
-						style="Report_Footer"
-						x="11"
-						y="20"
-						width="179"
-						height="18"
-						key="staticText-49"/>
-					<box></box>
-					<textElement textAlignment="Right">
-						<font/>
-					</textElement>
-				<text><![CDATA[Currency:]]></text>
+					<reportElement key="staticText-49" style="Report_Footer" x="11" y="20" width="179" height="18"/>
+					<textElement textAlignment="Right"/>
+					<text><![CDATA[Currency:]]></text>
 				</staticText>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						style="Report_Footer"
-						x="196"
-						y="20"
-						width="179"
-						height="18"
-						key="textField-45"/>
-					<box></box>
-					<textElement>
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$P{CURRENCY_SHOW}.toString()]]></textFieldExpression>
+				<textField isBlankWhenNull="true">
+					<reportElement key="textField-45" style="Report_Footer" x="196" y="20" width="179" height="18"/>
+					<textElement/>
+					<textFieldExpression class="java.lang.String"><![CDATA[$P{CURRENCY_SHOW}.toString()]]></textFieldExpression>
 				</textField>
 			</band>
-			</groupHeader>
-			<groupFooter>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-			</groupFooter>
-		</group>
-		<group  name="MultipleOrderingCriteria" >
-			<groupExpression><![CDATA[$F{GROUP_CRIT}]]></groupExpression>
-			<groupHeader>
-			<band height="20"  isSplitAllowed="true" >
+		</groupHeader>
+		<groupFooter>
+			<band splitType="Stretch"/>
+		</groupFooter>
+	</group>
+	<group name="MultipleOrderingCriteria">
+		<groupExpression><![CDATA[$F{GROUP_CRIT}]]></groupExpression>
+		<groupHeader>
+			<band height="20" splitType="Stretch">
 				<staticText>
-					<reportElement
-						style="Report_Footer"
-						x="11"
-						y="0"
-						width="179"
-						height="18"
-						key="staticText-43"
-						stretchType="RelativeToBandHeight"/>
-					<box></box>
-					<textElement textAlignment="Right">
-						<font/>
-					</textElement>
-				<text><![CDATA[Ordering Criteria:]]></text>
+					<reportElement key="staticText-43" style="Report_Footer" stretchType="RelativeToBandHeight" x="11" y="0" width="179" height="18"/>
+					<textElement textAlignment="Right"/>
+					<text><![CDATA[Ordering Criteria:]]></text>
 				</staticText>
-				<textField isStretchWithOverflow="true" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						style="Report_Footer"
-						x="196"
-						y="0"
-						width="179"
-						height="18"
-						key="textField-34"
-						stretchType="RelativeToBandHeight"/>
-					<box></box>
-					<textElement>
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$P{ORDCRIT_SHOW}.toString()]]></textFieldExpression>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement key="textField-34" style="Report_Footer" stretchType="RelativeToBandHeight" x="196" y="0" width="179" height="18"/>
+					<textElement/>
+					<textFieldExpression class="java.lang.String"><![CDATA[$P{ORDCRIT_SHOW}.toString()]]></textFieldExpression>
 				</textField>
 			</band>
-			</groupHeader>
-			<groupFooter>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-			</groupFooter>
-		</group>
-		<group  name="FirstPage" isStartNewPage="true" minHeightToStartNewPage="500" >
-			<groupExpression><![CDATA[]]></groupExpression>
-			<groupHeader>
-			<band height="20"  isSplitAllowed="true" >
-			</band>
-			</groupHeader>
-			<groupFooter>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-			</groupFooter>
-		</group>
-		<group  name="GroupingCriteria" >
-			<groupExpression><![CDATA[($P{GROUP_CRIT}.equalsIgnoreCase("APRM_FATS_BPARTNER") ? $F{BPARTNER} : 
+		</groupHeader>
+		<groupFooter>
+			<band splitType="Stretch"/>
+		</groupFooter>
+	</group>
+	<group name="FirstPage" isStartNewPage="true" minHeightToStartNewPage="500">
+		<groupExpression><![CDATA[]]></groupExpression>
+		<groupHeader>
+			<band height="20" splitType="Stretch"/>
+		</groupHeader>
+		<groupFooter>
+			<band splitType="Stretch"/>
+		</groupFooter>
+	</group>
+	<group name="GroupingCriteria">
+		<groupExpression><![CDATA[($P{GROUP_CRIT}.equalsIgnoreCase("APRM_FATS_BPARTNER") ? $F{BPARTNER} :
   ($P{GROUP_CRIT}.equalsIgnoreCase("Project") ? $F{PROJECT} :
     ($P{GROUP_CRIT}.equalsIgnoreCase("FINPR_BPartner_Category") ? $F{BP_GROUP} :
       ($P{GROUP_CRIT}.equalsIgnoreCase("INS_CURRENCY") ? $F{BASE_CURRENCY} : " "
@@ -709,21 +291,15 @@
     )
   )
 )]]></groupExpression>
-			<groupHeader>
-			<band height="30"  isSplitAllowed="true" >
-				<textField isStretchWithOverflow="false" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						style="Detail_Header"
-						x="103"
-						y="0"
-						width="200"
-						height="20"
-						key="textField-19"/>
-					<box></box>
+		<groupHeader>
+			<band height="30" splitType="Stretch">
+				<printWhenExpression><![CDATA[!"".equals($P{GROUP_CRIT})]]></printWhenExpression>
+				<textField isBlankWhenNull="true">
+					<reportElement key="textField-19" style="Detail_Header" x="103" y="0" width="246" height="20"/>
 					<textElement>
 						<font size="10"/>
 					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[($P{GROUP_CRIT}.equalsIgnoreCase("APRM_FATS_BPARTNER") ? $F{BPARTNER}.toString() : 
+					<textFieldExpression class="java.lang.String"><![CDATA[($P{GROUP_CRIT}.equalsIgnoreCase("APRM_FATS_BPARTNER") ? $F{BPARTNER}.toString() :
   ($P{GROUP_CRIT}.equalsIgnoreCase("Project") ? $F{PROJECT}.toString() :
     ($P{GROUP_CRIT}.equalsIgnoreCase("FINPR_BPartner_Category") ? $F{BP_GROUP}.toString() :
       ($P{GROUP_CRIT}.equalsIgnoreCase("INS_CURRENCY") ? $F{TRANS_CURRENCY}.toString() : "None"
@@ -733,1278 +309,511 @@
 )]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement
-						style="Detail_Header"
-						x="1"
-						y="0"
-						width="103"
-						height="20"
-						key="staticText-44"/>
-					<box></box>
+					<reportElement key="staticText-44" style="Detail_Header" x="1" y="0" width="103" height="20"/>
+					<textElement/>
+					<text><![CDATA[Grouping Criteria:]]></text>
+				</staticText>
+				<staticText>
+					<reportElement key="staticText-44" style="Detail_Header" x="349" y="0" width="58" height="20"/>
+					<textElement textAlignment="Right"/>
+					<text><![CDATA[Balance:]]></text>
+				</staticText>
+				<textField isBlankWhenNull="true">
+					<reportElement key="textField-19" style="Detail_Header" x="459" y="0" width="33" height="20"/>
+					<textElement textAlignment="Justified">
+						<font size="10"/>
+					</textElement>
+					<textFieldExpression class="java.lang.String"><![CDATA[$F{BASE_CURRENCY}]]></textFieldExpression>
+				</textField>
+				<textField evaluationTime="Group" evaluationGroup="GroupingCriteria" isBlankWhenNull="true">
+					<reportElement key="textField-19" style="Detail_Header" x="407" y="0" width="52" height="20"/>
+					<textElement textAlignment="Right">
+						<font size="10"/>
+					</textElement>
+					<textFieldExpression class="java.lang.String"><![CDATA[($V{SUMBALANCE}!=null)?$V{SUMBALANCE}.toString():new String(" ")]]></textFieldExpression>
+				</textField>
+			</band>
+		</groupHeader>
+	</group>
+	<group name="Status">
+		<groupExpression><![CDATA[$F{STATUS}]]></groupExpression>
+		<groupHeader>
+			<band height="60" splitType="Stretch">
+				<staticText>
+					<reportElement key="staticText-2" style="Detail_Header" x="1" y="35" width="100" height="25"/>
+					<box leftPadding="2"/>
+					<textElement verticalAlignment="Middle">
+						<font size="8" isBold="false"/>
+					</textElement>
+					<text><![CDATA[Business Partner]]></text>
+				</staticText>
+				<staticText>
+					<reportElement key="staticText-4" style="Detail_Header" x="285" y="35" width="65" height="25"/>
+					<box leftPadding="2"/>
+					<textElement verticalAlignment="Middle">
+						<font size="8" isBold="false"/>
+					</textElement>
+					<text><![CDATA[Payment]]></text>
+				</staticText>
+				<staticText>
+					<reportElement key="staticText-5" style="Detail_Header" x="102" y="35" width="70" height="25"/>
+					<box leftPadding="2"/>
+					<textElement verticalAlignment="Middle">
+						<font size="8" isBold="false"/>
+					</textElement>
+					<text><![CDATA[Sales Person]]></text>
+				</staticText>
+				<staticText>
+					<reportElement key="staticText-6" style="Detail_Header" x="173" y="35" width="55" height="25"/>
+					<box leftPadding="2"/>
+					<textElement verticalAlignment="Middle">
+						<font size="8" isBold="false"/>
+					</textElement>
+					<text><![CDATA[Invoice
+Number]]></text>
+				</staticText>
+				<staticText>
+					<reportElement key="staticText-7" style="Detail_Header" x="229" y="35" width="55" height="25"/>
+					<box leftPadding="2"/>
+					<textElement textAlignment="Left" verticalAlignment="Middle">
+						<font size="8" isBold="false"/>
+					</textElement>
+					<text><![CDATA[Invoice Date]]></text>
+				</staticText>
+				<staticText>
+					<reportElement key="staticText-8" style="Detail_Header" x="351" y="35" width="61" height="25"/>
+					<box leftPadding="2"/>
+					<textElement textAlignment="Left" verticalAlignment="Middle">
+						<font size="8" isBold="false"/>
+					</textElement>
+					<text><![CDATA[Due Date]]></text>
+				</staticText>
+				<staticText>
+					<reportElement key="staticText-9" style="Detail_Header" x="412" y="35" width="33" height="25"/>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font size="8" isBold="false"/>
+					</textElement>
+					<text><![CDATA[Planned
+DSO]]></text>
+				</staticText>
+				<staticText>
+					<reportElement key="staticText-10" style="Detail_Header" x="446" y="35" width="33" height="25"/>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font size="8" isBold="false"/>
+					</textElement>
+					<text><![CDATA[Current
+DSO]]></text>
+				</staticText>
+				<staticText>
+					<reportElement key="staticText-11" style="Detail_Header" x="480" y="35" width="36" height="25"/>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font size="8" isBold="false"/>
+					</textElement>
+					<text><![CDATA[Overdue]]></text>
+				</staticText>
+				<staticText>
+					<reportElement key="staticText-13" style="Detail_Header" x="659" y="35" width="80" height="25"/>
+					<box rightPadding="2"/>
+					<textElement textAlignment="Right">
+						<font size="8" isBold="false"/>
+					</textElement>
+					<text><![CDATA[Base
+Amount]]></text>
+				</staticText>
+				<staticText>
+					<reportElement key="staticText-14" style="Detail_Header" x="740" y="35" width="41" height="25"/>
+					<box leftPadding="2"/>
+					<textElement textAlignment="Center">
+						<font size="8" isBold="false"/>
+					</textElement>
+					<text><![CDATA[Base
+Currency]]></text>
+				</staticText>
+				<staticText>
+					<reportElement key="staticText-15" style="Detail_Header" x="517" y="35" width="80" height="25"/>
+					<box rightPadding="2"/>
+					<textElement textAlignment="Right">
+						<font size="8" isBold="false"/>
+					</textElement>
+					<text><![CDATA[Transactional
+Amount]]></text>
+				</staticText>
+				<staticText>
+					<reportElement key="staticText-16" style="Detail_Header" x="598" y="35" width="60" height="25"/>
+					<box leftPadding="2"/>
+					<textElement textAlignment="Center">
+						<font size="8" isBold="false"/>
+					</textElement>
+					<text><![CDATA[Transactional Currency]]></text>
+				</staticText>
+				<textField isBlankWhenNull="false">
+					<reportElement key="textField-20" style="Detail_Header" x="42" y="0" width="140" height="20"/>
 					<textElement>
-						<font/>
+						<font size="10"/>
 					</textElement>
-				<text><![CDATA[Grouping Criteria:]]></text>
+					<textFieldExpression class="java.lang.String"><![CDATA[$F{STATUS}]]></textFieldExpression>
+				</textField>
+				<line>
+					<reportElement key="line-36" style="Report_Footer" x="0" y="35" width="782" height="1"/>
+				</line>
+				<line>
+					<reportElement key="line-37" style="Report_Footer" stretchType="RelativeToBandHeight" x="0" y="35" width="1" height="25"/>
+				</line>
+				<line>
+					<reportElement key="line-38" style="Report_Footer" stretchType="RelativeToBandHeight" x="101" y="35" width="1" height="25"/>
+				</line>
+				<line>
+					<reportElement key="line-39" style="Report_Footer" stretchType="RelativeToBandHeight" x="172" y="35" width="1" height="25"/>
+				</line>
+				<line>
+					<reportElement key="line-40" style="Report_Footer" stretchType="RelativeToBandHeight" x="228" y="35" width="1" height="25"/>
+				</line>
+				<line>
+					<reportElement key="line-41" style="Report_Footer" stretchType="RelativeToBandHeight" x="284" y="35" width="1" height="25"/>
+				</line>
+				<line>
+					<reportElement key="line-42" style="Report_Footer" stretchType="RelativeToBandHeight" x="350" y="35" width="1" height="25"/>
+				</line>
+				<line>
+					<reportElement key="line-43" style="Report_Footer" stretchType="RelativeToBandHeight" x="412" y="35" width="1" height="25"/>
+				</line>
+				<line>
+					<reportElement key="line-44" style="Report_Footer" stretchType="RelativeToBandHeight" x="445" y="35" width="1" height="25"/>
+				</line>
+				<line>
+					<reportElement key="line-45" style="Report_Footer" stretchType="RelativeToBandHeight" x="479" y="35" width="1" height="25"/>
+				</line>
+				<line>
+					<reportElement key="line-46" style="Report_Footer" stretchType="RelativeToBandHeight" x="516" y="35" width="1" height="25"/>
+				</line>
+				<line>
+					<reportElement key="line-47" style="Report_Footer" stretchType="RelativeToBandHeight" x="597" y="35" width="1" height="25"/>
+				</line>
+				<line>
+					<reportElement key="line-48" style="Report_Footer" stretchType="RelativeToBandHeight" x="658" y="35" width="1" height="25"/>
+				</line>
+				<line>
+					<reportElement key="line-49" style="Report_Footer" stretchType="RelativeToBandHeight" x="739" y="35" width="1" height="25"/>
+				</line>
+				<line>
+					<reportElement key="line-50" style="Report_Footer" stretchType="RelativeToBandHeight" x="781" y="35" width="1" height="25"/>
+				</line>
+				<staticText>
+					<reportElement key="staticText-45" style="Detail_Header" x="1" y="0" width="41" height="20"/>
+					<textElement/>
+					<text><![CDATA[Status:]]></text>
 				</staticText>
 			</band>
-			</groupHeader>
-			<groupFooter>
-			<band height="30"  isSplitAllowed="true" >
+		</groupHeader>
+		<groupFooter>
+			<band height="30" splitType="Stretch">
+				<line>
+					<reportElement key="line-3" style="Report_Footer" x="0" y="0" width="782" height="1"/>
+				</line>
 				<staticText>
-					<reportElement
-						style="Report_Footer"
-						x="583"
-						y="6"
-						width="118"
-						height="20"
-						key="staticText-22"/>
-					<box></box>
+					<reportElement key="staticText-21" style="Report_Footer" x="626" y="6" width="75" height="20"/>
 					<textElement textAlignment="Right">
 						<font size="8"/>
 					</textElement>
-				<text><![CDATA[Sub Total (Grouping Criteria):]]></text>
+					<text><![CDATA[Sub Total (Status):]]></text>
 				</staticText>
-				<line direction="TopDown">
-					<reportElement
-						style="Report_Footer"
-						x="583"
-						y="5"
-						width="198"
-						height="0"
-						key="line-27"/>
-					<graphicElement stretchType="NoStretch"/>
+				<line>
+					<reportElement key="line-32" style="Report_Footer" x="626" y="27" width="156" height="1"/>
 				</line>
-				<line direction="TopDown">
-					<reportElement
-						style="Report_Footer"
-						x="583"
-						y="27"
-						width="198"
-						height="0"
-						key="line-28"/>
-					<graphicElement stretchType="NoStretch"/>
+				<line>
+					<reportElement key="line-33" style="Report_Footer" x="625" y="5" width="156" height="1"/>
 				</line>
-				<line direction="TopDown">
-					<reportElement
-						style="Report_Footer"
-						x="582"
-						y="5"
-						width="0"
-						height="23"
-						key="line-29"/>
-					<graphicElement stretchType="NoStretch"/>
+				<line>
+					<reportElement key="line-34" style="Report_Footer" x="625" y="5" width="1" height="23"/>
 				</line>
-				<line direction="TopDown">
-					<reportElement
-						style="Report_Footer"
-						x="781"
-						y="5"
-						width="0"
-						height="23"
-						key="line-30"/>
-					<graphicElement stretchType="NoStretch"/>
+				<line>
+					<reportElement key="line-35" style="Report_Footer" x="781" y="5" width="1" height="23"/>
 				</line>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						style="Report_Footer"
-						x="702"
-						y="6"
-						width="78"
-						height="20"
-						key="textField-23"/>
-					<box rightPadding="2"></box>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="10"/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[($V{SUMSUBTOTALGC}!=null)?$V{SUMSUBTOTALGC}.toString():new String(" ")]]></textFieldExpression>
-				</textField>
-			</band>
-			</groupFooter>
-		</group>
-		<group  name="Status" >
-			<groupExpression><![CDATA[$F{STATUS}]]></groupExpression>
-			<groupHeader>
-			<band height="60"  isSplitAllowed="true" >
-				<staticText>
-					<reportElement
-						style="Detail_Header"
-						x="1"
-						y="35"
-						width="100"
-						height="25"
-						key="staticText-2"/>
-					<box leftPadding="2"></box>
-					<textElement verticalAlignment="Middle">
-						<font size="8" isBold="false"/>
-					</textElement>
-				<text><![CDATA[Business Partner]]></text>
-				</staticText>
-				<staticText>
-					<reportElement
-						style="Detail_Header"
-						x="285"
-						y="35"
-						width="65"
-						height="25"
-						key="staticText-4"/>
-					<box leftPadding="2"></box>
-					<textElement verticalAlignment="Middle">
-						<font size="8" isBold="false"/>
-					</textElement>
-				<text><![CDATA[Payment]]></text>
-				</staticText>
-				<staticText>
-					<reportElement
-						style="Detail_Header"
-						x="102"
-						y="35"
-						width="70"
-						height="25"
-						key="staticText-5"/>
-					<box leftPadding="2"></box>
-					<textElement verticalAlignment="Middle">
-						<font size="8" isBold="false"/>
-					</textElement>
-				<text><![CDATA[Sales Person]]></text>
-				</staticText>
-				<staticText>
-					<reportElement
-						style="Detail_Header"
-						x="173"
-						y="35"
-						width="55"
-						height="25"
-						key="staticText-6"/>
-					<box leftPadding="2"></box>
-					<textElement verticalAlignment="Middle">
-						<font size="8" isBold="false"/>
-					</textElement>
-				<text><![CDATA[Invoice
-Number]]></text>
-				</staticText>
-				<staticText>
-					<reportElement
-						style="Detail_Header"
-						x="229"
-						y="35"
-						width="55"
-						height="25"
-						key="staticText-7"/>
-					<box leftPadding="2"></box>
-					<textElement textAlignment="Left" verticalAlignment="Middle">
-						<font size="8" isBold="false"/>
-					</textElement>
-				<text><![CDATA[Invoice Date]]></text>
-				</staticText>
-				<staticText>
-					<reportElement
-						style="Detail_Header"
-						x="351"
-						y="35"
-						width="61"
-						height="25"
-						key="staticText-8"/>
-					<box leftPadding="2"></box>
-					<textElement textAlignment="Left" verticalAlignment="Middle">
-						<font size="8" isBold="false"/>
-					</textElement>
-				<text><![CDATA[Due Date]]></text>
-				</staticText>
-				<staticText>
-					<reportElement
-						style="Detail_Header"
-						x="412"
-						y="35"
-						width="33"
-						height="25"
-						key="staticText-9"/>
-					<box></box>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
-						<font size="8" isBold="false"/>
-					</textElement>
-				<text><![CDATA[Planned
-DSO]]></text>
-				</staticText>
-				<staticText>
-					<reportElement
-						style="Detail_Header"
-						x="446"
-						y="35"
-						width="33"
-						height="25"
-						key="staticText-10"/>
-					<box></box>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
-						<font size="8" isBold="false"/>
-					</textElement>
-				<text><![CDATA[Current
-DSO]]></text>
-				</staticText>
-				<staticText>
-					<reportElement
-						style="Detail_Header"
-						x="480"
-						y="35"
-						width="36"
-						height="25"
-						key="staticText-11"/>
-					<box></box>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
-						<font size="8" isBold="false"/>
-					</textElement>
-				<text><![CDATA[Overdue]]></text>
-				</staticText>
-				<staticText>
-					<reportElement
-						style="Detail_Header"
-						x="659"
-						y="35"
-						width="80"
-						height="25"
-						key="staticText-13"/>
-					<box rightPadding="2"></box>
-					<textElement textAlignment="Right">
-						<font size="8" isBold="false"/>
-					</textElement>
-				<text><![CDATA[Base
-Amount]]></text>
-				</staticText>
-				<staticText>
-					<reportElement
-						style="Detail_Header"
-						x="740"
-						y="35"
-						width="41"
-						height="25"
-						key="staticText-14"/>
-					<box leftPadding="2"></box>
-					<textElement textAlignment="Center">
-						<font size="8" isBold="false"/>
-					</textElement>
-				<text><![CDATA[Base
-Currency]]></text>
-				</staticText>
-				<staticText>
-					<reportElement
-						style="Detail_Header"
-						x="517"
-						y="35"
-						width="80"
-						height="25"
-						key="staticText-15"/>
-					<box rightPadding="2"></box>
-					<textElement textAlignment="Right">
-						<font size="8" isBold="false"/>
-					</textElement>
-				<text><![CDATA[Transactional
-Amount]]></text>
-				</staticText>
-				<staticText>
-					<reportElement
-						style="Detail_Header"
-						x="598"
-						y="35"
-						width="60"
-						height="25"
-						key="staticText-16"/>
-					<box leftPadding="2"></box>
-					<textElement textAlignment="Center">
-						<font size="8" isBold="false"/>
-					</textElement>
-				<text><![CDATA[Transactional Currency]]></text>
-				</staticText>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						style="Detail_Header"
-						x="42"
-						y="0"
-						width="140"
-						height="20"
-						key="textField-20"/>
-					<box></box>
-					<textElement>
-						<font size="10"/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$F{STATUS}]]></textFieldExpression>
-				</textField>
-				<line direction="TopDown">
-					<reportElement
-						style="Report_Footer"
-						x="0"
-						y="35"
-						width="782"
-						height="0"
-						key="line-36"/>
-					<graphicElement stretchType="NoStretch"/>
-				</line>
-				<line direction="TopDown">
-					<reportElement
-						style="Report_Footer"
-						x="0"
-						y="35"
-						width="0"
-						height="25"
-						key="line-37"
-						stretchType="RelativeToBandHeight"/>
-					<graphicElement stretchType="RelativeToBandHeight"/>
-				</line>
-				<line direction="TopDown">
-					<reportElement
-						style="Report_Footer"
-						x="101"
-						y="35"
-						width="0"
-						height="25"
-						key="line-38"
-						stretchType="RelativeToBandHeight"/>
-					<graphicElement stretchType="RelativeToBandHeight"/>
-				</line>
-				<line direction="TopDown">
-					<reportElement
-						style="Report_Footer"
-						x="172"
-						y="35"
-						width="0"
-						height="25"
-						key="line-39"
-						stretchType="RelativeToBandHeight"/>
-					<graphicElement stretchType="RelativeToBandHeight"/>
-				</line>
-				<line direction="TopDown">
-					<reportElement
-						style="Report_Footer"
-						x="228"
-						y="35"
-						width="0"
-						height="25"
-						key="line-40"
-						stretchType="RelativeToBandHeight"/>
-					<graphicElement stretchType="RelativeToBandHeight"/>
-				</line>
-				<line direction="TopDown">
-					<reportElement
-						style="Report_Footer"
-						x="284"
-						y="35"
-						width="0"
-						height="25"
-						key="line-41"
-						stretchType="RelativeToBandHeight"/>
-					<graphicElement stretchType="RelativeToBandHeight"/>
-				</line>
-				<line direction="TopDown">
-					<reportElement
-						style="Report_Footer"
-						x="350"
-						y="35"
-						width="0"
-						height="25"
-						key="line-42"
-						stretchType="RelativeToBandHeight"/>
-					<graphicElement stretchType="RelativeToBandHeight"/>
-				</line>
-				<line direction="TopDown">
-					<reportElement
-						style="Report_Footer"
-						x="412"
-						y="35"
-						width="0"
-						height="25"
-						key="line-43"
-						stretchType="RelativeToBandHeight"/>
-					<graphicElement stretchType="RelativeToBandHeight"/>
-				</line>
-				<line direction="TopDown">
-					<reportElement
-						style="Report_Footer"
-						x="445"
-						y="35"
-						width="0"
-						height="25"
-						key="line-44"
-						stretchType="RelativeToBandHeight"/>
-					<graphicElement stretchType="RelativeToBandHeight"/>
-				</line>
-				<line direction="TopDown">
-					<reportElement
-						style="Report_Footer"
-						x="479"
-						y="35"
-						width="0"
-						height="25"
-						key="line-45"
-						stretchType="RelativeToBandHeight"/>
-					<graphicElement stretchType="RelativeToBandHeight"/>
-				</line>
-				<line direction="TopDown">
-					<reportElement
-						style="Report_Footer"
-						x="516"
-						y="35"
-						width="0"
-						height="25"
-						key="line-46"
-						stretchType="RelativeToBandHeight"/>
-					<graphicElement stretchType="RelativeToBandHeight"/>
-				</line>
-				<line direction="TopDown">
-					<reportElement
-						style="Report_Footer"
-						x="597"
-						y="35"
-						width="0"
-						height="25"
-						key="line-47"
-						stretchType="RelativeToBandHeight"/>
-					<graphicElement stretchType="RelativeToBandHeight"/>
-				</line>
-				<line direction="TopDown">
-					<reportElement
-						style="Report_Footer"
-						x="658"
-						y="35"
-						width="0"
-						height="25"
-						key="line-48"
-						stretchType="RelativeToBandHeight"/>
-					<graphicElement stretchType="RelativeToBandHeight"/>
-				</line>
-				<line direction="TopDown">
-					<reportElement
-						style="Report_Footer"
-						x="739"
-						y="35"
-						width="0"
-						height="25"
-						key="line-49"
-						stretchType="RelativeToBandHeight"/>
-					<graphicElement stretchType="RelativeToBandHeight"/>
-				</line>
-				<line direction="TopDown">
-					<reportElement
-						style="Report_Footer"
-						x="781"
-						y="35"
-						width="0"
-						height="25"
-						key="line-50"
-						stretchType="RelativeToBandHeight"/>
-					<graphicElement stretchType="RelativeToBandHeight"/>
-				</line>
-				<staticText>
-					<reportElement
-						style="Detail_Header"
-						x="1"
-						y="0"
-						width="41"
-						height="20"
-						key="staticText-45"/>
-					<box></box>
-					<textElement>
-						<font/>
-					</textElement>
-				<text><![CDATA[Status:]]></text>
-				</staticText>
-			</band>
-			</groupHeader>
-			<groupFooter>
-			<band height="30"  isSplitAllowed="true" >
-				<line direction="TopDown">
-					<reportElement
-						style="Report_Footer"
-						x="0"
-						y="0"
-						width="782"
-						height="0"
-						key="line-3"/>
-					<graphicElement stretchType="NoStretch"/>
-				</line>
-				<staticText>
-					<reportElement
-						style="Report_Footer"
-						x="626"
-						y="6"
-						width="75"
-						height="20"
-						key="staticText-21"/>
-					<box></box>
-					<textElement textAlignment="Right">
-						<font size="8"/>
-					</textElement>
-				<text><![CDATA[Sub Total (Status):]]></text>
-				</staticText>
-				<line direction="TopDown">
-					<reportElement
-						style="Report_Footer"
-						x="626"
-						y="27"
-						width="156"
-						height="0"
-						key="line-32"/>
-					<graphicElement stretchType="NoStretch"/>
-				</line>
-				<line direction="TopDown">
-					<reportElement
-						style="Report_Footer"
-						x="625"
-						y="5"
-						width="156"
-						height="0"
-						key="line-33"/>
-					<graphicElement stretchType="NoStretch"/>
-				</line>
-				<line direction="TopDown">
-					<reportElement
-						style="Report_Footer"
-						x="625"
-						y="5"
-						width="0"
-						height="23"
-						key="line-34"/>
-					<graphicElement stretchType="NoStretch"/>
-				</line>
-				<line direction="TopDown">
-					<reportElement
-						style="Report_Footer"
-						x="781"
-						y="5"
-						width="0"
-						height="23"
-						key="line-35"/>
-					<graphicElement stretchType="NoStretch"/>
-				</line>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						style="Report_Footer"
-						x="702"
-						y="6"
-						width="78"
-						height="20"
-						key="textField-22"/>
-					<box rightPadding="2"></box>
+				<textField isBlankWhenNull="false">
+					<reportElement key="textField-22" style="Report_Footer" x="702" y="6" width="78" height="20"/>
+					<box rightPadding="2"/>
 					<textElement textAlignment="Right">
 						<font size="10"/>
 					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[($V{SUMSUBTOTALSTATUS}!=null)?$V{SUMSUBTOTALSTATUS}.toString():new String(" ")]]></textFieldExpression>
+					<textFieldExpression class="java.lang.String"><![CDATA[($V{SUMSUBTOTALSTATUS}!=null)?$V{SUMSUBTOTALSTATUS}.toString():new String(" ")]]></textFieldExpression>
 				</textField>
 			</band>
-			</groupFooter>
-		</group>
-		<background>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-		</background>
-		<title>
-			<band height="153"  isSplitAllowed="true" >
-				<staticText>
-					<reportElement
-						style="Report_Footer"
-						x="11"
-						y="73"
-						width="179"
-						height="18"
-						key="staticText-24"/>
-					<box></box>
-					<textElement textAlignment="Right">
-						<font/>
-					</textElement>
+		</groupFooter>
+	</group>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<title>
+		<band height="153" splitType="Stretch">
+			<staticText>
+				<reportElement key="staticText-24" style="Report_Footer" x="11" y="73" width="179" height="18"/>
+				<textElement textAlignment="Right"/>
 				<text><![CDATA[Organization:]]></text>
-				</staticText>
-				<staticText>
-					<reportElement
-						style="Report_Footer"
-						x="408"
-						y="73"
-						width="179"
-						height="18"
-						key="staticText-25"/>
-					<box></box>
-					<textElement textAlignment="Right">
-						<font/>
-					</textElement>
+			</staticText>
+			<staticText>
+				<reportElement key="staticText-25" style="Report_Footer" x="408" y="73" width="179" height="18"/>
+				<textElement textAlignment="Right"/>
 				<text><![CDATA[Include Sub-Organization:]]></text>
-				</staticText>
-				<staticText>
-					<reportElement
-						style="Report_Footer"
-						x="11"
-						y="93"
-						width="179"
-						height="18"
-						key="staticText-26"/>
-					<box></box>
-					<textElement textAlignment="Right">
-						<font/>
-					</textElement>
+			</staticText>
+			<staticText>
+				<reportElement key="staticText-26" style="Report_Footer" x="11" y="93" width="179" height="18"/>
+				<textElement textAlignment="Right"/>
 				<text><![CDATA[Due Date From:]]></text>
-				</staticText>
-				<staticText>
-					<reportElement
-						style="Report_Footer"
-						x="408"
-						y="93"
-						width="179"
-						height="18"
-						key="staticText-27"/>
-					<box></box>
-					<textElement textAlignment="Right">
-						<font/>
-					</textElement>
+			</staticText>
+			<staticText>
+				<reportElement key="staticText-27" style="Report_Footer" x="408" y="93" width="179" height="18"/>
+				<textElement textAlignment="Right"/>
 				<text><![CDATA[Due Date To:]]></text>
-				</staticText>
-				<staticText>
-					<reportElement
-						style="Report_Footer"
-						x="11"
-						y="113"
-						width="179"
-						height="18"
-						key="staticText-28"/>
-					<box></box>
-					<textElement textAlignment="Right">
-						<font/>
-					</textElement>
+			</staticText>
+			<staticText>
+				<reportElement key="staticText-28" style="Report_Footer" x="11" y="113" width="179" height="18"/>
+				<textElement textAlignment="Right"/>
 				<text><![CDATA[Amount From:]]></text>
-				</staticText>
-				<staticText>
-					<reportElement
-						style="Report_Footer"
-						x="408"
-						y="113"
-						width="179"
-						height="18"
-						key="staticText-29"/>
-					<box></box>
-					<textElement textAlignment="Right">
-						<font/>
-					</textElement>
+			</staticText>
+			<staticText>
+				<reportElement key="staticText-29" style="Report_Footer" x="408" y="113" width="179" height="18"/>
+				<textElement textAlignment="Right"/>
 				<text><![CDATA[Amount To:]]></text>
-				</staticText>
-				<staticText>
-					<reportElement
-						style="Report_Footer"
-						x="11"
-						y="133"
-						width="179"
-						height="18"
-						key="staticText-30"/>
-					<box></box>
-					<textElement textAlignment="Right">
-						<font/>
-					</textElement>
+			</staticText>
+			<staticText>
+				<reportElement key="staticText-30" style="Report_Footer" x="11" y="133" width="179" height="18"/>
+				<textElement textAlignment="Right"/>
 				<text><![CDATA[Document Date From:]]></text>
-				</staticText>
-				<staticText>
-					<reportElement
-						style="Report_Footer"
-						x="408"
-						y="133"
-						width="179"
-						height="18"
-						key="staticText-31"/>
-					<box></box>
-					<textElement textAlignment="Right">
-						<font/>
-					</textElement>
+			</staticText>
+			<staticText>
+				<reportElement key="staticText-31" style="Report_Footer" x="408" y="133" width="179" height="18"/>
+				<textElement textAlignment="Right"/>
 				<text><![CDATA[Document Date To:]]></text>
-				</staticText>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						style="Report_Footer"
-						x="196"
-						y="73"
-						width="179"
-						height="18"
-						key="textField-25"/>
-					<box></box>
-					<textElement>
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$P{ORG_SHOW}.toString()]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						style="Report_Footer"
-						x="196"
-						y="93"
-						width="179"
-						height="18"
-						key="textField-26"/>
-					<box></box>
-					<textElement>
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$P{DUEDATEFROM_SHOW}.toString()]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						style="Report_Footer"
-						x="196"
-						y="113"
-						width="179"
-						height="18"
-						key="textField-27"/>
-					<box></box>
-					<textElement>
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$P{AMTFROM_SHOW}.toString()]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						style="Report_Footer"
-						x="196"
-						y="133"
-						width="179"
-						height="18"
-						key="textField-28"/>
-					<box></box>
-					<textElement>
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$P{DOCDATEFROM_SHOW}.toString()]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						style="Report_Footer"
-						x="593"
-						y="73"
-						width="179"
-						height="18"
-						key="textField-36"/>
-					<box></box>
-					<textElement>
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$P{INCL_SUBORG_SHOW}.toString()]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						style="Report_Footer"
-						x="593"
-						y="93"
-						width="179"
-						height="18"
-						key="textField-37"/>
-					<box></box>
-					<textElement>
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$P{DUEDATETO_SHOW}.toString()]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						style="Report_Footer"
-						x="593"
-						y="113"
-						width="179"
-						height="18"
-						key="textField-38"/>
-					<box></box>
-					<textElement>
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$P{AMTTO_SHOW}.toString()]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						style="Report_Footer"
-						x="593"
-						y="133"
-						width="179"
-						height="18"
-						key="textField-39"/>
-					<box></box>
-					<textElement>
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$P{DOCDATETO_SHOW}.toString()]]></textFieldExpression>
-				</textField>
-				<staticText>
-					<reportElement
-						style="Report_Footer"
-						x="11"
-						y="5"
-						width="634"
-						height="48"
-						key="staticText-46"/>
-					<box></box>
-					<textElement>
-						<font size="36"/>
-					</textElement>
+			</staticText>
+			<textField isBlankWhenNull="true">
+				<reportElement key="textField-25" style="Report_Footer" x="196" y="73" width="179" height="18"/>
+				<textElement/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$P{ORG_SHOW}.toString()]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement key="textField-26" style="Report_Footer" x="196" y="93" width="179" height="18"/>
+				<textElement/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$P{DUEDATEFROM_SHOW}.toString()]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement key="textField-27" style="Report_Footer" x="196" y="113" width="179" height="18"/>
+				<textElement/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$P{AMTFROM_SHOW}.toString()]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement key="textField-28" style="Report_Footer" x="196" y="133" width="179" height="18"/>
+				<textElement/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$P{DOCDATEFROM_SHOW}.toString()]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement key="textField-36" style="Report_Footer" x="593" y="73" width="179" height="18"/>
+				<textElement/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$P{INCL_SUBORG_SHOW}.toString()]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement key="textField-37" style="Report_Footer" x="593" y="93" width="179" height="18"/>
+				<textElement/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$P{DUEDATETO_SHOW}.toString()]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement key="textField-38" style="Report_Footer" x="593" y="113" width="179" height="18"/>
+				<textElement/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$P{AMTTO_SHOW}.toString()]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement key="textField-39" style="Report_Footer" x="593" y="133" width="179" height="18"/>
+				<textElement/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$P{DOCDATETO_SHOW}.toString()]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement key="staticText-46" style="Report_Footer" x="11" y="5" width="634" height="48"/>
+				<textElement>
+					<font size="36"/>
+				</textElement>
 				<text><![CDATA[PAYMENT REPORT]]></text>
-				</staticText>
-			</band>
-		</title>
-		<pageHeader>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-		</pageHeader>
-		<columnHeader>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-		</columnHeader>
-		<detail>
-			<band height="25"  isSplitAllowed="true" >
-				<frame>					<reportElement
-						style="Detail_Line"
-						x="0"
-						y="0"
-						width="782"
-						height="25"
-						key="frame-1"/>
-					<box></box>
-				</frame>				<line direction="TopDown">
-					<reportElement
-						style="Report_Footer"
-						x="0"
-						y="0"
-						width="0"
-						height="25"
-						key="line-1"
-						stretchType="RelativeToBandHeight"/>
-					<graphicElement stretchType="RelativeToBandHeight"/>
-				</line>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						style="Report_Footer"
-						x="2"
-						y="0"
-						width="98"
-						height="25"
-						key="textField-2"/>
-					<box leftPadding="2"></box>
-					<textElement>
-						<font size="8"/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$F{BPARTNER}]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						style="Report_Footer"
-						x="285"
-						y="0"
-						width="64"
-						height="25"
-						key="textField-4"/>
-					<box leftPadding="2"></box>
-					<textElement>
-						<font size="8"/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[($F{PAYMENT}==null ? " " : $F{PAYMENT})]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						style="Report_Footer"
-						x="102"
-						y="0"
-						width="69"
-						height="25"
-						key="textField-5"/>
-					<box leftPadding="2"></box>
-					<textElement>
-						<font size="8"/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[($F{SALES_PERSON}==null ? " " : $F{SALES_PERSON})]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						style="Report_Footer"
-						x="173"
-						y="0"
-						width="55"
-						height="25"
-						key="textField-6"/>
-					<box leftPadding="2"></box>
-					<textElement>
-						<font size="8"/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[($F{INVOICE_NUMBER}==null ? " " : $F{INVOICE_NUMBER}.toString())]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						style="Report_Footer"
-						x="229"
-						y="0"
-						width="54"
-						height="25"
-						key="textField-7"/>
-					<box leftPadding="2"></box>
-					<textElement>
-						<font size="8"/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[($F{INVOICE_DATE}== null ? " " : $F{INVOICE_DATE})]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						style="Report_Footer"
-						x="350"
-						y="0"
-						width="62"
-						height="25"
-						key="textField-8"/>
-					<box leftPadding="2"></box>
-					<textElement>
-						<font size="8"/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[($F{DUE_DATE}== null ? " " : $F{DUE_DATE})]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						style="Report_Footer"
-						x="412"
-						y="0"
-						width="33"
-						height="25"
-						key="textField-9"/>
-					<box></box>
-					<textElement textAlignment="Center">
-						<font size="8"/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[($F{PLANNED_DSO}== null ? " " : $F{PLANNED_DSO}.toString())]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						style="Report_Footer"
-						x="446"
-						y="0"
-						width="33"
-						height="25"
-						key="textField-10"/>
-					<box></box>
-					<textElement textAlignment="Center">
-						<font size="8"/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[($F{CURRENT_DSO}== null ? " " : $F{CURRENT_DSO}.toString())]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						style="Report_Footer"
-						x="480"
-						y="0"
-						width="36"
-						height="25"
-						key="textField-11"/>
-					<box></box>
-					<textElement textAlignment="Center">
-						<font size="8"/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[($F{OVERDUE}== null ? " " : $F{OVERDUE}.toString())]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						style="Report_Footer"
-						x="659"
-						y="0"
-						width="79"
-						height="25"
-						key="textField-13"/>
-					<box rightPadding="2"></box>
-					<textElement textAlignment="Right">
-						<font size="8"/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[($F{BASE_AMOUNT}== null ? " " : $F{BASE_AMOUNT}.toString())]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						style="Report_Footer"
-						x="740"
-						y="0"
-						width="40"
-						height="25"
-						key="textField-14"/>
-					<box></box>
-					<textElement textAlignment="Center">
-						<font size="8"/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$F{BASE_CURRENCY}]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						style="Report_Footer"
-						x="517"
-						y="0"
-						width="79"
-						height="25"
-						key="textField-15"/>
-					<box rightPadding="2"></box>
-					<textElement textAlignment="Right">
-						<font size="8"/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$F{TRANS_AMOUNT}.toString() + " "]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						style="Report_Footer"
-						x="598"
-						y="0"
-						width="60"
-						height="25"
-						key="textField-16"/>
-					<box></box>
-					<textElement textAlignment="Center">
-						<font size="8"/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$F{TRANS_CURRENCY}]]></textFieldExpression>
-				</textField>
-				<line direction="TopDown">
-					<reportElement
-						style="Report_Footer"
-						x="101"
-						y="0"
-						width="0"
-						height="25"
-						key="line-5"
-						stretchType="RelativeToBandHeight"/>
-					<graphicElement stretchType="RelativeToBandHeight"/>
-				</line>
-				<line direction="TopDown">
-					<reportElement
-						style="Report_Footer"
-						x="172"
-						y="0"
-						width="0"
-						height="25"
-						key="line-7"
-						stretchType="RelativeToBandHeight"/>
-					<graphicElement stretchType="RelativeToBandHeight"/>
-				</line>
-				<line direction="TopDown">
-					<reportElement
-						style="Report_Footer"
-						x="284"
-						y="0"
-						width="0"
-						height="25"
-						key="line-8"
-						stretchType="RelativeToBandHeight"/>
-					<graphicElement stretchType="RelativeToBandHeight"/>
-				</line>
-				<line direction="TopDown">
-					<reportElement
-						style="Report_Footer"
-						x="228"
-						y="0"
-						width="0"
-						height="25"
-						key="line-9"
-						stretchType="RelativeToBandHeight"/>
-					<graphicElement stretchType="RelativeToBandHeight"/>
-				</line>
-				<line direction="TopDown">
-					<reportElement
-						style="Report_Footer"
-						x="350"
-						y="0"
-						width="0"
-						height="25"
-						key="line-10"
-						stretchType="RelativeToBandHeight"/>
-					<graphicElement stretchType="RelativeToBandHeight"/>
-				</line>
-				<line direction="TopDown">
-					<reportElement
-						style="Report_Footer"
-						x="445"
-						y="0"
-						width="0"
-						height="25"
-						key="line-11"
-						stretchType="RelativeToBandHeight"/>
-					<graphicElement stretchType="RelativeToBandHeight"/>
-				</line>
-				<line direction="TopDown">
-					<reportElement
-						style="Report_Footer"
-						x="479"
-						y="0"
-						width="0"
-						height="25"
-						key="line-12"
-						stretchType="RelativeToBandHeight"/>
-					<graphicElement stretchType="RelativeToBandHeight"/>
-				</line>
-				<line direction="TopDown">
-					<reportElement
-						style="Report_Footer"
-						x="412"
-						y="0"
-						width="0"
-						height="25"
-						key="line-13"
-						stretchType="RelativeToBandHeight"/>
-					<graphicElement stretchType="RelativeToBandHeight"/>
-				</line>
-				<line direction="TopDown">
-					<reportElement
-						style="Report_Footer"
-						x="516"
-						y="0"
-						width="0"
-						height="25"
-						key="line-15"
-						stretchType="RelativeToBandHeight"/>
-					<graphicElement stretchType="RelativeToBandHeight"/>
-				</line>
-				<line direction="TopDown">
-					<reportElement
-						style="Report_Footer"
-						x="597"
-						y="0"
-						width="0"
-						height="25"
-						key="line-17"
-						stretchType="RelativeToBandHeight"/>
-					<graphicElement stretchType="RelativeToBandHeight"/>
-				</line>
-				<line direction="TopDown">
-					<reportElement
-						style="Report_Footer"
-						x="658"
-						y="0"
-						width="0"
-						height="25"
-						key="line-18"
-						stretchType="RelativeToBandHeight"/>
-					<graphicElement stretchType="RelativeToBandHeight"/>
-				</line>
-				<line direction="TopDown">
-					<reportElement
-						style="Report_Footer"
-						x="739"
-						y="0"
-						width="0"
-						height="25"
-						key="line-19"
-						stretchType="RelativeToBandHeight"/>
-					<graphicElement stretchType="RelativeToBandHeight"/>
-				</line>
-				<line direction="TopDown">
-					<reportElement
-						style="Report_Footer"
-						x="781"
-						y="0"
-						width="0"
-						height="25"
-						key="line-25"
-						stretchType="RelativeToBandHeight"/>
-					<graphicElement stretchType="RelativeToBandHeight"/>
-				</line>
-			</band>
-		</detail>
-		<columnFooter>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-		</columnFooter>
-		<pageFooter>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-		</pageFooter>
-		<lastPageFooter>
-			<band height="40"  isSplitAllowed="true" >
-				<staticText>
-					<reportElement
-						style="Report_Footer"
-						x="3"
-						y="4"
-						width="693"
-						height="17"
-						key="staticText-51">
-							<printWhenExpression><![CDATA[$P{ONE_ASTERISK_SHOW}]]></printWhenExpression>
-						</reportElement>
-					<box></box>
-					<textElement>
-						<font size="8"/>
-					</textElement>
+			</staticText>
+		</band>
+	</title>
+	<pageHeader>
+		<band splitType="Stretch"/>
+	</pageHeader>
+	<columnHeader>
+		<band splitType="Stretch"/>
+	</columnHeader>
+	<detail>
+		<band height="25" splitType="Stretch">
+			<frame>
+				<reportElement key="frame-1" style="Detail_Line" x="0" y="0" width="782" height="25"/>
+			</frame>
+			<line>
+				<reportElement key="line-1" style="Report_Footer" stretchType="RelativeToBandHeight" x="0" y="0" width="1" height="25"/>
+			</line>
+			<textField isBlankWhenNull="false">
+				<reportElement key="textField-2" style="Report_Footer" x="2" y="0" width="98" height="25"/>
+				<box leftPadding="2"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{BPARTNER}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="false">
+				<reportElement key="textField-4" style="Report_Footer" x="285" y="0" width="64" height="25"/>
+				<box leftPadding="2"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[($F{PAYMENT}==null ? " " : $F{PAYMENT})]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="false">
+				<reportElement key="textField-5" style="Report_Footer" x="102" y="0" width="69" height="25"/>
+				<box leftPadding="2"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[($F{SALES_PERSON}==null ? " " : $F{SALES_PERSON})]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="false">
+				<reportElement key="textField-6" style="Report_Footer" x="173" y="0" width="55" height="25"/>
+				<box leftPadding="2"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[($F{INVOICE_NUMBER}==null ? " " : $F{INVOICE_NUMBER}.toString())]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="false">
+				<reportElement key="textField-7" style="Report_Footer" x="229" y="0" width="54" height="25"/>
+				<box leftPadding="2"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[($F{INVOICE_DATE}== null ? " " : $F{INVOICE_DATE})]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="false">
+				<reportElement key="textField-8" style="Report_Footer" x="350" y="0" width="62" height="25"/>
+				<box leftPadding="2"/>
+				<textElement>
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[($F{DUE_DATE}== null ? " " : $F{DUE_DATE})]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="false">
+				<reportElement key="textField-9" style="Report_Footer" x="412" y="0" width="33" height="25"/>
+				<textElement textAlignment="Center">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[($F{PLANNED_DSO}== null ? " " : $F{PLANNED_DSO}.toString())]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="false">
+				<reportElement key="textField-10" style="Report_Footer" x="446" y="0" width="33" height="25"/>
+				<textElement textAlignment="Center">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[($F{CURRENT_DSO}== null ? " " : $F{CURRENT_DSO}.toString())]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="false">
+				<reportElement key="textField-11" style="Report_Footer" x="480" y="0" width="36" height="25"/>
+				<textElement textAlignment="Center">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[($F{OVERDUE}== null ? " " : $F{OVERDUE}.toString())]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="false">
+				<reportElement key="textField-13" style="Report_Footer" x="659" y="0" width="79" height="25"/>
+				<box rightPadding="2"/>
+				<textElement textAlignment="Right">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[($F{BASE_AMOUNT}== null ? " " : $F{BASE_AMOUNT}.toString())]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="false">
+				<reportElement key="textField-14" style="Report_Footer" x="740" y="0" width="40" height="25"/>
+				<textElement textAlignment="Center">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{BASE_CURRENCY}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="false">
+				<reportElement key="textField-15" style="Report_Footer" x="517" y="0" width="79" height="25"/>
+				<box rightPadding="2"/>
+				<textElement textAlignment="Right">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{TRANS_AMOUNT}.toString() + " "]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="false">
+				<reportElement key="textField-16" style="Report_Footer" x="598" y="0" width="60" height="25"/>
+				<textElement textAlignment="Center">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{TRANS_CURRENCY}]]></textFieldExpression>
+			</textField>
+			<line>
+				<reportElement key="line-5" style="Report_Footer" stretchType="RelativeToBandHeight" x="101" y="0" width="1" height="25"/>
+			</line>
+			<line>
+				<reportElement key="line-7" style="Report_Footer" stretchType="RelativeToBandHeight" x="172" y="0" width="1" height="25"/>
+			</line>
+			<line>
+				<reportElement key="line-8" style="Report_Footer" stretchType="RelativeToBandHeight" x="284" y="0" width="1" height="25"/>
+			</line>
+			<line>
+				<reportElement key="line-9" style="Report_Footer" stretchType="RelativeToBandHeight" x="228" y="0" width="1" height="25"/>
+			</line>
+			<line>
+				<reportElement key="line-10" style="Report_Footer" stretchType="RelativeToBandHeight" x="350" y="0" width="1" height="25"/>
+			</line>
+			<line>
+				<reportElement key="line-11" style="Report_Footer" stretchType="RelativeToBandHeight" x="445" y="0" width="1" height="25"/>
+			</line>
+			<line>
+				<reportElement key="line-12" style="Report_Footer" stretchType="RelativeToBandHeight" x="479" y="0" width="1" height="25"/>
+			</line>
+			<line>
+				<reportElement key="line-13" style="Report_Footer" stretchType="RelativeToBandHeight" x="412" y="0" width="1" height="25"/>
+			</line>
+			<line>
+				<reportElement key="line-15" style="Report_Footer" stretchType="RelativeToBandHeight" x="516" y="0" width="1" height="25"/>
+			</line>
+			<line>
+				<reportElement key="line-17" style="Report_Footer" stretchType="RelativeToBandHeight" x="597" y="0" width="1" height="25"/>
+			</line>
+			<line>
+				<reportElement key="line-18" style="Report_Footer" stretchType="RelativeToBandHeight" x="658" y="0" width="1" height="25"/>
+			</line>
+			<line>
+				<reportElement key="line-19" style="Report_Footer" stretchType="RelativeToBandHeight" x="739" y="0" width="1" height="25"/>
+			</line>
+			<line>
+				<reportElement key="line-25" style="Report_Footer" stretchType="RelativeToBandHeight" x="781" y="0" width="1" height="25"/>
+			</line>
+		</band>
+	</detail>
+	<columnFooter>
+		<band splitType="Stretch"/>
+	</columnFooter>
+	<pageFooter>
+		<band splitType="Stretch"/>
+	</pageFooter>
+	<lastPageFooter>
+		<band height="40" splitType="Stretch">
+			<staticText>
+				<reportElement key="staticText-51" style="Report_Footer" x="3" y="4" width="693" height="17">
+					<printWhenExpression><![CDATA[$P{ONE_ASTERISK_SHOW}]]></printWhenExpression>
+				</reportElement>
+				<textElement>
+					<font size="8"/>
+				</textElement>
 				<text><![CDATA[* Invoice paid using a credit payment]]></text>
-				</staticText>
-				<staticText>
-					<reportElement
-						style="Report_Footer"
-						x="3"
-						y="21"
-						width="693"
-						height="17"
-						key="staticText-52">
-							<printWhenExpression><![CDATA[$P{TWO_ASTERISK_SHOW}]]></printWhenExpression>
-						</reportElement>
-					<box></box>
-					<textElement>
-						<font size="8"/>
-					</textElement>
+			</staticText>
+			<staticText>
+				<reportElement key="staticText-52" style="Report_Footer" x="3" y="21" width="693" height="17">
+					<printWhenExpression><![CDATA[$P{TWO_ASTERISK_SHOW}]]></printWhenExpression>
+				</reportElement>
+				<textElement>
+					<font size="8"/>
+				</textElement>
 				<text><![CDATA[** Several invoices have been paid using the same credit payment]]></text>
-				</staticText>
-			</band>
-		</lastPageFooter>
-		<summary>
-			<band height="30"  isSplitAllowed="true" >
-				<staticText>
-					<reportElement
-						x="645"
-						y="4"
-						width="56"
-						height="20"
-						key="staticText-19"/>
-					<box></box>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="8" isBold="false"/>
-					</textElement>
-				<text><![CDATA[Grand Total:]]></text>
-				</staticText>
-				<line direction="TopDown">
-					<reportElement
-						style="Report_Footer"
-						x="644"
-						y="3"
-						width="138"
-						height="1"
-						key="line-21"/>
-					<graphicElement stretchType="NoStretch"/>
-				</line>
-				<line direction="TopDown">
-					<reportElement
-						style="Report_Footer"
-						x="644"
-						y="3"
-						width="0"
-						height="22"
-						key="line-22"/>
-					<graphicElement stretchType="NoStretch"/>
-				</line>
-				<line direction="TopDown">
-					<reportElement
-						style="Report_Footer"
-						x="781"
-						y="3"
-						width="0"
-						height="22"
-						key="line-24"/>
-					<graphicElement stretchType="NoStretch"/>
-				</line>
-				<line direction="TopDown">
-					<reportElement
-						style="Report_Footer"
-						x="644"
-						y="24"
-						width="138"
-						height="1"
-						key="line-26"/>
-					<graphicElement stretchType="NoStretch"/>
-				</line>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						style="Report_Footer"
-						x="702"
-						y="4"
-						width="78"
-						height="20"
-						key="textField-24"/>
-					<box rightPadding="2"></box>
-					<textElement textAlignment="Right">
-						<font size="10"/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[($V{SUMSUBTOTALGT}!=null)?$V{SUMSUBTOTALGT}.toString():new String(" ")]]></textFieldExpression>
-				</textField>
-			</band>
-		</summary>
+			</staticText>
+		</band>
+	</lastPageFooter>
 </jasperReport>
--- a/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -6,7 +6,7 @@
 <!--3A3A943684D64DEF9EC39F588A656848-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <NAME><![CDATA[Orders Awaiting Delivery]]></NAME>
-<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION><![CDATA[1.1.14182]]></VERSION>
+<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION><![CDATA[1.1.14253]]></VERSION>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <DESCRIPTION><![CDATA[Report displaying sales orders not shipped.]]></DESCRIPTION>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <URL><![CDATA[http://forge.openbravo.com/projects/ordersawaitingdlivery]]></URL>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <TYPE><![CDATA[M]]></TYPE>
--- a/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -7,7 +7,7 @@
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <AD_MODULE_ID><![CDATA[3A3A943684D64DEF9EC39F588A656848]]></AD_MODULE_ID>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <STARTVERSION><![CDATA[3.0.14182]]></STARTVERSION>
+<!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <STARTVERSION><![CDATA[3.0.14253]]></STARTVERSION>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_PROCESS.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_PROCESS.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -18,6 +18,7 @@
 <!--3DAA5E63A30D45A8ABF87701F8BD91EF-->  <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE>
 <!--3DAA5E63A30D45A8ABF87701F8BD91EF-->  <AD_MODULE_ID><![CDATA[3A3A943684D64DEF9EC39F588A656848]]></AD_MODULE_ID>
 <!--3DAA5E63A30D45A8ABF87701F8BD91EF-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
+<!--3DAA5E63A30D45A8ABF87701F8BD91EF-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--3DAA5E63A30D45A8ABF87701F8BD91EF--></AD_PROCESS>
 
 </data>
--- a/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -11,6 +11,7 @@
 <!--0D5107C3E85B4520AD9E4386DAA90C30-->  <DESCRIPTION><![CDATA[The template used to generate the client-side representation.]]></DESCRIPTION>
 <!--0D5107C3E85B4520AD9E4386DAA90C30-->  <HELP><![CDATA[The template used to generate the client-side representation (in the browser) of the datasource.]]></HELP>
 <!--0D5107C3E85B4520AD9E4386DAA90C30-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
+<!--0D5107C3E85B4520AD9E4386DAA90C30-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--0D5107C3E85B4520AD9E4386DAA90C30--></AD_ELEMENT>
 
 <!--3FB0A141F73D4E119BC633EEB22D07FD--><AD_ELEMENT>
@@ -24,6 +25,7 @@
 <!--3FB0A141F73D4E119BC633EEB22D07FD-->  <DESCRIPTION><![CDATA[Class implementing the functionality in java]]></DESCRIPTION>
 <!--3FB0A141F73D4E119BC633EEB22D07FD-->  <HELP><![CDATA[Class implementing the functionality in java]]></HELP>
 <!--3FB0A141F73D4E119BC633EEB22D07FD-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
+<!--3FB0A141F73D4E119BC633EEB22D07FD-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--3FB0A141F73D4E119BC633EEB22D07FD--></AD_ELEMENT>
 
 <!--60A68A01BC1D481996705730BDEA560D--><AD_ELEMENT>
@@ -37,6 +39,7 @@
 <!--60A68A01BC1D481996705730BDEA560D-->  <DESCRIPTION><![CDATA[The datasource field is part of the datasource definition.]]></DESCRIPTION>
 <!--60A68A01BC1D481996705730BDEA560D-->  <HELP><![CDATA[The datasource field is part of the datasource definition.]]></HELP>
 <!--60A68A01BC1D481996705730BDEA560D-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
+<!--60A68A01BC1D481996705730BDEA560D-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--60A68A01BC1D481996705730BDEA560D--></AD_ELEMENT>
 
 <!--73C534367AFA4C28A9F8767D59AAE37E--><AD_ELEMENT>
@@ -50,6 +53,7 @@
 <!--73C534367AFA4C28A9F8767D59AAE37E-->  <DESCRIPTION><![CDATA[The datasource ]]></DESCRIPTION>
 <!--73C534367AFA4C28A9F8767D59AAE37E-->  <HELP><![CDATA[The datasource provides data from the database or from in-memory data.]]></HELP>
 <!--73C534367AFA4C28A9F8767D59AAE37E-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
+<!--73C534367AFA4C28A9F8767D59AAE37E-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--73C534367AFA4C28A9F8767D59AAE37E--></AD_ELEMENT>
 
 <!--D8467987FB7A4EA6AADCB5500A96CBDB--><AD_ELEMENT>
@@ -63,6 +67,7 @@
 <!--D8467987FB7A4EA6AADCB5500A96CBDB-->  <DESCRIPTION><![CDATA[The HQL where clause used to filter and query for data.]]></DESCRIPTION>
 <!--D8467987FB7A4EA6AADCB5500A96CBDB-->  <HELP><![CDATA[The HQL where clause is added to the query to retrieve the data which is returned by the datasource.]]></HELP>
 <!--D8467987FB7A4EA6AADCB5500A96CBDB-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
+<!--D8467987FB7A4EA6AADCB5500A96CBDB-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--D8467987FB7A4EA6AADCB5500A96CBDB--></AD_ELEMENT>
 
 </data>
--- a/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -6,7 +6,7 @@
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <NAME><![CDATA[JSON Datasource]]></NAME>
-<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION><![CDATA[2.1.14182]]></VERSION>
+<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION><![CDATA[2.1.14253]]></VERSION>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <DESCRIPTION><![CDATA[Provides data source CRUD functionality using JSON as the data format]]></DESCRIPTION>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <HELP><![CDATA[This module implements the datasource concept. Datasources play a central role in Smartclient applications. The datasource module automatically creates a datasource for each Openbravo entity. In addition custom data source implementations can be defined.]]></HELP>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <URL><![CDATA[http://forge.openbravo.com/projects/datasourceservice]]></URL>
--- a/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -7,7 +7,7 @@
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <STARTVERSION><![CDATA[1.1.14182]]></STARTVERSION>
+<!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <STARTVERSION><![CDATA[1.1.14253]]></STARTVERSION>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <AD_DEPENDENT_MODULE_ID><![CDATA[F8D1B3ECB3474E8DA5C216473C840DF1]]></AD_DEPENDENT_MODULE_ID>
-<!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <STARTVERSION><![CDATA[2.0.14182]]></STARTVERSION>
+<!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <STARTVERSION><![CDATA[2.0.14253]]></STARTVERSION>
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON REST Webservice]]></DEPENDANT_MODULE_NAME>
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--4FCE95802A854F7E8623AFF7C33D13EE-->  <STARTVERSION><![CDATA[3.0.14182]]></STARTVERSION>
+<!--4FCE95802A854F7E8623AFF7C33D13EE-->  <STARTVERSION><![CDATA[3.0.14253]]></STARTVERSION>
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
 <!--54AF8B39C55E4E7496902893ECD82786-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--54AF8B39C55E4E7496902893ECD82786-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--54AF8B39C55E4E7496902893ECD82786-->  <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--54AF8B39C55E4E7496902893ECD82786-->  <STARTVERSION><![CDATA[2.1.14182]]></STARTVERSION>
+<!--54AF8B39C55E4E7496902893ECD82786-->  <STARTVERSION><![CDATA[2.1.14253]]></STARTVERSION>
 <!--54AF8B39C55E4E7496902893ECD82786-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--54AF8B39C55E4E7496902893ECD82786-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
 <!--54AF8B39C55E4E7496902893ECD82786-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -63,7 +63,7 @@
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID>
-<!--D03C56D8A4E14F45A5466350E05C631F-->  <STARTVERSION><![CDATA[8.1.14182]]></STARTVERSION>
+<!--D03C56D8A4E14F45A5466350E05C631F-->  <STARTVERSION><![CDATA[8.1.14253]]></STARTVERSION>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_WINDOW.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_WINDOW.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -14,6 +14,7 @@
 <!--67AD3A287B7F4577A1534C8430E9DB2E-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
 <!--67AD3A287B7F4577A1534C8430E9DB2E-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--67AD3A287B7F4577A1534C8430E9DB2E-->  <ISTHREADSAFE><![CDATA[N]]></ISTHREADSAFE>
+<!--67AD3A287B7F4577A1534C8430E9DB2E-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--67AD3A287B7F4577A1534C8430E9DB2E--></AD_WINDOW>
 
 </data>
--- a/modules/org.openbravo.service.integration.google/src-db/database/model/functions/OBSEIG_UPDATE_ACCESS.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.service.integration.google/src-db/database/model/functions/OBSEIG_UPDATE_ACCESS.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -39,7 +39,8 @@
     AND NOT EXISTS (SELECT 1
                      FROM OBUIAPP_View_Role_Access
                     WHERE OBUIAPP_View_Impl_ID = V.OBUIAPP_View_Impl_ID
-                      AND AD_ROLE_ID = R.AD_ROLE_ID);
+                      AND AD_ROLE_ID = R.AD_ROLE_ID
+                      AND (R.ISADVANCED = 'Y' OR V.ISADVANCEDFEATURE = 'N'));
 END OBSEIG_UPDATE_ACCESS
 ]]></body>
     </function>
--- a/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -9,6 +9,7 @@
 <!--582E87EC64394CAF9D5DE3415B5A011B-->  <NAME><![CDATA[Obseig_Defaults_ID]]></NAME>
 <!--582E87EC64394CAF9D5DE3415B5A011B-->  <PRINTNAME><![CDATA[Obseig_Defaults_ID]]></PRINTNAME>
 <!--582E87EC64394CAF9D5DE3415B5A011B-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
+<!--582E87EC64394CAF9D5DE3415B5A011B-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--582E87EC64394CAF9D5DE3415B5A011B--></AD_ELEMENT>
 
 <!--E83520E8DFED4721BD2F8417EFEC3C07--><AD_ELEMENT>
@@ -22,6 +23,7 @@
 <!--E83520E8DFED4721BD2F8417EFEC3C07-->  <DESCRIPTION><![CDATA[Defines if a newly created user is active by default]]></DESCRIPTION>
 <!--E83520E8DFED4721BD2F8417EFEC3C07-->  <HELP><![CDATA[If the Google Account used to login in Openbravo doesn't have an user associated, a new user is created. A default role is defined for this user. This flag defines if the newly created user should be active by default or not.]]></HELP>
 <!--E83520E8DFED4721BD2F8417EFEC3C07-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
+<!--E83520E8DFED4721BD2F8417EFEC3C07-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--E83520E8DFED4721BD2F8417EFEC3C07--></AD_ELEMENT>
 
 </data>
--- a/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -6,7 +6,7 @@
 <!--FF8080813129ADA401312CA1222A0005-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FF8080813129ADA401312CA1222A0005-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813129ADA401312CA1222A0005-->  <NAME><![CDATA[Integration with Google APIs]]></NAME>
-<!--FF8080813129ADA401312CA1222A0005-->  <VERSION><![CDATA[0.1.14182]]></VERSION>
+<!--FF8080813129ADA401312CA1222A0005-->  <VERSION><![CDATA[0.1.14253]]></VERSION>
 <!--FF8080813129ADA401312CA1222A0005-->  <DESCRIPTION><![CDATA[Integration with Google APIs]]></DESCRIPTION>
 <!--FF8080813129ADA401312CA1222A0005-->  <TYPE><![CDATA[M]]></TYPE>
 <!--FF8080813129ADA401312CA1222A0005-->  <LICENSE><![CDATA[Licensed under the Openbravo Public License Version 1.1.
--- a/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -7,7 +7,7 @@
 <!--FF8080813141B198013141BA0F7D0012-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813141B198013141BA0F7D0012-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
 <!--FF8080813141B198013141BA0F7D0012-->  <AD_DEPENDENT_MODULE_ID><![CDATA[FF8080813141B198013141B86DD70003]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813141B198013141BA0F7D0012-->  <STARTVERSION><![CDATA[0.1.14182]]></STARTVERSION>
+<!--FF8080813141B198013141BA0F7D0012-->  <STARTVERSION><![CDATA[0.1.14253]]></STARTVERSION>
 <!--FF8080813141B198013141BA0F7D0012-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080813141B198013141BA0F7D0012-->  <DEPENDANT_MODULE_NAME><![CDATA[OpenID Service Integration]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813141B198013141BA0F7D0012-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--FF8080813151AEE1013151C4ACE6001B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <AD_DEPENDENT_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813151AEE1013151C4ACE6001B-->  <STARTVERSION><![CDATA[2.1.14182]]></STARTVERSION>
+<!--FF8080813151AEE1013151C4ACE6001B-->  <STARTVERSION><![CDATA[2.1.14253]]></STARTVERSION>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <DEPENDANT_MODULE_NAME><![CDATA[Openbravo 3.0 Framework]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_WINDOW.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_WINDOW.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -13,6 +13,7 @@
 <!--FF8080813161A3D301316208017A0011-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
 <!--FF8080813161A3D301316208017A0011-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
 <!--FF8080813161A3D301316208017A0011-->  <ISTHREADSAFE><![CDATA[N]]></ISTHREADSAFE>
+<!--FF8080813161A3D301316208017A0011-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--FF8080813161A3D301316208017A0011--></AD_WINDOW>
 
 </data>
--- a/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/OBUIAPP_VIEW_IMPL.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/OBUIAPP_VIEW_IMPL.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -8,6 +8,7 @@
 <!--FF808081314D5BAC01314D64B9920013-->  <NAME><![CDATA[OBSEIG_AccountAssociationView]]></NAME>
 <!--FF808081314D5BAC01314D64B9920013-->  <DESCRIPTION><![CDATA[Google Account Association]]></DESCRIPTION>
 <!--FF808081314D5BAC01314D64B9920013-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF808081314D5BAC01314D64B9920013-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--FF808081314D5BAC01314D64B9920013--></OBUIAPP_VIEW_IMPL>
 
 </data>
--- a/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -9,6 +9,7 @@
 <!--031552634F9146CFB0C6140B8955DF1D-->  <NAME><![CDATA[OpenID Identifier]]></NAME>
 <!--031552634F9146CFB0C6140B8955DF1D-->  <PRINTNAME><![CDATA[OpenID Identifier]]></PRINTNAME>
 <!--031552634F9146CFB0C6140B8955DF1D-->  <AD_MODULE_ID><![CDATA[FF8080813141B198013141B86DD70003]]></AD_MODULE_ID>
+<!--031552634F9146CFB0C6140B8955DF1D-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--031552634F9146CFB0C6140B8955DF1D--></AD_ELEMENT>
 
 <!--066A5B188E3341F68CB01AC3D2803AED--><AD_ELEMENT>
@@ -20,6 +21,7 @@
 <!--066A5B188E3341F68CB01AC3D2803AED-->  <NAME><![CDATA[OpenID Identifier]]></NAME>
 <!--066A5B188E3341F68CB01AC3D2803AED-->  <PRINTNAME><![CDATA[OpenID Identifier]]></PRINTNAME>
 <!--066A5B188E3341F68CB01AC3D2803AED-->  <AD_MODULE_ID><![CDATA[FF8080813141B198013141B86DD70003]]></AD_MODULE_ID>
+<!--066A5B188E3341F68CB01AC3D2803AED-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--066A5B188E3341F68CB01AC3D2803AED--></AD_ELEMENT>
 
 </data>
--- a/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -6,7 +6,7 @@
 <!--FF8080813141B198013141B86DD70003-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FF8080813141B198013141B86DD70003-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813141B198013141B86DD70003-->  <NAME><![CDATA[OpenID Service Integration]]></NAME>
-<!--FF8080813141B198013141B86DD70003-->  <VERSION><![CDATA[0.1.14182]]></VERSION>
+<!--FF8080813141B198013141B86DD70003-->  <VERSION><![CDATA[0.1.14253]]></VERSION>
 <!--FF8080813141B198013141B86DD70003-->  <DESCRIPTION><![CDATA[OpenID Service Integration]]></DESCRIPTION>
 <!--FF8080813141B198013141B86DD70003-->  <TYPE><![CDATA[M]]></TYPE>
 <!--FF8080813141B198013141B86DD70003-->  <LICENSE><![CDATA[Licensed under the Openbravo Public License Version 1.1.
--- a/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -7,7 +7,7 @@
 <!--FF8080813141B198013141B8B21B0006-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813141B198013141B8B21B0006-->  <AD_MODULE_ID><![CDATA[FF8080813141B198013141B86DD70003]]></AD_MODULE_ID>
 <!--FF8080813141B198013141B8B21B0006-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813141B198013141B8B21B0006-->  <STARTVERSION><![CDATA[3.0.14182]]></STARTVERSION>
+<!--FF8080813141B198013141B8B21B0006-->  <STARTVERSION><![CDATA[3.0.14253]]></STARTVERSION>
 <!--FF8080813141B198013141B8B21B0006-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080813141B198013141B8B21B0006-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813141B198013141B8B21B0006-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -6,7 +6,7 @@
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <NAME><![CDATA[JSON REST Webservice]]></NAME>
-<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION><![CDATA[2.0.14182]]></VERSION>
+<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION><![CDATA[2.0.14253]]></VERSION>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <DESCRIPTION><![CDATA[Provides a JSON REST webservice for CRUD service requests]]></DESCRIPTION>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <HELP><![CDATA[Provides a JSON REST webservice for CRUD service requests. Both the servlet implementation (receiving HTTP REST requests in JSON) as the backend processing are provided.]]></HELP>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <URL><![CDATA[http://forge.openbravo.com/projects/openbravojsonrest]]></URL>
--- a/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -7,7 +7,7 @@
 <!--9E3E7B42DB16405FB794496D309D7044-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <AD_MODULE_ID><![CDATA[F8D1B3ECB3474E8DA5C216473C840DF1]]></AD_MODULE_ID>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--9E3E7B42DB16405FB794496D309D7044-->  <STARTVERSION><![CDATA[3.0.14182]]></STARTVERSION>
+<!--9E3E7B42DB16405FB794496D309D7044-->  <STARTVERSION><![CDATA[3.0.14253]]></STARTVERSION>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java	Thu Nov 17 13:04:04 2011 +0100
@@ -36,12 +36,17 @@
 import org.openbravo.base.model.ModelProvider;
 import org.openbravo.base.model.Property;
 import org.openbravo.base.model.domaintype.SearchDomainType;
+import org.openbravo.base.model.domaintype.TableDomainType;
 import org.openbravo.base.structure.IdentifierProvider;
 import org.openbravo.base.util.Check;
 import org.openbravo.client.kernel.RequestContext;
 import org.openbravo.dal.core.DalUtil;
 import org.openbravo.dal.core.OBContext;
+import org.openbravo.dal.service.OBDal;
 import org.openbravo.erpCommon.utility.Utility;
+import org.openbravo.model.ad.datamodel.Table;
+import org.openbravo.model.ad.domain.Reference;
+import org.openbravo.model.ad.domain.ReferencedTable;
 import org.openbravo.service.db.DalConnectionProvider;
 
 /**
@@ -398,13 +403,49 @@
   private String buildFieldClause(List<Property> properties, Property property, String fieldName,
       String operator) {
 
+    // special cases:
+    // TableDomainType
+    // TableDirDomainType
+
+    // handle a special case the table reference which shows a tablename in a combo
+    // or uses the display column to display that in the grid
+    Property useProperty = property;
+    String useFieldName = fieldName;
+    if (properties.size() >= 2) {
+      final Property refProperty = properties.get(properties.size() - 2);
+      if (refProperty.getDomainType() instanceof TableDomainType) {
+        // special case table reference itself
+        final boolean isTable = property.getEntity() == ModelProvider.getInstance().getEntity(
+            Table.ENTITY_NAME);
+        if (isTable) {
+          useProperty = property.getEntity().getProperty(Table.PROPERTY_NAME);
+          final int index = fieldName.indexOf(".");
+          useFieldName = fieldName.substring(0, index + 1) + useProperty.getName();
+        } else {
+          // read the reference to get the table reference
+          final Reference reference = OBDal.getInstance().get(Reference.class,
+              refProperty.getDomainType().getReference().getId());
+          for (ReferencedTable referencedTable : reference.getADReferencedTableList()) {
+            if (referencedTable.isActive() && referencedTable.getDisplayedColumn() != null
+                && referencedTable.getDisplayedColumn().isActive()) {
+              useProperty = property.getEntity().getPropertyByColumnName(
+                  referencedTable.getDisplayedColumn().getDBColumnName());
+              final int index = fieldName.indexOf(".");
+              useFieldName = fieldName.substring(0, index + 1) + useProperty.getName();
+              break;
+            }
+          }
+        }
+      }
+    }
+
     String clause = null;
     if (orNesting > 0) {
-      clause = resolveJoins(properties, fieldName);
+      clause = resolveJoins(properties, useFieldName);
     } else if (getMainAlias() != null) {
-      clause = getMainAlias() + "." + fieldName.trim();
+      clause = getMainAlias() + "." + useFieldName.trim();
     } else {
-      clause = fieldName;
+      clause = useFieldName;
     }
 
     // get rid of the identifier and replace it with the real property name
@@ -412,14 +453,14 @@
     // NOTE: the if and else check against the key variable and not the leftwherepart
     // because the key contains the original string (with the _identifier part).
     // Within the if the leftWherePart is used because it contains the join aliases
-    if (fieldName.equals(JsonConstants.IDENTIFIER)
-        || fieldName.endsWith("." + JsonConstants.IDENTIFIER)) {
-      clause = computeLeftWhereClauseForIdentifier(property, fieldName, clause);
-    } else if (!property.isPrimitive()) {
+    if (useFieldName.equals(JsonConstants.IDENTIFIER)
+        || useFieldName.endsWith("." + JsonConstants.IDENTIFIER)) {
+      clause = computeLeftWhereClauseForIdentifier(useProperty, useFieldName, clause);
+    } else if (!useProperty.isPrimitive()) {
       clause = clause + ".id";
     }
 
-    if (ignoreCase(property, operator)) {
+    if (ignoreCase(useProperty, operator)) {
       clause = "upper(" + clause + ")";
     }
     return clause;
--- a/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -11,6 +11,7 @@
 <!--115E1E4A48294BE880525B71474ECEF9-->  <DESCRIPTION><![CDATA[Allow sorting by this field in the popup grid.]]></DESCRIPTION>
 <!--115E1E4A48294BE880525B71474ECEF9-->  <HELP><![CDATA[Allow sorting by this field in the popup grid.]]></HELP>
 <!--115E1E4A48294BE880525B71474ECEF9-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
+<!--115E1E4A48294BE880525B71474ECEF9-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--115E1E4A48294BE880525B71474ECEF9--></AD_ELEMENT>
 
 <!--14118749B4354DCAB332F4A29D585699--><AD_ELEMENT>
@@ -34,6 +35,7 @@
 
 This will retrieve the session variable SESSIONVAR and use it as default value for the selector field]]></HELP>
 <!--14118749B4354DCAB332F4A29D585699-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
+<!--14118749B4354DCAB332F4A29D585699-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--14118749B4354DCAB332F4A29D585699--></AD_ELEMENT>
 
 <!--20B322C49F2B4A5EBEDA5BA73CE97623--><AD_ELEMENT>
@@ -47,6 +49,7 @@
 <!--20B322C49F2B4A5EBEDA5BA73CE97623-->  <DESCRIPTION><![CDATA[Identifies the 'out field' from which get a value on a row selection]]></DESCRIPTION>
 <!--20B322C49F2B4A5EBEDA5BA73CE97623-->  <HELP><![CDATA[The new selector can define a field as 'Out Field'. If a column from a tab is using a selector with an out field it will get listed. A field from the tab can receive the value of an Selector Out Field when the user picks a record in the selector. This fields establishes the connection between a selector out field and a field in the tab.]]></HELP>
 <!--20B322C49F2B4A5EBEDA5BA73CE97623-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
+<!--20B322C49F2B4A5EBEDA5BA73CE97623-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--20B322C49F2B4A5EBEDA5BA73CE97623--></AD_ELEMENT>
 
 <!--4BB494AABEA44BB4A383D4814FD72041--><AD_ELEMENT>
@@ -60,6 +63,7 @@
 <!--4BB494AABEA44BB4A383D4814FD72041-->  <DESCRIPTION><![CDATA[Path/name of the property to show in the selector]]></DESCRIPTION>
 <!--4BB494AABEA44BB4A383D4814FD72041-->  <HELP><![CDATA[Path/name of the property to show in the selector]]></HELP>
 <!--4BB494AABEA44BB4A383D4814FD72041-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
+<!--4BB494AABEA44BB4A383D4814FD72041-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--4BB494AABEA44BB4A383D4814FD72041--></AD_ELEMENT>
 
 <!--4DD095DE15384EB1A4B9DCFDE6BA4853--><AD_ELEMENT>
@@ -73,6 +77,7 @@
 <!--4DD095DE15384EB1A4B9DCFDE6BA4853-->  <DESCRIPTION><![CDATA[Defines a JavaScript expression that returns a HQL where clause]]></DESCRIPTION>
 <!--4DD095DE15384EB1A4B9DCFDE6BA4853-->  <HELP><![CDATA[Defines a JavaScript expression evaluated on the server that returns a HQL where clause string and will be appended in the where clause. HQL where clause is static defined where clause. The filter expression can use JavaScript to access the Openbravo API evaluate on the fly and return a HQL dynamically. Note: This expression expression must always return a string value, e.g. "e.customer = true"]]></HELP>
 <!--4DD095DE15384EB1A4B9DCFDE6BA4853-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
+<!--4DD095DE15384EB1A4B9DCFDE6BA4853-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--4DD095DE15384EB1A4B9DCFDE6BA4853--></AD_ELEMENT>
 
 <!--61493F0A941F4256900765CF36989AC7--><AD_ELEMENT>
@@ -84,6 +89,7 @@
 <!--61493F0A941F4256900765CF36989AC7-->  <NAME><![CDATA[Obuisel_Selector_Field_Trl_ID]]></NAME>
 <!--61493F0A941F4256900765CF36989AC7-->  <PRINTNAME><![CDATA[Obuisel_Selector_Field_Trl_ID]]></PRINTNAME>
 <!--61493F0A941F4256900765CF36989AC7-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
+<!--61493F0A941F4256900765CF36989AC7-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--61493F0A941F4256900765CF36989AC7--></AD_ELEMENT>
 
 <!--713B5A55B3DD4A17A9ECC6095DFCCD4F--><AD_ELEMENT>
@@ -97,6 +103,7 @@
 <!--713B5A55B3DD4A17A9ECC6095DFCCD4F-->  <DESCRIPTION><![CDATA[The value of this field will be set in the foreign key column. ]]></DESCRIPTION>
 <!--713B5A55B3DD4A17A9ECC6095DFCCD4F-->  <HELP><![CDATA[The value of this field will be set in the foreign key column. Normally this field does not need to be set. If not set then the id of the referenced entity is used.]]></HELP>
 <!--713B5A55B3DD4A17A9ECC6095DFCCD4F-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
+<!--713B5A55B3DD4A17A9ECC6095DFCCD4F-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--713B5A55B3DD4A17A9ECC6095DFCCD4F--></AD_ELEMENT>
 
 <!--779CE92421BF4EF5B29997CAF66FEABF--><AD_ELEMENT>
@@ -110,6 +117,7 @@
 <!--779CE92421BF4EF5B29997CAF66FEABF-->  <DESCRIPTION><![CDATA[Defines if the field is shown in the popup grid.]]></DESCRIPTION>
 <!--779CE92421BF4EF5B29997CAF66FEABF-->  <HELP><![CDATA[Defines if the field is shown in the popup grid.]]></HELP>
 <!--779CE92421BF4EF5B29997CAF66FEABF-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
+<!--779CE92421BF4EF5B29997CAF66FEABF-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--779CE92421BF4EF5B29997CAF66FEABF--></AD_ELEMENT>
 
 <!--7E3AF59AB6BB471DA2D0835926F92C07--><AD_ELEMENT>
@@ -122,6 +130,7 @@
 <!--7E3AF59AB6BB471DA2D0835926F92C07-->  <PRINTNAME><![CDATA[Column Sorting ]]></PRINTNAME>
 <!--7E3AF59AB6BB471DA2D0835926F92C07-->  <DESCRIPTION><![CDATA[Defines the sorting of columns in a grid]]></DESCRIPTION>
 <!--7E3AF59AB6BB471DA2D0835926F92C07-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
+<!--7E3AF59AB6BB471DA2D0835926F92C07-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--7E3AF59AB6BB471DA2D0835926F92C07--></AD_ELEMENT>
 
 <!--9A4B096709FEB876E040007F01007259--><AD_ELEMENT>
@@ -136,6 +145,7 @@
 
 Retrieved columns must have an alias defined, this alias is used to identify the returned value with a selector field. It is mandatory to set the "@additional_filters@" String on the main where clause. It is forbidden to include an Order by clause in the HQL, the order is defined on the Selector fields.]]></HELP>
 <!--9A4B096709FEB876E040007F01007259-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
+<!--9A4B096709FEB876E040007F01007259-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9A4B096709FEB876E040007F01007259--></AD_ELEMENT>
 
 <!--9A4B09670A04B876E040007F01007259--><AD_ELEMENT>
@@ -148,6 +158,7 @@
 <!--9A4B09670A04B876E040007F01007259-->  <PRINTNAME><![CDATA[Entity Alias]]></PRINTNAME>
 <!--9A4B09670A04B876E040007F01007259-->  <HELP><![CDATA[In case that the the selector's table has an alias in the HQL it is mandatory to set it on this field. This alias is used to add some mandatory filters on the Where clause replacing the @additional_filters@ string. Some examples of added filters are: client, organization and active flag.]]></HELP>
 <!--9A4B09670A04B876E040007F01007259-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
+<!--9A4B09670A04B876E040007F01007259-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9A4B09670A04B876E040007F01007259--></AD_ELEMENT>
 
 <!--9A597DDF9955E963E040007F01002F75--><AD_ELEMENT>
@@ -160,6 +171,7 @@
 <!--9A597DDF9955E963E040007F01002F75-->  <PRINTNAME><![CDATA[Custom Query]]></PRINTNAME>
 <!--9A597DDF9955E963E040007F01002F75-->  <HELP><![CDATA[Indicates that a custom query is used to fill out the selector's grid.]]></HELP>
 <!--9A597DDF9955E963E040007F01002F75-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
+<!--9A597DDF9955E963E040007F01002F75-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9A597DDF9955E963E040007F01002F75--></AD_ELEMENT>
 
 <!--9A5A29111528107DE040007F01002F6B--><AD_ELEMENT>
@@ -172,6 +184,7 @@
 <!--9A5A29111528107DE040007F01002F6B-->  <PRINTNAME><![CDATA[Display Column Alias]]></PRINTNAME>
 <!--9A5A29111528107DE040007F01002F6B-->  <HELP><![CDATA[Alias of the HQL query column to be shown]]></HELP>
 <!--9A5A29111528107DE040007F01002F6B-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
+<!--9A5A29111528107DE040007F01002F6B-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9A5A29111528107DE040007F01002F6B--></AD_ELEMENT>
 
 <!--9A5A29111529107DE040007F01002F6B--><AD_ELEMENT>
@@ -184,6 +197,7 @@
 <!--9A5A29111529107DE040007F01002F6B-->  <PRINTNAME><![CDATA[Clause Left Part]]></PRINTNAME>
 <!--9A5A29111529107DE040007F01002F6B-->  <HELP><![CDATA[Left part of a clause to be used on the where or order by clauses of the HQL.]]></HELP>
 <!--9A5A29111529107DE040007F01002F6B-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
+<!--9A5A29111529107DE040007F01002F6B-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9A5A29111529107DE040007F01002F6B--></AD_ELEMENT>
 
 <!--9D05F0BD3CA6AAECE040007F0100087A--><AD_ELEMENT>
@@ -196,6 +210,7 @@
 <!--9D05F0BD3CA6AAECE040007F0100087A-->  <PRINTNAME><![CDATA[Show In Picklist]]></PRINTNAME>
 <!--9D05F0BD3CA6AAECE040007F0100087A-->  <HELP><![CDATA[Sets additional fields to appear on the selectors pick list.]]></HELP>
 <!--9D05F0BD3CA6AAECE040007F0100087A-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
+<!--9D05F0BD3CA6AAECE040007F0100087A-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9D05F0BD3CA6AAECE040007F0100087A--></AD_ELEMENT>
 
 <!--B843BE7E4A984128AA589685C313E709--><AD_ELEMENT>
@@ -209,6 +224,7 @@
 <!--B843BE7E4A984128AA589685C313E709-->  <DESCRIPTION><![CDATA[Defines if the field is used to search when retrieving values in the suggestion box.]]></DESCRIPTION>
 <!--B843BE7E4A984128AA589685C313E709-->  <HELP><![CDATA[Defines if the field is used to search when retrieving values in the suggestion box.]]></HELP>
 <!--B843BE7E4A984128AA589685C313E709-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
+<!--B843BE7E4A984128AA589685C313E709-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--B843BE7E4A984128AA589685C313E709--></AD_ELEMENT>
 
 <!--BC75AC54601F4C17B6B5DDC7C8F18FDC--><AD_ELEMENT>
@@ -222,6 +238,7 @@
 <!--BC75AC54601F4C17B6B5DDC7C8F18FDC-->  <DESCRIPTION><![CDATA[Defines the text matching logic used in the filters in the popup grid.]]></DESCRIPTION>
 <!--BC75AC54601F4C17B6B5DDC7C8F18FDC-->  <HELP><![CDATA[Defines the text matching logic used in the filters in the popup grid.]]></HELP>
 <!--BC75AC54601F4C17B6B5DDC7C8F18FDC-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
+<!--BC75AC54601F4C17B6B5DDC7C8F18FDC-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--BC75AC54601F4C17B6B5DDC7C8F18FDC--></AD_ELEMENT>
 
 <!--C4B7AF76B82145BC9439ADF6855CBE7E--><AD_ELEMENT>
@@ -235,6 +252,7 @@
 <!--C4B7AF76B82145BC9439ADF6855CBE7E-->  <DESCRIPTION><![CDATA[Unique identifying key for the selector field record.]]></DESCRIPTION>
 <!--C4B7AF76B82145BC9439ADF6855CBE7E-->  <HELP><![CDATA[Unique identifying key for the selector field record.]]></HELP>
 <!--C4B7AF76B82145BC9439ADF6855CBE7E-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
+<!--C4B7AF76B82145BC9439ADF6855CBE7E-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--C4B7AF76B82145BC9439ADF6855CBE7E--></AD_ELEMENT>
 
 <!--C549CDBBFA994C9F952CB205EBFE5302--><AD_ELEMENT>
@@ -246,6 +264,7 @@
 <!--C549CDBBFA994C9F952CB205EBFE5302-->  <NAME><![CDATA[Obuisel_Selector_Trl_ID]]></NAME>
 <!--C549CDBBFA994C9F952CB205EBFE5302-->  <PRINTNAME><![CDATA[Obuisel_Selector_Trl_ID]]></PRINTNAME>
 <!--C549CDBBFA994C9F952CB205EBFE5302-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
+<!--C549CDBBFA994C9F952CB205EBFE5302-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--C549CDBBFA994C9F952CB205EBFE5302--></AD_ELEMENT>
 
 <!--CE0AB5DC107A4D288DE5E83015641750--><AD_ELEMENT>
@@ -259,6 +278,7 @@
 <!--CE0AB5DC107A4D288DE5E83015641750-->  <DESCRIPTION><![CDATA[Allow filtering on this field.]]></DESCRIPTION>
 <!--CE0AB5DC107A4D288DE5E83015641750-->  <HELP><![CDATA[Make it possible to filter in the grid using this field.]]></HELP>
 <!--CE0AB5DC107A4D288DE5E83015641750-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
+<!--CE0AB5DC107A4D288DE5E83015641750-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--CE0AB5DC107A4D288DE5E83015641750--></AD_ELEMENT>
 
 <!--CEF66D7F6D124261B706973417D761CD--><AD_ELEMENT>
@@ -271,6 +291,7 @@
 <!--CEF66D7F6D124261B706973417D761CD-->  <PRINTNAME><![CDATA[Out Field]]></PRINTNAME>
 <!--CEF66D7F6D124261B706973417D761CD-->  <DESCRIPTION><![CDATA[The value of this field should be returned to the opener window]]></DESCRIPTION>
 <!--CEF66D7F6D124261B706973417D761CD-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
+<!--CEF66D7F6D124261B706973417D761CD-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--CEF66D7F6D124261B706973417D761CD--></AD_ELEMENT>
 
 <!--D71D9890834E4D4183B4A2872A5107A2--><AD_ELEMENT>
@@ -284,6 +305,7 @@
 <!--D71D9890834E4D4183B4A2872A5107A2-->  <DESCRIPTION><![CDATA[The unique identifying key for the selector.]]></DESCRIPTION>
 <!--D71D9890834E4D4183B4A2872A5107A2-->  <HELP><![CDATA[The unique identifying key for the selector.]]></HELP>
 <!--D71D9890834E4D4183B4A2872A5107A2-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
+<!--D71D9890834E4D4183B4A2872A5107A2-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--D71D9890834E4D4183B4A2872A5107A2--></AD_ELEMENT>
 
 <!--E4FCED1CB10743E8A6BD994F27F939F1--><AD_ELEMENT>
@@ -297,6 +319,7 @@
 <!--E4FCED1CB10743E8A6BD994F27F939F1-->  <DESCRIPTION><![CDATA[The value of this field will be displayed in the selector text input box.]]></DESCRIPTION>
 <!--E4FCED1CB10743E8A6BD994F27F939F1-->  <HELP><![CDATA[The value of this field will be displayed in the selector text input box.]]></HELP>
 <!--E4FCED1CB10743E8A6BD994F27F939F1-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
+<!--E4FCED1CB10743E8A6BD994F27F939F1-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--E4FCED1CB10743E8A6BD994F27F939F1--></AD_ELEMENT>
 
 <!--E54D4B7821C44A6A9BD20D5B464B30E4--><AD_ELEMENT>
@@ -310,6 +333,7 @@
 <!--E54D4B7821C44A6A9BD20D5B464B30E4-->  <DESCRIPTION><![CDATA[Defines the text matching logic used in the suggestion box.]]></DESCRIPTION>
 <!--E54D4B7821C44A6A9BD20D5B464B30E4-->  <HELP><![CDATA[Defines the text matching logic used in the suggestion box.]]></HELP>
 <!--E54D4B7821C44A6A9BD20D5B464B30E4-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
+<!--E54D4B7821C44A6A9BD20D5B464B30E4-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--E54D4B7821C44A6A9BD20D5B464B30E4--></AD_ELEMENT>
 
 <!--FE81758CDCFA4B329F7F1BB8C99E45C3--><AD_ELEMENT>
@@ -323,6 +347,7 @@
 <!--FE81758CDCFA4B329F7F1BB8C99E45C3-->  <DESCRIPTION><![CDATA[The HQL where clause is added to the query to retrieve the data which is returned by the datasource.]]></DESCRIPTION>
 <!--FE81758CDCFA4B329F7F1BB8C99E45C3-->  <HELP><![CDATA[The HQL where clause is added to the query to retrieve the data which is returned by the datasource. When refering to properties of the entity shown in the selector then use the prefix e. For example if the selector shows Products then refering to product category works like this: e.productCategory.name='Ceramics'.]]></HELP>
 <!--FE81758CDCFA4B329F7F1BB8C99E45C3-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
+<!--FE81758CDCFA4B329F7F1BB8C99E45C3-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--FE81758CDCFA4B329F7F1BB8C99E45C3--></AD_ELEMENT>
 
 </data>
--- a/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -6,7 +6,7 @@
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <NAME><![CDATA[User Interface Selector]]></NAME>
-<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION><![CDATA[2.1.14182]]></VERSION>
+<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION><![CDATA[2.1.14253]]></VERSION>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <DESCRIPTION><![CDATA[Provides a selector with a suggestion box and popup grid window]]></DESCRIPTION>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <HELP><![CDATA[The Openbravo selector provides new selector functionality which is used inside of existing Openbravo forms. The selector is mainly used for supporting foreign key references in the user interface. The selector combines both suggestion box behavior with a popup grid.]]></HELP>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <URL><![CDATA[http://forge.openbravo.com/projects/selector]]></URL>
--- a/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -7,7 +7,7 @@
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID>
-<!--38825CAED43941D38CA0C78DB04FCFA0-->  <STARTVERSION><![CDATA[8.1.14182]]></STARTVERSION>
+<!--38825CAED43941D38CA0C78DB04FCFA0-->  <STARTVERSION><![CDATA[8.1.14253]]></STARTVERSION>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <AD_DEPENDENT_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_DEPENDENT_MODULE_ID>
-<!--6DDE7B1A70174242AF82B5022FB89279-->  <STARTVERSION><![CDATA[2.1.14182]]></STARTVERSION>
+<!--6DDE7B1A70174242AF82B5022FB89279-->  <STARTVERSION><![CDATA[2.1.14253]]></STARTVERSION>
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Application]]></DEPENDANT_MODULE_NAME>
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--94F9CD2CB5EF4467A67475C786C984A7-->  <STARTVERSION><![CDATA[2.1.14182]]></STARTVERSION>
+<!--94F9CD2CB5EF4467A67475C786C984A7-->  <STARTVERSION><![CDATA[2.1.14253]]></STARTVERSION>
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <STARTVERSION><![CDATA[1.1.14182]]></STARTVERSION>
+<!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <STARTVERSION><![CDATA[1.1.14253]]></STARTVERSION>
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -63,7 +63,7 @@
 <!--C8DAC574B88649D08C9468521B343F12-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--C8DAC574B88649D08C9468521B343F12-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--C8DAC574B88649D08C9468521B343F12-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--C8DAC574B88649D08C9468521B343F12-->  <STARTVERSION><![CDATA[3.0.14182]]></STARTVERSION>
+<!--C8DAC574B88649D08C9468521B343F12-->  <STARTVERSION><![CDATA[3.0.14253]]></STARTVERSION>
 <!--C8DAC574B88649D08C9468521B343F12-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--C8DAC574B88649D08C9468521B343F12-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--C8DAC574B88649D08C9468521B343F12-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -77,7 +77,7 @@
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID>
-<!--F14EB17946BE4724A46F80CB1A47EC70-->  <STARTVERSION><![CDATA[2.1.14182]]></STARTVERSION>
+<!--F14EB17946BE4724A46F80CB1A47EC70-->  <STARTVERSION><![CDATA[2.1.14253]]></STARTVERSION>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -6,7 +6,7 @@
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <NAME><![CDATA[2.50 to 3.00 Compatibility Skin]]></NAME>
-<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION><![CDATA[2.0.14182]]></VERSION>
+<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION><![CDATA[2.0.14253]]></VERSION>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <DESCRIPTION><![CDATA[Skin module to proper visualization of classic windows inside the MDI interface]]></DESCRIPTION>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <HELP><![CDATA[With this skin module the classic windows styles will display in a way more coherent with the new 3.00 styles]]></HELP>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <URL><![CDATA[www.openbravo.com]]></URL>
--- a/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -7,7 +7,7 @@
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <AD_MODULE_ID><![CDATA[96998CBC42744B3DBEE28AC8095C9335]]></AD_MODULE_ID>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--39BF75AD9AB3453698BF5DE29E727AA9-->  <STARTVERSION><![CDATA[3.0.14182]]></STARTVERSION>
+<!--39BF75AD9AB3453698BF5DE29E727AA9-->  <STARTVERSION><![CDATA[3.0.14253]]></STARTVERSION>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -6,7 +6,7 @@
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <NAME><![CDATA[Smartclient]]></NAME>
-<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION><![CDATA[8.1.14182]]></VERSION>
+<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION><![CDATA[8.1.14253]]></VERSION>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <DESCRIPTION><![CDATA[Smartclient libraries for use within Openbravo]]></DESCRIPTION>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <HELP><![CDATA[This module contains the Smartclient libraries for usage by other modules. It also contains some simple test pages to validate that Smartclient is working correctly. Also contains generic Openbravo Smartclient components]]></HELP>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <URL><![CDATA[http://forge.openbravo.com/projects/obsmartclient]]></URL>
--- a/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -7,7 +7,7 @@
 <!--086331E18477496B8AC74D2CFEBD1307-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <AD_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_MODULE_ID>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--086331E18477496B8AC74D2CFEBD1307-->  <STARTVERSION><![CDATA[3.0.14182]]></STARTVERSION>
+<!--086331E18477496B8AC74D2CFEBD1307-->  <STARTVERSION><![CDATA[3.0.14253]]></STARTVERSION>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--DC5D4EF450244482BD2B458DAA496333-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--DC5D4EF450244482BD2B458DAA496333-->  <AD_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_MODULE_ID>
 <!--DC5D4EF450244482BD2B458DAA496333-->  <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--DC5D4EF450244482BD2B458DAA496333-->  <STARTVERSION><![CDATA[2.1.14182]]></STARTVERSION>
+<!--DC5D4EF450244482BD2B458DAA496333-->  <STARTVERSION><![CDATA[2.1.14253]]></STARTVERSION>
 <!--DC5D4EF450244482BD2B458DAA496333-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--DC5D4EF450244482BD2B458DAA496333-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
 <!--DC5D4EF450244482BD2B458DAA496333-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <AD_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_MODULE_ID>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--F2AF15C0AF5540E393D96BE506E20648-->  <STARTVERSION><![CDATA[1.1.14182]]></STARTVERSION>
+<!--F2AF15C0AF5540E393D96BE506E20648-->  <STARTVERSION><![CDATA[1.1.14253]]></STARTVERSION>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js	Thu Nov 17 13:04:04 2011 +0100
@@ -112,7 +112,7 @@
       result = { operator: "and", criteria: [] },
       crit = result.criteria,
       valueParts = [],
-      allowEx = this._shouldAllowExpressions(),
+      allowEx = true,
       ds = isc.DS.get(this.form.expressionDataSource || this.form.dataSource)
     ;
   
--- a/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -6,7 +6,7 @@
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <NAME><![CDATA[Standard Roles]]></NAME>
-<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION><![CDATA[3.0.14182]]></VERSION>
+<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION><![CDATA[3.0.14253]]></VERSION>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <DESCRIPTION><![CDATA[Pre-configured collection of standard ERP roles]]></DESCRIPTION>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <HELP><![CDATA[This dataset contains the following roles with their access to corresponding Openbravo entities - windows, reports, actions.
 * Employee - Any person of the enterprise
--- a/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -7,7 +7,7 @@
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <AD_MODULE_ID><![CDATA[883B5872CA0548F9AF2BBBE7D2DDFA61]]></AD_MODULE_ID>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--148A000EE9A04A3CA653B1296A00B8E6-->  <STARTVERSION><![CDATA[3.0.14182]]></STARTVERSION>
+<!--148A000EE9A04A3CA653B1296A00B8E6-->  <STARTVERSION><![CDATA[3.0.14253]]></STARTVERSION>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--30F966407A6F4E15965821BAEE34D25B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--30F966407A6F4E15965821BAEE34D25B-->  <AD_MODULE_ID><![CDATA[883B5872CA0548F9AF2BBBE7D2DDFA61]]></AD_MODULE_ID>
 <!--30F966407A6F4E15965821BAEE34D25B-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_DEPENDENT_MODULE_ID>
-<!--30F966407A6F4E15965821BAEE34D25B-->  <STARTVERSION><![CDATA[3.0.14182]]></STARTVERSION>
+<!--30F966407A6F4E15965821BAEE34D25B-->  <STARTVERSION><![CDATA[3.0.14253]]></STARTVERSION>
 <!--30F966407A6F4E15965821BAEE34D25B-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--30F966407A6F4E15965821BAEE34D25B-->  <DEPENDANT_MODULE_NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></DEPENDANT_MODULE_NAME>
 <!--30F966407A6F4E15965821BAEE34D25B-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--F93CE30003B24F8F8886510B0065EECC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <AD_MODULE_ID><![CDATA[883B5872CA0548F9AF2BBBE7D2DDFA61]]></AD_MODULE_ID>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <AD_DEPENDENT_MODULE_ID><![CDATA[3A3A943684D64DEF9EC39F588A656848]]></AD_DEPENDENT_MODULE_ID>
-<!--F93CE30003B24F8F8886510B0065EECC-->  <STARTVERSION><![CDATA[1.1.14182]]></STARTVERSION>
+<!--F93CE30003B24F8F8886510B0065EECC-->  <STARTVERSION><![CDATA[1.1.14253]]></STARTVERSION>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <DEPENDANT_MODULE_NAME><![CDATA[Orders Awaiting Delivery]]></DEPENDANT_MODULE_NAME>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -6,7 +6,7 @@
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <NAME><![CDATA[Openbravo 3.0 Framework]]></NAME>
-<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION><![CDATA[2.1.14182]]></VERSION>
+<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION><![CDATA[2.1.14253]]></VERSION>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <DESCRIPTION><![CDATA[Openbravo 3.0 Framework]]></DESCRIPTION>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <HELP><![CDATA[Contains all the components required to run the Openbravo 3.0 framework]]></HELP>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <URL><![CDATA[http://forge.openbravo.com/projects/openbravov30framework]]></URL>
--- a/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -7,7 +7,7 @@
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--01E1BCCEC9114DE0960538DF34E30E6F-->  <STARTVERSION><![CDATA[2.1.14182]]></STARTVERSION>
+<!--01E1BCCEC9114DE0960538DF34E30E6F-->  <STARTVERSION><![CDATA[2.1.14253]]></STARTVERSION>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--025B181F63CA47B48A920F6983242390-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--025B181F63CA47B48A920F6983242390-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--025B181F63CA47B48A920F6983242390-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--025B181F63CA47B48A920F6983242390-->  <STARTVERSION><![CDATA[3.0.14182]]></STARTVERSION>
+<!--025B181F63CA47B48A920F6983242390-->  <STARTVERSION><![CDATA[3.0.14253]]></STARTVERSION>
 <!--025B181F63CA47B48A920F6983242390-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--025B181F63CA47B48A920F6983242390-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--025B181F63CA47B48A920F6983242390-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <AD_DEPENDENT_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_DEPENDENT_MODULE_ID>
-<!--054B4FEAF919478AA3FF27098A46D1D6-->  <STARTVERSION><![CDATA[2.1.14182]]></STARTVERSION>
+<!--054B4FEAF919478AA3FF27098A46D1D6-->  <STARTVERSION><![CDATA[2.1.14253]]></STARTVERSION>
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Application]]></DEPENDANT_MODULE_NAME>
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_DEPENDENT_MODULE_ID>
-<!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <STARTVERSION><![CDATA[1.0.14182]]></STARTVERSION>
+<!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <STARTVERSION><![CDATA[1.0.14253]]></STARTVERSION>
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <DEPENDANT_MODULE_NAME><![CDATA[Query/List Widget]]></DEPENDANT_MODULE_NAME>
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -63,7 +63,7 @@
 <!--224754C3EF674C93B0D468F47BAAB824-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--224754C3EF674C93B0D468F47BAAB824-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--224754C3EF674C93B0D468F47BAAB824-->  <AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID>
-<!--224754C3EF674C93B0D468F47BAAB824-->  <STARTVERSION><![CDATA[2.1.14182]]></STARTVERSION>
+<!--224754C3EF674C93B0D468F47BAAB824-->  <STARTVERSION><![CDATA[2.1.14253]]></STARTVERSION>
 <!--224754C3EF674C93B0D468F47BAAB824-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--224754C3EF674C93B0D468F47BAAB824-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Selector]]></DEPENDANT_MODULE_NAME>
 <!--224754C3EF674C93B0D468F47BAAB824-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -77,7 +77,7 @@
 <!--5B72D24032DD4879A950194139D961B6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--5B72D24032DD4879A950194139D961B6-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--5B72D24032DD4879A950194139D961B6-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID>
-<!--5B72D24032DD4879A950194139D961B6-->  <STARTVERSION><![CDATA[2.1.14182]]></STARTVERSION>
+<!--5B72D24032DD4879A950194139D961B6-->  <STARTVERSION><![CDATA[2.1.14253]]></STARTVERSION>
 <!--5B72D24032DD4879A950194139D961B6-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--5B72D24032DD4879A950194139D961B6-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME>
 <!--5B72D24032DD4879A950194139D961B6-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -91,7 +91,7 @@
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <AD_DEPENDENT_MODULE_ID><![CDATA[D393BE6F22BB44B7B728259B34FC795A]]></AD_DEPENDENT_MODULE_ID>
-<!--8730CA6A4224439D82E0DD31B3806E36-->  <STARTVERSION><![CDATA[1.0.14182]]></STARTVERSION>
+<!--8730CA6A4224439D82E0DD31B3806E36-->  <STARTVERSION><![CDATA[1.0.14253]]></STARTVERSION>
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <DEPENDANT_MODULE_NAME><![CDATA[HTML Widget]]></DEPENDANT_MODULE_NAME>
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -105,7 +105,7 @@
 <!--98C47FF058F8413B8A2B26036061446E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--98C47FF058F8413B8A2B26036061446E-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--98C47FF058F8413B8A2B26036061446E-->  <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID>
-<!--98C47FF058F8413B8A2B26036061446E-->  <STARTVERSION><![CDATA[8.1.14182]]></STARTVERSION>
+<!--98C47FF058F8413B8A2B26036061446E-->  <STARTVERSION><![CDATA[8.1.14253]]></STARTVERSION>
 <!--98C47FF058F8413B8A2B26036061446E-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--98C47FF058F8413B8A2B26036061446E-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--98C47FF058F8413B8A2B26036061446E-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -119,7 +119,7 @@
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <AD_DEPENDENT_MODULE_ID><![CDATA[96998CBC42744B3DBEE28AC8095C9335]]></AD_DEPENDENT_MODULE_ID>
-<!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <STARTVERSION><![CDATA[2.0.14182]]></STARTVERSION>
+<!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <STARTVERSION><![CDATA[2.0.14253]]></STARTVERSION>
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <DEPENDANT_MODULE_NAME><![CDATA[2.50 to 3.00 Compatibility Skin]]></DEPENDANT_MODULE_NAME>
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -133,7 +133,7 @@
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--A9CB99330AF34944877F889DD8A0AB3C-->  <STARTVERSION><![CDATA[2.1.14182]]></STARTVERSION>
+<!--A9CB99330AF34944877F889DD8A0AB3C-->  <STARTVERSION><![CDATA[2.1.14253]]></STARTVERSION>
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -147,7 +147,7 @@
 <!--E72A053A403C4A98A189C105B850ADB0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--E72A053A403C4A98A189C105B850ADB0-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--E72A053A403C4A98A189C105B850ADB0-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--E72A053A403C4A98A189C105B850ADB0-->  <STARTVERSION><![CDATA[1.1.14182]]></STARTVERSION>
+<!--E72A053A403C4A98A189C105B850ADB0-->  <STARTVERSION><![CDATA[1.1.14253]]></STARTVERSION>
 <!--E72A053A403C4A98A189C105B850ADB0-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--E72A053A403C4A98A189C105B850ADB0-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--E72A053A403C4A98A189C105B850ADB0-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -161,7 +161,7 @@
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <AD_DEPENDENT_MODULE_ID><![CDATA[F8D1B3ECB3474E8DA5C216473C840DF1]]></AD_DEPENDENT_MODULE_ID>
-<!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <STARTVERSION><![CDATA[2.0.14182]]></STARTVERSION>
+<!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <STARTVERSION><![CDATA[2.0.14253]]></STARTVERSION>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON REST Webservice]]></DEPENDANT_MODULE_NAME>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -6,7 +6,7 @@
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <NAME><![CDATA[Openbravo 3.0]]></NAME>
-<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION><![CDATA[3.0.14182]]></VERSION>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION><![CDATA[3.0.14253]]></VERSION>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <DESCRIPTION><![CDATA[Openbravo 3.0 distribution template]]></DESCRIPTION>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <HELP><![CDATA[Openbravo 3.0 is a collection (distribution) of modules. This template is a container of all the modules and configuration changes that compose Openbravo 3.0.]]></HELP>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <URL><![CDATA[http://forge.openbravo.com/projects/vthree]]></URL>
--- a/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -7,7 +7,7 @@
 <!--4D11E3A70650475381139522373CD191-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--4D11E3A70650475381139522373CD191-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--4D11E3A70650475381139522373CD191-->  <AD_DEPENDENT_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_DEPENDENT_MODULE_ID>
-<!--4D11E3A70650475381139522373CD191-->  <STARTVERSION><![CDATA[2.1.14182]]></STARTVERSION>
+<!--4D11E3A70650475381139522373CD191-->  <STARTVERSION><![CDATA[2.1.14253]]></STARTVERSION>
 <!--4D11E3A70650475381139522373CD191-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--4D11E3A70650475381139522373CD191-->  <DEPENDANT_MODULE_NAME><![CDATA[Openbravo 3.0 Framework]]></DEPENDANT_MODULE_NAME>
 <!--4D11E3A70650475381139522373CD191-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_DEPENDENT_MODULE_ID>
-<!--52CE523C40634C47A99C6EBBD9C3125C-->  <STARTVERSION><![CDATA[3.0.14182]]></STARTVERSION>
+<!--52CE523C40634C47A99C6EBBD9C3125C-->  <STARTVERSION><![CDATA[3.0.14253]]></STARTVERSION>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <DEPENDANT_MODULE_NAME><![CDATA[Payment Report]]></DEPENDANT_MODULE_NAME>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--60834727BB114764ACEF019F40A34562-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--60834727BB114764ACEF019F40A34562-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--60834727BB114764ACEF019F40A34562-->  <AD_DEPENDENT_MODULE_ID><![CDATA[3A3A943684D64DEF9EC39F588A656848]]></AD_DEPENDENT_MODULE_ID>
-<!--60834727BB114764ACEF019F40A34562-->  <STARTVERSION><![CDATA[1.1.14182]]></STARTVERSION>
+<!--60834727BB114764ACEF019F40A34562-->  <STARTVERSION><![CDATA[1.1.14253]]></STARTVERSION>
 <!--60834727BB114764ACEF019F40A34562-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--60834727BB114764ACEF019F40A34562-->  <DEPENDANT_MODULE_NAME><![CDATA[Orders Awaiting Delivery]]></DEPENDANT_MODULE_NAME>
 <!--60834727BB114764ACEF019F40A34562-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
 <!--8418885E97D643138B6D907671351E3D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8418885E97D643138B6D907671351E3D-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--8418885E97D643138B6D907671351E3D-->  <AD_DEPENDENT_MODULE_ID><![CDATA[883B5872CA0548F9AF2BBBE7D2DDFA61]]></AD_DEPENDENT_MODULE_ID>
-<!--8418885E97D643138B6D907671351E3D-->  <STARTVERSION><![CDATA[3.0.14182]]></STARTVERSION>
+<!--8418885E97D643138B6D907671351E3D-->  <STARTVERSION><![CDATA[3.0.14253]]></STARTVERSION>
 <!--8418885E97D643138B6D907671351E3D-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--8418885E97D643138B6D907671351E3D-->  <DEPENDANT_MODULE_NAME><![CDATA[Standard Roles]]></DEPENDANT_MODULE_NAME>
 <!--8418885E97D643138B6D907671351E3D-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -63,7 +63,7 @@
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--A32F3279B3374FC0A6CFEA2368BB7053-->  <STARTVERSION><![CDATA[3.0.14182]]></STARTVERSION>
+<!--A32F3279B3374FC0A6CFEA2368BB7053-->  <STARTVERSION><![CDATA[3.0.14253]]></STARTVERSION>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MINOR]]></DEPENDENCY_ENFORCEMENT>
@@ -77,7 +77,7 @@
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_DEPENDENT_MODULE_ID>
-<!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <STARTVERSION><![CDATA[3.0.14182]]></STARTVERSION>
+<!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <STARTVERSION><![CDATA[3.0.14253]]></STARTVERSION>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <DEPENDANT_MODULE_NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></DEPENDANT_MODULE_NAME>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -91,7 +91,7 @@
 <!--FF8080813189932B013189B45B59003A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813189932B013189B45B59003A-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--FF8080813189932B013189B45B59003A-->  <AD_DEPENDENT_MODULE_ID><![CDATA[FF8080813141B198013141B86DD70003]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813189932B013189B45B59003A-->  <STARTVERSION><![CDATA[0.1.14182]]></STARTVERSION>
+<!--FF8080813189932B013189B45B59003A-->  <STARTVERSION><![CDATA[0.1.14253]]></STARTVERSION>
 <!--FF8080813189932B013189B45B59003A-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FF8080813189932B013189B45B59003A-->  <DEPENDANT_MODULE_NAME><![CDATA[OpenID Service Integration]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813189932B013189B45B59003A-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -105,7 +105,7 @@
 <!--FF8080813189932B013189B4C00F003D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813189932B013189B4C00F003D-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--FF8080813189932B013189B4C00F003D-->  <AD_DEPENDENT_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813189932B013189B4C00F003D-->  <STARTVERSION><![CDATA[0.1.14182]]></STARTVERSION>
+<!--FF8080813189932B013189B4C00F003D-->  <STARTVERSION><![CDATA[0.1.14253]]></STARTVERSION>
 <!--FF8080813189932B013189B4C00F003D-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FF8080813189932B013189B4C00F003D-->  <DEPENDANT_MODULE_NAME><![CDATA[Integration with Google APIs]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813189932B013189B4C00F003D-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -119,7 +119,7 @@
 <!--FF8081812E2F6F3C012E2F750109001C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <AD_DEPENDENT_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8081812E2F6F3C012E2F750109001C-->  <STARTVERSION><![CDATA[0.0.14182]]></STARTVERSION>
+<!--FF8081812E2F6F3C012E2F750109001C-->  <STARTVERSION><![CDATA[0.0.14253]]></STARTVERSION>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <DEPENDANT_MODULE_NAME><![CDATA[Widgets Collection]]></DEPENDANT_MODULE_NAME>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/src-db/database/model/functions/AD_SYNCHRONIZE.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/src-db/database/model/functions/AD_SYNCHRONIZE.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -187,11 +187,13 @@
              (SELECT AD_Element_ID
               FROM AD_ELEMENT e, AD_MODULE M
               WHERE M.AD_MODULE_ID = E.AD_MODULE_ID
+                AND e.isGlossary = ''N''
                 AND m.isindevelopment = ''Y'' '||v_sql||')';
 
     EXECUTE IMMEDIATE 
         'DELETE FROM AD_ELEMENT e
-         WHERE EXISTS (SELECT 1 FROM AD_MODULE 
+         WHERE e.isGlossary = ''N''
+           AND EXISTS (SELECT 1 FROM AD_MODULE 
                        WHERE AD_MODULE_ID = e.AD_MODULE_ID 
                          AND ISINDEVELOPMENT =''Y'') '||v_sql;
 
--- a/src-db/database/model/functions/AD_UPDATE_ACCESS.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/src-db/database/model/functions/AD_UPDATE_ACCESS.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -44,7 +44,8 @@
     AND NOT EXISTS (SELECT 1
                      FROM AD_FORM_ACCESS
                     WHERE AD_FORM_ID = AD_FORM.AD_FORM_ID
-                      AND AD_ROLE_ID = AD_ROLE.AD_ROLE_ID);
+                      AND AD_ROLE_ID = AD_ROLE.AD_ROLE_ID
+                      AND (AD_ROLE.ISADVANCED = 'Y' OR AD_FORM.ISADVANCEDFEATURE = 'N'));
 
 --AD_PROCESS_ACCESS
   INSERT INTO AD_Process_Access
@@ -67,7 +68,8 @@
     AND NOT EXISTS (SELECT 1 
                       FROM AD_PROCESS_ACCESS
                      WHERE AD_PROCESS_ID = AD_PROCESS.AD_PROCESS_ID
-                       AND AD_ROLE_ID    = AD_ROLE.AD_ROLE_ID);
+                       AND AD_ROLE_ID    = AD_ROLE.AD_ROLE_ID
+                       AND (AD_ROLE.ISADVANCED = 'Y' OR AD_PROCESS.ISADVANCEDFEATURE = 'N'));
 
  --Add org 0 to role 0                
  INSERT INTO AD_Role_OrgAccess
@@ -114,7 +116,8 @@
     AND NOT EXISTS (SELECT 1 
                        FROM AD_WINDOW_ACCESS
                       WHERE AD_WINDOW_ID = AD_WINDOW.AD_WINDOW_ID
-                        AND AD_ROLE_ID = AD_ROLE.AD_ROLE_ID);
+                        AND AD_ROLE_ID = AD_ROLE.AD_ROLE_ID
+                        AND (AD_ROLE.ISADVANCED = 'Y' OR AD_WINDOW.ISADVANCEDFEATURE = 'N'));
 
   --Add role 0 to user 100 (Openbravo)
   INSERT INTO AD_USER_ROLES
--- a/src-db/database/model/functions/MRP_WORKREQUIREMENT.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/src-db/database/model/functions/MRP_WORKREQUIREMENT.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -77,6 +77,7 @@
         AND MRP_RUN_PRODUCTION_ID = v_Record_ID
         AND INOUTTRXTYPE = 'WP'
         AND MA_WORKREQUIREMENT_ID IS NULL
+        AND MRP_RUN_PRODUCTIONLINE.QTY <> 0
       ORDER BY PLANNEDDATE
       ) LOOP
       v_ResultStr:='Create Work Requirement';
--- a/src-db/database/model/tables/AD_ELEMENT.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/src-db/database/model/tables/AD_ELEMENT.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -73,6 +73,10 @@
         <default><![CDATA[0]]></default>
         <onCreateDefault><![CDATA[SELECT AD_MODULE_ID FROM AD_MODULE WHERE AD_MODULE_ID<>'0' AND TYPE='M']]></onCreateDefault>
       </column>
+      <column name="ISGLOSSARY" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault><![CDATA['N']]></onCreateDefault>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="AD_ELEMENT_AD_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
@@ -92,6 +96,7 @@
       <index name="AD_ELEMENT_NAME" unique="false">
         <index-column name="NAME"/>
       </index>
+      <check name="AD_ELEMENT_GLOSSARY_CHCK"><![CDATA[ISGLOSSARY IN ('Y', 'N')]]></check>
       <check name="AD_ELEMENT_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/src-db/database/model/tables/AD_FORM.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/src-db/database/model/tables/AD_FORM.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -57,6 +57,10 @@
         <default><![CDATA[0]]></default>
         <onCreateDefault><![CDATA[SELECT AD_MODULE_ID FROM AD_MODULE WHERE AD_MODULE_ID<>'0' AND TYPE='M']]></onCreateDefault>
       </column>
+      <column name="ISADVANCEDFEATURE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault><![CDATA['N']]></onCreateDefault>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="AD_FORM_AD_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
@@ -66,6 +70,7 @@
       <foreign-key foreignTable="AD_ORG" name="AD_FORM_AD_ORG">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <check name="AD_FORM_ADV_CHCK"><![CDATA[ISADVANCEDFEATURE IN ('Y', 'N')]]></check>
       <check name="AD_FORM_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/src-db/database/model/tables/AD_PROCESS.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/src-db/database/model/tables/AD_PROCESS.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -105,6 +105,10 @@
         <default><![CDATA[S]]></default>
         <onCreateDefault><![CDATA[CASE WHEN PROCEDURENAME IS NOT NULL THEN 'S' WHEN ISJASPER='Y' THEN 'S' ELSE 'M' END]]></onCreateDefault>
       </column>
+      <column name="ISADVANCEDFEATURE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault><![CDATA['N']]></onCreateDefault>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="AD_PROCESS_AD_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
@@ -114,6 +118,7 @@
       <foreign-key foreignTable="AD_ORG" name="AD_PROCESS_AD_ORG">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <check name="AD_PROCESS_ADV_CHCK"><![CDATA[ISADVANCEDFEATURE IN ('Y', 'N')]]></check>
       <check name="AD_PROCESS_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
       <check name="AD_PROCESS_ISBACKGROUND_CHK"><![CDATA[ISBACKGROUND IN ('Y', 'N')]]></check>
       <check name="AD_PROCESS_ISDIRECTPRINT_CHK"><![CDATA[ISDIRECTPRINT IN ('Y', 'N')]]></check>
--- a/src-db/database/model/tables/AD_ROLE.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/src-db/database/model/tables/AD_ROLE.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -77,6 +77,10 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="ISADVANCED" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[Y]]></default>
+        <onCreateDefault><![CDATA['Y']]></onCreateDefault>
+      </column>
       <foreign-key foreignTable="AD_TREE" name="AD_ROLE_AD_TREE_MENU">
         <reference local="AD_TREE_MENU_ID" foreign="AD_TREE_ID"/>
       </foreign-key>
@@ -93,6 +97,7 @@
         <unique-column name="AD_CLIENT_ID"/>
         <unique-column name="NAME"/>
       </unique>
+      <check name="AD_ROLE_ADV_CHECK"><![CDATA[ISADVANCED IN ('Y', 'N')]]></check>
       <check name="AD_ROLE_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
       <check name="AD_ROLE_ISCLIENTADMIN_CHECK"><![CDATA[IS_CLIENT_ADMIN IN ('Y', 'N')]]></check>
     </table>
--- a/src-db/database/model/tables/AD_WINDOW.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/src-db/database/model/tables/AD_WINDOW.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -73,6 +73,10 @@
         <default><![CDATA[N]]></default>
         <onCreateDefault><![CDATA['N']]></onCreateDefault>
       </column>
+      <column name="ISADVANCEDFEATURE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault><![CDATA['N']]></onCreateDefault>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="AD_WINDOW_AD_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
@@ -90,6 +94,7 @@
         <unique-column name="NAME"/>
         <unique-column name="AD_MODULE_ID"/>
       </unique>
+      <check name="AD_WINDOW_ADV_CHCK"><![CDATA[ISADVANCEDFEATURE IN ('Y', 'N')]]></check>
       <check name="AD_WINDOW_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
       <check name="AD_WINDOW_ISSOTRX_CHK"><![CDATA[ISSOTRX IN ('Y', 'N')]]></check>
       <check name="AD_WINDOW_ISTHREADSAFE_CHK"><![CDATA[ISTHREADSAFE IN ('Y', 'N')]]></check>
--- a/src-db/database/model/triggers/AD_ROLE_TRG.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/src-db/database/model/triggers/AD_ROLE_TRG.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -85,7 +85,8 @@
   WHERE w.AD_Window_ID=t.AD_Window_ID
     AND t.AD_Table_ID=tt.AD_Table_ID
     AND tt.AccessLevel IN ('4','7','6')
-    AND w.IsActive = 'Y') w;
+    AND w.IsActive = 'Y'
+    AND (:new.ISADVANCED = 'Y' OR w.ISADVANCEDFEATURE = 'N')) w;
   -- Process
   INSERT INTO AD_Process_Access
    ( AD_Process_Access_ID, AD_Process_ID, AD_Role_ID,
@@ -94,7 +95,8 @@
    :new.AD_CLIENT_ID, :new.AD_ORG_ID, 'Y', now(), :new.UpdatedBy, now(), :new.UpdatedBy, 'Y'
   FROM AD_Process p
   WHERE AccessLevel IN ('4','7','6')
-  AND p.IsActive='Y';
+  AND p.IsActive='Y'
+  AND (:new.ISADVANCED = 'Y' OR p.ISADVANCEDFEATURE = 'N');
   -- Form
   INSERT INTO AD_Form_Access
    (AD_Form_Access_ID, AD_Form_ID, AD_Role_ID,
@@ -103,7 +105,8 @@
    :new.AD_CLIENT_ID, :new.AD_ORG_ID, 'Y', now(), :new.UpdatedBy, now(), :new.UpdatedBy, 'Y'
   FROM AD_Form f
   WHERE AccessLevel IN ('4','7','6')
-  AND f.IsActive='Y';
+  AND f.IsActive='Y'
+  AND (:new.ISADVANCED = 'Y' OR f.ISADVANCEDFEATURE = 'N');
 
  -- Client/Org
  ELSIF (:new.UserLevel=' CO' OR :new.UserLevel=' C') AND (:new.IsManual <> 'Y') THEN
@@ -119,7 +122,8 @@
     AND t.AD_Table_ID=tt.AD_Table_ID
     AND tt.AccessLevel IN ('7','6','3','1')
     AND w.AD_Window_ID NOT IN ('100','102','165','187')
-    AND w.IsActive='Y') w;
+    AND w.IsActive='Y'
+    AND (:new.ISADVANCED = 'Y' OR w.ISADVANCEDFEATURE = 'N')) w;
   -- Process
   INSERT INTO AD_Process_Access
    (AD_Process_Access_ID, AD_Process_ID, AD_Role_ID,
@@ -128,7 +132,8 @@
    :new.AD_CLIENT_ID, :new.AD_ORG_ID, 'Y', now(), :new.UpdatedBy, now(), :new.UpdatedBy, 'Y'
   FROM AD_Process p
   WHERE AccessLevel IN ('7','6','3','1')
-  AND p.IsActive='Y';
+  AND p.IsActive='Y'
+  AND (:new.ISADVANCED = 'Y' OR p.ISADVANCEDFEATURE = 'N');
   -- Form
   INSERT INTO AD_Form_Access
    (AD_Form_Access_ID, AD_Form_ID, AD_Role_ID,
@@ -137,7 +142,8 @@
    :new.AD_CLIENT_ID, :new.AD_ORG_ID, 'Y', now(), :new.UpdatedBy, now(), :new.UpdatedBy, 'Y'
   FROM AD_Form f
   WHERE AccessLevel IN ('7','6','3','1')
-  AND f.IsActive='Y';
+  AND f.IsActive='Y'
+  AND (:new.ISADVANCED = 'Y' OR f.ISADVANCEDFEATURE = 'N');
   
  -- Organization
  ELSIF (:new.UserLevel='  O') AND (:new.IsManual <> 'Y') THEN
@@ -152,7 +158,8 @@
   WHERE w.AD_Window_ID=t.AD_Window_ID
     AND t.AD_Table_ID=tt.AD_Table_ID
     AND tt.AccessLevel IN ('3','1','7')
-    AND w.IsActive='Y') w;
+    AND w.IsActive='Y'
+    AND (:new.ISADVANCED = 'Y' OR w.ISADVANCEDFEATURE = 'N')) w;
   -- Process
   INSERT INTO AD_Process_Access
    (AD_Process_Access_ID, AD_Process_ID, AD_Role_ID,
@@ -161,7 +168,8 @@
    :new.AD_CLIENT_ID, :new.AD_ORG_ID, 'Y', now(), :new.UpdatedBy, now(), :new.UpdatedBy, 'Y'
   FROM AD_Process p
   WHERE AccessLevel IN ('3','1','7')
-  AND p.IsActive='Y';
+  AND p.IsActive='Y'
+  AND (:new.ISADVANCED = 'Y' OR p.ISADVANCEDFEATURE = 'N');
   -- Form
   INSERT INTO AD_Form_Access
    (AD_Form_Access_ID, AD_Form_ID, AD_Role_ID,
@@ -170,7 +178,8 @@
    :new.AD_CLIENT_ID, :new.AD_ORG_ID, 'Y', now(), :new.UpdatedBy, now(), :new.UpdatedBy, 'Y'
   FROM AD_Form f
   WHERE AccessLevel IN ('3','1','7')
-  AND f.IsActive='Y';
+  AND f.IsActive='Y'
+  AND (:new.ISADVANCED = 'Y' OR f.ISADVANCEDFEATURE = 'N');
   
  END IF;
 
--- a/src-db/database/sourcedata/AD_COLUMN.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/src-db/database/sourcedata/AD_COLUMN.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -223450,6 +223450,43 @@
 <!--5704CCB42F9F4FB6BD13C87F5648A2D4-->  <IMAGEHEIGHT><![CDATA[55]]></IMAGEHEIGHT>
 <!--5704CCB42F9F4FB6BD13C87F5648A2D4--></AD_COLUMN>
 
+<!--5704F83606894BEDA1CC91308059407B--><AD_COLUMN>
+<!--5704F83606894BEDA1CC91308059407B-->  <AD_COLUMN_ID><![CDATA[5704F83606894BEDA1CC91308059407B]]></AD_COLUMN_ID>
+<!--5704F83606894BEDA1CC91308059407B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5704F83606894BEDA1CC91308059407B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5704F83606894BEDA1CC91308059407B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5704F83606894BEDA1CC91308059407B-->  <NAME><![CDATA[Advanced Feature]]></NAME>
+<!--5704F83606894BEDA1CC91308059407B-->  <DESCRIPTION><![CDATA[Is advanced feature]]></DESCRIPTION>
+<!--5704F83606894BEDA1CC91308059407B-->  <HELP><![CDATA[Automatic roles are granted with all non advanced features defined within application dictionary.
+
+Advanced features are only granted to the automatic roles defined as advanced.]]></HELP>
+<!--5704F83606894BEDA1CC91308059407B-->  <COLUMNNAME><![CDATA[IsAdvancedFeature]]></COLUMNNAME>
+<!--5704F83606894BEDA1CC91308059407B-->  <AD_TABLE_ID><![CDATA[376]]></AD_TABLE_ID>
+<!--5704F83606894BEDA1CC91308059407B-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--5704F83606894BEDA1CC91308059407B-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--5704F83606894BEDA1CC91308059407B-->  <DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE>
+<!--5704F83606894BEDA1CC91308059407B-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--5704F83606894BEDA1CC91308059407B-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--5704F83606894BEDA1CC91308059407B-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--5704F83606894BEDA1CC91308059407B-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--5704F83606894BEDA1CC91308059407B-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--5704F83606894BEDA1CC91308059407B-->  <SEQNO><![CDATA[21]]></SEQNO>
+<!--5704F83606894BEDA1CC91308059407B-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--5704F83606894BEDA1CC91308059407B-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--5704F83606894BEDA1CC91308059407B-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--5704F83606894BEDA1CC91308059407B-->  <AD_ELEMENT_ID><![CDATA[103BB98EA3F9464E961E9AE046F7C665]]></AD_ELEMENT_ID>
+<!--5704F83606894BEDA1CC91308059407B-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--5704F83606894BEDA1CC91308059407B-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--5704F83606894BEDA1CC91308059407B-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--5704F83606894BEDA1CC91308059407B-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--5704F83606894BEDA1CC91308059407B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--5704F83606894BEDA1CC91308059407B-->  <POSITION><![CDATA[15]]></POSITION>
+<!--5704F83606894BEDA1CC91308059407B-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--5704F83606894BEDA1CC91308059407B-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--5704F83606894BEDA1CC91308059407B-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--5704F83606894BEDA1CC91308059407B-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--5704F83606894BEDA1CC91308059407B--></AD_COLUMN>
+
 <!--5712C83B725EEEAEE040007F010123FF--><AD_COLUMN>
 <!--5712C83B725EEEAEE040007F010123FF-->  <AD_COLUMN_ID><![CDATA[5712C83B725EEEAEE040007F010123FF]]></AD_COLUMN_ID>
 <!--5712C83B725EEEAEE040007F010123FF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -235824,6 +235861,43 @@
 <!--672E47F6A43B4AD1B7AC8EE923F9318B-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
 <!--672E47F6A43B4AD1B7AC8EE923F9318B--></AD_COLUMN>
 
+<!--67911B053249406F9FF0118D3FB3C402--><AD_COLUMN>
+<!--67911B053249406F9FF0118D3FB3C402-->  <AD_COLUMN_ID><![CDATA[67911B053249406F9FF0118D3FB3C402]]></AD_COLUMN_ID>
+<!--67911B053249406F9FF0118D3FB3C402-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--67911B053249406F9FF0118D3FB3C402-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--67911B053249406F9FF0118D3FB3C402-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--67911B053249406F9FF0118D3FB3C402-->  <NAME><![CDATA[Advanced Feature]]></NAME>
+<!--67911B053249406F9FF0118D3FB3C402-->  <DESCRIPTION><![CDATA[Is advanced feature]]></DESCRIPTION>
+<!--67911B053249406F9FF0118D3FB3C402-->  <HELP><![CDATA[Automatic roles are granted with all non advanced features defined within application dictionary.
+
+Advanced features are only granted to the automatic roles defined as advanced.]]></HELP>
+<!--67911B053249406F9FF0118D3FB3C402-->  <COLUMNNAME><![CDATA[IsAdvancedFeature]]></COLUMNNAME>
+<!--67911B053249406F9FF0118D3FB3C402-->  <AD_TABLE_ID><![CDATA[105]]></AD_TABLE_ID>
+<!--67911B053249406F9FF0118D3FB3C402-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--67911B053249406F9FF0118D3FB3C402-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--67911B053249406F9FF0118D3FB3C402-->  <DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE>
+<!--67911B053249406F9FF0118D3FB3C402-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--67911B053249406F9FF0118D3FB3C402-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--67911B053249406F9FF0118D3FB3C402-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--67911B053249406F9FF0118D3FB3C402-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--67911B053249406F9FF0118D3FB3C402-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--67911B053249406F9FF0118D3FB3C402-->  <SEQNO><![CDATA[31]]></SEQNO>
+<!--67911B053249406F9FF0118D3FB3C402-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--67911B053249406F9FF0118D3FB3C402-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--67911B053249406F9FF0118D3FB3C402-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--67911B053249406F9FF0118D3FB3C402-->  <AD_ELEMENT_ID><![CDATA[103BB98EA3F9464E961E9AE046F7C665]]></AD_ELEMENT_ID>
+<!--67911B053249406F9FF0118D3FB3C402-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--67911B053249406F9FF0118D3FB3C402-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--67911B053249406F9FF0118D3FB3C402-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--67911B053249406F9FF0118D3FB3C402-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--67911B053249406F9FF0118D3FB3C402-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--67911B053249406F9FF0118D3FB3C402-->  <POSITION><![CDATA[19]]></POSITION>
+<!--67911B053249406F9FF0118D3FB3C402-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--67911B053249406F9FF0118D3FB3C402-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--67911B053249406F9FF0118D3FB3C402-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--67911B053249406F9FF0118D3FB3C402-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--67911B053249406F9FF0118D3FB3C402--></AD_COLUMN>
+
 <!--68142DE975336AAFE040007F01012F8D--><AD_COLUMN>
 <!--68142DE975336AAFE040007F01012F8D-->  <AD_COLUMN_ID><![CDATA[68142DE975336AAFE040007F01012F8D]]></AD_COLUMN_ID>
 <!--68142DE975336AAFE040007F01012F8D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -238245,6 +238319,41 @@
 <!--6BDD5BBDFE613D4BE040007F01013540-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
 <!--6BDD5BBDFE613D4BE040007F01013540--></AD_COLUMN>
 
+<!--6C31A2B3095F4691895B92C158391497--><AD_COLUMN>
+<!--6C31A2B3095F4691895B92C158391497-->  <AD_COLUMN_ID><![CDATA[6C31A2B3095F4691895B92C158391497]]></AD_COLUMN_ID>
+<!--6C31A2B3095F4691895B92C158391497-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6C31A2B3095F4691895B92C158391497-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6C31A2B3095F4691895B92C158391497-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6C31A2B3095F4691895B92C158391497-->  <NAME><![CDATA[Advanced]]></NAME>
+<!--6C31A2B3095F4691895B92C158391497-->  <DESCRIPTION><![CDATA[Automatic advanced roles are granted with advanced features]]></DESCRIPTION>
+<!--6C31A2B3095F4691895B92C158391497-->  <HELP><![CDATA[Automatic (non manual) advanced roles are granted with features checked as advanced.]]></HELP>
+<!--6C31A2B3095F4691895B92C158391497-->  <COLUMNNAME><![CDATA[IsAdvanced]]></COLUMNNAME>
+<!--6C31A2B3095F4691895B92C158391497-->  <AD_TABLE_ID><![CDATA[156]]></AD_TABLE_ID>
+<!--6C31A2B3095F4691895B92C158391497-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--6C31A2B3095F4691895B92C158391497-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--6C31A2B3095F4691895B92C158391497-->  <DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE>
+<!--6C31A2B3095F4691895B92C158391497-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--6C31A2B3095F4691895B92C158391497-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--6C31A2B3095F4691895B92C158391497-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--6C31A2B3095F4691895B92C158391497-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--6C31A2B3095F4691895B92C158391497-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--6C31A2B3095F4691895B92C158391497-->  <SEQNO><![CDATA[41]]></SEQNO>
+<!--6C31A2B3095F4691895B92C158391497-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--6C31A2B3095F4691895B92C158391497-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--6C31A2B3095F4691895B92C158391497-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--6C31A2B3095F4691895B92C158391497-->  <AD_ELEMENT_ID><![CDATA[B99E543EAE5B4F97A3B7B5EEF28E5249]]></AD_ELEMENT_ID>
+<!--6C31A2B3095F4691895B92C158391497-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--6C31A2B3095F4691895B92C158391497-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--6C31A2B3095F4691895B92C158391497-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--6C31A2B3095F4691895B92C158391497-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--6C31A2B3095F4691895B92C158391497-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--6C31A2B3095F4691895B92C158391497-->  <POSITION><![CDATA[20]]></POSITION>
+<!--6C31A2B3095F4691895B92C158391497-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--6C31A2B3095F4691895B92C158391497-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--6C31A2B3095F4691895B92C158391497-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--6C31A2B3095F4691895B92C158391497-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--6C31A2B3095F4691895B92C158391497--></AD_COLUMN>
+
 <!--6D7F683367689D7AE040007F01015A4A--><AD_COLUMN>
 <!--6D7F683367689D7AE040007F01015A4A-->  <AD_COLUMN_ID><![CDATA[6D7F683367689D7AE040007F01015A4A]]></AD_COLUMN_ID>
 <!--6D7F683367689D7AE040007F01015A4A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -238416,6 +238525,43 @@
 <!--6DCAC7C506E85087E040007F01014948-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
 <!--6DCAC7C506E85087E040007F01014948--></AD_COLUMN>
 
+<!--6E55794836094404BC74A196392B0648--><AD_COLUMN>
+<!--6E55794836094404BC74A196392B0648-->  <AD_COLUMN_ID><![CDATA[6E55794836094404BC74A196392B0648]]></AD_COLUMN_ID>
+<!--6E55794836094404BC74A196392B0648-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6E55794836094404BC74A196392B0648-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6E55794836094404BC74A196392B0648-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6E55794836094404BC74A196392B0648-->  <NAME><![CDATA[Glossary]]></NAME>
+<!--6E55794836094404BC74A196392B0648-->  <DESCRIPTION><![CDATA[Part of gloassary]]></DESCRIPTION>
+<!--6E55794836094404BC74A196392B0648-->  <HELP><![CDATA[This element is part of the glossary in wiki documentation.
+
+Glossary orphan elements are preserved when running Synchronize Terminology process.]]></HELP>
+<!--6E55794836094404BC74A196392B0648-->  <COLUMNNAME><![CDATA[IsGlossary]]></COLUMNNAME>
+<!--6E55794836094404BC74A196392B0648-->  <AD_TABLE_ID><![CDATA[276]]></AD_TABLE_ID>
+<!--6E55794836094404BC74A196392B0648-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--6E55794836094404BC74A196392B0648-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--6E55794836094404BC74A196392B0648-->  <DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE>
+<!--6E55794836094404BC74A196392B0648-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--6E55794836094404BC74A196392B0648-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--6E55794836094404BC74A196392B0648-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--6E55794836094404BC74A196392B0648-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--6E55794836094404BC74A196392B0648-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--6E55794836094404BC74A196392B0648-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--6E55794836094404BC74A196392B0648-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--6E55794836094404BC74A196392B0648-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--6E55794836094404BC74A196392B0648-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--6E55794836094404BC74A196392B0648-->  <AD_ELEMENT_ID><![CDATA[3C45DFEEC7B8494F8A8F2043D43DBED4]]></AD_ELEMENT_ID>
+<!--6E55794836094404BC74A196392B0648-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--6E55794836094404BC74A196392B0648-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--6E55794836094404BC74A196392B0648-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--6E55794836094404BC74A196392B0648-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--6E55794836094404BC74A196392B0648-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--6E55794836094404BC74A196392B0648-->  <POSITION><![CDATA[19]]></POSITION>
+<!--6E55794836094404BC74A196392B0648-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--6E55794836094404BC74A196392B0648-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--6E55794836094404BC74A196392B0648-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--6E55794836094404BC74A196392B0648-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--6E55794836094404BC74A196392B0648--></AD_COLUMN>
+
 <!--6F387D3737CA3635E040007F01002312--><AD_COLUMN>
 <!--6F387D3737CA3635E040007F01002312-->  <AD_COLUMN_ID><![CDATA[6F387D3737CA3635E040007F01002312]]></AD_COLUMN_ID>
 <!--6F387D3737CA3635E040007F01002312-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -263479,7 +263625,7 @@
 <!--94C40D6E18376001E040007F01001FF3-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--94C40D6E18376001E040007F01001FF3-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--94C40D6E18376001E040007F01001FF3-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--94C40D6E18376001E040007F01001FF3-->  <POSITION><![CDATA[20]]></POSITION>
+<!--94C40D6E18376001E040007F01001FF3-->  <POSITION><![CDATA[19]]></POSITION>
 <!--94C40D6E18376001E040007F01001FF3-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--94C40D6E18376001E040007F01001FF3-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--94C40D6E18376001E040007F01001FF3-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -267822,6 +267968,43 @@
 <!--B7ED22A39C674AA0B00C1E8440C0A980-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
 <!--B7ED22A39C674AA0B00C1E8440C0A980--></AD_COLUMN>
 
+<!--B8A72B85E1134BEE8EACB1375DD6056F--><AD_COLUMN>
+<!--B8A72B85E1134BEE8EACB1375DD6056F-->  <AD_COLUMN_ID><![CDATA[B8A72B85E1134BEE8EACB1375DD6056F]]></AD_COLUMN_ID>
+<!--B8A72B85E1134BEE8EACB1375DD6056F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B8A72B85E1134BEE8EACB1375DD6056F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B8A72B85E1134BEE8EACB1375DD6056F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B8A72B85E1134BEE8EACB1375DD6056F-->  <NAME><![CDATA[Advanced Feature]]></NAME>
+<!--B8A72B85E1134BEE8EACB1375DD6056F-->  <DESCRIPTION><![CDATA[Is advanced feature]]></DESCRIPTION>
+<!--B8A72B85E1134BEE8EACB1375DD6056F-->  <HELP><![CDATA[Automatic roles are granted with all non advanced features defined within application dictionary.
+
+Advanced features are only granted to the automatic roles defined as advanced.]]></HELP>
+<!--B8A72B85E1134BEE8EACB1375DD6056F-->  <COLUMNNAME><![CDATA[IsAdvancedFeature]]></COLUMNNAME>
+<!--B8A72B85E1134BEE8EACB1375DD6056F-->  <AD_TABLE_ID><![CDATA[284]]></AD_TABLE_ID>
+<!--B8A72B85E1134BEE8EACB1375DD6056F-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--B8A72B85E1134BEE8EACB1375DD6056F-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--B8A72B85E1134BEE8EACB1375DD6056F-->  <DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE>
+<!--B8A72B85E1134BEE8EACB1375DD6056F-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--B8A72B85E1134BEE8EACB1375DD6056F-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--B8A72B85E1134BEE8EACB1375DD6056F-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--B8A72B85E1134BEE8EACB1375DD6056F-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--B8A72B85E1134BEE8EACB1375DD6056F-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--B8A72B85E1134BEE8EACB1375DD6056F-->  <SEQNO><![CDATA[91]]></SEQNO>
+<!--B8A72B85E1134BEE8EACB1375DD6056F-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--B8A72B85E1134BEE8EACB1375DD6056F-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--B8A72B85E1134BEE8EACB1375DD6056F-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--B8A72B85E1134BEE8EACB1375DD6056F-->  <AD_ELEMENT_ID><![CDATA[103BB98EA3F9464E961E9AE046F7C665]]></AD_ELEMENT_ID>
+<!--B8A72B85E1134BEE8EACB1375DD6056F-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--B8A72B85E1134BEE8EACB1375DD6056F-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--B8A72B85E1134BEE8EACB1375DD6056F-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--B8A72B85E1134BEE8EACB1375DD6056F-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--B8A72B85E1134BEE8EACB1375DD6056F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--B8A72B85E1134BEE8EACB1375DD6056F-->  <POSITION><![CDATA[27]]></POSITION>
+<!--B8A72B85E1134BEE8EACB1375DD6056F-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--B8A72B85E1134BEE8EACB1375DD6056F-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--B8A72B85E1134BEE8EACB1375DD6056F-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--B8A72B85E1134BEE8EACB1375DD6056F-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--B8A72B85E1134BEE8EACB1375DD6056F--></AD_COLUMN>
+
 <!--B9336FB7C2B0400EB495358FAB55E17F--><AD_COLUMN>
 <!--B9336FB7C2B0400EB495358FAB55E17F-->  <AD_COLUMN_ID><![CDATA[B9336FB7C2B0400EB495358FAB55E17F]]></AD_COLUMN_ID>
 <!--B9336FB7C2B0400EB495358FAB55E17F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_DATASET_TABLE.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/src-db/database/sourcedata/AD_DATASET_TABLE.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -5573,6 +5573,20 @@
 <!--F07A2963B9D94573802CFC9E8EB1945E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--F07A2963B9D94573802CFC9E8EB1945E--></AD_DATASET_TABLE>
 
+<!--F15D91BC7A8743DC9F5F72541F5E3FDD--><AD_DATASET_TABLE>
+<!--F15D91BC7A8743DC9F5F72541F5E3FDD-->  <AD_DATASET_TABLE_ID><![CDATA[F15D91BC7A8743DC9F5F72541F5E3FDD]]></AD_DATASET_TABLE_ID>
+<!--F15D91BC7A8743DC9F5F72541F5E3FDD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F15D91BC7A8743DC9F5F72541F5E3FDD-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F15D91BC7A8743DC9F5F72541F5E3FDD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F15D91BC7A8743DC9F5F72541F5E3FDD-->  <AD_DATASET_ID><![CDATA[D81C5C810AEF47C690E4F688ABC8AAC8]]></AD_DATASET_ID>
+<!--F15D91BC7A8743DC9F5F72541F5E3FDD-->  <AD_TABLE_ID><![CDATA[FF808181308EA42301308FB5F7BC0049]]></AD_TABLE_ID>
+<!--F15D91BC7A8743DC9F5F72541F5E3FDD-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
+<!--F15D91BC7A8743DC9F5F72541F5E3FDD-->  <WHERECLAUSE><![CDATA[client.id=:ClientID]]></WHERECLAUSE>
+<!--F15D91BC7A8743DC9F5F72541F5E3FDD-->  <EXCLUDEAUDITINFO><![CDATA[N]]></EXCLUDEAUDITINFO>
+<!--F15D91BC7A8743DC9F5F72541F5E3FDD-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
+<!--F15D91BC7A8743DC9F5F72541F5E3FDD-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--F15D91BC7A8743DC9F5F72541F5E3FDD--></AD_DATASET_TABLE>
+
 <!--F20434BE96E111DDBFA8001B388C61A4--><AD_DATASET_TABLE>
 <!--F20434BE96E111DDBFA8001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[F20434BE96E111DDBFA8001B388C61A4]]></AD_DATASET_TABLE_ID>
 <!--F20434BE96E111DDBFA8001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Nov 17 12:32:36 2011 +0100
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Nov 17 13:04:04 2011 +0100
@@ -11,6 +11,7 @@
 <!--102-->  <DESCRIPTION><![CDATA[Client for this installation.]]></DESCRIPTION>
 <!--102-->  <HELP><![CDATA[A Client is a company or a legal entity. You cannot share data between Clients.]]></HELP>
 <!--102-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--102-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--102--></AD_ELEMENT>
 
 <!--104--><AD_ELEMENT>
@@ -24,6 +25,7 @@
 <!--104-->  <DESCRIPTION><![CDATA[A link to the database column of the table.]]></DESCRIPTION>
 <!--104-->  <HELP><![CDATA[Link to the database column of the table]]></HELP>
 <!--104-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--104-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--104--></AD_ELEMENT>
 
 <!--105--><AD_ELEMENT>
@@ -37,6 +39,7 @@
 <!--105-->  <DESCRIPTION><![CDATA[Column that will display]]></DESCRIPTION>
 <!--105-->  <HELP><![CDATA[The Display Column indicates the column that will display.]]></HELP>
 <!--105-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--105-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--105--></AD_ELEMENT>
 
 <!--106--><AD_ELEMENT>
@@ -50,6 +53,7 @@
 <!--106-->  <DESCRIPTION><![CDATA[An element that consolidates help, descriptions and terms for a database column and allows for a central maintenance.]]></DESCRIPTION>
 <!--106-->  <HELP><![CDATA[The System Element allows for the central maintenance of help, descriptions and terminology for a database column.]]></HELP>
 <!--106-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--106-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--106--></AD_ELEMENT>
 
 <!--107--><AD_ELEMENT>
@@ -63,6 +67,7 @@
 <!--107-->  <DESCRIPTION><![CDATA[Any element which can be viewed, edited, or added to a window.]]></DESCRIPTION>
 <!--107-->  <HELP><![CDATA[The Field identifies a field on a database table.]]></HELP>
 <!--107-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--107-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--107--></AD_ELEMENT>
 
 <!--108--><AD_ELEMENT>
@@ -76,6 +81,7 @@
 <!--108-->  <DESCRIPTION><![CDATA[Unique identifier of a record]]></DESCRIPTION>
 <!--108-->  <HELP><![CDATA[The Key Column indicates that this the unique identifier of a record on this table.]]></HELP>
 <!--108-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--108-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--108--></AD_ELEMENT>
 
 <!--109--><AD_ELEMENT>
@@ -89,6 +95,7 @@
 <!--109-->  <DESCRIPTION><![CDATA[A method of communication being used.]]></DESCRIPTION>
 <!--109-->  <HELP><![CDATA[The Language identifies the language to use for display]]></HELP>
 <!--109-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--109-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--109--></AD_ELEMENT>
 
 <!--110--><AD_ELEMENT>
@@ -102,6 +109,7 @@
 <!--110-->  <DESCRIPTION><![CDATA[Identifies a Menu]]></DESCRIPTION>
 <!--110-->  <HELP><![CDATA[The Menu identifies a unique Menu.  Menus are used to control the display of those screens a user has access to.]]></HELP>
 <!--110-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--110-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--110--></AD_ELEMENT>
 
 <!--112--><AD_ELEMENT>
@@ -115,6 +123,7 @@
 <!--112-->  <DESCRIPTION><![CDATA[The organization which performs or initiates the transaction.]]></DESCRIPTION>
 <!--112-->  <HELP><![CDATA[The organization which performs or initiates this transaction (for another organization).  The owning Organization may not be the transaction organization in a service bureau environment, with centralized services, and inter-organization transactions.]]></HELP>
 <!--112-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--112-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--112--></AD_ELEMENT>
 
 <!--113--><AD_ELEMENT>
@@ -128,6 +137,7 @@
 <!--113-->  <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION>
 <!--113-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
 <!--113-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--113-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--113--></AD_ELEMENT>
 
 <!--114--><AD_ELEMENT>
@@ -141,6 +151,7 @@
 <!--114-->  <DESCRIPTION><![CDATA[Process Instance]]></DESCRIPTION>
 <!--114-->  <HELP><![CDATA[Process Instance identifies the instance of a process. Every time a process is executed a new instance of it is created.]]></HELP>
 <!--114-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--114-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--114--></AD_ELEMENT>
 
 <!--116--><AD_ELEMENT>
@@ -154,6 +165,7 @@
 <!--116-->  <DESCRIPTION><![CDATA[Personal Preference]]></DESCRIPTION>
 <!--116-->  <HELP><![CDATA[Personal Preference, a default value that will be used by a user.]]></HELP>
 <!--116-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--116-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--116--></AD_ELEMENT>
 
 <!--117--><AD_ELEMENT>
@@ -167,6 +179,7 @@
 <!--117-->  <DESCRIPTION><![CDATA[A series of actions carried out in sequential order.]]></DESCRIPTION>
 <!--117-->  <HELP><![CDATA[The Process field identifies a unique Process or Report in the system.]]></HELP>
 <!--117-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--117-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--117--></AD_ELEMENT>
 
 <!--118--><AD_ELEMENT>
@@ -180,6 +193,7 @@
 <!--118-->  <DESCRIPTION><![CDATA[Process Parameter]]></DESCRIPTION>
 <!--118-->  <HELP><![CDATA[Process Parameter identifies the parameters of a process or report.]]></HELP>
 <!--118-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--118-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--118--></AD_ELEMENT>
 
 <!--119--><AD_ELEMENT>
@@ -193,6 +207,7 @@
 <!--119-->  <DESCRIPTION><![CDATA[Reference List based on Table]]></DESCRIPTION>
 <!--119-->  <HELP><![CDATA[The Reference List field indicates a list of reference values from a database tables.  Reference lists populate drop down list boxes in data entry screens]]></HELP>
 <!--119-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--119-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--119--></AD_ELEMENT>
 
 <!--120--><AD_ELEMENT>
@@ -206,6 +221,7 @@
 <!--120-->  <DESCRIPTION><![CDATA[The data type of this field.]]></DESCRIPTION>
 <!--120-->  <HELP><![CDATA[The Reference indicates the type of reference field]]></HELP>
 <!--120-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--120-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--120--></AD_ELEMENT>
 
 <!--121--><AD_ELEMENT>
@@ -219,6 +235,7 @@
 <!--121-->  <DESCRIPTION><![CDATA[The exact reference specification for a list or a table.]]></DESCRIPTION>
 <!--121-->  <HELP><![CDATA[The Reference Value indicates where the reference values are stored.  It must be specified if the data type is Table or List.]]></HELP>
 <!--121-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--121-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--121--></AD_ELEMENT>
 
 <!--123--><AD_ELEMENT>
@@ -232,6 +249,7 @@
 <!--123-->  <DESCRIPTION><![CDATA[The profile of security for the user defining what windows and tabs they can see.]]></DESCRIPTION>
 <!--123-->  <HELP><![CDATA[The Role determines security and access a user who has this Role will have in the System.]]></HELP>
 <!--123-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--123-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--123--></AD_ELEMENT>
 
 <!--124--><AD_ELEMENT>
@@ -245,6 +263,7 @@
 <!--124-->  <DESCRIPTION><![CDATA[The order of records in a specified document.]]></DESCRIPTION>
 <!--124-->  <HELP><![CDATA[The Sequence defines the numbering sequence to be used for documents.]]></HELP>
 <!--124-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--124-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--124--></AD_ELEMENT>
 
 <!--125--><AD_ELEMENT>
@@ -258,6 +277,7 @@
 <!--125-->  <DESCRIPTION><![CDATA[An indication that a tab is displayed within a window.]]></DESCRIPTION>
 <!--125-->  <HELP><![CDATA[The Tab indicates a tab that displays within a window.]]></HELP>
 <!--125-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--125-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--125--></AD_ELEMENT>
 
 <!--126--><AD_ELEMENT>
@@ -271,6 +291,7 @@
 <!--126-->  <DESCRIPTION><![CDATA[A dictionary table used for this tab that points to the database table.]]></DESCRIPTION>
 <!--126-->  <HELP><![CDATA[The Table indicates the table in which a field or fields reside.]]></HELP>
 <!--126-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--126-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--126--></AD_ELEMENT>
 
 <!--131--><AD_ELEMENT>
@@ -284,6 +305,7 @@
 <!--131-->  <DESCRIPTION><![CDATA[Business Partner Tree]]></DESCRIPTION>
 <!--131-->  <HELP><![CDATA[Business Partner Tree]]></HELP>
 <!--131-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--131-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--131--></AD_ELEMENT>
 
 <!--132--><AD_ELEMENT>
@@ -297,6 +319,7 @@
 <!--132-->  <DESCRIPTION><![CDATA[Identifies a Tree]]></DESCRIPTION>
 <!--132-->  <HELP><![CDATA[The Tree field identifies a unique Tree in the system. Trees define roll ups or summary levels of information.  They are used in reports for defining report points and summarization levels.]]></HELP>
 <!--132-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--132-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--132--></AD_ELEMENT>
 
 <!--133--><AD_ELEMENT>
@@ -310,6 +333,7 @@
 <!--133-->  <DESCRIPTION><![CDATA[Tree Menu]]></DESCRIPTION>
 <!--133-->  <HELP><![CDATA[Tree Menu]]></HELP>
 <!--133-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--133-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--133--></AD_ELEMENT>
 
 <!--134--><AD_ELEMENT>
@@ -323,6 +347,7 @@
 <!--134-->  <DESCRIPTION><![CDATA[Organization Tree]]></DESCRIPTION>
 <!--134-->  <HELP><![CDATA[Organization Tree]]></HELP>
 <!--134-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--134-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--134--></AD_ELEMENT>
 
 <!--135--><AD_ELEMENT>
@@ -336,6 +361,7 @@
 <!--135-->  <DESCRIPTION><![CDATA[Product Tree]]></DESCRIPTION>
 <!--135-->  <HELP><![CDATA[Product Tree]]></HELP>
 <!--135-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--135-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--135--></AD_ELEMENT>
 
 <!--136--><AD_ELEMENT>
@@ -349,6 +375,7 @@
 <!--136-->  <DESCRIPTION><![CDATA[Project Tree]]></DESCRIPTION>
 <!--136-->  <HELP><![CDATA[Project Tree]]></HELP>
 <!--136-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--136-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--136--></AD_ELEMENT>
 
 <!--137--><AD_ELEMENT>
@@ -360,6 +387,7 @@
 <!--137-->  <NAME><![CDATA[Primary Tree Sales Region]]></NAME>
 <!--137-->  <PRINTNAME><![CDATA[Primary Tree Sales Region]]></PRINTNAME>
 <!--137-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--137-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--137--></AD_ELEMENT>
 
 <!--138--><AD_ELEMENT>
@@ -373,6 +401,7 @@
 <!--138-->  <DESCRIPTION><![CDATA[An acquaintance to reach for information related to the business partner.]]></DESCRIPTION>
 <!--138-->  <HELP><![CDATA[The User identifies a unique user in the system. This could be an internal user or a business partner contact]]></HELP>
 <!--138-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--138-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--138--></AD_ELEMENT>
 
 <!--139--><AD_ELEMENT>
@@ -386,6 +415,7 @@
 <!--139-->  <DESCRIPTION><![CDATA[A validation rule that defines how an entry is determined to be valid or invalid.]]></DESCRIPTION>
 <!--139-->  <HELP><![CDATA[The Validation Rule indicates a unique validation rule.  These rules define how an entry is determined to valid or invalid.]]></HELP>
 <!--139-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--139-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--139--></AD_ELEMENT>
 
 <!--143--><AD_ELEMENT>
@@ -399,6 +429,7 @@
 <!--143-->  <DESCRIPTION><![CDATA[A work area which can be used to create, view, edit, and process a record.]]></DESCRIPTION>
 <!--143-->  <HELP><![CDATA[The Window field identifies a unique Window in the system.]]></HELP>
 <!--143-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--143-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--143--></AD_ELEMENT>
 
 <!--145--><AD_ELEMENT>
@@ -418,6 +449,7 @@
 
 or All (AD_CLIENT=anything, AD_ORG_ID=anything)]]></HELP>
 <!--145-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--145-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--145--></AD_ELEMENT>
 
 <!--146--><AD_ELEMENT>
@@ -431,6 +463,7 @@
 <!--146-->  <DESCRIPTION><![CDATA[Indicates the Natural Sign of the Account as a Debit or Credit]]></DESCRIPTION>
 <!--146-->  <HELP><![CDATA[Indicates if the expected balance for this account should be a Debit or a Credit.]]></HELP>
 <!--146-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--146-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--146--></AD_ELEMENT>
 
 <!--147--><AD_ELEMENT>
@@ -444,6 +477,7 @@
 <!--147-->  <DESCRIPTION><![CDATA[Indicates the type of account]]></DESCRIPTION>
 <!--147-->  <HELP><![CDATA[Valid account types are A - Asset, E - Expense, L - Liability, O- Owner Equity, R -Revenue and M- Memo.  The account type is used to determine what taxes, if any are applicable, validating payables and receivables for business partners.  Note:  Memo account amounts are ignored when checking for balancing]]></HELP>
 <!--147-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--147-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--147--></AD_ELEMENT>
 
 <!--148--><AD_ELEMENT>
@@ -457,6 +491,7 @@
 <!--148-->  <DESCRIPTION><![CDATA[The identification code used for accounting.]]></DESCRIPTION>
 <!--148-->  <HELP><![CDATA[The (natural) account used]]></HELP>
 <!--148-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--148-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--148--></AD_ELEMENT>
 
 <!--149--><AD_ELEMENT>
@@ -470,6 +505,7 @@
 <!--149-->  <DESCRIPTION><![CDATA[For parallel reporting using different accounting currency or field selection]]></DESCRIPTION>
 <!--149-->  <HELP><![CDATA[The Second Accounting Schema indicates an alternate set of rules to use for generating reports.]]></HELP>
 <!--149-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--149-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--149--></AD_ELEMENT>
 
 <!--150--><AD_ELEMENT>
@@ -483,6 +519,7 @@
 <!--150-->  <DESCRIPTION><![CDATA[For parallel reporting using different accounting currency or field selection]]></DESCRIPTION>
 <!--150-->  <HELP><![CDATA[The Third Accounting Schema indicates an alternate set of rules to use for generating reports.]]></HELP>
 <!--150-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--150-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--150--></AD_ELEMENT>
 
 <!--151--><AD_ELEMENT>
@@ -496,6 +533,7 @@
 <!--151-->  <DESCRIPTION><![CDATA[The cost of gaining the prospect as a customer]]></DESCRIPTION>
 <!--151-->  <HELP><![CDATA[The Acquisition Cost identifies the cost associated with making this prospect a customer.]]></HELP>
 <!--151-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--151-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--151--></AD_ELEMENT>
 
 <!--152--><AD_ELEMENT>
@@ -509,6 +547,7 @@
 <!--152-->  <DESCRIPTION><![CDATA[A drop down list box indicating the next step to take.]]></DESCRIPTION>
 <!--152-->  <HELP><![CDATA[The Action field indicates the Action to be performed for this element.]]></HELP>
 <!--152-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--152-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--152--></AD_ELEMENT>
 
 <!--153--><AD_ELEMENT>
@@ -522,6 +561,7 @@
 <!--153-->  <DESCRIPTION><![CDATA[Actual Life Time Revenue]]></DESCRIPTION>
 <!--153-->  <HELP><![CDATA[The Actual Life Time Value is the recorded revenue to be generated by this Business Partner.]]></HELP>
 <!--153-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--153-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--153--></AD_ELEMENT>
 
 <!--154--><AD_ELEMENT>
@@ -535,6 +575,7 @@
 <!--154-->  <DESCRIPTION><![CDATA[For parallel Reporting]]></DESCRIPTION>
 <!--154-->  <HELP><![CDATA[The Additional Tree is used to define alternate roll ups which can be used in reporting.  For example, you may have a Business Partner Tree which rolls up based on geographic location and an additional tree which rolls up based on industry.]]></HELP>
 <!--154-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--154-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--154--></AD_ELEMENT>
 
 <!--155--><AD_ELEMENT>
@@ -548,6 +589,7 @@
 <!--155-->  <DESCRIPTION><![CDATA[For parallel Reporting]]></DESCRIPTION>
 <!--155-->  <HELP><![CDATA[The Additional Tree is used to define alternate roll ups which can be used in reporting.  For example, you may have a Business Partner Tree which rolls up based on geographic location and an additional tree which rolls up based on industry.]]></HELP>
 <!--155-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--155-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--155--></AD_ELEMENT>
 
 <!--156--><AD_ELEMENT>
@@ -561,6 +603,7 @@
 <!--156-->  <DESCRIPTION><![CDATA[A space to write the location of a business partner.]]></DESCRIPTION>
 <!--156-->  <HELP><![CDATA[The Address 1 identifies the address for an entity's location]]></HELP>
 <!--156-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--156-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--156--></AD_ELEMENT>
 
 <!--157--><AD_ELEMENT>
@@ -574,6 +617,7 @@
 <!--157-->  <DESCRIPTION><![CDATA[A space to write the location of a business partner.]]></DESCRIPTION>
 <!--157-->  <HELP><![CDATA[The Address 2 provides additional address information for an entity.  It can be used for building location, apartment number or similar information.]]></HELP>
 <!--157-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--157-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--157--></AD_ELEMENT>
 
 <!--159--><AD_ELEMENT>
@@ -587,6 +631,7 @@
 <!--159-->  <DESCRIPTION><![CDATA[Defines an alternate method of indicating an account combination.]]></DESCRIPTION>
 <!--159-->  <HELP><![CDATA[The Alias field allows you to define a alternate method for referring to a full account combination.  For example, the Account Receivable Account for Garden World may be aliased as GW_AR.]]></HELP>
 <!--159-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--159-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--159--></AD_ELEMENT>
 
 <!--160--><AD_ELEMENT>
@@ -600,6 +645,7 @@
 <!--160-->  <DESCRIPTION><![CDATA[A monetary sum of two or more quantities.]]></DESCRIPTION>
 <!--160-->  <HELP><![CDATA[Amount]]></HELP>
 <!--160-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--160-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--160--></AD_ELEMENT>
 
 <!--161--><AD_ELEMENT>
@@ -613,6 +659,7 @@
 <!--161-->  <DESCRIPTION><![CDATA[The amount credited to an account, converted to the organization default currency.]]></DESCRIPTION>
 <!--161-->  <HELP><![CDATA[The Account Credit Amount indicates the transaction amount converted to this organization's accounting currency]]></HELP>
 <!--161-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--161-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--161--></AD_ELEMENT>
 
 <!--162--><AD_ELEMENT>
@@ -626,6 +673,7 @@
 <!--162-->  <DESCRIPTION><![CDATA[The amount debited to an account, converted to the organization default currency.]]></DESCRIPTION>
 <!--162-->  <HELP><![CDATA[The Account Debit Amount indicates the transaction amount converted to this organization's accounting currency]]></HELP>
 <!--162-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--162-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--162--></AD_ELEMENT>
 
 <!--163--><AD_ELEMENT>
@@ -639,6 +687,7 @@
 <!--163-->  <DESCRIPTION><![CDATA[The approval amount limit for this role]]></DESCRIPTION>
 <!--163-->  <HELP><![CDATA[The Approval Amount field indicates the amount limit this Role has for approval of documents.]]></HELP>
 <!--163-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--163-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--163--></AD_ELEMENT>
 
 <!--164--><AD_ELEMENT>
@@ -652,6 +701,7 @@
 <!--164-->  <DESCRIPTION><![CDATA[The amount credited from the account, given in provider currency.]]></DESCRIPTION>
 <!--164-->  <HELP><![CDATA[The Source Credit Amount indicates the credit amount for this line in the source currency.]]></HELP>
 <!--164-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--164-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--164--></AD_ELEMENT>
 
 <!--165--><AD_ELEMENT>
@@ -665,6 +715,7 @@
 <!--165-->  <DESCRIPTION><![CDATA[The amount debited from the account, given in provider currency.]]></DESCRIPTION>
 <!--165-->  <HELP><![CDATA[The Source Debit Amount indicates the credit amount for this line in the source currency.]]></HELP>
 <!--165-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--165-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--165--></AD_ELEMENT>
 
 <!--167--><AD_ELEMENT>
@@ -678,6 +729,7 @@
 <!--167-->  <DESCRIPTION><![CDATA[A defined characteristic of a specific product.]]></DESCRIPTION>
 <!--167-->  <HELP><![CDATA[A defined characteristic of a specific product.]]></HELP>
 <!--167-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--167-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--167--></AD_ELEMENT>
 
 <!--168--><AD_ELEMENT>
@@ -691,6 +743,7 @@
 <!--168-->  <DESCRIPTION><![CDATA[If selected, the periods are automatically opened and closed]]></DESCRIPTION>
 <!--168-->  <HELP><![CDATA[In the Automatic Period Control, periods are opened and closed based on the current date.  If the Manual alternative is activated, you have to open and close periods explicitly.]]></HELP>
 <!--168-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--168-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--168--></AD_ELEMENT>
 
 <!--173--><AD_ELEMENT>
@@ -708,6 +761,7 @@
 <!--173-->  <PO_DESCRIPTION><![CDATA[Bill From Address]]></PO_DESCRIPTION>
 <!--173-->  <PO_HELP><![CDATA[The Bill/Invoice From indicated the address where the invoice is created by the vendor]]></PO_HELP>
 <!--173-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--173-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--173--></AD_ELEMENT>
 
 <!--174--><AD_ELEMENT>
@@ -721,6 +775,7 @@
 <!--174-->  <DESCRIPTION><![CDATA[Binary Data]]></DESCRIPTION>
 <!--174-->  <HELP><![CDATA[The Binary field stores binary data.]]></HELP>
 <!--174-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--174-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--174--></AD_ELEMENT>
 
 <!--177--><AD_ELEMENT>
@@ -734,6 +789,7 @@
 <!--177-->  <DESCRIPTION><![CDATA[Primary rules for accounting]]></DESCRIPTION>
 <!--177-->  <HELP><![CDATA[An Accounting  Schema defines the rules used accounting such as costing method, currency and calendar.]]></HELP>
 <!--177-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--177-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--177--></AD_ELEMENT>
 
 <!--178--><AD_ELEMENT>
@@ -747,6 +803,7 @@
 <!--178-->  <DESCRIPTION><![CDATA[Secondary rules for accounting]]></DESCRIPTION>
 <!--178-->  <HELP><![CDATA[An Accounting Schema defines the rules used in accounting such as costing method, currency and calendar.]]></HELP>
 <!--178-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--178-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--178--></AD_ELEMENT>
 
 <!--179--><AD_ELEMENT>
@@ -760,6 +817,7 @@
 <!--179-->  <DESCRIPTION><![CDATA[Terceary rules for accounting]]></DESCRIPTION>
 <!--179-->  <HELP><![CDATA[An Accounting Schema defines the rules used in accounting such as costing method, currency and calendar]]></HELP>
 <!--179-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--179-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--179--></AD_ELEMENT>
 
 <!--180--><AD_ELEMENT>
@@ -773,6 +831,7 @@
 <!--180-->  <DESCRIPTION><![CDATA[Acct.Schema Element]]></DESCRIPTION>
 <!--180-->  <HELP><![CDATA[The Account Schema Element defines each element that comprise the account key.]]></HELP>
 <!--180-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--180-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--180--></AD_ELEMENT>
 
 <!--181--><AD_ELEMENT>
@@ -786,6 +845,7 @@
 <!--181-->  <DESCRIPTION><![CDATA[The structure used in accounting including costing methods, currencies, and the calendar.]]></DESCRIPTION>
 <!--181-->  <HELP><![CDATA[An Accounting Schema defines the rules used in accounting such as costing method, currency and calendar]]></HELP>
 <!--181-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--181-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--181--></AD_ELEMENT>
 
 <!--187--><AD_ELEMENT>
@@ -799,6 +859,7 @@
 <!--187-->  <DESCRIPTION><![CDATA[Anyone who takes part in daily business operations by acting as a customer, employee, etc.]]></DESCRIPTION>
 <!--187-->  <HELP><![CDATA[A Business Partner is anyone with whom you transact.  This can include a customer, vendor, employee or any combination of these.]]></HELP>
 <!--187-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--187-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--187--></AD_ELEMENT>
 
 <!--189--><AD_ELEMENT>
@@ -816,6 +877,7 @@
 <!--189-->  <PO_DESCRIPTION><![CDATA[Identifies the (ship from) address for this Business Partner]]></PO_DESCRIPTION>
 <!--189-->  <PO_HELP><![CDATA[The Partner address indicates the location of a Business Partner]]></PO_HELP>
 <!--189-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--189-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--189--></AD_ELEMENT>
 
 <!--190--><AD_ELEMENT>
@@ -829,6 +891,7 @@
 <!--190-->  <DESCRIPTION><![CDATA[A table showing the days of the week for each month of the year.]]></DESCRIPTION>
 <!--190-->  <HELP><![CDATA[The Calendar uniquely identifies an accounting calendar.  Multiple calendars can be used.  For example you may need a standard calendar that runs from Jan 1 to Dec 31 and a fiscal calendar that runs from July 1 to June 30.]]></HELP>
 <!--190-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--190-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--190--></AD_ELEMENT>
 
 <!--191--><AD_ELEMENT>
@@ -842,6 +905,7 @@
 <!--191-->  <DESCRIPTION><![CDATA[The amount or quantity at which one unit of measure is changed to another.]]></DESCRIPTION>
 <!--191-->  <HELP><![CDATA[The Conversion Rate defines the rate (multiply or divide) to use when converting a source currency to an accounting currency.]]></HELP>
 <!--191-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--191-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--191--></AD_ELEMENT>
 
 <!--192--><AD_ELEMENT>
@@ -855,6 +919,7 @@
 <!--192-->  <DESCRIPTION><![CDATA[A state or a nation.]]></DESCRIPTION>
 <!--192-->  <HELP><![CDATA[The Country defines a Country.  Each Country must be defined before it can be used in any document.]]></HELP>
 <!--192-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--192-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--192--></AD_ELEMENT>
 
 <!--193--><AD_ELEMENT>
@@ -868,6 +933,7 @@
 <!--193-->  <DESCRIPTION><![CDATA[An accepted medium of monetary exchange that may vary across countries.]]></DESCRIPTION>
 <!--193-->  <HELP><![CDATA[Indicates the currency to be used when processing this document.]]></HELP>
 <!--193-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--193-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--193--></AD_ELEMENT>
 
 <!--195--><AD_ELEMENT>
@@ -881,6 +947,7 @@
 <!--195-->  <DESCRIPTION><![CDATA[Target currency]]></DESCRIPTION>
 <!--195-->  <HELP><![CDATA[The Currency To defines the target currency for this conversion rate.]]></HELP>
 <!--195-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--195-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--195--></AD_ELEMENT>
 
 <!--196--><AD_ELEMENT>
@@ -894,6 +961,7 @@
 <!--196-->  <DESCRIPTION><![CDATA[A value defining what sequence and process setup are used to handle this document.]]></DESCRIPTION>
 <!--196-->  <HELP><![CDATA[The Document Type determines document sequence and processing rules]]></HELP>
 <!--196-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--196-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--196--></AD_ELEMENT>
 
 <!--197--><AD_ELEMENT>
@@ -907,6 +975,7 @@
 <!--197-->  <DESCRIPTION><![CDATA[The specific document type which should be used for the document.]]></DESCRIPTION>
 <!--197-->  <HELP><![CDATA[Specifies document subtype (eg. POS Order, Return Material, etc.) that each document (such as Sales Invoice, Purchase Order, etc.). Various document subtypes usually differ on the consequences they have. You can convert document types (e.g. from Offer to Order).  The conversion is then reflected in the current type.]]></HELP>
 <!--197-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--197-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--197--></AD_ELEMENT>
 
 <!--198--><AD_ELEMENT>
@@ -920,6 +989,7 @@
 <!--198-->  <DESCRIPTION><![CDATA[A identification code for an account type.]]></DESCRIPTION>
 <!--198-->  <HELP><![CDATA[Account Elements can be natural accounts or user defined values.]]></HELP>
 <!--198-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--198-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--198--></AD_ELEMENT>
 
 <!--199--><AD_ELEMENT>
@@ -933,6 +1003,7 @@
 <!--199-->  <DESCRIPTION><![CDATA[A unique identifier for an account type.]]></DESCRIPTION>
 <!--199-->  <HELP><![CDATA[The Account Element uniquely identifies an Account Type.  These are commonly known as a Chart of Accounts.]]></HELP>
 <!--199-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--199-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--199--></AD_ELEMENT>
 
 <!--200--><AD_ELEMENT>
@@ -946,6 +1017,7 @@
 <!--200-->  <DESCRIPTION><![CDATA[The location where items are sent from.]]></DESCRIPTION>
 <!--200-->  <HELP><![CDATA[The Location From indicates the location that a product was moved from.]]></HELP>
 <!--200-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--200-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--200--></AD_ELEMENT>
 
 <!--201--><AD_ELEMENT>
@@ -959,6 +1031,7 @@
 <!--201-->  <DESCRIPTION><![CDATA[The location where items are sent to.]]></DESCRIPTION>
 <!--201-->  <HELP><![CDATA[The Location To indicates the location that a product was moved to.]]></HELP>
 <!--201-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--201-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--201--></AD_ELEMENT>
 
 <!--202--><AD_ELEMENT>
@@ -972,6 +1045,7 @@
 <!--202-->  <DESCRIPTION><![CDATA[A specific place or residence.]]></DESCRIPTION>
 <!--202-->  <HELP><![CDATA[The Location / Address field defines the location of an entity.]]></HELP>
 <!--202-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--202-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--202--></AD_ELEMENT>
 
 <!--203--><AD_ELEMENT>
@@ -985,6 +1059,7 @@
 <!--203-->  <DESCRIPTION><![CDATA[Day on which business is not transacted]]></DESCRIPTION>
 <!--203-->  <HELP><![CDATA[The Non Business Day identifies a day that should not be considered a day when business is transacted]]></HELP>
 <!--203-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--203-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--203--></AD_ELEMENT>
 
 <!--204--><AD_ELEMENT>
@@ -998,6 +1073,7 @@
 <!--204-->  <DESCRIPTION><![CDATA[The setup and timing defined to complete a specified payment.]]></DESCRIPTION>
 <!--204-->  <HELP><![CDATA[Payment Terms identify the method and timing of payment for this transaction.]]></HELP>
 <!--204-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--204-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--204--></AD_ELEMENT>
 
 <!--205--><AD_ELEMENT>
@@ -1011,6 +1087,7 @@
 <!--205-->  <DESCRIPTION><![CDATA[Period Control]]></DESCRIPTION>
 <!--205-->  <HELP><![CDATA[The Period Control shows the status of a Period (Never Opened, Opened, Closed) for each of the DocBaseTypes.]]></HELP>
 <!--205-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--205-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--205--></AD_ELEMENT>
 
 <!--206--><AD_ELEMENT>
@@ -1024,6 +1101,7 @@
 <!--206-->  <DESCRIPTION><![CDATA[A specified time period.]]></DESCRIPTION>
 <!--206-->  <HELP><![CDATA[The Period indicates an exclusive range of dates for a calendar.]]></HELP>
 <!--206-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--206-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--206--></AD_ELEMENT>
 
 <!--208--><AD_ELEMENT>
@@ -1037,6 +1115,7 @@
 <!--208-->  <DESCRIPTION><![CDATA[Identifier of a project defined within the Project & Service Management module.]]></DESCRIPTION>
 <!--208-->  <HELP><![CDATA[Identifier of a project defined within the Project & Service Management module.]]></HELP>
 <!--208-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--208-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--208--></AD_ELEMENT>
 
 <!--209--><AD_ELEMENT>
@@ -1050,6 +1129,7 @@
 <!--209-->  <DESCRIPTION><![CDATA[An area of a specific country.]]></DESCRIPTION>
 <!--209-->  <HELP><![CDATA[The Region identifies a unique Region for this Country.]]></HELP>
 <!--209-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--209-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--209--></AD_ELEMENT>
 
 <!--210--><AD_ELEMENT>
@@ -1063,6 +1143,7 @@
 <!--210-->  <DESCRIPTION><![CDATA[A defined section of the world where sales efforts will be focused.]]></DESCRIPTION>
 <!--210-->  <HELP><![CDATA[The Sales Region indicates a specific area of sales coverage.]]></HELP>
 <!--210-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--210-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--210--></AD_ELEMENT>
 
 <!--211--><AD_ELEMENT>
@@ -1076,6 +1157,7 @@
 <!--211-->  <DESCRIPTION><![CDATA[A classification of tax options based on similar characteristics or attributes.]]></DESCRIPTION>
 <!--211-->  <HELP><![CDATA[The Tax Category provides a method of grouping similar taxes.  For example, Sales Tax or Value Added Tax.]]></HELP>
 <!--211-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--211-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--211--></AD_ELEMENT>
 
 <!--213--><AD_ELEMENT>
@@ -1089,6 +1171,7 @@
 <!--213-->  <DESCRIPTION><![CDATA[The percentage of money requested by the government for this specified product or transaction.]]></DESCRIPTION>
 <!--213-->  <HELP><![CDATA[The Tax indicates the type of tax for this document line.]]></HELP>
 <!--213-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--213-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--213--></AD_ELEMENT>
 
 <!--214--><AD_ELEMENT>
@@ -1102,6 +1185,7 @@
 <!--214-->  <DESCRIPTION><![CDATA[Unit of Measure Conversion]]></DESCRIPTION>
 <!--214-->  <HELP><![CDATA[The UOM Conversion identifies a unique to and from Unit of Measure, conversion rate and conversion date range.]]></HELP>
 <!--214-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--214-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--214--></AD_ELEMENT>
 
 <!--215--><AD_ELEMENT>
@@ -1115,6 +1199,7 @@
 <!--215-->  <DESCRIPTION><![CDATA[A non monetary unit of measure.]]></DESCRIPTION>
 <!--215-->  <HELP><![CDATA[The UOM defines a unique non monetary unit of measure]]></HELP>
 <!--215-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--215-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--215--></AD_ELEMENT>
 
 <!--217--><AD_ELEMENT>
@@ -1128,6 +1213,7 @@
 <!--217-->  <DESCRIPTION><![CDATA[Target or destination Unit of Measure]]></DESCRIPTION>
 <!--217-->  <HELP><![CDATA[The UOM To indicates the destination UOM for a UOM Conversion pair.]]></HELP>
 <!--217-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--217-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--217--></AD_ELEMENT>
 
 <!--218--><AD_ELEMENT>
@@ -1141,6 +1227,7 @@
 <!--218-->  <DESCRIPTION><![CDATA[Standard Unit of Measure for Length]]></DESCRIPTION>
 <!--218-->  <HELP><![CDATA[The Standard UOM for Length indicates the UOM to use for products referenced by length in a document.]]></HELP>
 <!--218-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--218-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--218--></AD_ELEMENT>
 
 <!--219--><AD_ELEMENT>
@@ -1154,6 +1241,7 @@
 <!--219-->  <DESCRIPTION><![CDATA[Standard Unit of Measure for Time]]></DESCRIPTION>
 <!--219-->  <HELP><![CDATA[The Standard UOM for Time indicates the UOM to use for products referenced by time in a document.]]></HELP>
 <!--219-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--219-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--219--></AD_ELEMENT>
 
 <!--220--><AD_ELEMENT>
@@ -1167,6 +1255,7 @@
 <!--220-->  <DESCRIPTION><![CDATA[Standard Unit of Measure for Volume]]></DESCRIPTION>
 <!--220-->  <HELP><![CDATA[The Standard UOM for Volume indicates the UOM to use for products referenced by volume in a document.]]></HELP>
 <!--220-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--220-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--220--></AD_ELEMENT>
 
 <!--221--><AD_ELEMENT>
@@ -1180,6 +1269,7 @@
 <!--221-->  <DESCRIPTION><![CDATA[Standard Unit of Measure for Weight]]></DESCRIPTION>
 <!--221-->  <HELP><![CDATA[The Standard UOM for Weight indicates the UOM to use for products referenced by weight in a document.]]></HELP>
 <!--221-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--221-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--221--></AD_ELEMENT>
 
 <!--222--><AD_ELEMENT>
@@ -1193,6 +1283,7 @@
 <!--222-->  <DESCRIPTION><![CDATA[An identification code comprised of an individual account number and additional dimensions such organization, product, and business partner.]]></DESCRIPTION>
 <!--222-->  <HELP><![CDATA[The Combination identifies a valid combination of element which represent a GL account.]]></HELP>
 <!--222-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--222-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--222--></AD_ELEMENT>
 
 <!--223--><AD_ELEMENT>
@@ -1206,6 +1297,7 @@
 <!--223-->  <DESCRIPTION><![CDATA[Calendar Year]]></DESCRIPTION>
 <!--223-->  <HELP><![CDATA[The Year uniquely identifies an accounting year for a calendar.]]></HELP>
 <!--223-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--223-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--223--></AD_ELEMENT>
 
 <!--224--><AD_ELEMENT>
@@ -1219,6 +1311,7 @@
 <!--224-->  <DESCRIPTION><![CDATA[A series of actions that occur when data is modified.]]></DESCRIPTION>
 <!--224-->  <HELP><![CDATA[Function Calls separated by semicolons; SE_/SL_/UE_/UL_ - 1st: System/User; 2nd: Enter/Leave; 3rd: _ Underscore, - then Function Name]]></HELP>
 <!--224-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--224-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--224--></AD_ELEMENT>
 
 <!--225--><AD_ELEMENT>
@@ -1232,6 +1325,7 @@
 <!--225-->  <DESCRIPTION><![CDATA[A populated defined area located within a larger area such as a state, province, or country.]]></DESCRIPTION>
 <!--225-->  <HELP><![CDATA[The City identifies a unique City for this Country or Region.]]></HELP>
 <!--225-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--225-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--225--></AD_ELEMENT>
 
 <!--226--><AD_ELEMENT>
@@ -1245,6 +1339,7 @@
 <!--226-->  <DESCRIPTION><![CDATA[Clients this Role can access]]></DESCRIPTION>
 <!--226-->  <HELP><![CDATA[Indicates the Clients (by client id) that this Role can access.  Multiple Clients are delimited by a comma ','.]]></HELP>
 <!--226-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--226-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--226--></AD_ELEMENT>
 
 <!--227--><AD_ELEMENT>
@@ -1258,6 +1353,7 @@
 <!--227-->  <DESCRIPTION><![CDATA[The code that will be executed to determine the setup procedure.]]></DESCRIPTION>
 <!--227-->  <HELP><![CDATA[The Validation Code is the code that will be executed to determine the rule.]]></HELP>
 <!--227-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--227-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--227--></AD_ELEMENT>
 
 <!--228--><AD_ELEMENT>
@@ -1271,6 +1367,7 @@
 <!--228-->  <DESCRIPTION><![CDATA[The name of a column within the database.]]></DESCRIPTION>
 <!--228-->  <HELP><![CDATA[The Column Name indicates the name of a column on a table as defined in the database.]]></HELP>
 <!--228-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--228-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--228--></AD_ELEMENT>
 
 <!--229--><AD_ELEMENT>
@@ -1284,6 +1381,7 @@
 <!--229-->  <DESCRIPTION><![CDATA[Unique combination of account elements]]></DESCRIPTION>
 <!--229-->  <HELP><![CDATA[The Combination field defines the unique combination of element values which comprise this account.]]></HELP>
 <!--229-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--229-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--229--></AD_ELEMENT>
 
 <!--230--><AD_ELEMENT>
@@ -1297,6 +1395,7 @@
 <!--230-->  <DESCRIPTION><![CDATA[A space to write additional related information.]]></DESCRIPTION>
 <!--230-->  <HELP><![CDATA[The Comments field allows for free form entry of additional information.]]></HELP>
 <!--230-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--230-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--230--></AD_ELEMENT>
 
 <!--231--><AD_ELEMENT>
@@ -1310,6 +1409,7 @@
 <!--231-->  <DESCRIPTION><![CDATA[A warning or information displayed when saving the record.]]></DESCRIPTION>
 <!--231-->  <HELP><![CDATA[Warning or information displayed when committing the record]]></HELP>
 <!--231-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--231-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--231--></AD_ELEMENT>
 
 <!--233--><AD_ELEMENT>
@@ -1323,6 +1423,7 @@
 <!--233-->  <DESCRIPTION><![CDATA[If not zero, the Debit amount of the document must be equal this amount]]></DESCRIPTION>
 <!--233-->  <HELP><![CDATA[If the control amount is zero, no check is performed.Otherwise the total Debit amount must be equal to the control amount, before the document is processed.]]></HELP>
 <!--233-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--233-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--233--></AD_ELEMENT>
 
 <!--234--><AD_ELEMENT>
@@ -1336,6 +1437,7 @@
 <!--234-->  <DESCRIPTION><![CDATA[A distinct conversion rate characteristic used for processes.]]></DESCRIPTION>
 <!--234-->  <HELP><![CDATA[The Conversion Rate Type indicates the type of conversion rate.  This allows you to enter multiple rates for the same currency pair.  For example, one rate may be used for Spot conversions and a different rate for Revaluations.]]></HELP>
 <!--234-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--234-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--234--></AD_ELEMENT>
 
 <!--241--><AD_ELEMENT>
@@ -1349,6 +1451,7 @@
 <!--241-->  <DESCRIPTION><![CDATA[Indicates how costs will be calculated]]></DESCRIPTION>
 <!--241-->  <HELP><![CDATA[Indicates how costs will be calculated (Standard, Average) for valuation and accounting purposes.]]></HELP>
 <!--241-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--241-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--241--></AD_ELEMENT>
 
 <!--242--><AD_ELEMENT>
@@ -1362,6 +1465,7 @@
 <!--242-->  <DESCRIPTION><![CDATA[Rounding used costing calculations]]></DESCRIPTION>
 <!--242-->  <HELP><![CDATA[The Costing Precision defines the number of decimal places that amounts will be rounded to when performing costing calculations.]]></HELP>
 <!--242-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--242-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--242--></AD_ELEMENT>
 
 <!--243--><AD_ELEMENT>
@@ -1375,6 +1479,7 @@
 <!--243-->  <DESCRIPTION><![CDATA[Costs in accounting currency]]></DESCRIPTION>
 <!--243-->  <HELP><![CDATA[The Costs indicates the cost of a campaign in an Organizations accounting currency.]]></HELP>
 <!--243-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--243-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--243--></AD_ELEMENT>
 
 <!--244--><AD_ELEMENT>
@@ -1388,6 +1493,7 @@
 <!--244-->  <DESCRIPTION><![CDATA[The geographic country code for a country based on the ISO standard.]]></DESCRIPTION>
 <!--244-->  <HELP><![CDATA[For details - http://www.din.de/gremien/nas/nabd/iso3166ma/codlstp1.html or - http://www.unece.org/trade/rec/rec03en.htm]]></HELP>
 <!--244-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--244-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--244--></AD_ELEMENT>
 
 <!--245--><AD_ELEMENT>
@@ -1401,6 +1507,7 @@
 <!--245-->  <DESCRIPTION><![CDATA[The date that this record is completed.]]></DESCRIPTION>
 <!--245-->  <HELP><![CDATA[The Created field indicates the date that this record was created.]]></HELP>
 <!--245-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--245-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--245--></AD_ELEMENT>
 
 <!--246--><AD_ELEMENT>
@@ -1414,6 +1521,7 @@
 <!--246-->  <DESCRIPTION><![CDATA[User who created this records]]></DESCRIPTION>
 <!--246-->  <HELP><![CDATA[The Created By field indicates the user who created this record.]]></HELP>
 <!--246-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--246-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--246--></AD_ELEMENT>
 
 <!--249--><AD_ELEMENT>
@@ -1427,6 +1535,7 @@
 <!--249-->  <DESCRIPTION><![CDATA[Credit Card Number]]></DESCRIPTION>
 <!--249-->  <HELP><![CDATA[The Credit Card number indicates the number on the credit card, without blanks or spaces.]]></HELP>
 <!--249-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--249-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--249--></AD_ELEMENT>
 
 <!--250--><AD_ELEMENT>
@@ -1440,6 +1549,7 @@
 <!--250-->  <DESCRIPTION><![CDATA[An abbreviated description used to define a unit of measure or currency.]]></DESCRIPTION>
 <!--250-->  <HELP><![CDATA[The Currency Symbol defines the symbol that will print when this currency is used.]]></HELP>
 <!--250-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--250-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--250--></AD_ELEMENT>
 
 <!--252--><AD_ELEMENT>
@@ -1453,6 +1563,7 @@
 <!--252-->  <DESCRIPTION><![CDATA[Account used when a currency is out of balance]]></DESCRIPTION>
 <!--252-->  <HELP><![CDATA[The Currency Balancing Account indicates the account to used when a currency is out of balance (generally due to rounding)]]></HELP>
 <!--252-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--252-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--252--></AD_ELEMENT>
 
 <!--253--><AD_ELEMENT>
@@ -1466,6 +1577,7 @@
 <!--253-->  <DESCRIPTION><![CDATA[The percentage to be multiplied by the source to arrive at the tax or exchange amount.]]></DESCRIPTION>
 <!--253-->  <HELP><![CDATA[The Currency Conversion Rate indicates the rate to use when converting the source currency to the accounting currency]]></HELP>
 <!--253-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--253-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--253--></AD_ELEMENT>
 
 <!--254--><AD_ELEMENT>
@@ -1479,6 +1591,7 @@
 <!--254-->  <DESCRIPTION><![CDATA[A distinct currency rate characteristic used for processes.]]></DESCRIPTION>
 <!--254-->  <HELP><![CDATA[The Conversion Rate Type indicates the type of rate to use when retrieving the conversion rate.  It allows you to define multiple rates for the same to and from currency.  For example you may have a set of rates used for daily transactions with a rate type of SPOT and rates for currency revaluation defined as REVAL.]]></HELP>
 <!--254-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--254-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--254--></AD_ELEMENT>
 
 <!--257--><AD_ELEMENT>
@@ -1492,6 +1605,7 @@
 <!--257-->  <DESCRIPTION><![CDATA[The next number that will be assigned to an item.]]></DESCRIPTION>
 <!--257-->  <HELP><![CDATA[The Current Next indicates the next number to use for this document]]></HELP>
 <!--257-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--257-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--257--></AD_ELEMENT>
 
 <!--260--><AD_ELEMENT>