[aprm-windows] Remove unnecessary windows and functions
authorUnai Martirena <unai.martirena@openbravo.com>
Mon, 05 May 2014 11:02:51 +0200
changeset 23557 0f8118824d72
parent 23556 aac70520c192
child 23558 5b41d75ed2fc
[aprm-windows] Remove unnecessary windows and functions
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_AUXILIARINPUT.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MENU.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TABLE.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TREENODE.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_WINDOW.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_REF_WINDOW.xml
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/datasource/GLItemDatasource.java
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-utilities.js
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_AUXILIARINPUT.xml	Wed Apr 30 17:54:56 2014 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_AUXILIARINPUT.xml	Mon May 05 11:02:51 2014 +0200
@@ -22,17 +22,6 @@
 <!--21943DF0B89F4AE3AF14A9C06F1181C2-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--21943DF0B89F4AE3AF14A9C06F1181C2--></AD_AUXILIARINPUT>
 
-<!--2546EDF7ECE94A23B22341AA498C24D3--><AD_AUXILIARINPUT>
-<!--2546EDF7ECE94A23B22341AA498C24D3-->  <AD_AUXILIARINPUT_ID><![CDATA[2546EDF7ECE94A23B22341AA498C24D3]]></AD_AUXILIARINPUT_ID>
-<!--2546EDF7ECE94A23B22341AA498C24D3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--2546EDF7ECE94A23B22341AA498C24D3-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--2546EDF7ECE94A23B22341AA498C24D3-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--2546EDF7ECE94A23B22341AA498C24D3-->  <AD_TAB_ID><![CDATA[263]]></AD_TAB_ID>
-<!--2546EDF7ECE94A23B22341AA498C24D3-->  <NAME><![CDATA[APRM_PAYIN_ISMULTICURRENCY]]></NAME>
-<!--2546EDF7ECE94A23B22341AA498C24D3-->  <CODE><![CDATA[@SQL=SELECT PAYIN_ISMULTICURRENCY FROM FIN_PAYMENTMETHOD WHERE FIN_PAYMENTMETHOD_ID=@FIN_PAYMENTMETHOD_ID@]]></CODE>
-<!--2546EDF7ECE94A23B22341AA498C24D3-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--2546EDF7ECE94A23B22341AA498C24D3--></AD_AUXILIARINPUT>
-
 <!--29B80A89DBA84293A75434979C655101--><AD_AUXILIARINPUT>
 <!--29B80A89DBA84293A75434979C655101-->  <AD_AUXILIARINPUT_ID><![CDATA[29B80A89DBA84293A75434979C655101]]></AD_AUXILIARINPUT_ID>
 <!--29B80A89DBA84293A75434979C655101-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml	Wed Apr 30 17:54:56 2014 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml	Mon May 05 11:02:51 2014 +0200
@@ -558,38 +558,6 @@
 <!--170284D098F547C69327DD057F08DEDA-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--170284D098F547C69327DD057F08DEDA--></AD_COLUMN>
 
-<!--17A8B4AF0A884591BF50D57AF8472D13--><AD_COLUMN>
-<!--17A8B4AF0A884591BF50D57AF8472D13-->  <AD_COLUMN_ID><![CDATA[17A8B4AF0A884591BF50D57AF8472D13]]></AD_COLUMN_ID>
-<!--17A8B4AF0A884591BF50D57AF8472D13-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--17A8B4AF0A884591BF50D57AF8472D13-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--17A8B4AF0A884591BF50D57AF8472D13-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--17A8B4AF0A884591BF50D57AF8472D13-->  <NAME><![CDATA[id]]></NAME>
-<!--17A8B4AF0A884591BF50D57AF8472D13-->  <COLUMNNAME><![CDATA[id]]></COLUMNNAME>
-<!--17A8B4AF0A884591BF50D57AF8472D13-->  <AD_TABLE_ID><![CDATA[E4E42C1D2A3E433B85C3CC13C89AB6AA]]></AD_TABLE_ID>
-<!--17A8B4AF0A884591BF50D57AF8472D13-->  <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
-<!--17A8B4AF0A884591BF50D57AF8472D13-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
-<!--17A8B4AF0A884591BF50D57AF8472D13-->  <ISKEY><![CDATA[Y]]></ISKEY>
-<!--17A8B4AF0A884591BF50D57AF8472D13-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--17A8B4AF0A884591BF50D57AF8472D13-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
-<!--17A8B4AF0A884591BF50D57AF8472D13-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--17A8B4AF0A884591BF50D57AF8472D13-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--17A8B4AF0A884591BF50D57AF8472D13-->  <SEQNO><![CDATA[10]]></SEQNO>
-<!--17A8B4AF0A884591BF50D57AF8472D13-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--17A8B4AF0A884591BF50D57AF8472D13-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--17A8B4AF0A884591BF50D57AF8472D13-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--17A8B4AF0A884591BF50D57AF8472D13-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--17A8B4AF0A884591BF50D57AF8472D13-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--17A8B4AF0A884591BF50D57AF8472D13-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--17A8B4AF0A884591BF50D57AF8472D13-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--17A8B4AF0A884591BF50D57AF8472D13-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--17A8B4AF0A884591BF50D57AF8472D13-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--17A8B4AF0A884591BF50D57AF8472D13-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--17A8B4AF0A884591BF50D57AF8472D13-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--17A8B4AF0A884591BF50D57AF8472D13-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--17A8B4AF0A884591BF50D57AF8472D13-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--17A8B4AF0A884591BF50D57AF8472D13-->  <ENTITY_ALIAS><![CDATA[e.id]]></ENTITY_ALIAS>
-<!--17A8B4AF0A884591BF50D57AF8472D13--></AD_COLUMN>
-
 <!--18096D8809024E67A36E636EA0D9D0E7--><AD_COLUMN>
 <!--18096D8809024E67A36E636EA0D9D0E7-->  <AD_COLUMN_ID><![CDATA[18096D8809024E67A36E636EA0D9D0E7]]></AD_COLUMN_ID>
 <!--18096D8809024E67A36E636EA0D9D0E7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1348,38 +1316,6 @@
 <!--35605F6EE878473E9ACCB9196452A4A6-->  <ENTITY_ALIAS><![CDATA[psd.id]]></ENTITY_ALIAS>
 <!--35605F6EE878473E9ACCB9196452A4A6--></AD_COLUMN>
 
-<!--35963EB2E27247C6AF2D987331956261--><AD_COLUMN>
-<!--35963EB2E27247C6AF2D987331956261-->  <AD_COLUMN_ID><![CDATA[35963EB2E27247C6AF2D987331956261]]></AD_COLUMN_ID>
-<!--35963EB2E27247C6AF2D987331956261-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--35963EB2E27247C6AF2D987331956261-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--35963EB2E27247C6AF2D987331956261-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--35963EB2E27247C6AF2D987331956261-->  <NAME><![CDATA[Organization]]></NAME>
-<!--35963EB2E27247C6AF2D987331956261-->  <COLUMNNAME><![CDATA[organization]]></COLUMNNAME>
-<!--35963EB2E27247C6AF2D987331956261-->  <AD_TABLE_ID><![CDATA[E4E42C1D2A3E433B85C3CC13C89AB6AA]]></AD_TABLE_ID>
-<!--35963EB2E27247C6AF2D987331956261-->  <AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID>
-<!--35963EB2E27247C6AF2D987331956261-->  <AD_REFERENCE_VALUE_ID><![CDATA[276]]></AD_REFERENCE_VALUE_ID>
-<!--35963EB2E27247C6AF2D987331956261-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
-<!--35963EB2E27247C6AF2D987331956261-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--35963EB2E27247C6AF2D987331956261-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--35963EB2E27247C6AF2D987331956261-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
-<!--35963EB2E27247C6AF2D987331956261-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--35963EB2E27247C6AF2D987331956261-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--35963EB2E27247C6AF2D987331956261-->  <SEQNO><![CDATA[60]]></SEQNO>
-<!--35963EB2E27247C6AF2D987331956261-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--35963EB2E27247C6AF2D987331956261-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--35963EB2E27247C6AF2D987331956261-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--35963EB2E27247C6AF2D987331956261-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--35963EB2E27247C6AF2D987331956261-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--35963EB2E27247C6AF2D987331956261-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--35963EB2E27247C6AF2D987331956261-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--35963EB2E27247C6AF2D987331956261-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--35963EB2E27247C6AF2D987331956261-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--35963EB2E27247C6AF2D987331956261-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--35963EB2E27247C6AF2D987331956261-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--35963EB2E27247C6AF2D987331956261-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--35963EB2E27247C6AF2D987331956261-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--35963EB2E27247C6AF2D987331956261--></AD_COLUMN>
-
 <!--385DE6A637CD4D788AB480B3D1369E4F--><AD_COLUMN>
 <!--385DE6A637CD4D788AB480B3D1369E4F-->  <AD_COLUMN_ID><![CDATA[385DE6A637CD4D788AB480B3D1369E4F]]></AD_COLUMN_ID>
 <!--385DE6A637CD4D788AB480B3D1369E4F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2878,38 +2814,6 @@
 <!--63454E73F07B4C908EB1268C41F5DE8A-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--63454E73F07B4C908EB1268C41F5DE8A--></AD_COLUMN>
 
