Merge from pi-pne pick and execute development branch
authorGorka Ion Damián <gorkaion.damian@openbravo.com>
Thu, 17 Nov 2011 15:22:06 +0100
changeset 14629 bd731b953514
parent 14612 4d6944c2522a (current diff)
parent 14628 a7fd8b13ab22 (diff)
child 14631 d62a0a4e2476
Merge from pi-pne pick and execute development branch
src-db/database/sourcedata/AD_COLUMN.xml
src-db/database/sourcedata/AD_DATASET_TABLE.xml
src-db/database/sourcedata/AD_ELEMENT.xml
src-db/database/sourcedata/AD_FIELD.xml
src-db/database/sourcedata/AD_MESSAGE.xml
src-db/database/sourcedata/AD_MODEL_OBJECT.xml
src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml
src-db/database/sourcedata/AD_PROCESS.xml
src-db/database/sourcedata/AD_TAB.xml
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
src-db/database/sourcedata/AD_WINDOW.xml
--- a/.hgsigs	Thu Nov 17 13:14:35 2011 +0100
+++ b/.hgsigs	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/.hgtags	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_AUXILIARINPUT.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FORM.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS_PARA.xml	Thu Nov 17 15:22:06 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/AD_TAB.xml	Thu Nov 17 13:14:35 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml	Thu Nov 17 15:22:06 2011 +0100
@@ -25,6 +25,8 @@
 <!--2A9BA5FDA0F8470D881F8EA9DEDCC598-->  <UIPATTERN><![CDATA[RO]]></UIPATTERN>
 <!--2A9BA5FDA0F8470D881F8EA9DEDCC598-->  <HQLORDERBYCLAUSE><![CDATA[-accountingDate,financialAccountTransaction,groupID,-sequenceNumber]]></HQLORDERBYCLAUSE>
 <!--2A9BA5FDA0F8470D881F8EA9DEDCC598-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--2A9BA5FDA0F8470D881F8EA9DEDCC598-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--2A9BA5FDA0F8470D881F8EA9DEDCC598-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--2A9BA5FDA0F8470D881F8EA9DEDCC598--></AD_TAB>
 
 <!--5B9941AC1F6A4529A76FCA7CDA0A7D7A--><AD_TAB>
@@ -49,6 +51,8 @@
 <!--5B9941AC1F6A4529A76FCA7CDA0A7D7A-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--5B9941AC1F6A4529A76FCA7CDA0A7D7A-->  <UIPATTERN><![CDATA[SR]]></UIPATTERN>
 <!--5B9941AC1F6A4529A76FCA7CDA0A7D7A-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--5B9941AC1F6A4529A76FCA7CDA0A7D7A-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--5B9941AC1F6A4529A76FCA7CDA0A7D7A-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--5B9941AC1F6A4529A76FCA7CDA0A7D7A--></AD_TAB>
 
 <!--6707D7449A8D45DB851F608BA88329C8--><AD_TAB>
@@ -72,6 +76,8 @@
 <!--6707D7449A8D45DB851F608BA88329C8-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--6707D7449A8D45DB851F608BA88329C8-->  <UIPATTERN><![CDATA[RO]]></UIPATTERN>
 <!--6707D7449A8D45DB851F608BA88329C8-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--6707D7449A8D45DB851F608BA88329C8-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--6707D7449A8D45DB851F608BA88329C8-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--6707D7449A8D45DB851F608BA88329C8--></AD_TAB>
 
 <!--79DFBE24B39742AD877E3163643E619F--><AD_TAB>
@@ -97,6 +103,8 @@
 <!--79DFBE24B39742AD877E3163643E619F-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--79DFBE24B39742AD877E3163643E619F-->  <UIPATTERN><![CDATA[RO]]></UIPATTERN>
 <!--79DFBE24B39742AD877E3163643E619F-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--79DFBE24B39742AD877E3163643E619F-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--79DFBE24B39742AD877E3163643E619F-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--79DFBE24B39742AD877E3163643E619F--></AD_TAB>
 
 <!--9380E9AFB1074FB98030E5549D7FF346--><AD_TAB>
@@ -122,6 +130,8 @@
 <!--9380E9AFB1074FB98030E5549D7FF346-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--9380E9AFB1074FB98030E5549D7FF346-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--9380E9AFB1074FB98030E5549D7FF346-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--9380E9AFB1074FB98030E5549D7FF346-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--9380E9AFB1074FB98030E5549D7FF346-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--9380E9AFB1074FB98030E5549D7FF346--></AD_TAB>
 
 <!--A94442B27F664A41BF64735DFA76FB4D--><AD_TAB>
@@ -147,6 +157,8 @@
 <!--A94442B27F664A41BF64735DFA76FB4D-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--A94442B27F664A41BF64735DFA76FB4D-->  <UIPATTERN><![CDATA[RO]]></UIPATTERN>
 <!--A94442B27F664A41BF64735DFA76FB4D-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--A94442B27F664A41BF64735DFA76FB4D-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--A94442B27F664A41BF64735DFA76FB4D-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--A94442B27F664A41BF64735DFA76FB4D--></AD_TAB>
 
 <!--B82C02920AA84E8DB57D553185BD2F06--><AD_TAB>
@@ -170,6 +182,8 @@
 <!--B82C02920AA84E8DB57D553185BD2F06-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--B82C02920AA84E8DB57D553185BD2F06-->  <UIPATTERN><![CDATA[RO]]></UIPATTERN>
 <!--B82C02920AA84E8DB57D553185BD2F06-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--B82C02920AA84E8DB57D553185BD2F06-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--B82C02920AA84E8DB57D553185BD2F06-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--B82C02920AA84E8DB57D553185BD2F06--></AD_TAB>
 
 <!--C095D2CC39704DBE8B906B7CD7710968--><AD_TAB>
@@ -195,6 +209,8 @@
 <!--C095D2CC39704DBE8B906B7CD7710968-->  <UIPATTERN><![CDATA[SR]]></UIPATTERN>
 <!--C095D2CC39704DBE8B906B7CD7710968-->  <HQLORDERBYCLAUSE><![CDATA[-transactionDate]]></HQLORDERBYCLAUSE>
 <!--C095D2CC39704DBE8B906B7CD7710968-->  <SHOWPARENTBUTTONS><![CDATA[N]]></SHOWPARENTBUTTONS>
+<!--C095D2CC39704DBE8B906B7CD7710968-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--C095D2CC39704DBE8B906B7CD7710968-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--C095D2CC39704DBE8B906B7CD7710968--></AD_TAB>
 
 <!--EB0466B2A22343F28773B356D292BC7E--><AD_TAB>
@@ -220,6 +236,8 @@
 <!--EB0466B2A22343F28773B356D292BC7E-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--EB0466B2A22343F28773B356D292BC7E-->  <UIPATTERN><![CDATA[RO]]></UIPATTERN>
 <!--EB0466B2A22343F28773B356D292BC7E-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--EB0466B2A22343F28773B356D292BC7E-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--EB0466B2A22343F28773B356D292BC7E-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--EB0466B2A22343F28773B356D292BC7E--></AD_TAB>
 
 <!--EB0E0C5A58344F7FA345097E7365CD22--><AD_TAB>
@@ -243,6 +261,8 @@
 <!--EB0E0C5A58344F7FA345097E7365CD22-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--EB0E0C5A58344F7FA345097E7365CD22-->  <UIPATTERN><![CDATA[RO]]></UIPATTERN>
 <!--EB0E0C5A58344F7FA345097E7365CD22-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--EB0E0C5A58344F7FA345097E7365CD22-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--EB0E0C5A58344F7FA345097E7365CD22-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--EB0E0C5A58344F7FA345097E7365CD22--></AD_TAB>
 
 <!--F9751D712A804D57B97A36803843F2D7--><AD_TAB>
@@ -268,6 +288,8 @@
 <!--F9751D712A804D57B97A36803843F2D7-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--F9751D712A804D57B97A36803843F2D7-->  <UIPATTERN><![CDATA[RO]]></UIPATTERN>
 <!--F9751D712A804D57B97A36803843F2D7-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--F9751D712A804D57B97A36803843F2D7-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--F9751D712A804D57B97A36803843F2D7-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--F9751D712A804D57B97A36803843F2D7--></AD_TAB>
 
 <!--FA57D75B1BBB4583B4A777008A29BF54--><AD_TAB>
@@ -291,6 +313,8 @@
 <!--FA57D75B1BBB4583B4A777008A29BF54-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--FA57D75B1BBB4583B4A777008A29BF54-->  <UIPATTERN><![CDATA[RO]]></UIPATTERN>
 <!--FA57D75B1BBB4583B4A777008A29BF54-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--FA57D75B1BBB4583B4A777008A29BF54-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--FA57D75B1BBB4583B4A777008A29BF54-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--FA57D75B1BBB4583B4A777008A29BF54--></AD_TAB>
 
 <!--FD40D9C2F1F14943933DEFEF4A8458E4--><AD_TAB>
@@ -316,6 +340,8 @@
 <!--FD40D9C2F1F14943933DEFEF4A8458E4-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--FD40D9C2F1F14943933DEFEF4A8458E4-->  <UIPATTERN><![CDATA[RO]]></UIPATTERN>
 <!--FD40D9C2F1F14943933DEFEF4A8458E4-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--FD40D9C2F1F14943933DEFEF4A8458E4-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--FD40D9C2F1F14943933DEFEF4A8458E4-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--FD40D9C2F1F14943933DEFEF4A8458E4--></AD_TAB>
 
 <!--FF8080812F213146012F2135BC25000E--><AD_TAB>
@@ -340,6 +366,8 @@
 <!--FF8080812F213146012F2135BC25000E-->  <UIPATTERN><![CDATA[SR]]></UIPATTERN>
 <!--FF8080812F213146012F2135BC25000E-->  <HQLFILTERCLAUSE><![CDATA[e.reconciled = false]]></HQLFILTERCLAUSE>
 <!--FF8080812F213146012F2135BC25000E-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--FF8080812F213146012F2135BC25000E-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--FF8080812F213146012F2135BC25000E-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--FF8080812F213146012F2135BC25000E--></AD_TAB>
 
 <!--FF80808130BB89090130BB9A3A2B0043--><AD_TAB>
