details: https://code.openbravo.com/erp/stable/2.50/rev/21d8563de26a
changeset: 9564:21d8563de26a
user: David Alsasua <david.alsasua <at> openbravo.com>
date: Thu Jul 07 16:33:27 2011 +0200
summary: Fixes issue 17929: Improve error message whith zero invoices
diffstat:
src-db/database/sourcedata/AD_MESSAGE.xml | 11 ++++++
src/org/openbravo/erpCommon/ad_forms/AcctServer.java | 32 +++++++++++--------
src/org/openbravo/erpCommon/ad_forms/DocInvoice.java | 7 ++++
3 files changed, 36 insertions(+), 14 deletions(-)
diffs (108 lines):
diff -r fcf0fcf7e9b4 -r 21d8563de26a src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml Thu Jul 07 16:13:58 2011 +0200
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml Thu Jul 07 16:33:27 2011 +0200
@@ -33655,6 +33655,17 @@
<!--C64A7803441A4E56A7CF47F35EAC0C46-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--C64A7803441A4E56A7CF47F35EAC0C46--></AD_MESSAGE>
+<!--C673E1E05FDF4FD889B7FDE75733A620--><AD_MESSAGE>
+<!--C673E1E05FDF4FD889B7FDE75733A620-->
<AD_MESSAGE_ID><![CDATA[C673E1E05FDF4FD889B7FDE75733A620]]></AD_MESSAGE_ID>
+<!--C673E1E05FDF4FD889B7FDE75733A620-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C673E1E05FDF4FD889B7FDE75733A620--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C673E1E05FDF4FD889B7FDE75733A620--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C673E1E05FDF4FD889B7FDE75733A620-->
<VALUE><![CDATA[TotalGrossIsZero]]></VALUE>
+<!--C673E1E05FDF4FD889B7FDE75733A620--> <MSGTEXT><![CDATA[Total Gross Amount
of the invoice is zero. Invoice is disabled for accounting.]]></MSGTEXT>
+<!--C673E1E05FDF4FD889B7FDE75733A620--> <MSGTYPE><![CDATA[W]]></MSGTYPE>
+<!--C673E1E05FDF4FD889B7FDE75733A620-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--C673E1E05FDF4FD889B7FDE75733A620--></AD_MESSAGE>
+
<!--C6B53C6EC4A94F24ACBB8B3EEDF592B5--><AD_MESSAGE>
<!--C6B53C6EC4A94F24ACBB8B3EEDF592B5-->
<AD_MESSAGE_ID><![CDATA[C6B53C6EC4A94F24ACBB8B3EEDF592B5]]></AD_MESSAGE_ID>
<!--C6B53C6EC4A94F24ACBB8B3EEDF592B5-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r fcf0fcf7e9b4 -r 21d8563de26a
src/org/openbravo/erpCommon/ad_forms/AcctServer.java
--- a/src/org/openbravo/erpCommon/ad_forms/AcctServer.java Thu Jul 07
16:13:58 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/AcctServer.java Thu Jul 07
16:33:27 2011 +0200
@@ -150,6 +150,7 @@
public static final String STATUS_BackgroundDisabled = "d";
OBError messageResult = null;
+ String strMessage = null;
/** AR Invoices */
public static final String DOCTYPE_ARInvoice = "ARI";
@@ -1729,7 +1730,7 @@
String strMessageType) {
if (strStatus == null || strStatus.equals(""))
strStatus = getStatus();
- String strMessage = "";
+ String strTitle = "";
if (messageResult == null)
messageResult = new OBError();
if (strMessageType == null || strMessageType.equals(""))
@@ -1737,33 +1738,36 @@
else
messageResult.setType(strMessageType);
if (strStatus.equals(STATUS_Error))
- strMessage = "@ProcessRunError@";
+ strTitle = "@ProcessRunError@";
else if (strStatus.equals(STATUS_DocumentLocked)) {
- strMessage = "@OtherPostingProcessActive@";
+ strTitle = "@OtherPostingProcessActive@";
messageResult.setType("Warning");
} else if (strStatus.equals(STATUS_InvalidCost))
- strMessage = "@InvalidCost@";
+ strTitle = "@InvalidCost@";
else if (strStatus.equals(STATUS_DocumentDisabled)) {
- strMessage = "@DocumentDisabled@";
+ strTitle = "@DocumentDisabled@";
messageResult.setType("Warning");
} else if (strStatus.equals(STATUS_BackgroundDisabled)) {
- strMessage = "@BackgroundDisabled@";
+ strTitle = "@BackgroundDisabled@";
messageResult.setType("Warning");
} else if (strStatus.equals(STATUS_InvalidAccount))
- strMessage = "@InvalidAccount@";
+ strTitle = "@InvalidAccount@";
else if (strStatus.equals(STATUS_PeriodClosed))
- strMessage = "@PeriodNotAvailable@";
+ strTitle = "@PeriodNotAvailable@";
else if (strStatus.equals(STATUS_NotConvertible))
- strMessage = "@NotConvertible@";
+ strTitle = "@NotConvertible@";
else if (strStatus.equals(STATUS_NotBalanced))
- strMessage = "@NotBalanced@";
+ strTitle = "@NotBalanced@";
else if (strStatus.equals(STATUS_NotPosted))
- strMessage = "@NotPosted@";
+ strTitle = "@NotPosted@";
else if (strStatus.equals(STATUS_PostPrepared))
- strMessage = "@PostPrepared@";
+ strTitle = "@PostPrepared@";
else if (strStatus.equals(STATUS_Posted))
- strMessage = "@Posted@";
- messageResult.setMessage(Utility.parseTranslation(conn, vars,
vars.getLanguage(), strMessage));
+ strTitle = "@Posted@";
+ messageResult.setTitle(Utility.parseTranslation(conn, vars,
vars.getLanguage(), strTitle));
+ if (strMessage != null)
+ messageResult
+ .setMessage(Utility.parseTranslation(conn, vars, vars.getLanguage(),
strMessage));
}
public OBError getMessageResult() {
diff -r fcf0fcf7e9b4 -r 21d8563de26a
src/org/openbravo/erpCommon/ad_forms/DocInvoice.java
--- a/src/org/openbravo/erpCommon/ad_forms/DocInvoice.java Thu Jul 07
16:13:58 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/DocInvoice.java Thu Jul 07
16:33:27 2011 +0200
@@ -721,6 +721,13 @@
*/
public boolean getDocumentConfirmation(ConnectionProvider conn, String
strRecordId) {
DocInvoiceData[] data = null;
+ FieldProvider dataFP[] = getObjectFieldProvider();
+
+ if (ZERO.compareTo(new BigDecimal(dataFP[0].getField("GrandTotal"))) == 0)
{
+ strMessage = "@TotalGrossIsZero@";
+ setStatus(STATUS_DocumentDisabled);
+ return false;
+ }
try {
data = DocInvoiceData.selectFinInvCount(conn, strRecordId);
if (data.length > 0) {
------------------------------------------------------------------------------
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security
threats, fraudulent activity, and more. Splunk takes this data and makes
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2d-c2
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