-<!--658051DEBCFA45CE9BA6D6F802976BAA--><AD_COLUMN>
-<!--658051DEBCFA45CE9BA6D6F802976BAA-->  <AD_COLUMN_ID><![CDATA[658051DEBCFA45CE9BA6D6F802976BAA]]></AD_COLUMN_ID>
-<!--658051DEBCFA45CE9BA6D6F802976BAA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--658051DEBCFA45CE9BA6D6F802976BAA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--658051DEBCFA45CE9BA6D6F802976BAA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--658051DEBCFA45CE9BA6D6F802976BAA-->  <NAME><![CDATA[EDI Code]]></NAME>
-<!--658051DEBCFA45CE9BA6D6F802976BAA-->  <COLUMNNAME><![CDATA[eDICode]]></COLUMNNAME>
-<!--658051DEBCFA45CE9BA6D6F802976BAA-->  <AD_TABLE_ID><![CDATA[E4E42C1D2A3E433B85C3CC13C89AB6AA]]></AD_TABLE_ID>
-<!--658051DEBCFA45CE9BA6D6F802976BAA-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
-<!--658051DEBCFA45CE9BA6D6F802976BAA-->  <FIELDLENGTH><![CDATA[2]]></FIELDLENGTH>
-<!--658051DEBCFA45CE9BA6D6F802976BAA-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--658051DEBCFA45CE9BA6D6F802976BAA-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--658051DEBCFA45CE9BA6D6F802976BAA-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
-<!--658051DEBCFA45CE9BA6D6F802976BAA-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--658051DEBCFA45CE9BA6D6F802976BAA-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
-<!--658051DEBCFA45CE9BA6D6F802976BAA-->  <SEQNO><![CDATA[30]]></SEQNO>
-<!--658051DEBCFA45CE9BA6D6F802976BAA-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--658051DEBCFA45CE9BA6D6F802976BAA-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--658051DEBCFA45CE9BA6D6F802976BAA-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--658051DEBCFA45CE9BA6D6F802976BAA-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--658051DEBCFA45CE9BA6D6F802976BAA-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--658051DEBCFA45CE9BA6D6F802976BAA-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--658051DEBCFA45CE9BA6D6F802976BAA-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--658051DEBCFA45CE9BA6D6F802976BAA-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--658051DEBCFA45CE9BA6D6F802976BAA-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--658051DEBCFA45CE9BA6D6F802976BAA-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--658051DEBCFA45CE9BA6D6F802976BAA-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--658051DEBCFA45CE9BA6D6F802976BAA-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--658051DEBCFA45CE9BA6D6F802976BAA-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--658051DEBCFA45CE9BA6D6F802976BAA-->  <ENTITY_ALIAS><![CDATA[e.eDICode]]></ENTITY_ALIAS>
-<!--658051DEBCFA45CE9BA6D6F802976BAA--></AD_COLUMN>
-
 <!--670423B76C554A6C957A58F1DA4A6D98--><AD_COLUMN>
 <!--670423B76C554A6C957A58F1DA4A6D98-->  <AD_COLUMN_ID><![CDATA[670423B76C554A6C957A58F1DA4A6D98]]></AD_COLUMN_ID>
 <!--670423B76C554A6C957A58F1DA4A6D98-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -3404,38 +3308,6 @@
 <!--76C4D6CDF96B4CB5B80967475AA3D2A9-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--76C4D6CDF96B4CB5B80967475AA3D2A9--></AD_COLUMN>
 
-<!--780D3F75A96440D38803334E788C7498--><AD_COLUMN>
-<!--780D3F75A96440D38803334E788C7498-->  <AD_COLUMN_ID><![CDATA[780D3F75A96440D38803334E788C7498]]></AD_COLUMN_ID>
-<!--780D3F75A96440D38803334E788C7498-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--780D3F75A96440D38803334E788C7498-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--780D3F75A96440D38803334E788C7498-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--780D3F75A96440D38803334E788C7498-->  <NAME><![CDATA[Costing Precision]]></NAME>
-<!--780D3F75A96440D38803334E788C7498-->  <COLUMNNAME><![CDATA[costingPrecision]]></COLUMNNAME>
-<!--780D3F75A96440D38803334E788C7498-->  <AD_TABLE_ID><![CDATA[E4E42C1D2A3E433B85C3CC13C89AB6AA]]></AD_TABLE_ID>
-<!--780D3F75A96440D38803334E788C7498-->  <AD_REFERENCE_ID><![CDATA[11]]></AD_REFERENCE_ID>
-<!--780D3F75A96440D38803334E788C7498-->  <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
-<!--780D3F75A96440D38803334E788C7498-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--780D3F75A96440D38803334E788C7498-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--780D3F75A96440D38803334E788C7498-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
-<!--780D3F75A96440D38803334E788C7498-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--780D3F75A96440D38803334E788C7498-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--780D3F75A96440D38803334E788C7498-->  <SEQNO><![CDATA[40]]></SEQNO>
-<!--780D3F75A96440D38803334E788C7498-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--780D3F75A96440D38803334E788C7498-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--780D3F75A96440D38803334E788C7498-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--780D3F75A96440D38803334E788C7498-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--780D3F75A96440D38803334E788C7498-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--780D3F75A96440D38803334E788C7498-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--780D3F75A96440D38803334E788C7498-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--780D3F75A96440D38803334E788C7498-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--780D3F75A96440D38803334E788C7498-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--780D3F75A96440D38803334E788C7498-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--780D3F75A96440D38803334E788C7498-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--780D3F75A96440D38803334E788C7498-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--780D3F75A96440D38803334E788C7498-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--780D3F75A96440D38803334E788C7498-->  <ENTITY_ALIAS><![CDATA[e.costingPrecision]]></ENTITY_ALIAS>
-<!--780D3F75A96440D38803334E788C7498--></AD_COLUMN>
-
 <!--78A3367822B35459E040007F01012510--><AD_COLUMN>
 <!--78A3367822B35459E040007F01012510-->  <AD_COLUMN_ID><![CDATA[78A3367822B35459E040007F01012510]]></AD_COLUMN_ID>
 <!--78A3367822B35459E040007F01012510-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -7957,38 +7829,6 @@
 <!--A4EC0B42F0B34FF79A95BB469E5E5113-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A4EC0B42F0B34FF79A95BB469E5E5113--></AD_COLUMN>
 
-<!--A51D05FA572B48F4B454BB97F98F62EE--><AD_COLUMN>
-<!--A51D05FA572B48F4B454BB97F98F62EE-->  <AD_COLUMN_ID><![CDATA[A51D05FA572B48F4B454BB97F98F62EE]]></AD_COLUMN_ID>
-<!--A51D05FA572B48F4B454BB97F98F62EE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--A51D05FA572B48F4B454BB97F98F62EE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--A51D05FA572B48F4B454BB97F98F62EE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--A51D05FA572B48F4B454BB97F98F62EE-->  <NAME><![CDATA[Name]]></NAME>
-<!--A51D05FA572B48F4B454BB97F98F62EE-->  <COLUMNNAME><![CDATA[name]]></COLUMNNAME>
-<!--A51D05FA572B48F4B454BB97F98F62EE-->  <AD_TABLE_ID><![CDATA[E4E42C1D2A3E433B85C3CC13C89AB6AA]]></AD_TABLE_ID>
-<!--A51D05FA572B48F4B454BB97F98F62EE-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
-<!--A51D05FA572B48F4B454BB97F98F62EE-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
-<!--A51D05FA572B48F4B454BB97F98F62EE-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--A51D05FA572B48F4B454BB97F98F62EE-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--A51D05FA572B48F4B454BB97F98F62EE-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
-<!--A51D05FA572B48F4B454BB97F98F62EE-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--A51D05FA572B48F4B454BB97F98F62EE-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--A51D05FA572B48F4B454BB97F98F62EE-->  <SEQNO><![CDATA[20]]></SEQNO>
-<!--A51D05FA572B48F4B454BB97F98F62EE-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--A51D05FA572B48F4B454BB97F98F62EE-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--A51D05FA572B48F4B454BB97F98F62EE-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--A51D05FA572B48F4B454BB97F98F62EE-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--A51D05FA572B48F4B454BB97F98F62EE-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--A51D05FA572B48F4B454BB97F98F62EE-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--A51D05FA572B48F4B454BB97F98F62EE-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--A51D05FA572B48F4B454BB97F98F62EE-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--A51D05FA572B48F4B454BB97F98F62EE-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--A51D05FA572B48F4B454BB97F98F62EE-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--A51D05FA572B48F4B454BB97F98F62EE-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--A51D05FA572B48F4B454BB97F98F62EE-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--A51D05FA572B48F4B454BB97F98F62EE-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--A51D05FA572B48F4B454BB97F98F62EE-->  <ENTITY_ALIAS><![CDATA[e.name]]></ENTITY_ALIAS>
-<!--A51D05FA572B48F4B454BB97F98F62EE--></AD_COLUMN>
-
 <!--A6B405E9791D4BC685220C11CCA916C0--><AD_COLUMN>
 <!--A6B405E9791D4BC685220C11CCA916C0-->  <AD_COLUMN_ID><![CDATA[A6B405E9791D4BC685220C11CCA916C0]]></AD_COLUMN_ID>
 <!--A6B405E9791D4BC685220C11CCA916C0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -10262,39 +10102,6 @@
 <!--FEB149D92A0E4F9E9532F0F78A16B0A8-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--FEB149D92A0E4F9E9532F0F78A16B0A8--></AD_COLUMN>
 