@@ -366,6 +394,8 @@
 <!--FF80808130BB89090130BB9A3A2B0043-->  <UIPATTERN><![CDATA[RO]]></UIPATTERN>
 <!--FF80808130BB89090130BB9A3A2B0043-->  <HQLORDERBYCLAUSE><![CDATA[-accountingDate, accountingSchema.id, groupID, documentCategory, financialAccountTransaction.id, -sequenceNumber]]></HQLORDERBYCLAUSE>
 <!--FF80808130BB89090130BB9A3A2B0043-->  <SHOWPARENTBUTTONS><![CDATA[N]]></SHOWPARENTBUTTONS>
+<!--FF80808130BB89090130BB9A3A2B0043-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--FF80808130BB89090130BB9A3A2B0043-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--FF80808130BB89090130BB9A3A2B0043--></AD_TAB>
 
 <!--FF8080813320657F0133209DE21B0042--><AD_TAB>
@@ -389,6 +419,8 @@
 <!--FF8080813320657F0133209DE21B0042-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--FF8080813320657F0133209DE21B0042-->  <UIPATTERN><![CDATA[SR]]></UIPATTERN>
 <!--FF8080813320657F0133209DE21B0042-->  <SHOWPARENTBUTTONS><![CDATA[N]]></SHOWPARENTBUTTONS>
+<!--FF8080813320657F0133209DE21B0042-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--FF8080813320657F0133209DE21B0042-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--FF8080813320657F0133209DE21B0042--></AD_TAB>
 
 </data>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml	Thu Nov 17 13:14:35 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 15:22:06 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/modifiedTables/AD_TAB.xml	Thu Nov 17 13:14:35 2011 +0100
