Fixed issue 12680.Minor adjustments on the callout.
authorGorka Ion Damián <gorkaion.damian@openbravo.com>
Tue, 23 Mar 2010 18:24:37 +0100
changeset 6872 c4ac0459ec41
parent 6871 be80945ca684
child 6873 00616c47730b
Fixed issue 12680.Minor adjustments on the callout.
src-db/database/sourcedata/AD_COLUMN.xml
src/org/openbravo/erpCommon/ad_callouts/SL_AdvPayment_Document.java
--- a/src-db/database/sourcedata/AD_COLUMN.xml	Tue Mar 23 17:29:26 2010 +0100
+++ b/src-db/database/sourcedata/AD_COLUMN.xml	Tue Mar 23 18:24:37 2010 +0100
@@ -277833,7 +277833,7 @@
 <!--8189F49FFEAA6E56E040007F01003E83-->  <NAME><![CDATA[Document No.]]></NAME>
 <!--8189F49FFEAA6E56E040007F01003E83-->  <DESCRIPTION><![CDATA[An often automatically generated identifier for all documents.]]></DESCRIPTION>
 <!--8189F49FFEAA6E56E040007F01003E83-->  <HELP><![CDATA[The document number is usually automatically generated by the system and determined by the document type of the document. If the document is not saved, the preliminary number is displayed in "<>". If the document type of your document has no automatic document sequence defined, the field will be empty when creating a new document. This is for documents which usually have an external number (like vendor invoice).  If you leave the field empty, the system will generate a document number for you. The document sequence used for this fallback number is defined in the "Document Sequence" window with the name "DocumentNo_<TableName>", where TableName is the actual name of the table inside the database (e.g. C_Order).]]></HELP>
-<!--8189F49FFEAA6E56E040007F01003E83-->  <COLUMNNAME><![CDATA[Documentno]]></COLUMNNAME>
+<!--8189F49FFEAA6E56E040007F01003E83-->  <COLUMNNAME><![CDATA[DocumentNo]]></COLUMNNAME>
 <!--8189F49FFEAA6E56E040007F01003E83-->  <AD_TABLE_ID><![CDATA[D4C23A17190649E7B78F55A05AF3438C]]></AD_TABLE_ID>
 <!--8189F49FFEAA6E56E040007F01003E83-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
 <!--8189F49FFEAA6E56E040007F01003E83-->  <FIELDLENGTH><![CDATA[30]]></FIELDLENGTH>
@@ -278970,7 +278970,7 @@
 <!--8189F49FFEDD6E56E040007F01003E83-->  <NAME><![CDATA[Document No.]]></NAME>
 <!--8189F49FFEDD6E56E040007F01003E83-->  <DESCRIPTION><![CDATA[An often automatically generated identifier for all documents.]]></DESCRIPTION>
 <!--8189F49FFEDD6E56E040007F01003E83-->  <HELP><![CDATA[The document number is usually automatically generated by the system and determined by the document type of the document. If the document is not saved, the preliminary number is displayed in "<>". If the document type of your document has no automatic document sequence defined, the field will be empty when creating a new document. This is for documents which usually have an external number (like vendor invoice).  If you leave the field empty, the system will generate a document number for you. The document sequence used for this fallback number is defined in the "Document Sequence" window with the name "DocumentNo_<TableName>", where TableName is the actual name of the table inside the database (e.g. C_Order).]]></HELP>
-<!--8189F49FFEDD6E56E040007F01003E83-->  <COLUMNNAME><![CDATA[Documentno]]></COLUMNNAME>
+<!--8189F49FFEDD6E56E040007F01003E83-->  <COLUMNNAME><![CDATA[DocumentNo]]></COLUMNNAME>
 <!--8189F49FFEDD6E56E040007F01003E83-->  <AD_TABLE_ID><![CDATA[B1B7075C46934F0A9FD4C4D0F1457B42]]></AD_TABLE_ID>
 <!--8189F49FFEDD6E56E040007F01003E83-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
 <!--8189F49FFEDD6E56E040007F01003E83-->  <FIELDLENGTH><![CDATA[30]]></FIELDLENGTH>
@@ -279078,6 +279078,7 @@
 <!--8189F49FFEE06E56E040007F01003E83-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--8189F49FFEE06E56E040007F01003E83-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--8189F49FFEE06E56E040007F01003E83-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--8189F49FFEE06E56E040007F01003E83-->  <AD_CALLOUT_ID><![CDATA[DC83B2F49C084E28A61C4D7FEA4DF480]]></AD_CALLOUT_ID>
 <!--8189F49FFEE06E56E040007F01003E83-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--8189F49FFEE06E56E040007F01003E83-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--8189F49FFEE06E56E040007F01003E83-->  <POSITION><![CDATA[13]]></POSITION>
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_AdvPayment_Document.java	Tue Mar 23 17:29:26 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_AdvPayment_Document.java	Tue Mar 23 18:24:37 2010 +0100
@@ -16,7 +16,7 @@
     VariablesSecureApp vars = info.vars;
     String strWindowNo = info.getWindowId();
     String strTableNameId = info.getStringParameter("inpkeyColumnId", new RegexFilter(
-        "[a-zA-Z0-9]*_[a-zA-Z0-9]*_ID"));
+        "[a-zA-Z0-9_]*_ID"));
     String strDocType_Id = info.getStringParameter("inpcDoctypeId", IsIDFilter.instance);
     String strTableName = strTableNameId.substring(0, strTableNameId.length() - 3);
     String strDocumentNo = Utility.getDocumentNo(this, vars, strWindowNo, strTableName,