-<!--FEF8282BB5714B5DB7ACD2622F40EEEF--><AD_COLUMN>
-<!--FEF8282BB5714B5DB7ACD2622F40EEEF-->  <AD_COLUMN_ID><![CDATA[FEF8282BB5714B5DB7ACD2622F40EEEF]]></AD_COLUMN_ID>
-<!--FEF8282BB5714B5DB7ACD2622F40EEEF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--FEF8282BB5714B5DB7ACD2622F40EEEF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--FEF8282BB5714B5DB7ACD2622F40EEEF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--FEF8282BB5714B5DB7ACD2622F40EEEF-->  <NAME><![CDATA[Client]]></NAME>
-<!--FEF8282BB5714B5DB7ACD2622F40EEEF-->  <COLUMNNAME><![CDATA[client]]></COLUMNNAME>
-<!--FEF8282BB5714B5DB7ACD2622F40EEEF-->  <AD_TABLE_ID><![CDATA[E4E42C1D2A3E433B85C3CC13C89AB6AA]]></AD_TABLE_ID>
-<!--FEF8282BB5714B5DB7ACD2622F40EEEF-->  <AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID>
-<!--FEF8282BB5714B5DB7ACD2622F40EEEF-->  <AD_REFERENCE_VALUE_ID><![CDATA[129]]></AD_REFERENCE_VALUE_ID>
-<!--FEF8282BB5714B5DB7ACD2622F40EEEF-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
-<!--FEF8282BB5714B5DB7ACD2622F40EEEF-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--FEF8282BB5714B5DB7ACD2622F40EEEF-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--FEF8282BB5714B5DB7ACD2622F40EEEF-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
-<!--FEF8282BB5714B5DB7ACD2622F40EEEF-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--FEF8282BB5714B5DB7ACD2622F40EEEF-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--FEF8282BB5714B5DB7ACD2622F40EEEF-->  <SEQNO><![CDATA[50]]></SEQNO>
-<!--FEF8282BB5714B5DB7ACD2622F40EEEF-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--FEF8282BB5714B5DB7ACD2622F40EEEF-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--FEF8282BB5714B5DB7ACD2622F40EEEF-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--FEF8282BB5714B5DB7ACD2622F40EEEF-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--FEF8282BB5714B5DB7ACD2622F40EEEF-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--FEF8282BB5714B5DB7ACD2622F40EEEF-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--FEF8282BB5714B5DB7ACD2622F40EEEF-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--FEF8282BB5714B5DB7ACD2622F40EEEF-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--FEF8282BB5714B5DB7ACD2622F40EEEF-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--FEF8282BB5714B5DB7ACD2622F40EEEF-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--FEF8282BB5714B5DB7ACD2622F40EEEF-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--FEF8282BB5714B5DB7ACD2622F40EEEF-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--FEF8282BB5714B5DB7ACD2622F40EEEF-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--FEF8282BB5714B5DB7ACD2622F40EEEF-->  <ENTITY_ALIAS><![CDATA[e.client]]></ENTITY_ALIAS>
-<!--FEF8282BB5714B5DB7ACD2622F40EEEF--></AD_COLUMN>
-
 <!--FF082FD594D64E958DB1CE24B011C97B--><AD_COLUMN>
 <!--FF082FD594D64E958DB1CE24B011C97B-->  <AD_COLUMN_ID><![CDATA[FF082FD594D64E958DB1CE24B011C97B]]></AD_COLUMN_ID>
 <!--FF082FD594D64E958DB1CE24B011C97B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml	Wed Apr 30 17:54:56 2014 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml	Mon May 05 11:02:51 2014 +0200
@@ -3091,32 +3091,6 @@
 <!--33DDD5700BEC4555B97870401877B31F-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--33DDD5700BEC4555B97870401877B31F--></AD_FIELD>
 
-<!--3435E42F9254469CA541E08AA085FD62--><AD_FIELD>
-<!--3435E42F9254469CA541E08AA085FD62-->  <AD_FIELD_ID><![CDATA[3435E42F9254469CA541E08AA085FD62]]></AD_FIELD_ID>
-<!--3435E42F9254469CA541E08AA085FD62-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--3435E42F9254469CA541E08AA085FD62-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--3435E42F9254469CA541E08AA085FD62-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--3435E42F9254469CA541E08AA085FD62-->  <NAME><![CDATA[id]]></NAME>
-<!--3435E42F9254469CA541E08AA085FD62-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--3435E42F9254469CA541E08AA085FD62-->  <AD_TAB_ID><![CDATA[CC4234FA517B4F8CAA58FF6C1E03FE1C]]></AD_TAB_ID>
-<!--3435E42F9254469CA541E08AA085FD62-->  <AD_COLUMN_ID><![CDATA[17A8B4AF0A884591BF50D57AF8472D13]]></AD_COLUMN_ID>
-<!--3435E42F9254469CA541E08AA085FD62-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--3435E42F9254469CA541E08AA085FD62-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
-<!--3435E42F9254469CA541E08AA085FD62-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
-<!--3435E42F9254469CA541E08AA085FD62-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--3435E42F9254469CA541E08AA085FD62-->  <SEQNO><![CDATA[70]]></SEQNO>
-<!--3435E42F9254469CA541E08AA085FD62-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--3435E42F9254469CA541E08AA085FD62-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--3435E42F9254469CA541E08AA085FD62-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--3435E42F9254469CA541E08AA085FD62-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
-<!--3435E42F9254469CA541E08AA085FD62-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--3435E42F9254469CA541E08AA085FD62-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--3435E42F9254469CA541E08AA085FD62-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--3435E42F9254469CA541E08AA085FD62-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--3435E42F9254469CA541E08AA085FD62-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--3435E42F9254469CA541E08AA085FD62-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
-<!--3435E42F9254469CA541E08AA085FD62--></AD_FIELD>
-
 <!--344DBD51F19444C3A50D67480A4925B7--><AD_FIELD>
 <!--344DBD51F19444C3A50D67480A4925B7-->  <AD_FIELD_ID><![CDATA[344DBD51F19444C3A50D67480A4925B7]]></AD_FIELD_ID>
 <!--344DBD51F19444C3A50D67480A4925B7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -6253,32 +6227,6 @@
 <!--5E7451300D254B11B582F0FBA8F11D2A-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--5E7451300D254B11B582F0FBA8F11D2A--></AD_FIELD>
 
-<!--5EE2496C688146D88A2E205640E52E01--><AD_FIELD>
-<!--5EE2496C688146D88A2E205640E52E01-->  <AD_FIELD_ID><![CDATA[5EE2496C688146D88A2E205640E52E01]]></AD_FIELD_ID>
-<!--5EE2496C688146D88A2E205640E52E01-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--5EE2496C688146D88A2E205640E52E01-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--5EE2496C688146D88A2E205640E52E01-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--5EE2496C688146D88A2E205640E52E01-->  <NAME><![CDATA[EDI Code]]></NAME>
-<!--5EE2496C688146D88A2E205640E52E01-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--5EE2496C688146D88A2E205640E52E01-->  <AD_TAB_ID><![CDATA[CC4234FA517B4F8CAA58FF6C1E03FE1C]]></AD_TAB_ID>
-<!--5EE2496C688146D88A2E205640E52E01-->  <AD_COLUMN_ID><![CDATA[658051DEBCFA45CE9BA6D6F802976BAA]]></AD_COLUMN_ID>
-<!--5EE2496C688146D88A2E205640E52E01-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--5EE2496C688146D88A2E205640E52E01-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--5EE2496C688146D88A2E205640E52E01-->  <DISPLAYLENGTH><![CDATA[2]]></DISPLAYLENGTH>
-<!--5EE2496C688146D88A2E205640E52E01-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--5EE2496C688146D88A2E205640E52E01-->  <SEQNO><![CDATA[50]]></SEQNO>
-<!--5EE2496C688146D88A2E205640E52E01-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--5EE2496C688146D88A2E205640E52E01-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--5EE2496C688146D88A2E205640E52E01-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--5EE2496C688146D88A2E205640E52E01-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
-<!--5EE2496C688146D88A2E205640E52E01-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--5EE2496C688146D88A2E205640E52E01-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--5EE2496C688146D88A2E205640E52E01-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--5EE2496C688146D88A2E205640E52E01-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--5EE2496C688146D88A2E205640E52E01-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--5EE2496C688146D88A2E205640E52E01-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
-<!--5EE2496C688146D88A2E205640E52E01--></AD_FIELD>
-
 <!--5FB03B43C29548D491D2489CEA2B5DCC--><AD_FIELD>
 <!--5FB03B43C29548D491D2489CEA2B5DCC-->  <AD_FIELD_ID><![CDATA[5FB03B43C29548D491D2489CEA2B5DCC]]></AD_FIELD_ID>
 <!--5FB03B43C29548D491D2489CEA2B5DCC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -7762,32 +7710,6 @@
 <!--74BA3651D26349AEA134E0CB79CC3A61-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--74BA3651D26349AEA134E0CB79CC3A61--></AD_FIELD>
 
-<!--75EC5D94C4D94307BAA42AE7A3E6A042--><AD_FIELD>
-<!--75EC5D94C4D94307BAA42AE7A3E6A042-->  <AD_FIELD_ID><![CDATA[75EC5D94C4D94307BAA42AE7A3E6A042]]></AD_FIELD_ID>
-<!--75EC5D94C4D94307BAA42AE7A3E6A042-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--75EC5D94C4D94307BAA42AE7A3E6A042-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--75EC5D94C4D94307BAA42AE7A3E6A042-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--75EC5D94C4D94307BAA42AE7A3E6A042-->  <NAME><![CDATA[Client]]></NAME>
-<!--75EC5D94C4D94307BAA42AE7A3E6A042-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--75EC5D94C4D94307BAA42AE7A3E6A042-->  <AD_TAB_ID><![CDATA[CC4234FA517B4F8CAA58FF6C1E03FE1C]]></AD_TAB_ID>
-<!--75EC5D94C4D94307BAA42AE7A3E6A042-->  <AD_COLUMN_ID><![CDATA[FEF8282BB5714B5DB7ACD2622F40EEEF]]></AD_COLUMN_ID>
-<!--75EC5D94C4D94307BAA42AE7A3E6A042-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--75EC5D94C4D94307BAA42AE7A3E6A042-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--75EC5D94C4D94307BAA42AE7A3E6A042-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
-<!--75EC5D94C4D94307BAA42AE7A3E6A042-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--75EC5D94C4D94307BAA42AE7A3E6A042-->  <SEQNO><![CDATA[30]]></SEQNO>
-<!--75EC5D94C4D94307BAA42AE7A3E6A042-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--75EC5D94C4D94307BAA42AE7A3E6A042-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--75EC5D94C4D94307BAA42AE7A3E6A042-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--75EC5D94C4D94307BAA42AE7A3E6A042-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
-<!--75EC5D94C4D94307BAA42AE7A3E6A042-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--75EC5D94C4D94307BAA42AE7A3E6A042-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--75EC5D94C4D94307BAA42AE7A3E6A042-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--75EC5D94C4D94307BAA42AE7A3E6A042-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--75EC5D94C4D94307BAA42AE7A3E6A042-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--75EC5D94C4D94307BAA42AE7A3E6A042-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
-<!--75EC5D94C4D94307BAA42AE7A3E6A042--></AD_FIELD>
-
 <!--762F50D5DFA74180B0E88B3FCBFE13DE--><AD_FIELD>
 <!--762F50D5DFA74180B0E88B3FCBFE13DE-->  <AD_FIELD_ID><![CDATA[762F50D5DFA74180B0E88B3FCBFE13DE]]></AD_FIELD_ID>
 <!--762F50D5DFA74180B0E88B3FCBFE13DE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -9349,32 +9271,6 @@
 <!--80D55E34FCEE37C9E040007F01001C25-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--80D55E34FCEE37C9E040007F01001C25--></AD_FIELD>
 