+++ b/modules/org.openbravo.client.application/src-db/database/model/modifiedTables/AD_TAB.xml	Thu Nov 17 15:22:06 2011 +0100
@@ -5,5 +5,15 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="EM_OBUIAPP_CAN_ADD" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault><![CDATA['N']]></onCreateDefault>
+      </column>
+      <column name="EM_OBUIAPP_CAN_DELETE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault><![CDATA['N']]></onCreateDefault>
+      </column>
+      <check name="EM_OBUIAPP_AD_TAB_CAN_ADD"><![CDATA[EM_OBUIAPP_CAN_ADD IN ('Y', 'N')]]></check>
+      <check name="EM_OBUIAPP_AD_TAB_CAN_DELETE"><![CDATA[EM_OBUIAPP_CAN_DELETE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_VIEW_IMPL.xml	Thu Nov 17 13:14:35 2011 +0100
+++ b/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_VIEW_IMPL.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml	Thu Nov 17 15:22:06 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>
@@ -4522,6 +4559,41 @@
 <!--92FF524EA9234BFF90C89761876AEA7D-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
 <!--92FF524EA9234BFF90C89761876AEA7D--></AD_COLUMN>
 
+<!--961FB60572894A78810B8845F499D387--><AD_COLUMN>
+<!--961FB60572894A78810B8845F499D387-->  <AD_COLUMN_ID><![CDATA[961FB60572894A78810B8845F499D387]]></AD_COLUMN_ID>
+<!--961FB60572894A78810B8845F499D387-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--961FB60572894A78810B8845F499D387-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--961FB60572894A78810B8845F499D387-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--961FB60572894A78810B8845F499D387-->  <NAME><![CDATA[EM_Obuiapp_Can_Delete]]></NAME>
+<!--961FB60572894A78810B8845F499D387-->  <DESCRIPTION><![CDATA[Defines if a user is allowed to delete lines]]></DESCRIPTION>
+<!--961FB60572894A78810B8845F499D387-->  <HELP><![CDATA[Defines if a user is allowed to delete lines]]></HELP>
+<!--961FB60572894A78810B8845F499D387-->  <COLUMNNAME><![CDATA[EM_Obuiapp_Can_Delete]]></COLUMNNAME>
+<!--961FB60572894A78810B8845F499D387-->  <AD_TABLE_ID><![CDATA[106]]></AD_TABLE_ID>
+<!--961FB60572894A78810B8845F499D387-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--961FB60572894A78810B8845F499D387-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--961FB60572894A78810B8845F499D387-->  <DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE>
+<!--961FB60572894A78810B8845F499D387-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--961FB60572894A78810B8845F499D387-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--961FB60572894A78810B8845F499D387-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--961FB60572894A78810B8845F499D387-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--961FB60572894A78810B8845F499D387-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--961FB60572894A78810B8845F499D387-->  <SEQNO><![CDATA[122]]></SEQNO>
+<!--961FB60572894A78810B8845F499D387-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--961FB60572894A78810B8845F499D387-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--961FB60572894A78810B8845F499D387-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--961FB60572894A78810B8845F499D387-->  <AD_ELEMENT_ID><![CDATA[6DBAB16113DB4879A0EA095E80FBA959]]></AD_ELEMENT_ID>
+<!--961FB60572894A78810B8845F499D387-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--961FB60572894A78810B8845F499D387-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--961FB60572894A78810B8845F499D387-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--961FB60572894A78810B8845F499D387-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--961FB60572894A78810B8845F499D387-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--961FB60572894A78810B8845F499D387-->  <POSITION><![CDATA[44]]></POSITION>
+<!--961FB60572894A78810B8845F499D387-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--961FB60572894A78810B8845F499D387-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--961FB60572894A78810B8845F499D387-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--961FB60572894A78810B8845F499D387-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--961FB60572894A78810B8845F499D387--></AD_COLUMN>
+
 <!--970E2B0C6F6FA805E040007F0100216B--><AD_COLUMN>
 <!--970E2B0C6F6FA805E040007F0100216B-->  <AD_COLUMN_ID><![CDATA[970E2B0C6F6FA805E040007F0100216B]]></AD_COLUMN_ID>
 <!--970E2B0C6F6FA805E040007F0100216B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -5491,6 +5563,41 @@
 <!--CF2A28A6B90547D8ABBCFFA026A7EFE9-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
 <!--CF2A28A6B90547D8ABBCFFA026A7EFE9--></AD_COLUMN>
 
+<!--D3F8F1142D914AD0ACAD03B45BEB3E9F--><AD_COLUMN>
+<!--D3F8F1142D914AD0ACAD03B45BEB3E9F-->  <AD_COLUMN_ID><![CDATA[D3F8F1142D914AD0ACAD03B45BEB3E9F]]></AD_COLUMN_ID>
+<!--D3F8F1142D914AD0ACAD03B45BEB3E9F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D3F8F1142D914AD0ACAD03B45BEB3E9F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D3F8F1142D914AD0ACAD03B45BEB3E9F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D3F8F1142D914AD0ACAD03B45BEB3E9F-->  <NAME><![CDATA[EM_Obuiapp_Can_Add]]></NAME>
+<!--D3F8F1142D914AD0ACAD03B45BEB3E9F-->  <DESCRIPTION><![CDATA[Defines if a user is allowed to add new lines]]></DESCRIPTION>
+<!--D3F8F1142D914AD0ACAD03B45BEB3E9F-->  <HELP><![CDATA[Defines if a user is allowed to add new lines]]></HELP>
+<!--D3F8F1142D914AD0ACAD03B45BEB3E9F-->  <COLUMNNAME><![CDATA[EM_Obuiapp_Can_Add]]></COLUMNNAME>
+<!--D3F8F1142D914AD0ACAD03B45BEB3E9F-->  <AD_TABLE_ID><![CDATA[106]]></AD_TABLE_ID>
+<!--D3F8F1142D914AD0ACAD03B45BEB3E9F-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--D3F8F1142D914AD0ACAD03B45BEB3E9F-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--D3F8F1142D914AD0ACAD03B45BEB3E9F-->  <DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE>
+<!--D3F8F1142D914AD0ACAD03B45BEB3E9F-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--D3F8F1142D914AD0ACAD03B45BEB3E9F-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--D3F8F1142D914AD0ACAD03B45BEB3E9F-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--D3F8F1142D914AD0ACAD03B45BEB3E9F-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--D3F8F1142D914AD0ACAD03B45BEB3E9F-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--D3F8F1142D914AD0ACAD03B45BEB3E9F-->  <SEQNO><![CDATA[112]]></SEQNO>
+<!--D3F8F1142D914AD0ACAD03B45BEB3E9F-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--D3F8F1142D914AD0ACAD03B45BEB3E9F-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--D3F8F1142D914AD0ACAD03B45BEB3E9F-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--D3F8F1142D914AD0ACAD03B45BEB3E9F-->  <AD_ELEMENT_ID><![CDATA[969A16E782CF42E797A10365AB76E9D7]]></AD_ELEMENT_ID>
+<!--D3F8F1142D914AD0ACAD03B45BEB3E9F-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--D3F8F1142D914AD0ACAD03B45BEB3E9F-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--D3F8F1142D914AD0ACAD03B45BEB3E9F-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--D3F8F1142D914AD0ACAD03B45BEB3E9F-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--D3F8F1142D914AD0ACAD03B45BEB3E9F-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--D3F8F1142D914AD0ACAD03B45BEB3E9F-->  <POSITION><![CDATA[43]]></POSITION>
+<!--D3F8F1142D914AD0ACAD03B45BEB3E9F-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--D3F8F1142D914AD0ACAD03B45BEB3E9F-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--D3F8F1142D914AD0ACAD03B45BEB3E9F-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--D3F8F1142D914AD0ACAD03B45BEB3E9F-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--D3F8F1142D914AD0ACAD03B45BEB3E9F--></AD_COLUMN>
+
 <!--D5128BD152A44494A9F60DBF4E33B67F--><AD_COLUMN>
 <!--D5128BD152A44494A9F60DBF4E33B67F-->  <AD_COLUMN_ID><![CDATA[D5128BD152A44494A9F60DBF4E33B67F]]></AD_COLUMN_ID>
 <!--D5128BD152A44494A9F60DBF4E33B67F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -6381,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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Nov 17 15:22:06 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>
@@ -37,6 +39,7 @@
 <!--41A5FEDD70F140BF8438B8C8FA03B876-->  <DESCRIPTION><![CDATA[Defines the function to be used as part of fields validatiors]]></DESCRIPTION>
 <!--41A5FEDD70F140BF8438B8C8FA03B876-->  <HELP><![CDATA[By default a field have a set of validation functions, isNumber, isBoolean, etc. The developer can define a custom validator function to check the value entered by a the user.]]></HELP>
 <!--41A5FEDD70F140BF8438B8C8FA03B876-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--41A5FEDD70F140BF8438B8C8FA03B876-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--41A5FEDD70F140BF8438B8C8FA03B876--></AD_ELEMENT>
 
 <!--4B3999F4700C4C93ABEA49C89A8E484E--><AD_ELEMENT>
@@ -50,6 +53,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 +65,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 +79,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>
@@ -85,8 +91,23 @@
 <!--557A756A00364FE5AFF9584D2F1C19FF-->  <NAME><![CDATA[Obuiapp_Process_ID]]></NAME>
 <!--557A756A00364FE5AFF9584D2F1C19FF-->  <PRINTNAME><![CDATA[Obuiapp_Process_ID]]></PRINTNAME>
 <!--557A756A00364FE5AFF9584D2F1C19FF-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--557A756A00364FE5AFF9584D2F1C19FF-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--557A756A00364FE5AFF9584D2F1C19FF--></AD_ELEMENT>
 
+<!--6DBAB16113DB4879A0EA095E80FBA959--><AD_ELEMENT>
+<!--6DBAB16113DB4879A0EA095E80FBA959-->  <AD_ELEMENT_ID><![CDATA[6DBAB16113DB4879A0EA095E80FBA959]]></AD_ELEMENT_ID>
+<!--6DBAB16113DB4879A0EA095E80FBA959-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6DBAB16113DB4879A0EA095E80FBA959-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6DBAB16113DB4879A0EA095E80FBA959-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6DBAB16113DB4879A0EA095E80FBA959-->  <COLUMNNAME><![CDATA[EM_Obuiapp_Can_Delete]]></COLUMNNAME>
+<!--6DBAB16113DB4879A0EA095E80FBA959-->  <NAME><![CDATA[Can Delete]]></NAME>
+<!--6DBAB16113DB4879A0EA095E80FBA959-->  <PRINTNAME><![CDATA[Can Delete]]></PRINTNAME>
+<!--6DBAB16113DB4879A0EA095E80FBA959-->  <DESCRIPTION><![CDATA[Defines if a user is allowed to delete lines]]></DESCRIPTION>
+<!--6DBAB16113DB4879A0EA095E80FBA959-->  <HELP><![CDATA[Defines if a user is allowed to delete lines]]></HELP>
+<!--6DBAB16113DB4879A0EA095E80FBA959-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--6DBAB16113DB4879A0EA095E80FBA959-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--6DBAB16113DB4879A0EA095E80FBA959--></AD_ELEMENT>
+
 <!--7A18B7D741A349B493D145C80DB54E5E--><AD_ELEMENT>
 <!--7A18B7D741A349B493D145C80DB54E5E-->  <AD_ELEMENT_ID><![CDATA[7A18B7D741A349B493D145C80DB54E5E]]></AD_ELEMENT_ID>
 <!--7A18B7D741A349B493D145C80DB54E5E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -96,6 +117,7 @@
 <!--7A18B7D741A349B493D145C80DB54E5E-->  <NAME><![CDATA[Obuiapp_Ref_Window_ID]]></NAME>
 <!--7A18B7D741A349B493D145C80DB54E5E-->  <PRINTNAME><![CDATA[Obuiapp_Ref_Window_ID]]></PRINTNAME>
 <!--7A18B7D741A349B493D145C80DB54E5E-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--7A18B7D741A349B493D145C80DB54E5E-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--7A18B7D741A349B493D145C80DB54E5E--></AD_ELEMENT>
 
 <!--7F257DE6A0C847A8A121804BC5F9B7A8--><AD_ELEMENT>
@@ -109,6 +131,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>
@@ -120,6 +143,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>
@@ -131,6 +155,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>
@@ -142,6 +167,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>
@@ -153,6 +179,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>
@@ -164,6 +191,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>
@@ -175,6 +203,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>
@@ -186,6 +215,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>
@@ -197,6 +227,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>
@@ -208,6 +239,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>
@@ -221,8 +253,23 @@
 <!--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>
+<!--969A16E782CF42E797A10365AB76E9D7-->  <AD_ELEMENT_ID><![CDATA[969A16E782CF42E797A10365AB76E9D7]]></AD_ELEMENT_ID>
+<!--969A16E782CF42E797A10365AB76E9D7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--969A16E782CF42E797A10365AB76E9D7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--969A16E782CF42E797A10365AB76E9D7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--969A16E782CF42E797A10365AB76E9D7-->  <COLUMNNAME><![CDATA[EM_Obuiapp_Can_Add]]></COLUMNNAME>
+<!--969A16E782CF42E797A10365AB76E9D7-->  <NAME><![CDATA[Can Add]]></NAME>
+<!--969A16E782CF42E797A10365AB76E9D7-->  <PRINTNAME><![CDATA[Can Add]]></PRINTNAME>
+<!--969A16E782CF42E797A10365AB76E9D7-->  <DESCRIPTION><![CDATA[Defines if a user is allowed to add new lines]]></DESCRIPTION>
+<!--969A16E782CF42E797A10365AB76E9D7-->  <HELP><![CDATA[Defines if a user is allowed to add new lines]]></HELP>
+<!--969A16E782CF42E797A10365AB76E9D7-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--969A16E782CF42E797A10365AB76E9D7-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--969A16E782CF42E797A10365AB76E9D7--></AD_ELEMENT>
+
 <!--970F01C5451937C3E040007F01002163--><AD_ELEMENT>
 <!--970F01C5451937C3E040007F01002163-->  <AD_ELEMENT_ID><![CDATA[970F01C5451937C3E040007F01002163]]></AD_ELEMENT_ID>
 <!--970F01C5451937C3E040007F01002163-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -233,6 +280,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>
@@ -246,6 +294,7 @@
 <!--98001F5A0FFD4D21BDE553CF8B2F00F5-->  <DESCRIPTION><![CDATA[Custom JavaScript function that will get executed when the selection in a grid changes]]></DESCRIPTION>
 <!--98001F5A0FFD4D21BDE553CF8B2F00F5-->  <HELP><![CDATA[When the user changes the selection (a row gets selected or deselected) the custom JavaScript function will get executed]]></HELP>
 <!--98001F5A0FFD4D21BDE553CF8B2F00F5-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--98001F5A0FFD4D21BDE553CF8B2F00F5-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--98001F5A0FFD4D21BDE553CF8B2F00F5--></AD_ELEMENT>
 
 <!--B7BB240B9AA74817AFD7B8C2602B1CAD--><AD_ELEMENT>
@@ -259,6 +308,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>
@@ -270,6 +320,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>
@@ -283,6 +334,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>
@@ -296,6 +348,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>
@@ -307,6 +360,7 @@
 <!--F39469FBB4F041BFBC730BB9E0691F29-->  <NAME><![CDATA[Obuiapp_Process_Access_ID]]></NAME>
 <!--F39469FBB4F041BFBC730BB9E0691F29-->  <PRINTNAME><![CDATA[Obuiapp_Process_Access_ID]]></PRINTNAME>
 <!--F39469FBB4F041BFBC730BB9E0691F29-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--F39469FBB4F041BFBC730BB9E0691F29-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--F39469FBB4F041BFBC730BB9E0691F29--></AD_ELEMENT>
 
 <!--FC093F3F9DD64F81828FE06AB2CC4FEB--><AD_ELEMENT>
@@ -320,6 +374,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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml	Thu Nov 17 15:22:06 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>
@@ -2134,6 +2134,32 @@
 <!--A919733DDDA74DD9B3D67EC72600CCD4-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
 <!--A919733DDDA74DD9B3D67EC72600CCD4--></AD_FIELD>
 
+<!--B0F69EEF6B434E2FAA627D2AF43C8E55--><AD_FIELD>
+<!--B0F69EEF6B434E2FAA627D2AF43C8E55-->  <AD_FIELD_ID><![CDATA[B0F69EEF6B434E2FAA627D2AF43C8E55]]></AD_FIELD_ID>
+<!--B0F69EEF6B434E2FAA627D2AF43C8E55-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B0F69EEF6B434E2FAA627D2AF43C8E55-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B0F69EEF6B434E2FAA627D2AF43C8E55-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B0F69EEF6B434E2FAA627D2AF43C8E55-->  <NAME><![CDATA[Can Add]]></NAME>
+<!--B0F69EEF6B434E2FAA627D2AF43C8E55-->  <DESCRIPTION><![CDATA[Defines if a user is allowed to add new lines]]></DESCRIPTION>
+<!--B0F69EEF6B434E2FAA627D2AF43C8E55-->  <HELP><![CDATA[Defines if a user is allowed to add new lines]]></HELP>
+<!--B0F69EEF6B434E2FAA627D2AF43C8E55-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--B0F69EEF6B434E2FAA627D2AF43C8E55-->  <AD_TAB_ID><![CDATA[106]]></AD_TAB_ID>
+<!--B0F69EEF6B434E2FAA627D2AF43C8E55-->  <AD_COLUMN_ID><![CDATA[D3F8F1142D914AD0ACAD03B45BEB3E9F]]></AD_COLUMN_ID>
+<!--B0F69EEF6B434E2FAA627D2AF43C8E55-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--B0F69EEF6B434E2FAA627D2AF43C8E55-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--B0F69EEF6B434E2FAA627D2AF43C8E55-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--B0F69EEF6B434E2FAA627D2AF43C8E55-->  <SEQNO><![CDATA[240]]></SEQNO>
+<!--B0F69EEF6B434E2FAA627D2AF43C8E55-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--B0F69EEF6B434E2FAA627D2AF43C8E55-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--B0F69EEF6B434E2FAA627D2AF43C8E55-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--B0F69EEF6B434E2FAA627D2AF43C8E55-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--B0F69EEF6B434E2FAA627D2AF43C8E55-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--B0F69EEF6B434E2FAA627D2AF43C8E55-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--B0F69EEF6B434E2FAA627D2AF43C8E55-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--B0F69EEF6B434E2FAA627D2AF43C8E55-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--B0F69EEF6B434E2FAA627D2AF43C8E55-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--B0F69EEF6B434E2FAA627D2AF43C8E55--></AD_FIELD>
+
 <!--B1C77EB566B240DBB638498B3BE81BD1--><AD_FIELD>
 <!--B1C77EB566B240DBB638498B3BE81BD1-->  <AD_FIELD_ID><![CDATA[B1C77EB566B240DBB638498B3BE81BD1]]></AD_FIELD_ID>
 <!--B1C77EB566B240DBB638498B3BE81BD1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2547,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>
@@ -2833,6 +2887,32 @@
 <!--F194002D518540F2AE1AB299F5B6E353-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
 <!--F194002D518540F2AE1AB299F5B6E353--></AD_FIELD>
 
+<!--F4C4E4DB9A5A4703BF738F14F96C21BA--><AD_FIELD>
+<!--F4C4E4DB9A5A4703BF738F14F96C21BA-->  <AD_FIELD_ID><![CDATA[F4C4E4DB9A5A4703BF738F14F96C21BA]]></AD_FIELD_ID>
+<!--F4C4E4DB9A5A4703BF738F14F96C21BA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F4C4E4DB9A5A4703BF738F14F96C21BA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F4C4E4DB9A5A4703BF738F14F96C21BA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F4C4E4DB9A5A4703BF738F14F96C21BA-->  <NAME><![CDATA[Can Delete]]></NAME>
+<!--F4C4E4DB9A5A4703BF738F14F96C21BA-->  <DESCRIPTION><![CDATA[Defines if a user is allowed to delete lines]]></DESCRIPTION>
+<!--F4C4E4DB9A5A4703BF738F14F96C21BA-->  <HELP><![CDATA[Defines if a user is allowed to delete lines]]></HELP>
+<!--F4C4E4DB9A5A4703BF738F14F96C21BA-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--F4C4E4DB9A5A4703BF738F14F96C21BA-->  <AD_TAB_ID><![CDATA[106]]></AD_TAB_ID>
+<!--F4C4E4DB9A5A4703BF738F14F96C21BA-->  <AD_COLUMN_ID><![CDATA[961FB60572894A78810B8845F499D387]]></AD_COLUMN_ID>
+<!--F4C4E4DB9A5A4703BF738F14F96C21BA-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--F4C4E4DB9A5A4703BF738F14F96C21BA-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--F4C4E4DB9A5A4703BF738F14F96C21BA-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--F4C4E4DB9A5A4703BF738F14F96C21BA-->  <SEQNO><![CDATA[250]]></SEQNO>
+<!--F4C4E4DB9A5A4703BF738F14F96C21BA-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--F4C4E4DB9A5A4703BF738F14F96C21BA-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--F4C4E4DB9A5A4703BF738F14F96C21BA-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--F4C4E4DB9A5A4703BF738F14F96C21BA-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--F4C4E4DB9A5A4703BF738F14F96C21BA-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--F4C4E4DB9A5A4703BF738F14F96C21BA-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--F4C4E4DB9A5A4703BF738F14F96C21BA-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--F4C4E4DB9A5A4703BF738F14F96C21BA-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--F4C4E4DB9A5A4703BF738F14F96C21BA-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--F4C4E4DB9A5A4703BF738F14F96C21BA--></AD_FIELD>
+
 <!--F66D593A55A543F096B75905CDCD95B1--><AD_FIELD>
 <!--F66D593A55A543F096B75905CDCD95B1-->  <AD_FIELD_ID><![CDATA[F66D593A55A543F096B75905CDCD95B1]]></AD_FIELD_ID>
 <!--F66D593A55A543F096B75905CDCD95B1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 13:14:35 2011 +0100
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 15:22:06 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_TAB.xml	Thu Nov 17 13:14:35 2011 +0100
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TAB.xml	Thu Nov 17 15:22:06 2011 +0100
@@ -22,6 +22,8 @@
 <!--25EB9212730C4E88B95C75BFCD6F5EBF-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--25EB9212730C4E88B95C75BFCD6F5EBF-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--25EB9212730C4E88B95C75BFCD6F5EBF-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--25EB9212730C4E88B95C75BFCD6F5EBF-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--25EB9212730C4E88B95C75BFCD6F5EBF-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--25EB9212730C4E88B95C75BFCD6F5EBF--></AD_TAB>
 
 <!--6EFD1987E93847DE87AD7B70282FBDF1--><AD_TAB>
@@ -47,6 +49,8 @@
 <!--6EFD1987E93847DE87AD7B70282FBDF1-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--6EFD1987E93847DE87AD7B70282FBDF1-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--6EFD1987E93847DE87AD7B70282FBDF1-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--6EFD1987E93847DE87AD7B70282FBDF1-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--6EFD1987E93847DE87AD7B70282FBDF1-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--6EFD1987E93847DE87AD7B70282FBDF1--></AD_TAB>
 
 <!--7BF1D74F5C60424088416584DFD1EC1F--><AD_TAB>
@@ -72,6 +76,8 @@
 <!--7BF1D74F5C60424088416584DFD1EC1F-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--7BF1D74F5C60424088416584DFD1EC1F-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--7BF1D74F5C60424088416584DFD1EC1F-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--7BF1D74F5C60424088416584DFD1EC1F-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--7BF1D74F5C60424088416584DFD1EC1F-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--7BF1D74F5C60424088416584DFD1EC1F--></AD_TAB>
 
 <!--D275449FFACC4539A401336214FDBF94--><AD_TAB>
@@ -97,6 +103,8 @@
 <!--D275449FFACC4539A401336214FDBF94-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--D275449FFACC4539A401336214FDBF94-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--D275449FFACC4539A401336214FDBF94-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--D275449FFACC4539A401336214FDBF94-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--D275449FFACC4539A401336214FDBF94-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--D275449FFACC4539A401336214FDBF94--></AD_TAB>
 
 <!--F648835984F842AF906FA5F97EF6641B--><AD_TAB>
@@ -124,6 +132,8 @@
 <!--F648835984F842AF906FA5F97EF6641B-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--F648835984F842AF906FA5F97EF6641B-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--F648835984F842AF906FA5F97EF6641B-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--F648835984F842AF906FA5F97EF6641B-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--F648835984F842AF906FA5F97EF6641B-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--F648835984F842AF906FA5F97EF6641B--></AD_TAB>
 
 <!--FF8080812EFBEA81012EFBED3F58000C--><AD_TAB>
@@ -149,6 +159,8 @@
 <!--FF8080812EFBEA81012EFBED3F58000C-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--FF8080812EFBEA81012EFBED3F58000C-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--FF8080812EFBEA81012EFBED3F58000C-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--FF8080812EFBEA81012EFBED3F58000C-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--FF8080812EFBEA81012EFBED3F58000C-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--FF8080812EFBEA81012EFBED3F58000C--></AD_TAB>
 
 <!--FF8081813157AED2013157BF6D810023--><AD_TAB>
@@ -174,6 +186,8 @@
 <!--FF8081813157AED2013157BF6D810023-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--FF8081813157AED2013157BF6D810023-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--FF8081813157AED2013157BF6D810023-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--FF8081813157AED2013157BF6D810023-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--FF8081813157AED2013157BF6D810023-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--FF8081813157AED2013157BF6D810023--></AD_TAB>
 
 <!--FF80818132D7FB620132D819C1720046--><AD_TAB>
@@ -197,6 +211,8 @@
 <!--FF80818132D7FB620132D819C1720046-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--FF80818132D7FB620132D819C1720046-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--FF80818132D7FB620132D819C1720046-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--FF80818132D7FB620132D819C1720046-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--FF80818132D7FB620132D819C1720046-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--FF80818132D7FB620132D819C1720046--></AD_TAB>
 
 <!--FF80818132D85DB50132D86374920010--><AD_TAB>
@@ -220,6 +236,8 @@
 <!--FF80818132D85DB50132D86374920010-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--FF80818132D85DB50132D86374920010-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--FF80818132D85DB50132D86374920010-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--FF80818132D85DB50132D86374920010-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--FF80818132D85DB50132D86374920010-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--FF80818132D85DB50132D86374920010--></AD_TAB>
 
 <!--FF80818132D8C36D0132D8C4936F0006--><AD_TAB>
@@ -243,6 +261,8 @@
 <!--FF80818132D8C36D0132D8C4936F0006-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--FF80818132D8C36D0132D8C4936F0006-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--FF80818132D8C36D0132D8C4936F0006-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--FF80818132D8C36D0132D8C4936F0006-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--FF80818132D8C36D0132D8C4936F0006-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--FF80818132D8C36D0132D8C4936F0006--></AD_TAB>
 
 <!--FF80818132F27A590132F28008350006--><AD_TAB>
@@ -267,6 +287,8 @@
 <!--FF80818132F27A590132F28008350006-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--FF80818132F27A590132F28008350006-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--FF80818132F27A590132F28008350006-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--FF80818132F27A590132F28008350006-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--FF80818132F27A590132F28008350006-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--FF80818132F27A590132F28008350006--></AD_TAB>
 
 </data>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_WINDOW.xml	Thu Nov 17 13:14:35 2011 +0100
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_WINDOW.xml	Thu Nov 17 15:22:06 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>
@@ -62,6 +65,7 @@
 <!--FF80818132D7FB620132D8193C0C0043-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
 <!--FF80818132D7FB620132D8193C0C0043-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--FF80818132D7FB620132D8193C0C0043-->  <ISTHREADSAFE><![CDATA[N]]></ISTHREADSAFE>
+<!--FF80818132D7FB620132D8193C0C0043-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--FF80818132D7FB620132D8193C0C0043--></AD_WINDOW>
 
 </data>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/OBCLKER_UIDEFINITION.xml	Thu Nov 17 13:14:35 2011 +0100
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/OBCLKER_UIDEFINITION.xml	Thu Nov 17 15:22:06 2011 +0100
@@ -1,5 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <data>
+<!--330DEFC7EE4D4E84BE38F0AE5AD098EF--><OBCLKER_UIDEFINITION>
+<!--330DEFC7EE4D4E84BE38F0AE5AD098EF-->  <OBCLKER_UIDEFINITION_ID><![CDATA[330DEFC7EE4D4E84BE38F0AE5AD098EF]]></OBCLKER_UIDEFINITION_ID>
+<!--330DEFC7EE4D4E84BE38F0AE5AD098EF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--330DEFC7EE4D4E84BE38F0AE5AD098EF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--330DEFC7EE4D4E84BE38F0AE5AD098EF-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--330DEFC7EE4D4E84BE38F0AE5AD098EF-->  <AD_REFERENCE_ID><![CDATA[FF80818132F94B500132F9575619000A]]></AD_REFERENCE_ID>
+<!--330DEFC7EE4D4E84BE38F0AE5AD098EF-->  <CLASSNAME><![CDATA[org.openbravo.client.kernel.reference.EnumUIDefinition]]></CLASSNAME>
+<!--330DEFC7EE4D4E84BE38F0AE5AD098EF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--330DEFC7EE4D4E84BE38F0AE5AD098EF--></OBCLKER_UIDEFINITION>
+
 <!--FF80818132D9C75D0132D9D13C6F001A--><OBCLKER_UIDEFINITION>
 <!--FF80818132D9C75D0132D9D13C6F001A-->  <OBCLKER_UIDEFINITION_ID><![CDATA[FF80818132D9C75D0132D9D13C6F001A]]></OBCLKER_UIDEFINITION_ID>
 <!--FF80818132D9C75D0132D9D13C6F001A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/OBUIAPP_VIEW_IMPL.xml	Thu Nov 17 13:14:35 2011 +0100
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/OBUIAPP_VIEW_IMPL.xml	Thu Nov 17 15:22:06 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/src/org/openbravo/client/application/ApplicationConstants.java	Thu Nov 17 13:14:35 2011 +0100
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationConstants.java	Thu Nov 17 15:22:06 2011 +0100
@@ -47,9 +47,9 @@
   public static final String PROPERTIES_COMPONENT_ID = "Properties";
   public static final String PROPERTY_PARAMETER = "property";
 
+  // Processes constants
   public static final String WINDOW_REFERENCE_ID = "FF80818132D8F0F30132D9BC395D0038";
-
-  // Processes constants
+  public static final String BUTTON_LIST_REFERENCE_ID = "FF80818132F94B500132F9575619000A";
 
   // Identifier of the key holding the selected rows in a grid
   public static final String SELECTION_PROPERTY = "_selection";
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-pick-and-execute-view-tab.js.ftl	Thu Nov 17 13:14:35 2011 +0100
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-pick-and-execute-view-tab.js.ftl	Thu Nov 17 15:22:06 2011 +0100
@@ -41,7 +41,13 @@
     </#if> 
     <#if tabComponent.trlTab>
     isTrlTab: ${tabComponent.trlTab?string},
-    </#if> 
+    </#if>
+    <#if tabComponent.allowAdd>
+    allowAdd: true,
+    </#if>
+    <#if tabComponent.allowDelete>
+    allowDelete: true,
+    </#if>
     
     standardProperties:{
 <@compress single_line=true>
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java	Thu Nov 17 13:14:35 2011 +0100
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java	Thu Nov 17 15:22:06 2011 +0100
@@ -29,14 +29,12 @@
 import javax.inject.Inject;
 
 import org.apache.log4j.Logger;
-import org.hibernate.criterion.Restrictions;
 import org.openbravo.base.model.Entity;
 import org.openbravo.base.model.ModelProvider;
 import org.openbravo.base.model.Property;
 import org.openbravo.client.application.ApplicationConstants;
 import org.openbravo.client.application.ApplicationUtils;
 import org.openbravo.client.application.DynamicExpressionParser;
-import org.openbravo.client.application.RefWindow;
 import org.openbravo.client.kernel.BaseTemplateComponent;
 import org.openbravo.client.kernel.Component;
 import org.openbravo.client.kernel.ComponentProvider;
@@ -45,7 +43,6 @@
 import org.openbravo.client.kernel.reference.UIDefinitionController;
 import org.openbravo.dal.core.DalUtil;
 import org.openbravo.dal.core.OBContext;
-import org.openbravo.dal.service.OBCriteria;
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.data.Sqlc;
 import org.openbravo.erpCommon.obps.ActivationKey;
@@ -399,12 +396,27 @@
     return views.toString();
   }
 
+  public boolean isAllowAdd() {
+    if (tab.isObuiappCanAdd() != null) {
+      return tab.isObuiappCanAdd();
+    }
+    return false;
+  }
+
+  public boolean isAllowDelete() {
+    if (tab.isObuiappCanDelete() != null) {
+      return tab.isObuiappCanDelete();
+    }
+    return false;
+  }
+
   public class ButtonField {
+    private static final String AD_DEF_ERROR = "AD definition error: process parameter (%s) is using %s reference without %s";
     private String id;
     private String label;
     private String url;
     private String propertyName;
-    private List<Value> labelValues;
+    private List<Value> labelValues = null;
     private boolean autosave;
     private String showIf = "";
     private String readOnlyIf = "";
@@ -436,22 +448,8 @@
         if ("OBUIAPP_PickAndExecute".equals(newProcess.getUIPattern())) {
           // TODO: modal should be a parameter in the process definition?
           modal = false;
-
-          // figuring out the windowId
-          for (org.openbravo.client.application.Parameter param : newProcess
-              .getOBUIAPPParameterList()) {
-            if (param.getReference().getId().equals(ApplicationConstants.WINDOW_REFERENCE_ID)) {
-              OBCriteria<RefWindow> obcRefWindow = OBDal.getInstance().createCriteria(
-                  RefWindow.class);
-              obcRefWindow.add(Restrictions.eq(RefWindow.PROPERTY_REFERENCE,
-                  param.getReferenceSearchKey()));
-              if (obcRefWindow.list().size() > 0) {
-                setWindowId(obcRefWindow.list().get(0).getWindow().getId());
-                break;
-              }
-              log.error("AD definition error: process parameter (" + param.getId()
-                  + ") is using Window Reference without a window");
-            }
+          for (org.openbravo.client.application.Parameter p : newProcess.getOBUIAPPParameterList()) {
+            processParameter(p);
           }
         }
       } else if (column.getProcess() != null) {
@@ -490,11 +488,13 @@
         }
       }
 
-      labelValues = new ArrayList<Value>();
-      if (column.getReferenceSearchKey() != null) {
-        for (org.openbravo.model.ad.domain.List valueList : column.getReferenceSearchKey()
-            .getADListList()) {
-          labelValues.add(new Value(valueList));
+      if (labelValues == null) {
+        labelValues = new ArrayList<Value>();
+        if (column.getReferenceSearchKey() != null) {
+          for (org.openbravo.model.ad.domain.List valueList : column.getReferenceSearchKey()
+              .getADListList()) {
+            labelValues.add(new Value(valueList));
+          }
         }
       }
 
@@ -519,6 +519,31 @@
       }
     }
 
+    private void processParameter(org.openbravo.client.application.Parameter p) {
+
+      if (p.getReference().getId().equals(ApplicationConstants.WINDOW_REFERENCE_ID)) {
+        if (p.getReferenceSearchKey().getOBUIAPPRefWindowList().size() == 0
+            || p.getReferenceSearchKey().getOBUIAPPRefWindowList().get(0).getWindow() == null) {
+          log.error(String.format(AD_DEF_ERROR, p.getId(), "Window", "window"));
+        } else {
+          setWindowId(p.getReferenceSearchKey().getOBUIAPPRefWindowList().get(0).getWindow()
+              .getId());
+        }
+        return;
+      } else if (p.getReference().getId().equals(ApplicationConstants.BUTTON_LIST_REFERENCE_ID)) {
+        labelValues = new ArrayList<Value>();
+        for (org.openbravo.model.ad.domain.List valueList : p.getReferenceSearchKey()
+            .getADListList()) {
+          labelValues.add(new Value(valueList));
+        }
+        if (labelValues.size() == 0) {
+          log.error(String.format(AD_DEF_ERROR, p.getId(), "Button List", "a list associated"));
+        }
+        return;
+      }
+      log.error("Trying to use a yet not implemented reference: " + p.getReference());
+    }
+
     public boolean isAutosave() {
       return autosave;
     }
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-compatibility.js	Thu Nov 17 13:14:35 2011 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-compatibility.js	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js	Thu Nov 17 15:22:06 2011 +0100
@@ -108,11 +108,7 @@
         // debug mode, we have added _timestamp
         className = className + '_' + parts[2];
       }
-      this.runningProcess = isc[className].create({parentWindow: this,
-        windowId: params.windowId,
-        processId: params.processId,
-        actionHandler: params.actionHandler
-      });
+      this.runningProcess = isc[className].create(isc.addProperties({}, params, {parentWindow: this}));
       tabSet.updateTab(tabSet.getSelectedTab(), this.runningProcess);
     }
   },
