details: https://code.openbravo.com/erp/devel/pi/rev/cf89ea93bdfc
changeset: 23964:cf89ea93bdfc
user: Daniel Ruiz <daniel.ruiz <at> openbravo.com>
date: Thu Jul 03 18:33:48 2014 +0200
summary: Fixes Issue 26649:Wrong payment details when using credit but total
amount to pay is negative
diffstat:
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml
| 12 ++++++++++
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js
| 7 +++++-
2 files changed, 18 insertions(+), 1 deletions(-)
diffs (39 lines):
diff -r 96103f60f96e -r cf89ea93bdfc
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml
Thu Jul 03 11:05:45 2014 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml
Thu Jul 03 18:33:48 2014 +0200
@@ -541,6 +541,18 @@
<!--6E6B065C16C747A9AA784F7434276DBE-->
<ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
<!--6E6B065C16C747A9AA784F7434276DBE--></AD_MESSAGE>
+<!--712C841E501642B881A998CCAC13E420--><AD_MESSAGE>
+<!--712C841E501642B881A998CCAC13E420-->
<AD_MESSAGE_ID><![CDATA[712C841E501642B881A998CCAC13E420]]></AD_MESSAGE_ID>
+<!--712C841E501642B881A998CCAC13E420-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--712C841E501642B881A998CCAC13E420--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--712C841E501642B881A998CCAC13E420--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--712C841E501642B881A998CCAC13E420-->
<VALUE><![CDATA[APRM_CreditWithNegativeAmt]]></VALUE>
+<!--712C841E501642B881A998CCAC13E420--> <MSGTEXT><![CDATA[It is not necessary
to use credit for this payment: Actual Payment is greater than Expected
Payment.]]></MSGTEXT>
+<!--712C841E501642B881A998CCAC13E420--> <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--712C841E501642B881A998CCAC13E420-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--712C841E501642B881A998CCAC13E420-->
<ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--712C841E501642B881A998CCAC13E420--></AD_MESSAGE>
+
<!--7918E1E75DF84F499AD21A51F53F9A9B--><AD_MESSAGE>
<!--7918E1E75DF84F499AD21A51F53F9A9B-->
<AD_MESSAGE_ID><![CDATA[7918E1E75DF84F499AD21A51F53F9A9B]]></AD_MESSAGE_ID>
<!--7918E1E75DF84F499AD21A51F53F9A9B-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 96103f60f96e -r cf89ea93bdfc
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js
---
a/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js
Thu Jul 03 11:05:45 2014 +0200
+++
b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js
Thu Jul 03 18:33:48 2014 +0200
@@ -766,7 +766,12 @@
view.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR, null,
OB.I18N.getLabel('APRM_CreditWithoutBPartner'));
return false;
}
-
+ //If Actual Payment amount is negative, it is not necessary to use credit.
+ if ((total.compareTo(BigDecimal.prototype.ZERO) < 0) &&
(creditTotalItem.signum() !== 0)){
+ view.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR, null,
OB.I18N.getLabel('APRM_CreditWithNegativeAmt'));
+ return false;
+ }
+
if (actualPayment.compareTo(total) > 0 &&
totalOustandingAmount.compareTo(amountInvOrds.add(totalWriteOffAmount)) > 0) {
// Not all the payment amount has been allocated
view.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR, null,
OB.I18N.getLabel('APRM_JSNOTALLAMOUTALLOCATED'));
------------------------------------------------------------------------------
Open source business process management suite built on Java and Eclipse
Turn processes into business applications with Bonita BPM Community Edition
Quickly connect people, data, and systems into organized workflows
Winner of BOSSIE, CODIE, OW2 and Gartner awards
http://p.sf.net/sfu/Bonitasoft
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