-<!--81338AF04C7940CEBBCC5ADFBC8F638F--><AD_FIELD>
-<!--81338AF04C7940CEBBCC5ADFBC8F638F-->  <AD_FIELD_ID><![CDATA[81338AF04C7940CEBBCC5ADFBC8F638F]]></AD_FIELD_ID>
-<!--81338AF04C7940CEBBCC5ADFBC8F638F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--81338AF04C7940CEBBCC5ADFBC8F638F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--81338AF04C7940CEBBCC5ADFBC8F638F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--81338AF04C7940CEBBCC5ADFBC8F638F-->  <NAME><![CDATA[Name]]></NAME>
-<!--81338AF04C7940CEBBCC5ADFBC8F638F-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--81338AF04C7940CEBBCC5ADFBC8F638F-->  <AD_TAB_ID><![CDATA[CC4234FA517B4F8CAA58FF6C1E03FE1C]]></AD_TAB_ID>
-<!--81338AF04C7940CEBBCC5ADFBC8F638F-->  <AD_COLUMN_ID><![CDATA[A51D05FA572B48F4B454BB97F98F62EE]]></AD_COLUMN_ID>
-<!--81338AF04C7940CEBBCC5ADFBC8F638F-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--81338AF04C7940CEBBCC5ADFBC8F638F-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--81338AF04C7940CEBBCC5ADFBC8F638F-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
-<!--81338AF04C7940CEBBCC5ADFBC8F638F-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--81338AF04C7940CEBBCC5ADFBC8F638F-->  <SEQNO><![CDATA[60]]></SEQNO>
-<!--81338AF04C7940CEBBCC5ADFBC8F638F-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--81338AF04C7940CEBBCC5ADFBC8F638F-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--81338AF04C7940CEBBCC5ADFBC8F638F-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--81338AF04C7940CEBBCC5ADFBC8F638F-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
-<!--81338AF04C7940CEBBCC5ADFBC8F638F-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--81338AF04C7940CEBBCC5ADFBC8F638F-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--81338AF04C7940CEBBCC5ADFBC8F638F-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--81338AF04C7940CEBBCC5ADFBC8F638F-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--81338AF04C7940CEBBCC5ADFBC8F638F-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--81338AF04C7940CEBBCC5ADFBC8F638F-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
-<!--81338AF04C7940CEBBCC5ADFBC8F638F--></AD_FIELD>
-
 <!--8181A5437B57457C90A4463B680D0111--><AD_FIELD>
 <!--8181A5437B57457C90A4463B680D0111-->  <AD_FIELD_ID><![CDATA[8181A5437B57457C90A4463B680D0111]]></AD_FIELD_ID>
 <!--8181A5437B57457C90A4463B680D0111-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -16471,32 +16367,6 @@
 <!--B5EC7451D85F43C2A71AA09E0CFC9897-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--B5EC7451D85F43C2A71AA09E0CFC9897--></AD_FIELD>
 
-<!--B6237A5556BC4E3F985BB206F9EE01F4--><AD_FIELD>
-<!--B6237A5556BC4E3F985BB206F9EE01F4-->  <AD_FIELD_ID><![CDATA[B6237A5556BC4E3F985BB206F9EE01F4]]></AD_FIELD_ID>
-<!--B6237A5556BC4E3F985BB206F9EE01F4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--B6237A5556BC4E3F985BB206F9EE01F4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--B6237A5556BC4E3F985BB206F9EE01F4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--B6237A5556BC4E3F985BB206F9EE01F4-->  <NAME><![CDATA[Organization]]></NAME>
-<!--B6237A5556BC4E3F985BB206F9EE01F4-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--B6237A5556BC4E3F985BB206F9EE01F4-->  <AD_TAB_ID><![CDATA[CC4234FA517B4F8CAA58FF6C1E03FE1C]]></AD_TAB_ID>
-<!--B6237A5556BC4E3F985BB206F9EE01F4-->  <AD_COLUMN_ID><![CDATA[35963EB2E27247C6AF2D987331956261]]></AD_COLUMN_ID>
-<!--B6237A5556BC4E3F985BB206F9EE01F4-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--B6237A5556BC4E3F985BB206F9EE01F4-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--B6237A5556BC4E3F985BB206F9EE01F4-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
-<!--B6237A5556BC4E3F985BB206F9EE01F4-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--B6237A5556BC4E3F985BB206F9EE01F4-->  <SEQNO><![CDATA[20]]></SEQNO>
-<!--B6237A5556BC4E3F985BB206F9EE01F4-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--B6237A5556BC4E3F985BB206F9EE01F4-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--B6237A5556BC4E3F985BB206F9EE01F4-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--B6237A5556BC4E3F985BB206F9EE01F4-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
-<!--B6237A5556BC4E3F985BB206F9EE01F4-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--B6237A5556BC4E3F985BB206F9EE01F4-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--B6237A5556BC4E3F985BB206F9EE01F4-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--B6237A5556BC4E3F985BB206F9EE01F4-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--B6237A5556BC4E3F985BB206F9EE01F4-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--B6237A5556BC4E3F985BB206F9EE01F4-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
-<!--B6237A5556BC4E3F985BB206F9EE01F4--></AD_FIELD>
-
 <!--B62C63760FA84CCDB4E6B056A7AA5EBE--><AD_FIELD>
 <!--B62C63760FA84CCDB4E6B056A7AA5EBE-->  <AD_FIELD_ID><![CDATA[B62C63760FA84CCDB4E6B056A7AA5EBE]]></AD_FIELD_ID>
 <!--B62C63760FA84CCDB4E6B056A7AA5EBE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -20183,32 +20053,6 @@
 <!--EDA2BCAC69ED4168A72632F257E79568-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--EDA2BCAC69ED4168A72632F257E79568--></AD_FIELD>
 
-<!--EDA4EA85DA6E4AE1AD21C1AC1A3EFF2C--><AD_FIELD>
-<!--EDA4EA85DA6E4AE1AD21C1AC1A3EFF2C-->  <AD_FIELD_ID><![CDATA[EDA4EA85DA6E4AE1AD21C1AC1A3EFF2C]]></AD_FIELD_ID>
-<!--EDA4EA85DA6E4AE1AD21C1AC1A3EFF2C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--EDA4EA85DA6E4AE1AD21C1AC1A3EFF2C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--EDA4EA85DA6E4AE1AD21C1AC1A3EFF2C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--EDA4EA85DA6E4AE1AD21C1AC1A3EFF2C-->  <NAME><![CDATA[Costing Precision]]></NAME>
-<!--EDA4EA85DA6E4AE1AD21C1AC1A3EFF2C-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--EDA4EA85DA6E4AE1AD21C1AC1A3EFF2C-->  <AD_TAB_ID><![CDATA[CC4234FA517B4F8CAA58FF6C1E03FE1C]]></AD_TAB_ID>
-<!--EDA4EA85DA6E4AE1AD21C1AC1A3EFF2C-->  <AD_COLUMN_ID><![CDATA[780D3F75A96440D38803334E788C7498]]></AD_COLUMN_ID>
-<!--EDA4EA85DA6E4AE1AD21C1AC1A3EFF2C-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--EDA4EA85DA6E4AE1AD21C1AC1A3EFF2C-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--EDA4EA85DA6E4AE1AD21C1AC1A3EFF2C-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
-<!--EDA4EA85DA6E4AE1AD21C1AC1A3EFF2C-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--EDA4EA85DA6E4AE1AD21C1AC1A3EFF2C-->  <SEQNO><![CDATA[40]]></SEQNO>
-<!--EDA4EA85DA6E4AE1AD21C1AC1A3EFF2C-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--EDA4EA85DA6E4AE1AD21C1AC1A3EFF2C-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--EDA4EA85DA6E4AE1AD21C1AC1A3EFF2C-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--EDA4EA85DA6E4AE1AD21C1AC1A3EFF2C-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
-<!--EDA4EA85DA6E4AE1AD21C1AC1A3EFF2C-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--EDA4EA85DA6E4AE1AD21C1AC1A3EFF2C-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--EDA4EA85DA6E4AE1AD21C1AC1A3EFF2C-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--EDA4EA85DA6E4AE1AD21C1AC1A3EFF2C-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--EDA4EA85DA6E4AE1AD21C1AC1A3EFF2C-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--EDA4EA85DA6E4AE1AD21C1AC1A3EFF2C-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
-<!--EDA4EA85DA6E4AE1AD21C1AC1A3EFF2C--></AD_FIELD>
-
 <!--EDD729A0C5F448F0AE9749490A293571--><AD_FIELD>
 <!--EDD729A0C5F448F0AE9749490A293571-->  <AD_FIELD_ID><![CDATA[EDD729A0C5F448F0AE9749490A293571]]></AD_FIELD_ID>
 <!--EDD729A0C5F448F0AE9749490A293571-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MENU.xml	Wed Apr 30 17:54:56 2014 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MENU.xml	Mon May 05 11:02:51 2014 +0200
@@ -13,18 +13,6 @@
 <!--125E6EAD650841F69E2601C78F558AA1-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--125E6EAD650841F69E2601C78F558AA1--></AD_MENU>
 
-<!--3D505B4F14CB402CB8D702D0207001D9--><AD_MENU>
-<!--3D505B4F14CB402CB8D702D0207001D9-->  <AD_MENU_ID><![CDATA[3D505B4F14CB402CB8D702D0207001D9]]></AD_MENU_ID>
-<!--3D505B4F14CB402CB8D702D0207001D9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--3D505B4F14CB402CB8D702D0207001D9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--3D505B4F14CB402CB8D702D0207001D9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--3D505B4F14CB402CB8D702D0207001D9-->  <NAME><![CDATA[APRM HQL UOM]]></NAME>
-<!--3D505B4F14CB402CB8D702D0207001D9-->  <ISSUMMARY><![CDATA[N]]></ISSUMMARY>
-<!--3D505B4F14CB402CB8D702D0207001D9-->  <ACTION><![CDATA[W]]></ACTION>
-<!--3D505B4F14CB402CB8D702D0207001D9-->  <AD_WINDOW_ID><![CDATA[4A22A00D0FAA45A39D6087C581C5073A]]></AD_WINDOW_ID>
-<!--3D505B4F14CB402CB8D702D0207001D9-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--3D505B4F14CB402CB8D702D0207001D9--></AD_MENU>
-
 <!--57DA6BAE74334B5B81A0AD05256C1B34--><AD_MENU>
 <!--57DA6BAE74334B5B81A0AD05256C1B34-->  <AD_MENU_ID><![CDATA[57DA6BAE74334B5B81A0AD05256C1B34]]></AD_MENU_ID>
 <!--57DA6BAE74334B5B81A0AD05256C1B34-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml	Wed Apr 30 17:54:56 2014 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml	Mon May 05 11:02:51 2014 +0200