@@ -159,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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form.js	Thu Nov 17 15:22:06 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/process/ob-pick-and-execute-grid.js	Thu Nov 17 13:14:35 2011 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js	Thu Nov 17 15:22:06 2011 +0100
@@ -165,7 +165,7 @@
 
     if (len === 0) {
       // push all *selected* rows into selectedIds cache
-      allRows = this.data.allRows;
+      allRows = this.data.allRows || [];
       len = allRows.length;
       for (i = 0; i < len; i++) {
         if (allRows[i][this.selectionProperty]) {
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-view.js	Thu Nov 17 13:14:35 2011 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-view.js	Thu Nov 17 15:22:06 2011 +0100
@@ -45,7 +45,7 @@
   initWidget: function () {
 
     var view = this,
-        okButton, cancelButton;
+        okButton, cancelButton, i, buttonLayout = [];
 
     okButton = isc.OBFormButton.create({
       //FIXME: Move to AD_Message
@@ -82,6 +82,30 @@
       gridProperties: this.viewProperties.gridProperties
     });
 
+    buttonLayout.push(isc.LayoutSpacer.create({}));
+
+    if (this.buttons) {
+      for (i in this.buttons) {
+        if (this.buttons.hasOwnProperty(i)) {
+
+          buttonLayout.push(isc.addProperties({}, okButton, {
+            title: this.buttons[i],
+            value: i
+          }));
+
+          // pushing a spacer
+          buttonLayout.push(isc.LayoutSpacer.create({
+            width: 32
+          }));
+        }
+      }
+    } else {
+      buttonLayout.push(okButton);
+    }
+
+    buttonLayout.push(cancelButton);
+    buttonLayout.push(isc.LayoutSpacer.create({}));
+
     this.items = [this.viewGrid, isc.HLayout.create({
       align: 'center',
       width: '100%',
@@ -91,9 +115,7 @@
         styleName: this.buttonBarStyleName,
         height: this.buttonBarHeight,
         defaultLayoutAlign: 'center',
-        members: [isc.LayoutSpacer.create({}), okButton, isc.LayoutSpacer.create({
-          width: 32
-        }), cancelButton, isc.LayoutSpacer.create({})]
+        members: buttonLayout
       })]
     })];
 
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-action-button.js	Thu Nov 17 13:14:35 2011 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-action-button.js	Thu Nov 17 15:22:06 2011 +0100
@@ -84,7 +84,8 @@
         standardWindow.openProcess({
           processId: me.processId,
           windowId: me.windowId,
-          actionHandler: me.command
+          actionHandler: me.command,
+          buttons: me.labelValue
         });
       };
 
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js	Thu Nov 17 13:14:35 2011 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js	Thu Nov 17 15:22:06 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 13:14:35 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 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 15:22:06 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_TAB.xml	Thu Nov 17 13:14:35 2011 +0100
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_TAB.xml	Thu Nov 17 15:22:06 2011 +0100
@@ -23,6 +23,8 @@
 <!--0424D6B4F7FF46A6A4B4960F410144B6-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
 <!--0424D6B4F7FF46A6A4B4960F410144B6-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--0424D6B4F7FF46A6A4B4960F410144B6-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--0424D6B4F7FF46A6A4B4960F410144B6-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--0424D6B4F7FF46A6A4B4960F410144B6-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--0424D6B4F7FF46A6A4B4960F410144B6--></AD_TAB>
 
 <!--9BC8881FA26C4609BEC7571F55CA053C--><AD_TAB>
