details: /erp/devel/pi/rev/cb7906309aed
changeset: 11645:cb7906309aed
user: Mikel Irurita <mikel.irurita <at> openbravo.com>
date: Fri Apr 15 14:01:29 2011 +0200
summary: Fixes issue 16723: Improve import bank statement process message
details: /erp/devel/pi/rev/11053ddb29cd
changeset: 11646:11053ddb29cd
user: Mikel Irurita <mikel.irurita <at> openbravo.com>
date: Fri Apr 15 14:51:26 2011 +0200
summary: Fixes issue 16796: show message when no import bank file modules are
installed
diffstat:
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml
| 33 ++++++++++
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ImportBankFile.java
| 21 ++++-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java
| 3 +-
3 files changed, 51 insertions(+), 6 deletions(-)
diffs (119 lines):
diff -r 8d49ea02cc10 -r 11053ddb29cd
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml
Fri Apr 22 17:49:47 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml
Fri Apr 15 14:51:26 2011 +0200
@@ -264,6 +264,17 @@
<!--6E6B065C16C747A9AA784F7434276DBE-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
<!--6E6B065C16C747A9AA784F7434276DBE--></AD_MESSAGE>
+<!--7918E1E75DF84F499AD21A51F53F9A9B--><AD_MESSAGE>
+<!--7918E1E75DF84F499AD21A51F53F9A9B-->
<AD_MESSAGE_ID><![CDATA[7918E1E75DF84F499AD21A51F53F9A9B]]></AD_MESSAGE_ID>
+<!--7918E1E75DF84F499AD21A51F53F9A9B-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7918E1E75DF84F499AD21A51F53F9A9B--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7918E1E75DF84F499AD21A51F53F9A9B--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7918E1E75DF84F499AD21A51F53F9A9B-->
<VALUE><![CDATA[APRM_NoBankFileAvailable]]></VALUE>
+<!--7918E1E75DF84F499AD21A51F53F9A9B--> <MSGTEXT><![CDATA[No file import
extension installed]]></MSGTEXT>
+<!--7918E1E75DF84F499AD21A51F53F9A9B--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--7918E1E75DF84F499AD21A51F53F9A9B-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--7918E1E75DF84F499AD21A51F53F9A9B--></AD_MESSAGE>
+
<!--7955CBDC1CB246FBB6BE1E2C5DD36ACC--><AD_MESSAGE>
<!--7955CBDC1CB246FBB6BE1E2C5DD36ACC-->
<AD_MESSAGE_ID><![CDATA[7955CBDC1CB246FBB6BE1E2C5DD36ACC]]></AD_MESSAGE_ID>
<!--7955CBDC1CB246FBB6BE1E2C5DD36ACC-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -561,6 +572,17 @@
<!--E217A4F4BDE84DC6A95ACB3F54549FDD-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
<!--E217A4F4BDE84DC6A95ACB3F54549FDD--></AD_MESSAGE>
+<!--E92C3899BD924A5C991A39B2CDA74D29--><AD_MESSAGE>
+<!--E92C3899BD924A5C991A39B2CDA74D29-->
<AD_MESSAGE_ID><![CDATA[E92C3899BD924A5C991A39B2CDA74D29]]></AD_MESSAGE_ID>
+<!--E92C3899BD924A5C991A39B2CDA74D29-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E92C3899BD924A5C991A39B2CDA74D29--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E92C3899BD924A5C991A39B2CDA74D29--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E92C3899BD924A5C991A39B2CDA74D29-->
<VALUE><![CDATA[APRM_NoBankFileAvailableInfo]]></VALUE>
+<!--E92C3899BD924A5C991A39B2CDA74D29--> <MSGTEXT><![CDATA[System
administrators can install extensions via Module Management > Add
Modules]]></MSGTEXT>
+<!--E92C3899BD924A5C991A39B2CDA74D29--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--E92C3899BD924A5C991A39B2CDA74D29-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--E92C3899BD924A5C991A39B2CDA74D29--></AD_MESSAGE>
+
<!--EFA31753A0BB4C4AB3E6BC741FEE811E--><AD_MESSAGE>
<!--EFA31753A0BB4C4AB3E6BC741FEE811E-->
<AD_MESSAGE_ID><![CDATA[EFA31753A0BB4C4AB3E6BC741FEE811E]]></AD_MESSAGE_ID>
<!--EFA31753A0BB4C4AB3E6BC741FEE811E-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -627,4 +649,15 @@
<!--FF8080812E44C5F1012E44D35D750020-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
<!--FF8080812E44C5F1012E44D35D750020--></AD_MESSAGE>
+<!--FF8080812F5805CF012F5843BD3A005B--><AD_MESSAGE>
+<!--FF8080812F5805CF012F5843BD3A005B-->
<AD_MESSAGE_ID><![CDATA[FF8080812F5805CF012F5843BD3A005B]]></AD_MESSAGE_ID>
+<!--FF8080812F5805CF012F5843BD3A005B-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF8080812F5805CF012F5843BD3A005B--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF8080812F5805CF012F5843BD3A005B--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF8080812F5805CF012F5843BD3A005B-->
<VALUE><![CDATA[APRM_BankStatementNo]]></VALUE>
+<!--FF8080812F5805CF012F5843BD3A005B--> <MSGTEXT><![CDATA[Bank Statement
No.:]]></MSGTEXT>
+<!--FF8080812F5805CF012F5843BD3A005B--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--FF8080812F5805CF012F5843BD3A005B-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--FF8080812F5805CF012F5843BD3A005B--></AD_MESSAGE>
+
</data>
diff -r 8d49ea02cc10 -r 11053ddb29cd
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ImportBankFile.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ImportBankFile.java
Fri Apr 22 17:49:47 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ImportBankFile.java
Fri Apr 15 14:51:26 2011 +0200
@@ -30,6 +30,7 @@
import org.openbravo.base.secureApp.HttpSecureAppServlet;
import org.openbravo.base.secureApp.VariablesSecureApp;
import org.openbravo.dal.service.OBDal;
+import org.openbravo.data.FieldProvider;
import org.openbravo.erpCommon.ad_actionButton.ActionButtonDefaultData;
import org.openbravo.erpCommon.utility.ComboTableData;
import org.openbravo.erpCommon.utility.OBError;
@@ -121,14 +122,16 @@
xmlDocument.setParameter("help", strHelp);
xmlDocument.setParameter("tabId", tabId);
// Bank File Formats
+ boolean isAnyFileFormatInstalled = false;
try {
ComboTableData comboTableData = new ComboTableData(vars, this,
"TABLEDIR",
"FIN_BANKFILE_FORMAT_ID", "", "", Utility.getContext(this, vars,
"#AccessibleOrgTree",
"ImportBankFile"), Utility.getContext(this, vars,
"#User_Client", "ImportBankFile"),
0);
Utility.fillSQLParameters(this, vars, null, comboTableData,
"ImportBankFile", "");
- xmlDocument.setData("reportfinBankFileFormatId", "liststructure",
comboTableData
- .select(false));
+ FieldProvider[] fileFormatCombo = comboTableData.select(false);
+ isAnyFileFormatInstalled = fileFormatCombo.length > 0;
+ xmlDocument.setData("reportfinBankFileFormatId", "liststructure",
fileFormatCombo);
comboTableData = null;
} catch (Exception ex) {
throw new ServletException(ex);
@@ -136,9 +139,17 @@
xmlDocument.setParameter("finBankFileFormatId", "");
if (isDefault) {
- xmlDocument.setParameter("messageType", "");
- xmlDocument.setParameter("messageTitle", "");
- xmlDocument.setParameter("messageMessage", "");
+ if (!isAnyFileFormatInstalled) {
+ xmlDocument.setParameter("messageType", "Warning");
+ xmlDocument.setParameter("messageTitle", Utility.messageBD(this,
+ "APRM_NoBankFileAvailable", vars.getLanguage()));
+ xmlDocument.setParameter("messageMessage", Utility.messageBD(this,
+ "APRM_NoBankFileAvailableInfo", vars.getLanguage()));
+ } else {
+ xmlDocument.setParameter("messageType", "");
+ xmlDocument.setParameter("messageTitle", "");
+ xmlDocument.setParameter("messageMessage", "");
+ }
} else {
OBError myMessage = new OBError();
myMessage.setTitle("");
diff -r 8d49ea02cc10 -r 11053ddb29cd
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java
Fri Apr 22 17:49:47 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java
Fri Apr 15 14:51:26 2011 +0200
@@ -162,7 +162,8 @@
} else if (getMyError() != null &&
getMyError().getType().toLowerCase().equals("success")) {
return getMyError();
} else {
- return getOBError(conn, vars, numberOfLines + " " + "@RowsInserted@",
"Success", "Success");
+ return getOBError(conn, vars, "@APRM_BankStatementNo@ " +
bankStatement.getDocumentNo()
+ + "<br/>" + numberOfLines + " " + "@RowsInserted@", "Success",
"Success");
}
}
------------------------------------------------------------------------------
WhatsUp Gold - Download Free Network Management Software
The most intuitive, comprehensive, and cost-effective network
management toolset available today. Delivers lowest initial
acquisition cost and overall TCO of any competing solution.
http://p.sf.net/sfu/whatsupgold-sd
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