@@ -36,18 +36,6 @@
 <!--1221BEA5C19F4FA89D3565CA8877A82E-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
 <!--1221BEA5C19F4FA89D3565CA8877A82E--></AD_REFERENCE>
 
-<!--128682630C9142ACAA45F533E333CA55--><AD_REFERENCE>
-<!--128682630C9142ACAA45F533E333CA55-->  <AD_REFERENCE_ID><![CDATA[128682630C9142ACAA45F533E333CA55]]></AD_REFERENCE_ID>
-<!--128682630C9142ACAA45F533E333CA55-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--128682630C9142ACAA45F533E333CA55-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--128682630C9142ACAA45F533E333CA55-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--128682630C9142ACAA45F533E333CA55-->  <NAME><![CDATA[APRM HQL UOM]]></NAME>
-<!--128682630C9142ACAA45F533E333CA55-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--128682630C9142ACAA45F533E333CA55-->  <ISBASEREFERENCE><![CDATA[N]]></ISBASEREFERENCE>
-<!--128682630C9142ACAA45F533E333CA55-->  <PARENTREFERENCE_ID><![CDATA[FF80818132D8F0F30132D9BC395D0038]]></PARENTREFERENCE_ID>
-<!--128682630C9142ACAA45F533E333CA55-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
-<!--128682630C9142ACAA45F533E333CA55--></AD_REFERENCE>
-
 <!--1543EE40981840C3929CBC16320FE155--><AD_REFERENCE>
 <!--1543EE40981840C3929CBC16320FE155-->  <AD_REFERENCE_ID><![CDATA[1543EE40981840C3929CBC16320FE155]]></AD_REFERENCE_ID>
 <!--1543EE40981840C3929CBC16320FE155-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml	Wed Apr 30 17:54:56 2014 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml	Mon May 05 11:02:51 2014 +0200
@@ -594,33 +594,6 @@
 <!--C095D2CC39704DBE8B906B7CD7710968-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
 <!--C095D2CC39704DBE8B906B7CD7710968--></AD_TAB>
 
-<!--CC4234FA517B4F8CAA58FF6C1E03FE1C--><AD_TAB>
-<!--CC4234FA517B4F8CAA58FF6C1E03FE1C-->  <AD_TAB_ID><![CDATA[CC4234FA517B4F8CAA58FF6C1E03FE1C]]></AD_TAB_ID>
-<!--CC4234FA517B4F8CAA58FF6C1E03FE1C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--CC4234FA517B4F8CAA58FF6C1E03FE1C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--CC4234FA517B4F8CAA58FF6C1E03FE1C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--CC4234FA517B4F8CAA58FF6C1E03FE1C-->  <NAME><![CDATA[APRM HQL UOM]]></NAME>
-<!--CC4234FA517B4F8CAA58FF6C1E03FE1C-->  <AD_TABLE_ID><![CDATA[E4E42C1D2A3E433B85C3CC13C89AB6AA]]></AD_TABLE_ID>
-<!--CC4234FA517B4F8CAA58FF6C1E03FE1C-->  <AD_WINDOW_ID><![CDATA[4A22A00D0FAA45A39D6087C581C5073A]]></AD_WINDOW_ID>
-<!--CC4234FA517B4F8CAA58FF6C1E03FE1C-->  <SEQNO><![CDATA[10]]></SEQNO>
-<!--CC4234FA517B4F8CAA58FF6C1E03FE1C-->  <TABLEVEL><![CDATA[0]]></TABLEVEL>
-<!--CC4234FA517B4F8CAA58FF6C1E03FE1C-->  <ISSINGLEROW><![CDATA[N]]></ISSINGLEROW>
-<!--CC4234FA517B4F8CAA58FF6C1E03FE1C-->  <ISINFOTAB><![CDATA[N]]></ISINFOTAB>
-<!--CC4234FA517B4F8CAA58FF6C1E03FE1C-->  <ISTRANSLATIONTAB><![CDATA[N]]></ISTRANSLATIONTAB>
-<!--CC4234FA517B4F8CAA58FF6C1E03FE1C-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--CC4234FA517B4F8CAA58FF6C1E03FE1C-->  <HASTREE><![CDATA[N]]></HASTREE>
-<!--CC4234FA517B4F8CAA58FF6C1E03FE1C-->  <PROCESSING><![CDATA[N]]></PROCESSING>
-<!--CC4234FA517B4F8CAA58FF6C1E03FE1C-->  <IMPORTFIELDS><![CDATA[N]]></IMPORTFIELDS>
-<!--CC4234FA517B4F8CAA58FF6C1E03FE1C-->  <ISSORTTAB><![CDATA[N]]></ISSORTTAB>
-<!--CC4234FA517B4F8CAA58FF6C1E03FE1C-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--CC4234FA517B4F8CAA58FF6C1E03FE1C-->  <UIPATTERN><![CDATA[RO]]></UIPATTERN>
-<!--CC4234FA517B4F8CAA58FF6C1E03FE1C-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
-<!--CC4234FA517B4F8CAA58FF6C1E03FE1C-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
-<!--CC4234FA517B4F8CAA58FF6C1E03FE1C-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
-<!--CC4234FA517B4F8CAA58FF6C1E03FE1C-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
-<!--CC4234FA517B4F8CAA58FF6C1E03FE1C-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
-<!--CC4234FA517B4F8CAA58FF6C1E03FE1C--></AD_TAB>
-
 <!--D4D450A66C754D65940DBC36B11779C8--><AD_TAB>
 <!--D4D450A66C754D65940DBC36B11779C8-->  <AD_TAB_ID><![CDATA[D4D450A66C754D65940DBC36B11779C8]]></AD_TAB_ID>
 <!--D4D450A66C754D65940DBC36B11779C8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TABLE.xml	Wed Apr 30 17:54:56 2014 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TABLE.xml	Mon May 05 11:02:51 2014 +0200
@@ -184,31 +184,6 @@
 <!--DC814AB3BC84486CA5411131724BC95A-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--DC814AB3BC84486CA5411131724BC95A--></AD_TABLE>
 
-<!--E4E42C1D2A3E433B85C3CC13C89AB6AA--><AD_TABLE>
-<!--E4E42C1D2A3E433B85C3CC13C89AB6AA-->  <AD_TABLE_ID><![CDATA[E4E42C1D2A3E433B85C3CC13C89AB6AA]]></AD_TABLE_ID>
-<!--E4E42C1D2A3E433B85C3CC13C89AB6AA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--E4E42C1D2A3E433B85C3CC13C89AB6AA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--E4E42C1D2A3E433B85C3CC13C89AB6AA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--E4E42C1D2A3E433B85C3CC13C89AB6AA-->  <NAME><![CDATA[aprm_testhql]]></NAME>
-<!--E4E42C1D2A3E433B85C3CC13C89AB6AA-->  <TABLENAME><![CDATA[aprm_testhql]]></TABLENAME>
-<!--E4E42C1D2A3E433B85C3CC13C89AB6AA-->  <ISVIEW><![CDATA[N]]></ISVIEW>
-<!--E4E42C1D2A3E433B85C3CC13C89AB6AA-->  <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
-<!--E4E42C1D2A3E433B85C3CC13C89AB6AA-->  <ISSECURITYENABLED><![CDATA[N]]></ISSECURITYENABLED>
-<!--E4E42C1D2A3E433B85C3CC13C89AB6AA-->  <ISDELETEABLE><![CDATA[Y]]></ISDELETEABLE>
-<!--E4E42C1D2A3E433B85C3CC13C89AB6AA-->  <ISHIGHVOLUME><![CDATA[N]]></ISHIGHVOLUME>
-<!--E4E42C1D2A3E433B85C3CC13C89AB6AA-->  <IMPORTTABLE><![CDATA[N]]></IMPORTTABLE>
-<!--E4E42C1D2A3E433B85C3CC13C89AB6AA-->  <ISCHANGELOG><![CDATA[N]]></ISCHANGELOG>
-<!--E4E42C1D2A3E433B85C3CC13C89AB6AA-->  <ISDEFAULTACCT><![CDATA[N]]></ISDEFAULTACCT>
-<!--E4E42C1D2A3E433B85C3CC13C89AB6AA-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--E4E42C1D2A3E433B85C3CC13C89AB6AA-->  <AD_PACKAGE_ID><![CDATA[AC33B2262748414A816510545755435A]]></AD_PACKAGE_ID>
-<!--E4E42C1D2A3E433B85C3CC13C89AB6AA-->  <DATAORIGINTYPE><![CDATA[HQL]]></DATAORIGINTYPE>
-<!--E4E42C1D2A3E433B85C3CC13C89AB6AA-->  <ISTREE><![CDATA[N]]></ISTREE>
-<!--E4E42C1D2A3E433B85C3CC13C89AB6AA-->  <HQLQUERY><![CDATA[select e.id, e.name, e.eDICode, e.costingPrecision, e.client, e.client.organization
-from UOM as e
-where @additional_filters@]]></HQLQUERY>
-<!--E4E42C1D2A3E433B85C3CC13C89AB6AA-->  <ENTITY_ALIAS><![CDATA[e]]></ENTITY_ALIAS>
-<!--E4E42C1D2A3E433B85C3CC13C89AB6AA--></AD_TABLE>
-
 <!--FF8080812FFEC82D012FFECCE3400030--><AD_TABLE>
 <!--FF8080812FFEC82D012FFECCE3400030-->  <AD_TABLE_ID><![CDATA[FF8080812FFEC82D012FFECCE3400030]]></AD_TABLE_ID>
 <!--FF8080812FFEC82D012FFECCE3400030-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TREENODE.xml	Wed Apr 30 17:54:56 2014 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TREENODE.xml	Mon May 05 11:02:51 2014 +0200