@@ -48,6 +50,8 @@
 <!--9BC8881FA26C4609BEC7571F55CA053C-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
 <!--9BC8881FA26C4609BEC7571F55CA053C-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--9BC8881FA26C4609BEC7571F55CA053C-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--9BC8881FA26C4609BEC7571F55CA053C-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--9BC8881FA26C4609BEC7571F55CA053C-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--9BC8881FA26C4609BEC7571F55CA053C--></AD_TAB>
 
 <!--9CEA7BCAB01844EEBA8D254796B9BCA3--><AD_TAB>
@@ -73,6 +77,8 @@
 <!--9CEA7BCAB01844EEBA8D254796B9BCA3-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
 <!--9CEA7BCAB01844EEBA8D254796B9BCA3-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--9CEA7BCAB01844EEBA8D254796B9BCA3-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--9CEA7BCAB01844EEBA8D254796B9BCA3-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--9CEA7BCAB01844EEBA8D254796B9BCA3-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--9CEA7BCAB01844EEBA8D254796B9BCA3--></AD_TAB>
 
 </data>
--- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_WINDOW.xml	Thu Nov 17 13:14:35 2011 +0100
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_WINDOW.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 15:22:06 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_TAB.xml	Thu Nov 17 13:14:35 2011 +0100
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_TAB.xml	Thu Nov 17 15:22:06 2011 +0100
@@ -21,6 +21,8 @@
 <!--2B858E00A3064E16B8CC5BE267FE55C2-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
 <!--2B858E00A3064E16B8CC5BE267FE55C2-->  <UIPATTERN><![CDATA[RO]]></UIPATTERN>
 <!--2B858E00A3064E16B8CC5BE267FE55C2-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--2B858E00A3064E16B8CC5BE267FE55C2-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--2B858E00A3064E16B8CC5BE267FE55C2-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--2B858E00A3064E16B8CC5BE267FE55C2--></AD_TAB>
 
 <!--2BA5C4E002C94D54B4CB2992CC47245E--><AD_TAB>