@@ -44,17 +44,6 @@
 <!--3FD746883F8840E1BED768193D141802-->  <SEQNO><![CDATA[140]]></SEQNO>
 <!--3FD746883F8840E1BED768193D141802--></AD_TREENODE>
 
-<!--5C70ED9AD27C46119FDF625280C69325--><AD_TREENODE>
-<!--5C70ED9AD27C46119FDF625280C69325-->  <AD_TREENODE_ID><![CDATA[5C70ED9AD27C46119FDF625280C69325]]></AD_TREENODE_ID>
-<!--5C70ED9AD27C46119FDF625280C69325-->  <AD_TREE_ID><![CDATA[10]]></AD_TREE_ID>
-<!--5C70ED9AD27C46119FDF625280C69325-->  <NODE_ID><![CDATA[3D505B4F14CB402CB8D702D0207001D9]]></NODE_ID>
-<!--5C70ED9AD27C46119FDF625280C69325-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--5C70ED9AD27C46119FDF625280C69325-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--5C70ED9AD27C46119FDF625280C69325-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--5C70ED9AD27C46119FDF625280C69325-->  <PARENT_ID><![CDATA[0]]></PARENT_ID>
-<!--5C70ED9AD27C46119FDF625280C69325-->  <SEQNO><![CDATA[999]]></SEQNO>
-<!--5C70ED9AD27C46119FDF625280C69325--></AD_TREENODE>
-
 <!--5E9BF82654A14831A72FD96432F48791--><AD_TREENODE>
 <!--5E9BF82654A14831A72FD96432F48791-->  <AD_TREENODE_ID><![CDATA[5E9BF82654A14831A72FD96432F48791]]></AD_TREENODE_ID>
 <!--5E9BF82654A14831A72FD96432F48791-->  <AD_TREE_ID><![CDATA[10]]></AD_TREE_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_WINDOW.xml	Wed Apr 30 17:54:56 2014 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_WINDOW.xml	Mon May 05 11:02:51 2014 +0200
@@ -15,21 +15,6 @@
 <!--17BE11F1C49547048F9D29E6C95BB67E-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--17BE11F1C49547048F9D29E6C95BB67E--></AD_WINDOW>
 
-<!--4A22A00D0FAA45A39D6087C581C5073A--><AD_WINDOW>
-<!--4A22A00D0FAA45A39D6087C581C5073A-->  <AD_WINDOW_ID><![CDATA[4A22A00D0FAA45A39D6087C581C5073A]]></AD_WINDOW_ID>
-<!--4A22A00D0FAA45A39D6087C581C5073A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--4A22A00D0FAA45A39D6087C581C5073A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--4A22A00D0FAA45A39D6087C581C5073A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--4A22A00D0FAA45A39D6087C581C5073A-->  <NAME><![CDATA[APRM HQL UOM]]></NAME>
-<!--4A22A00D0FAA45A39D6087C581C5073A-->  <WINDOWTYPE><![CDATA[M]]></WINDOWTYPE>
-<!--4A22A00D0FAA45A39D6087C581C5073A-->  <ISSOTRX><![CDATA[Y]]></ISSOTRX>
-<!--4A22A00D0FAA45A39D6087C581C5073A-->  <PROCESSING><![CDATA[N]]></PROCESSING>
-<!--4A22A00D0FAA45A39D6087C581C5073A-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
-<!--4A22A00D0FAA45A39D6087C581C5073A-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--4A22A00D0FAA45A39D6087C581C5073A-->  <ISTHREADSAFE><![CDATA[N]]></ISTHREADSAFE>
-<!--4A22A00D0FAA45A39D6087C581C5073A-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
-<!--4A22A00D0FAA45A39D6087C581C5073A--></AD_WINDOW>
-
 <!--4A35B1C57B4243F4A1E42D882C8DDA3D--><AD_WINDOW>
 <!--4A35B1C57B4243F4A1E42D882C8DDA3D-->  <AD_WINDOW_ID><![CDATA[4A35B1C57B4243F4A1E42D882C8DDA3D]]></AD_WINDOW_ID>
 <!--4A35B1C57B4243F4A1E42D882C8DDA3D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_REF_WINDOW.xml	Wed Apr 30 17:54:56 2014 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_REF_WINDOW.xml	Mon May 05 11:02:51 2014 +0200
@@ -18,15 +18,6 @@
 <!--0B6086CBCBFC4D0881B619A8E886DC91-->  <AD_WINDOW_ID><![CDATA[17BE11F1C49547048F9D29E6C95BB67E]]></AD_WINDOW_ID>
 <!--0B6086CBCBFC4D0881B619A8E886DC91--></OBUIAPP_REF_WINDOW>
 
-<!--356A36B638F34DA6B450E6B75353841F--><OBUIAPP_REF_WINDOW>
-<!--356A36B638F34DA6B450E6B75353841F-->  <OBUIAPP_REF_WINDOW_ID><![CDATA[356A36B638F34DA6B450E6B75353841F]]></OBUIAPP_REF_WINDOW_ID>
-<!--356A36B638F34DA6B450E6B75353841F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--356A36B638F34DA6B450E6B75353841F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--356A36B638F34DA6B450E6B75353841F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--356A36B638F34DA6B450E6B75353841F-->  <AD_REFERENCE_ID><![CDATA[128682630C9142ACAA45F533E333CA55]]></AD_REFERENCE_ID>
-<!--356A36B638F34DA6B450E6B75353841F-->  <AD_WINDOW_ID><![CDATA[4A22A00D0FAA45A39D6087C581C5073A]]></AD_WINDOW_ID>
-<!--356A36B638F34DA6B450E6B75353841F--></OBUIAPP_REF_WINDOW>
-
 <!--6F4B972A4EF541EC9CD107A71BE205FA--><OBUIAPP_REF_WINDOW>
 <!--6F4B972A4EF541EC9CD107A71BE205FA-->  <OBUIAPP_REF_WINDOW_ID><![CDATA[6F4B972A4EF541EC9CD107A71BE205FA]]></OBUIAPP_REF_WINDOW_ID>
 <!--6F4B972A4EF541EC9CD107A71BE205FA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/datasource/GLItemDatasource.java	Wed Apr 30 17:54:56 2014 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/datasource/GLItemDatasource.java	Mon May 05 11:02:51 2014 +0200
@@ -1,26 +1,16 @@
 package org.openbravo.advpaymentmngt.datasource;
 
-import java.math.BigInteger;
 import java.util.ArrayList;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import org.codehaus.jettison.json.JSONArray;
 import org.codehaus.jettison.json.JSONException;
 import org.codehaus.jettison.json.JSONObject;
-import org.hibernate.SQLQuery;
 import org.openbravo.base.model.Entity;
 import org.openbravo.base.model.ModelProvider;
-import org.openbravo.base.provider.OBProvider;
-import org.openbravo.common.datasource.ReturnFromCustomerPickEditLineRow;
-import org.openbravo.dal.core.OBContext;
-import org.openbravo.dal.service.OBDal;
 import org.openbravo.service.datasource.DefaultDataSourceService;
-import org.openbravo.service.json.DataToJsonConverter;
 import org.openbravo.service.json.JsonConstants;
-import org.openbravo.service.json.JsonUtils;
 
 public class GLItemDatasource extends DefaultDataSourceService {
 
@@ -61,384 +51,4 @@
     return content;
 
   }