@@ -44,6 +46,8 @@
 <!--2BA5C4E002C94D54B4CB2992CC47245E-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
 <!--2BA5C4E002C94D54B4CB2992CC47245E-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--2BA5C4E002C94D54B4CB2992CC47245E-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--2BA5C4E002C94D54B4CB2992CC47245E-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--2BA5C4E002C94D54B4CB2992CC47245E-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--2BA5C4E002C94D54B4CB2992CC47245E--></AD_TAB>
 
 <!--4526BAAEC10A4B25A89B66792EF86D31--><AD_TAB>
@@ -67,6 +71,8 @@
 <!--4526BAAEC10A4B25A89B66792EF86D31-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
 <!--4526BAAEC10A4B25A89B66792EF86D31-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--4526BAAEC10A4B25A89B66792EF86D31-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--4526BAAEC10A4B25A89B66792EF86D31-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--4526BAAEC10A4B25A89B66792EF86D31-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--4526BAAEC10A4B25A89B66792EF86D31--></AD_TAB>
 
 <!--64DE7AC24BC745239662A56A0E8FA8A7--><AD_TAB>
@@ -90,6 +96,8 @@
 <!--64DE7AC24BC745239662A56A0E8FA8A7-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
 <!--64DE7AC24BC745239662A56A0E8FA8A7-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--64DE7AC24BC745239662A56A0E8FA8A7-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--64DE7AC24BC745239662A56A0E8FA8A7-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--64DE7AC24BC745239662A56A0E8FA8A7-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--64DE7AC24BC745239662A56A0E8FA8A7--></AD_TAB>
 
 <!--70D3C99A3C1144B0A7EAAF0A42EAFE31--><AD_TAB>
@@ -113,6 +121,8 @@
 <!--70D3C99A3C1144B0A7EAAF0A42EAFE31-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
 <!--70D3C99A3C1144B0A7EAAF0A42EAFE31-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--70D3C99A3C1144B0A7EAAF0A42EAFE31-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--70D3C99A3C1144B0A7EAAF0A42EAFE31-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--70D3C99A3C1144B0A7EAAF0A42EAFE31-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--70D3C99A3C1144B0A7EAAF0A42EAFE31--></AD_TAB>
 
 <!--8223D8C9D8244DE1A7B49D5E0861BC6B--><AD_TAB>
@@ -136,6 +146,8 @@
 <!--8223D8C9D8244DE1A7B49D5E0861BC6B-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
 <!--8223D8C9D8244DE1A7B49D5E0861BC6B-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--8223D8C9D8244DE1A7B49D5E0861BC6B-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--8223D8C9D8244DE1A7B49D5E0861BC6B-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--8223D8C9D8244DE1A7B49D5E0861BC6B-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--8223D8C9D8244DE1A7B49D5E0861BC6B--></AD_TAB>
 
 <!--9083A717190E48F0970115C3F739FBF7--><AD_TAB>
@@ -161,6 +173,8 @@
 <!--9083A717190E48F0970115C3F739FBF7-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
 <!--9083A717190E48F0970115C3F739FBF7-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--9083A717190E48F0970115C3F739FBF7-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--9083A717190E48F0970115C3F739FBF7-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--9083A717190E48F0970115C3F739FBF7-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--9083A717190E48F0970115C3F739FBF7--></AD_TAB>
 
 <!--92F00CC55A4840B18B4D868978587B5E--><AD_TAB>
@@ -184,6 +198,8 @@
 <!--92F00CC55A4840B18B4D868978587B5E-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
 <!--92F00CC55A4840B18B4D868978587B5E-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--92F00CC55A4840B18B4D868978587B5E-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--92F00CC55A4840B18B4D868978587B5E-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--92F00CC55A4840B18B4D868978587B5E-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--92F00CC55A4840B18B4D868978587B5E--></AD_TAB>
 
 <!--B013F445508A41D5908F48575C9CE045--><AD_TAB>
@@ -207,6 +223,8 @@
 <!--B013F445508A41D5908F48575C9CE045-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
 <!--B013F445508A41D5908F48575C9CE045-->  <UIPATTERN><![CDATA[RO]]></UIPATTERN>
 <!--B013F445508A41D5908F48575C9CE045-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--B013F445508A41D5908F48575C9CE045-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--B013F445508A41D5908F48575C9CE045-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--B013F445508A41D5908F48575C9CE045--></AD_TAB>
 
 <!--C603DA260A2F444E927B73F28C766D74--><AD_TAB>
@@ -230,6 +248,8 @@
 <!--C603DA260A2F444E927B73F28C766D74-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
 <!--C603DA260A2F444E927B73F28C766D74-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--C603DA260A2F444E927B73F28C766D74-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--C603DA260A2F444E927B73F28C766D74-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--C603DA260A2F444E927B73F28C766D74-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--C603DA260A2F444E927B73F28C766D74--></AD_TAB>
 
 <!--CD7AAE5C65D043ED8A8B790811EAEFA1--><AD_TAB>
@@ -253,6 +273,8 @@
 <!--CD7AAE5C65D043ED8A8B790811EAEFA1-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
 <!--CD7AAE5C65D043ED8A8B790811EAEFA1-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--CD7AAE5C65D043ED8A8B790811EAEFA1-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--CD7AAE5C65D043ED8A8B790811EAEFA1-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--CD7AAE5C65D043ED8A8B790811EAEFA1-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--CD7AAE5C65D043ED8A8B790811EAEFA1--></AD_TAB>
 
 <!--EA867498578C4E98A4935A53A3A5F6AE--><AD_TAB>
@@ -276,6 +298,8 @@
 <!--EA867498578C4E98A4935A53A3A5F6AE-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
 <!--EA867498578C4E98A4935A53A3A5F6AE-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--EA867498578C4E98A4935A53A3A5F6AE-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--EA867498578C4E98A4935A53A3A5F6AE-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--EA867498578C4E98A4935A53A3A5F6AE-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--EA867498578C4E98A4935A53A3A5F6AE--></AD_TAB>
 
 <!--FF808181314242630131426D95280008--><AD_TAB>
@@ -300,6 +324,8 @@
 <!--FF808181314242630131426D95280008-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
 <!--FF808181314242630131426D95280008-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--FF808181314242630131426D95280008-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--FF808181314242630131426D95280008-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--FF808181314242630131426D95280008-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--FF808181314242630131426D95280008--></AD_TAB>
 
 </data>
--- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_WINDOW.xml	Thu Nov 17 13:14:35 2011 +0100
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_WINDOW.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-widget.js	Thu Nov 17 15:22:06 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 13:14:35 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 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 15:22:06 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.querylist/src-db/database/sourcedata/AD_TAB.xml	Thu Nov 17 13:14:35 2011 +0100
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_TAB.xml	Thu Nov 17 15:22:06 2011 +0100
@@ -21,6 +21,8 @@
 <!--15F16613CF764D948B2B2163F7A9CFF8-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
 <!--15F16613CF764D948B2B2163F7A9CFF8-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--15F16613CF764D948B2B2163F7A9CFF8-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--15F16613CF764D948B2B2163F7A9CFF8-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--15F16613CF764D948B2B2163F7A9CFF8-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--15F16613CF764D948B2B2163F7A9CFF8--></AD_TAB>
 
 <!--8BA14DE095DE496A82A84FE53F0B9821--><AD_TAB>
@@ -44,6 +46,8 @@
 <!--8BA14DE095DE496A82A84FE53F0B9821-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
 <!--8BA14DE095DE496A82A84FE53F0B9821-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--8BA14DE095DE496A82A84FE53F0B9821-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--8BA14DE095DE496A82A84FE53F0B9821-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--8BA14DE095DE496A82A84FE53F0B9821-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--8BA14DE095DE496A82A84FE53F0B9821--></AD_TAB>
 
 <!--C6A5082CCE324AC5A48A98814B9D0A3A--><AD_TAB>