-
-  private int getCount(Map<String, String> parameters) {
-    SQLQuery qry = null;
-    if (parameters.get(JsonConstants.DISTINCT_PARAMETER) != null) {
-      qry = OBDal.getInstance().getSession().createSQLQuery(getCountProductQuery(parameters));
-    } else {
-      qry = OBDal.getInstance().getSession().createSQLQuery(getSQLCountQuery(parameters));
-    }
-    OBDal.getInstance().getSession().createSQLQuery(getSQLCountQuery(parameters));
-    BigInteger count = (BigInteger) qry.uniqueResult();
-    return count.intValue();
-  }
-
-  private List<JSONObject> fetchJSONObject(Map<String, String> parameters) {
-    final String startRowStr = parameters.get(JsonConstants.STARTROW_PARAMETER);
-    final String endRowStr = parameters.get(JsonConstants.ENDROW_PARAMETER);
-    int startRow = -1;
-    int endRow = -1;
-    if (startRowStr != null) {
-      startRow = Integer.parseInt(startRowStr);
-    }
-    if (endRowStr != null) {
-      endRow = Integer.parseInt(endRowStr);
-    }
-    final List<Map<String, Object>> data = getData(parameters, startRow, endRow);
-    final DataToJsonConverter toJsonConverter = OBProvider.getInstance().get(
-        DataToJsonConverter.class);
-    toJsonConverter.setAdditionalProperties(JsonUtils.getAdditionalProperties(parameters));
-    return toJsonConverter.convertToJsonObjects(data);
-  }
-
-  protected List<Map<String, Object>> getData(Map<String, String> parameters, int startRow,
-      int endRow) {
-    List<Map<String, Object>> result = new ArrayList<Map<String, Object>>();
-
-    int offset = startRow;
-    int nRows = endRow - startRow + 1;
-
-    String fetchType = null;
-    SQLQuery qry = null;
-    if (parameters.get(JsonConstants.DISTINCT_PARAMETER) != null) {
-      fetchType = (String) parameters.get(JsonConstants.DISTINCT_PARAMETER);
-      qry = OBDal.getInstance().getSession()
-          .createSQLQuery(getDistinctProductQuery(parameters, offset, nRows));
-    } else {
-      fetchType = "grid";
-      qry = OBDal.getInstance().getSession().createSQLQuery(getSQLQuery(parameters, offset, nRows));
-    }
-
-    for (Object o : qry.list()) {
-      Map<String, Object> row = createRow(o, fetchType);
-      result.add(row);
-    }
-
-    return result;
-  }
-
-  private Map<String, Object> createRow(Object o, String fetchType) {
-    Object[] values = (Object[]) o;
-    Map<String, Object> map = null;
-    if ("grid".equals(fetchType)) {
-      ReturnFromCustomerPickEditLineRow line = new ReturnFromCustomerPickEditLineRow(values);
-      map = line.toMap();
-
-    } else if ("product".equals(fetchType)) {
-      DistinctItem line = new DistinctItem("Product", values);
-      map = line.toMap();
-    }
-    return map;
-  }
-
-  private String getSQLCountQuery(Map<String, String> parameters) {
-    StringBuilder queryBuilder = new StringBuilder();
-    queryBuilder.append("SELECT count(*) ");
-    queryBuilder.append(getSQLMainBody(parameters));
-    return queryBuilder.toString();
-  }
-
-  private String getSQLQuery(Map<String, String> parameters, int offset, int nRows) {
-    String sortClause = getSortClause(parameters);
-    StringBuilder queryBuilder = new StringBuilder();
-    queryBuilder
-        .append("SELECT COALESCE(il.m_inoutline_id, rol.c_orderline_id) AS c_rm_order_pick_edit_lines_id,");
-    queryBuilder
-        .append("       COALESCE(rol.ad_client_id,il.ad_client_id) AS ad_client_id, COALESCE(rol.ad_org_id, il.ad_org_id) AS ad_org_id,");
-    queryBuilder
-        .append("       COALESCE(rol.ad_client_identifier,ic.name) AS ad_client_identifier, COALESCE(rol.ad_org_identifier, io.name) AS ad_org_identifier,");
-    queryBuilder
-        .append("       COALESCE(rol.isactive, il.isactive) AS isactive, COALESCE(rol.createdby, il.createdby) AS createdby,");
-    queryBuilder
-        .append("       COALESCE(rol.updatedby, il.updatedby) AS updatedby, COALESCE(rol.created, il.created) AS created,");
-    queryBuilder.append("       COALESCE(rol.updated, il.updated) AS updated,");
-    queryBuilder.append("       CASE WHEN rol.c_orderline_id IS NOT NULL THEN 'Y' ");
-    queryBuilder.append("            ELSE 'N' END AS ob_selected,");
-    queryBuilder
-        .append("       il.m_inoutline_id, rol.c_order_id AS returnorderid, i.documentno AS inoutno,");
-    queryBuilder
-        .append("       i.movementdate, COALESCE(rol.m_product_id, il.m_product_id) AS m_product_id,");
-    queryBuilder
-        .append("       COALESCE(rol.m_product_identifier,ip.name) AS m_product_identifier,");
-    queryBuilder
-        .append("       COALESCE(rol.m_attributesetinstance_id, il.m_attributesetinstance_id) AS m_attributesetinstance_id,");
-    queryBuilder
-        .append("       COALESCE(rol.m_attributesetinstance_identifier, iat.description) AS m_attributesetinstance_identifier,");
-    queryBuilder
-        .append("       il.movementqty, COALESCE(rol.c_uom_id, il.c_uom_id) AS c_uom_id, COALESCE(rol.c_uom_identifier,iuom.name) AS c_uom_identifier,");
-    queryBuilder.append("       (-1) * rol.qtyordered AS returned,");
-    queryBuilder.append("       CASE WHEN rol.c_orderline_id IS NOT NULL THEN ");
-    queryBuilder.append("                 CASE rol.istaxincluded WHEN");
-    queryBuilder.append("                   'N' THEN rol.priceactual ");
-    queryBuilder.append("                   ELSE rol.gross_unit_price END ");
-    queryBuilder.append("            ELSE CASE pl.istaxincluded WHEN ");
-    queryBuilder.append("                   'N' THEN ol.priceactual");
-    queryBuilder.append("                   ELSE ol.gross_unit_price END ");
-    queryBuilder.append("            END AS priceactual_,");
-    queryBuilder
-        .append("       rol.c_return_reason_id, rol.c_return_reason_identifier, o.documentno AS orderno,");
-    queryBuilder
-        .append("       (-1) * retol.returnedqty AS returnedqty, COALESCE(rol.c_bpartner_id, i.c_bpartner_id) AS c_bpartner_id,");
-    queryBuilder
-        .append("       COALESCE(rol.c_tax_id, ol.c_tax_id) AS c_tax_id, pl.istaxincluded, rol.c_orderline_id");
-    queryBuilder.append(getSQLMainBody(parameters));
-    if (sortClause != null && !sortClause.isEmpty()) {
-      queryBuilder.append(sortClause);
-    }
-    queryBuilder
-        .append(" OFFSET " + Integer.toString(offset) + " LIMIT " + Integer.toString(nRows));
-    return queryBuilder.toString();
-  }
-
-  private String getCountProductQuery(Map<String, String> parameters) {
-    StringBuilder queryBuilder = new StringBuilder();
-    queryBuilder.append("SELECT count(distinct COALESCE(rol.m_product_id,il.m_product_id))");
-    queryBuilder.append(getSQLMainBody(parameters));
-    return queryBuilder.toString();
-  }
-
-  private String getDistinctProductQuery(Map<String, String> parameters, int offset, int nRows) {
-    StringBuilder queryBuilder = new StringBuilder();
-    queryBuilder
-        .append("SELECT distinct COALESCE(rol.m_product_id,il.m_product_id) AS m_product_id,");
-    queryBuilder
-        .append("       COALESCE(rol.m_product_identifier,ip.name) AS m_product_identifier");
-    queryBuilder.append(getSQLMainBody(parameters));
-    queryBuilder.append(" ORDER BY COALESCE(rol.m_product_identifier, ip.name) ");
-    queryBuilder
-        .append(" OFFSET " + Integer.toString(offset) + " LIMIT " + Integer.toString(nRows));
-    return queryBuilder.toString();
-  }
-
-  public String getSQLMainBody(Map<String, String> parameters) {
-    String businessPartnerId = parameters.get("@Order.businessPartner@");
-    String orderId = parameters.get("@Order.id@");
-    String sqlWhereClause = parameters.get("_sqlWhere");
-    String clientId = OBContext.getOBContext().getCurrentClient().getId();
-
-    String orgWhereClause = getOrgWhereClause(parameters);
-    String filterClause = getFilterClause(parameters);
-    StringBuilder queryBuilder = new StringBuilder();
-    queryBuilder.append(" FROM m_inoutline il");
-    queryBuilder.append(" JOIN ad_client ic ON il.ad_client_id = ic.ad_client_id");
-    queryBuilder.append(" JOIN ad_org io ON il.ad_org_id= io.ad_org_id");
-    queryBuilder
-        .append(" LEFT JOIN m_attributesetinstance iat ON il.m_attributesetinstance_id = iat.m_attributesetinstance_id ");
-    queryBuilder.append(" JOIN m_product ip ON il.m_product_id= ip.m_product_id");
-    queryBuilder.append(" JOIN m_inout i ON il.m_inout_id = i.m_inout_id");
-    queryBuilder.append("               AND i.processed = 'Y' AND i.docstatus <> 'VO' ");
-    queryBuilder.append("               AND i.c_bpartner_id = '" + businessPartnerId + "'");
-    queryBuilder.append(" JOIN c_doctype dt ON i.c_doctype_id = dt.c_doctype_id");
-    queryBuilder.append("                  AND dt.isreturn = 'N'");
-    queryBuilder.append(" LEFT JOIN c_orderline ol ON il.c_orderline_id = ol.c_orderline_id");
-    queryBuilder.append(" LEFT JOIN c_order o ON ol.c_order_id = o.c_order_id");
-    queryBuilder.append(" LEFT JOIN c_uom iuom ON il.c_uom_id = iuom.c_uom_id");
-    queryBuilder.append(" LEFT JOIN m_pricelist pl ON o.m_pricelist_id = pl.m_pricelist_id");
-    queryBuilder
-        .append(" FULL JOIN ( SELECT rolc.name as ad_client_identifier, rolo.name as ad_org_identifier, rolp.name as m_product_identifier,");
-    queryBuilder
-        .append("                    ol2.c_orderline_id, ol2.ad_org_id, ol2.isactive, ol2.created,");
-    queryBuilder
-        .append("                    ol2.createdby, ol2.updated, ol2.updatedby, ol2.c_order_id, ol2.qtyordered,");
-    queryBuilder
-        .append("                    ol2.priceactual, ol2.c_return_reason_id, ol2.m_inoutline_id, o2.c_bpartner_id,");
-    queryBuilder
-        .append("                    o2.issotrx, o2.ad_client_id, ol2.m_product_id, ol2.m_attributesetinstance_id,");
-    queryBuilder
-        .append("                    ol2.c_uom_id, roluom.name as c_uom_identifier, ol2.c_tax_id, pl2.istaxincluded, ol2.gross_unit_price,");
-    queryBuilder
-        .append("                    rolat.description as m_attributesetinstance_identifier, rolreas.name as c_return_reason_identifier");
-    queryBuilder.append("             FROM c_orderline ol2");
-    queryBuilder.append("             JOIN c_order o2 ON ol2.c_order_id = o2.c_order_id");
-    queryBuilder.append("                             AND o2.processed = 'N' ");
-    queryBuilder.append("             JOIN ad_client rolc ON ol2.ad_client_id = rolc.ad_client_id");
-    queryBuilder.append("             JOIN ad_org rolo ON ol2.ad_org_id= rolo.ad_org_id");
-    queryBuilder.append("             LEFT JOIN c_uom roluom ON ol2.c_uom_id= roluom.c_uom_id");
-    queryBuilder
-        .append("             LEFT JOIN c_return_reason rolreas ON ol2.c_return_reason_id= rolreas.c_return_reason_id");
-    queryBuilder
-        .append("             LEFT JOIN m_attributesetinstance rolat ON ol2.m_attributesetinstance_id = rolat.m_attributesetinstance_id");
-    queryBuilder.append("             JOIN m_product rolp ON ol2.m_product_id= rolp.m_product_id");
-    queryBuilder
-        .append("             JOIN m_pricelist pl2 ON pl2.m_pricelist_id = o2.m_pricelist_id");
-    queryBuilder.append("                                  AND o2.c_bpartner_id = '"
-        + businessPartnerId + "'");
-    queryBuilder.append("                                  AND (o2.c_order_id = '" + orderId
-        + "' OR o2.c_order_id IS NULL)");
-    queryBuilder.append("                                  AND o2.issotrx = 'Y'");
-    queryBuilder.append("             ) rol ON rol.m_inoutline_id = il.m_inoutline_id ");
-    queryBuilder
-        .append(" LEFT JOIN ( SELECT sum(ol3.qtyordered) AS returnedqty, ol3.m_inoutline_id ");
-    queryBuilder.append("             FROM c_orderline ol3 ");
-    queryBuilder.append("             JOIN c_order o3 ON ol3.c_order_id = o3.c_order_id");
-    queryBuilder
-        .append("                             AND o3.processed = 'Y' AND o3.docstatus <> 'VO'");
-    queryBuilder.append(" WHERE ol3.m_inoutline_id IS NOT NULL ");
-    queryBuilder
-        .append(" GROUP BY ol3.m_inoutline_id) retol ON retol.m_inoutline_id = il.m_inoutline_id");
-    queryBuilder
-        .append(" WHERE (COALESCE(retol.returnedqty, 0) + COALESCE(il.movementqty, rol.qtyordered)) <> 0");
-    queryBuilder.append(" AND ol.c_order_discount_id IS NULL ");
-    queryBuilder.append(" AND COALESCE(rol.ad_client_id,il.ad_client_id) = '" + clientId + "'");
-    queryBuilder.append(" AND i.issotrx = 'Y'");
-    if (sqlWhereClause != null && !sqlWhereClause.isEmpty() && !"null".equals(sqlWhereClause)) {
-      queryBuilder.append(" AND (" + sqlWhereClause.toString() + ")");
-    }
-    if (filterClause != null && !filterClause.isEmpty() && !"null".equals(filterClause)) {
-      queryBuilder.append(filterClause.toString());
-    }
-    if (orgWhereClause != null && !orgWhereClause.isEmpty() && !"null".equals(orgWhereClause)) {
-      queryBuilder.append(orgWhereClause.toString());
-    }
-    return queryBuilder.toString();
-  }
-
-  private String getOrgWhereClause(Map<String, String> parameters) {
-    StringBuilder orgWhereCLause = new StringBuilder();
-    final String orgId = parameters.get(JsonConstants.ORG_PARAMETER);
-    final Set<String> orgs = OBContext.getOBContext().getOrganizationStructureProvider()
-        .getNaturalTree(orgId);
-    if (orgs.size() > 0) {
-      orgWhereCLause.append(" AND COALESCE(rol.ad_org_id, il.ad_org_id) IN (");
-      boolean addComma = false;
-      for (String org : orgs) {
-        if (addComma) {
-          orgWhereCLause.append(",");
-        }
-        orgWhereCLause.append("'" + org + "'");
-        addComma = true;
-      }
-      orgWhereCLause.append(") ");
-
-    }
-    return orgWhereCLause.toString();
-  }
-
-  private String getFilterClause(Map<String, String> parameters) {
-    StringBuilder filterClause = new StringBuilder();
-    try {
-      JSONArray criteriaArray = (JSONArray) JsonUtils.buildCriteria(parameters).get("criteria");
-      for (int i = 0; i < criteriaArray.length(); i++) {
-        JSONObject criteria = criteriaArray.getJSONObject(i);
-        // Basic advanced criteria handling
-        if (criteria.has("_constructor")
-            && "AdvancedCriteria".equals(criteria.getString("_constructor"))
-            && criteria.has("criteria")) {
-          JSONArray innerCriteriaArray = new JSONArray(criteria.getString("criteria"));
-          criteria = innerCriteriaArray.getJSONObject(0);
-        }
-        String fieldName = criteria.getString("fieldName");
-        String operatorName = criteria.getString("operator");
-        String value = criteria.getString("value");
-        if (!fieldName.equals("dummy")) {
-          if (fieldName.equals("product$_identifier")) {
-            filterClause.append(" AND COALESCE(rol.m_product_identifier,ip.name) ilike '%" + value
-                + "%'");
-          } else if (fieldName.equals("inOutDocumentNumber")) {
-            filterClause.append(" AND i.documentno ilike '%" + value + "%'");
-          } else if (fieldName.equals("movementDate")) {
-            filterClause.append(buildComplexFilter("i.movementdate", operatorName, "to_date('"
-                + value + "', 'yyyy/mm/dd')"));
-          } else if (fieldName.equals("movementQuantity")) {
-            filterClause.append(buildComplexFilter("il.movementqty", operatorName, value));
-          } else if (fieldName.equals("uOM$_identifier")) {
-            filterClause.append(" AND c_uom_id ilike '%" + value + "%'");
-          } else if (fieldName.equals("attributeSetValue$_identifier")) {
-            filterClause
-                .append(" AND COALESCE(rol.m_attributesetinstance_identifier, iat.description) ilike '%"
-                    + value + "%'");
-          }
-        }
-      }
-    } catch (JSONException e) {
-    }
-    if (filterClause.length() > 0) {
-      return " AND (rol.c_orderline_id IS NOT NULL OR " + filterClause.toString().substring(4)
-          + ")";
-    } else {
-      return "";
-    }
-  }
-
-  private String buildComplexFilter(String fieldName, String operatorName, String value) {
-    String operator = null;
-    if ("greaterOrEqual".equals(operatorName)) {
-      operator = ">=";
-    } else if ("greaterThan".equals(operatorName)) {
-      operator = ">";
-    } else if ("lessOrEqual".equals(operatorName)) {
-      operator = "<=";
-    } else if ("lessThan".equals(operatorName)) {
-      operator = "<";
-    } else {
-      operator = "=";
-    }
-    return " AND " + fieldName + operator + value;
-  }
-
-  private String getSortClause(Map<String, String> parameters) {
-    String sortByField = parameters.get("_sortBy");
-    StringBuilder sortClause = new StringBuilder();
-    if (sortByField != null && !sortByField.isEmpty()) {
-      sortClause.append(" ORDER BY ");
-      boolean desc = false;
-      if (sortByField.startsWith("-")) {
-        desc = true;
-        sortByField = sortByField.substring(1);
-      }
-      if (sortByField.equals("product$_identifier")) {
-        sortClause.append(" m_product_identifier ");
-      } else if (sortByField.equals("inOutDocumentNumber")) {
-        sortClause.append(" i.documentno ");
-      } else if (sortByField.equals("movementDate")) {
-        sortClause.append(" i.movementdate ");
-      } else if (sortByField.equals("movementQuantity")) {
-        sortClause.append(" il.movementqty ");
-      } else if (sortByField.equals("uOM$_identifier")) {
-        sortClause.append(" c_uom_id ");
-      } else if (sortByField.equals("attributeSetValue$_identifier")) {
-        sortClause.append(" m_attributesetinstance_identifier ");
-      } else if (sortByField.equals("orderNo")) {
-        sortClause.append(" orderno ");
-      } else if (sortByField.equals("unitPrice")) {
-        sortClause.append(" priceactual_ ");
-      } else if (sortByField.equals("returned")) {
-        sortClause.append(" returned ");
-      } else if (sortByField.equals("returnQtyOtherRM")) {
-        sortClause.append(" returnedqty ");
-      }
-      if (desc) {
-        sortClause.append(" DESC ");
-      }
-    } else {
-      String sqlOrderBy = parameters.get("_sqlOrderBy");
-      if (sqlOrderBy != null && !sqlOrderBy.isEmpty()) {
-        sortClause.append(" ORDER BY ");
-        sortClause.append(sqlOrderBy);
-      }
-    }
-    return sortClause.toString();
-  }
-
-  public class DistinctItem {
-    private String id;
-    private String identifier;
-    private String entityName;
-
-    public DistinctItem(String entityName, Object[] values) {
-      this.entityName = entityName;
-      this.id = (String) values[0];
-      this.identifier = (String) values[1];
-    }
-
-    public Map<String, Object> toMap() {
-      Map<String, Object> row = new LinkedHashMap<String, Object>();
-      row.put("$ref", this.entityName + "/" + this.id);
-      row.put("_entityName", this.entityName);
-      row.put("id", this.id);
-      row.put("_identifier", this.identifier);
-      return row;
-    }
-  }
 }