@@ -67,6 +71,8 @@
 <!--C6A5082CCE324AC5A48A98814B9D0A3A-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
 <!--C6A5082CCE324AC5A48A98814B9D0A3A-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--C6A5082CCE324AC5A48A98814B9D0A3A-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--C6A5082CCE324AC5A48A98814B9D0A3A-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--C6A5082CCE324AC5A48A98814B9D0A3A-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--C6A5082CCE324AC5A48A98814B9D0A3A--></AD_TAB>
 
 </data>
--- a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Nov 17 13:14:35 2011 +0100
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 15:22:06 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.example.pne/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Nov 17 13:14:35 2011 +0100
+++ b/modules/org.openbravo.example.pne/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Nov 17 15:22:06 2011 +0100
@@ -9,6 +9,7 @@
 <!--4D782F44B0F341B3AE9835D3298CD5FD-->  <NAME><![CDATA[Copy Lines (New)]]></NAME>
 <!--4D782F44B0F341B3AE9835D3298CD5FD-->  <PRINTNAME><![CDATA[Copy Lines (New)]]></PRINTNAME>
 <!--4D782F44B0F341B3AE9835D3298CD5FD-->  <AD_MODULE_ID><![CDATA[FF8081813310CEAE013310DB96BC0005]]></AD_MODULE_ID>
+<!--4D782F44B0F341B3AE9835D3298CD5FD-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--4D782F44B0F341B3AE9835D3298CD5FD--></AD_ELEMENT>
 
 <!--B9CE50D5D073400DBA2E420A6A814DDC--><AD_ELEMENT>
@@ -20,6 +21,19 @@
 <!--B9CE50D5D073400DBA2E420A6A814DDC-->  <NAME><![CDATA[grid]]></NAME>
 <!--B9CE50D5D073400DBA2E420A6A814DDC-->  <PRINTNAME><![CDATA[grid]]></PRINTNAME>
 <!--B9CE50D5D073400DBA2E420A6A814DDC-->  <AD_MODULE_ID><![CDATA[FF8081813310CEAE013310DB96BC0005]]></AD_MODULE_ID>
+<!--B9CE50D5D073400DBA2E420A6A814DDC-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--B9CE50D5D073400DBA2E420A6A814DDC--></AD_ELEMENT>
 
+<!--D63E1DFAEBDD496EB9FFB24546EEA4A5--><AD_ELEMENT>
+<!--D63E1DFAEBDD496EB9FFB24546EEA4A5-->  <AD_ELEMENT_ID><![CDATA[D63E1DFAEBDD496EB9FFB24546EEA4A5]]></AD_ELEMENT_ID>
+<!--D63E1DFAEBDD496EB9FFB24546EEA4A5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D63E1DFAEBDD496EB9FFB24546EEA4A5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D63E1DFAEBDD496EB9FFB24546EEA4A5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D63E1DFAEBDD496EB9FFB24546EEA4A5-->  <COLUMNNAME><![CDATA[buttonList]]></COLUMNNAME>
+<!--D63E1DFAEBDD496EB9FFB24546EEA4A5-->  <NAME><![CDATA[buttonList]]></NAME>
+<!--D63E1DFAEBDD496EB9FFB24546EEA4A5-->  <PRINTNAME><![CDATA[buttonList]]></PRINTNAME>
+<!--D63E1DFAEBDD496EB9FFB24546EEA4A5-->  <AD_MODULE_ID><![CDATA[FF8081813310CEAE013310DB96BC0005]]></AD_MODULE_ID>
+<!--D63E1DFAEBDD496EB9FFB24546EEA4A5-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--D63E1DFAEBDD496EB9FFB24546EEA4A5--></AD_ELEMENT>
+
 </data>
--- a/modules/org.openbravo.example.pne/src-db/database/sourcedata/AD_REFERENCE.xml	Thu Nov 17 13:14:35 2011 +0100
+++ b/modules/org.openbravo.example.pne/src-db/database/sourcedata/AD_REFERENCE.xml	Thu Nov 17 15:22:06 2011 +0100
@@ -1,5 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <data>
+<!--2B3F817A8734411D82926A7AEE078834--><AD_REFERENCE>
+<!--2B3F817A8734411D82926A7AEE078834-->  <AD_REFERENCE_ID><![CDATA[2B3F817A8734411D82926A7AEE078834]]></AD_REFERENCE_ID>
+<!--2B3F817A8734411D82926A7AEE078834-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2B3F817A8734411D82926A7AEE078834-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2B3F817A8734411D82926A7AEE078834-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2B3F817A8734411D82926A7AEE078834-->  <NAME><![CDATA[OBEXPE_ButtonList]]></NAME>
+<!--2B3F817A8734411D82926A7AEE078834-->  <AD_MODULE_ID><![CDATA[FF8081813310CEAE013310DB96BC0005]]></AD_MODULE_ID>
+<!--2B3F817A8734411D82926A7AEE078834-->  <ISBASEREFERENCE><![CDATA[N]]></ISBASEREFERENCE>
+<!--2B3F817A8734411D82926A7AEE078834-->  <PARENTREFERENCE_ID><![CDATA[FF80818132F94B500132F9575619000A]]></PARENTREFERENCE_ID>
+<!--2B3F817A8734411D82926A7AEE078834-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
+<!--2B3F817A8734411D82926A7AEE078834--></AD_REFERENCE>
+
 <!--FF8081813310CEAE0133110B314F0082--><AD_REFERENCE>
 <!--FF8081813310CEAE0133110B314F0082-->  <AD_REFERENCE_ID><![CDATA[FF8081813310CEAE0133110B314F0082]]></AD_REFERENCE_ID>
 <!--FF8081813310CEAE0133110B314F0082-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.example.pne/src-db/database/sourcedata/AD_REF_LIST.xml	Thu Nov 17 15:22:06 2011 +0100
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<data>
+<!--245E4E2C65D34329B32C0C750BB115D5--><AD_REF_LIST>
+<!--245E4E2C65D34329B32C0C750BB115D5-->  <AD_REF_LIST_ID><![CDATA[245E4E2C65D34329B32C0C750BB115D5]]></AD_REF_LIST_ID>
+<!--245E4E2C65D34329B32C0C750BB115D5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--245E4E2C65D34329B32C0C750BB115D5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--245E4E2C65D34329B32C0C750BB115D5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--245E4E2C65D34329B32C0C750BB115D5-->  <VALUE><![CDATA[OBEXPE_Action2]]></VALUE>
+<!--245E4E2C65D34329B32C0C750BB115D5-->  <NAME><![CDATA[Action 2]]></NAME>
+<!--245E4E2C65D34329B32C0C750BB115D5-->  <AD_REFERENCE_ID><![CDATA[2B3F817A8734411D82926A7AEE078834]]></AD_REFERENCE_ID>
+<!--245E4E2C65D34329B32C0C750BB115D5-->  <AD_MODULE_ID><![CDATA[FF8081813310CEAE013310DB96BC0005]]></AD_MODULE_ID>
+<!--245E4E2C65D34329B32C0C750BB115D5-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--245E4E2C65D34329B32C0C750BB115D5--></AD_REF_LIST>
+
+<!--684F0CE7F9B24B2C8774A6835F770DDD--><AD_REF_LIST>
+<!--684F0CE7F9B24B2C8774A6835F770DDD-->  <AD_REF_LIST_ID><![CDATA[684F0CE7F9B24B2C8774A6835F770DDD]]></AD_REF_LIST_ID>
+<!--684F0CE7F9B24B2C8774A6835F770DDD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--684F0CE7F9B24B2C8774A6835F770DDD-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--684F0CE7F9B24B2C8774A6835F770DDD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--684F0CE7F9B24B2C8774A6835F770DDD-->  <VALUE><![CDATA[OBEXPE_Action1]]></VALUE>
+<!--684F0CE7F9B24B2C8774A6835F770DDD-->  <NAME><![CDATA[Action 1]]></NAME>
+<!--684F0CE7F9B24B2C8774A6835F770DDD-->  <AD_REFERENCE_ID><![CDATA[2B3F817A8734411D82926A7AEE078834]]></AD_REFERENCE_ID>
+<!--684F0CE7F9B24B2C8774A6835F770DDD-->  <AD_MODULE_ID><![CDATA[FF8081813310CEAE013310DB96BC0005]]></AD_MODULE_ID>
+<!--684F0CE7F9B24B2C8774A6835F770DDD-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--684F0CE7F9B24B2C8774A6835F770DDD--></AD_REF_LIST>
+
+</data>
--- a/modules/org.openbravo.example.pne/src-db/database/sourcedata/AD_TAB.xml	Thu Nov 17 13:14:35 2011 +0100
+++ b/modules/org.openbravo.example.pne/src-db/database/sourcedata/AD_TAB.xml	Thu Nov 17 15:22:06 2011 +0100
@@ -22,6 +22,8 @@
 <!--FF8081813310CEAE013310E39053001D-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--FF8081813310CEAE013310E39053001D-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
 <!--FF8081813310CEAE013310E39053001D-->  <EM_OBUIAPP_SELECTION><![CDATA[OB.OBEXPE.selectionChanged]]></EM_OBUIAPP_SELECTION>
+<!--FF8081813310CEAE013310E39053001D-->  <EM_OBUIAPP_CAN_ADD><![CDATA[Y]]></EM_OBUIAPP_CAN_ADD>
+<!--FF8081813310CEAE013310E39053001D-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[Y]]></EM_OBUIAPP_CAN_DELETE>
 <!--FF8081813310CEAE013310E39053001D--></AD_TAB>
 
 </data>
--- a/modules/org.openbravo.example.pne/src-db/database/sourcedata/AD_WINDOW.xml	Thu Nov 17 13:14:35 2011 +0100
+++ b/modules/org.openbravo.example.pne/src-db/database/sourcedata/AD_WINDOW.xml	Thu Nov 17 15:22:06 2011 +0100
@@ -13,6 +13,7 @@
 <!--FF8081813310CEAE013310E34C66001A-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
 <!--FF8081813310CEAE013310E34C66001A-->  <AD_MODULE_ID><![CDATA[FF8081813310CEAE013310DB96BC0005]]></AD_MODULE_ID>
 <!--FF8081813310CEAE013310E34C66001A-->  <ISTHREADSAFE><![CDATA[N]]></ISTHREADSAFE>
+<!--FF8081813310CEAE013310E34C66001A-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--FF8081813310CEAE013310E34C66001A--></AD_WINDOW>
 
 </data>
--- a/modules/org.openbravo.example.pne/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml	Thu Nov 17 13:14:35 2011 +0100
+++ b/modules/org.openbravo.example.pne/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml	Thu Nov 17 15:22:06 2011 +0100
@@ -1,5 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <data>
+<!--7D82B96613E544E691871438E60B96B9--><OBUIAPP_PARAMETER>
+<!--7D82B96613E544E691871438E60B96B9-->  <OBUIAPP_PARAMETER_ID><![CDATA[7D82B96613E544E691871438E60B96B9]]></OBUIAPP_PARAMETER_ID>
+<!--7D82B96613E544E691871438E60B96B9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7D82B96613E544E691871438E60B96B9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7D82B96613E544E691871438E60B96B9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7D82B96613E544E691871438E60B96B9-->  <AD_MODULE_ID><![CDATA[FF8081813310CEAE013310DB96BC0005]]></AD_MODULE_ID>
+<!--7D82B96613E544E691871438E60B96B9-->  <NAME><![CDATA[buttonList]]></NAME>
+<!--7D82B96613E544E691871438E60B96B9-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--7D82B96613E544E691871438E60B96B9-->  <AD_REFERENCE_ID><![CDATA[FF80818132F94B500132F9575619000A]]></AD_REFERENCE_ID>
+<!--7D82B96613E544E691871438E60B96B9-->  <AD_REFERENCE_VALUE_ID><![CDATA[2B3F817A8734411D82926A7AEE078834]]></AD_REFERENCE_VALUE_ID>
+<!--7D82B96613E544E691871438E60B96B9-->  <COLUMNNAME><![CDATA[buttonList]]></COLUMNNAME>
+<!--7D82B96613E544E691871438E60B96B9-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--7D82B96613E544E691871438E60B96B9-->  <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
+<!--7D82B96613E544E691871438E60B96B9-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--7D82B96613E544E691871438E60B96B9-->  <AD_ELEMENT_ID><![CDATA[D63E1DFAEBDD496EB9FFB24546EEA4A5]]></AD_ELEMENT_ID>
+<!--7D82B96613E544E691871438E60B96B9-->  <ISFIXED><![CDATA[Y]]></ISFIXED>
+<!--7D82B96613E544E691871438E60B96B9-->  <EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE>
+<!--7D82B96613E544E691871438E60B96B9-->  <OBUIAPP_PROCESS_ID><![CDATA[FF8081813310CEAE013310E9242F002C]]></OBUIAPP_PROCESS_ID>
+<!--7D82B96613E544E691871438E60B96B9--></OBUIAPP_PARAMETER>
+
 <!--FF8081813310CEAE01331109E6B70078--><OBUIAPP_PARAMETER>
 <!--FF8081813310CEAE01331109E6B70078-->  <OBUIAPP_PARAMETER_ID><![CDATA[FF8081813310CEAE01331109E6B70078]]></OBUIAPP_PARAMETER_ID>
 <!--FF8081813310CEAE01331109E6B70078-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -7,7 +27,7 @@
 <!--FF8081813310CEAE01331109E6B70078-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8081813310CEAE01331109E6B70078-->  <AD_MODULE_ID><![CDATA[FF8081813310CEAE013310DB96BC0005]]></AD_MODULE_ID>
 <!--FF8081813310CEAE01331109E6B70078-->  <NAME><![CDATA[grid]]></NAME>
-<!--FF8081813310CEAE01331109E6B70078-->  <SEQNO><![CDATA[0]]></SEQNO>
+<!--FF8081813310CEAE01331109E6B70078-->  <SEQNO><![CDATA[10]]></SEQNO>
 <!--FF8081813310CEAE01331109E6B70078-->  <AD_REFERENCE_ID><![CDATA[FF80818132D8F0F30132D9BC395D0038]]></AD_REFERENCE_ID>
 <!--FF8081813310CEAE01331109E6B70078-->  <AD_REFERENCE_VALUE_ID><![CDATA[FF8081813310CEAE0133110B314F0082]]></AD_REFERENCE_VALUE_ID>
 <!--FF8081813310CEAE01331109E6B70078-->  <COLUMNNAME><![CDATA[grid]]></COLUMNNAME>
--- a/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 13:14:35 2011 +0100
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_PROCESS.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.html	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.java	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportPDF.jrxml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_PROCESS.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 15:22:06 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_TAB.xml	Thu Nov 17 13:14:35 2011 +0100
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_TAB.xml	Thu Nov 17 15:22:06 2011 +0100
@@ -23,6 +23,8 @@
 <!--D7508D810A3B438D8D6B6760E2855334-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--D7508D810A3B438D8D6B6760E2855334-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--D7508D810A3B438D8D6B6760E2855334-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--D7508D810A3B438D8D6B6760E2855334-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--D7508D810A3B438D8D6B6760E2855334-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--D7508D810A3B438D8D6B6760E2855334--></AD_TAB>
 
 <!--EFA7EFCFC6E14827B109D88F236A0B6C--><AD_TAB>
@@ -48,6 +50,8 @@
 <!--EFA7EFCFC6E14827B109D88F236A0B6C-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--EFA7EFCFC6E14827B109D88F236A0B6C-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--EFA7EFCFC6E14827B109D88F236A0B6C-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--EFA7EFCFC6E14827B109D88F236A0B6C-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--EFA7EFCFC6E14827B109D88F236A0B6C-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--EFA7EFCFC6E14827B109D88F236A0B6C--></AD_TAB>
 
 </data>
--- a/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_WINDOW.xml	Thu Nov 17 13:14:35 2011 +0100
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_WINDOW.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.service.integration.google/src-db/database/model/functions/OBSEIG_UPDATE_ACCESS.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 15:22:06 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_TAB.xml	Thu Nov 17 13:14:35 2011 +0100
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_TAB.xml	Thu Nov 17 15:22:06 2011 +0100
@@ -21,6 +21,8 @@
 <!--FF8080813161A3D30131620862BF0014-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
 <!--FF8080813161A3D30131620862BF0014-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--FF8080813161A3D30131620862BF0014-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--FF8080813161A3D30131620862BF0014-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--FF8080813161A3D30131620862BF0014-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--FF8080813161A3D30131620862BF0014--></AD_TAB>
 
 </data>
--- a/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_WINDOW.xml	Thu Nov 17 13:14:35 2011 +0100
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_WINDOW.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/OBUIAPP_VIEW_IMPL.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 15:22:06 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.integration.openid/src-db/database/sourcedata/AD_TAB.xml	Thu Nov 17 13:14:35 2011 +0100
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_TAB.xml	Thu Nov 17 15:22:06 2011 +0100
@@ -21,6 +21,8 @@
 <!--FF808081314BA5A001314BA803930005-->  <AD_MODULE_ID><![CDATA[FF8080813141B198013141B86DD70003]]></AD_MODULE_ID>
 <!--FF808081314BA5A001314BA803930005-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--FF808081314BA5A001314BA803930005-->  <SHOWPARENTBUTTONS><![CDATA[N]]></SHOWPARENTBUTTONS>
+<!--FF808081314BA5A001314BA803930005-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--FF808081314BA5A001314BA803930005-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--FF808081314BA5A001314BA803930005--></AD_TAB>
 
 </data>
--- a/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 13:14:35 2011 +0100
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 15:22:06 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.selector/src-db/database/sourcedata/AD_TAB.xml	Thu Nov 17 13:14:35 2011 +0100
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_TAB.xml	Thu Nov 17 15:22:06 2011 +0100
@@ -25,6 +25,8 @@
 <!--10153E4B83EC4A5E8C558FCE74071FB0-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--10153E4B83EC4A5E8C558FCE74071FB0-->  <HQLORDERBYCLAUSE><![CDATA[e.name]]></HQLORDERBYCLAUSE>
 <!--10153E4B83EC4A5E8C558FCE74071FB0-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--10153E4B83EC4A5E8C558FCE74071FB0-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--10153E4B83EC4A5E8C558FCE74071FB0-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--10153E4B83EC4A5E8C558FCE74071FB0--></AD_TAB>
 
 <!--308C5577EA73404DAF44CBA9A467E34F--><AD_TAB>
@@ -50,6 +52,8 @@
 <!--308C5577EA73404DAF44CBA9A467E34F-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--308C5577EA73404DAF44CBA9A467E34F-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--308C5577EA73404DAF44CBA9A467E34F-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--308C5577EA73404DAF44CBA9A467E34F-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--308C5577EA73404DAF44CBA9A467E34F-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--308C5577EA73404DAF44CBA9A467E34F--></AD_TAB>
 
 <!--75FEAE3FF26F49E394BDF833B1B97647--><AD_TAB>
@@ -77,6 +81,8 @@
 <!--75FEAE3FF26F49E394BDF833B1B97647-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--75FEAE3FF26F49E394BDF833B1B97647-->  <HQLORDERBYCLAUSE><![CDATA[e.sortno,e.name]]></HQLORDERBYCLAUSE>
 <!--75FEAE3FF26F49E394BDF833B1B97647-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--75FEAE3FF26F49E394BDF833B1B97647-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--75FEAE3FF26F49E394BDF833B1B97647-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--75FEAE3FF26F49E394BDF833B1B97647--></AD_TAB>
 
 <!--BE8CCBD813044537A6B02CA5E7FBA413--><AD_TAB>
@@ -102,6 +108,8 @@
 <!--BE8CCBD813044537A6B02CA5E7FBA413-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--BE8CCBD813044537A6B02CA5E7FBA413-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--BE8CCBD813044537A6B02CA5E7FBA413-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--BE8CCBD813044537A6B02CA5E7FBA413-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--BE8CCBD813044537A6B02CA5E7FBA413-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--BE8CCBD813044537A6B02CA5E7FBA413--></AD_TAB>
 
 </data>
--- a/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 13:14:35 2011 +0100
+++ b/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/src-db/database/model/functions/AD_SYNCHRONIZE.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/src-db/database/model/functions/AD_UPDATE_ACCESS.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/src-db/database/model/functions/MRP_WORKREQUIREMENT.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/src-db/database/model/tables/AD_ELEMENT.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/src-db/database/model/tables/AD_FORM.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/src-db/database/model/tables/AD_PROCESS.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/src-db/database/model/tables/AD_ROLE.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/src-db/database/model/tables/AD_WINDOW.xml	Thu Nov 17 15:22:06 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 13:14:35 2011 +0100
+++ b/src-db/database/model/triggers/AD_ROLE_TRG.xml	Thu Nov 17 15:22:06 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,