--- a/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-utilities.js	Wed Apr 30 17:54:56 2014 +0200
+++ b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-utilities.js	Mon May 05 11:02:51 2014 +0200
@@ -219,25 +219,6 @@
 OB.APRM.addNewGLItem = function (grid) {
   var selectedRecord = grid.view.parentWindow.views[0].getParentRecord();
   var returnObject = isc.addProperties({}, grid.data[0]);
-  var indRow, allRows = grid.data,
-      row, totalOutstanding = new BigDecimal("0");
-  for (indRow = 0; indRow < allRows.length; indRow++) {
-    row = allRows[indRow];
-    totalOutstanding = totalOutstanding.add(new BigDecimal(String(row.outstanding)));
-  }
-  returnObject.outstanding = Number(new BigDecimal(String(selectedRecord.outstandingAmount)).subtract(totalOutstanding));
-  returnObject.received = 0;
-  returnObject.expected = 0;
-  returnObject.awaitingExecutionAmount = 0;
-  returnObject.id = '';
-  returnObject.paymentMethod = selectedRecord.paymentMethod;
-  returnObject['paymentMethod' + OB.Constants.FIELDSEPARATOR + OB.Constants.IDENTIFIER] = selectedRecord['paymentMethod' + OB.Constants.FIELDSEPARATOR + OB.Constants.IDENTIFIER];
-  returnObject.currency = selectedRecord.currency;
-  returnObject['currency' + OB.Constants.FIELDSEPARATOR + OB.Constants.IDENTIFIER] = selectedRecord['currency' + OB.Constants.FIELDSEPARATOR + OB.Constants.IDENTIFIER];
-  returnObject.duedate = selectedRecord.invoiceDate;
-  //General properties
   returnObject.organization = selectedRecord.organization;
-  returnObject.client = selectedRecord.client;
-  returnObject.invoice = selectedRecord.id;
   return returnObject;
 };
\ No newline at end of file