details: /erp/devel/pi/rev/31b1f08ae65b
changeset: 12518:31b1f08ae65b
user: Mikel Irurita <mikel.irurita <at> openbravo.com>
date: Fri May 27 14:31:00 2011 +0200
summary: [APRM] AddPaymentFromTransaction in payment out actual payment is
fixed
diffstat:
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html
| 4 +++-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java
| 2 ++
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.xml
| 1 +
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js
| 7 +++++--
4 files changed, 11 insertions(+), 3 deletions(-)
diffs (69 lines):
diff -r 145fea0f4502 -r 31b1f08ae65b
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html
Fri May 27 14:20:14 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html
Fri May 27 14:31:00 2011 +0200
@@ -135,7 +135,8 @@
if (mark==null) mark=false;
updateReadOnly(key, mark);
var paymentAmount = document.frmMain.elements['inpPaymentAmount'+key];
- if (!isTrue('isReceipt')){
+ var isInheritedActualPayment =
(document.getElementById('paramInheritedActualPayment').value === 'Y');
+ if (!isTrue('isReceipt') && !isInheritedActualPayment) {
if (mark && paymentAmount.value=='') {
paymentAmount.value =
document.frmMain.elements['inpRecordAmt'+key].value;
}
@@ -371,6 +372,7 @@
<input type="hidden" name="inpFinBankStatementLineId" value=""
id="paramFinBankStatementLineId"></input>
<input type="hidden" name="isFirstLoad" value="true"/>
<input type="hidden" name="inpadOrgId" value="" id="fieldOrg"/>
+ <input type="hidden" name="inpInheritedActualPayment" value="N"
id="paramInheritedActualPayment"/>
<div class="Popup_ContentPane_CircleLogo">
<div class="Popup_WindowLogo">
<img class="Popup_WindowLogo_Icon Popup_WindowLogo_Icon_process"
src="../../../../../web/images/blank.gif" border=0/></img>
diff -r 145fea0f4502 -r 31b1f08ae65b
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java
Fri May 27 14:20:14 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java
Fri May 27 14:31:00 2011 +0200
@@ -296,6 +296,8 @@
xmlDocument.setParameter("isSoTrx", (isReceipt) ? "Y" : "N");
xmlDocument.setParameter("finBankStatementLineId",
strFinBankStatementLineId);
xmlDocument.setParameter("orgId",
financialAccount.getOrganization().getId());
+ xmlDocument.setParameter("inheritedActualPayment",
strFinBankStatementLineId.isEmpty() ? "N"
+ : "Y");
// get DocumentNo
final List<Object> parameters = new ArrayList<Object>();
diff -r 145fea0f4502 -r 31b1f08ae65b
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.xml
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.xml
Fri May 27 14:20:14 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.xml
Fri May 27 14:31:00 2011 +0200
@@ -43,6 +43,7 @@
<PARAMETER id="paramPrecision" name="precision" attribute="value"/>
<PARAMETER id="paramFinBankStatementLineId" name="finBankStatementLineId"
attribute="value" default=""/>
<PARAMETER id="fieldOrg" name="orgId" attribute="value"/>
+ <PARAMETER id="paramInheritedActualPayment" name="inheritedActualPayment"
attribute="value"/>
<PARAMETER id="paramPaymentDate" name="paymentDate" attribute="value"/>
<PARAMETER id="paramPaymentDate" name="dateDisplayFormat"
attribute="displayformat" replace="xx"/>
diff -r 145fea0f4502 -r 31b1f08ae65b
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js
---
a/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js
Fri May 27 14:20:14 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js
Fri May 27 14:31:00 2011 +0200
@@ -249,8 +249,10 @@
selectDifferenceAction('none');
} else if ( isCreditAllowed && compareWithSign(amount, '>', total) ) {
selectDifferenceAction('credit');
- } else if ( !isCreditAllowed && compareWithSign(expected, '>', total) ) {
+ } else if ( !isCreditAllowed || compareWithSign(expected, '>', total) ) {
selectDifferenceAction('underpayment');
+ } else {
+ selectDifferenceAction('none');
}
}
@@ -332,7 +334,8 @@
}
frm.inpTotal.value = total;
document.getElementById('paramTotal').innerHTML = frm.inpTotal.value;
- if (!isReceipt) {
+ var inheritedActualPayment = (frm.paramInheritedActualPayment &&
frm.paramInheritedActualPayment.value === "Y");
+ if (!isReceipt && !inheritedActualPayment) {
if (frm.inpUseCredit.checked) {
if ( compare(total, '>',frm.inpCredit.value) ) {
frm.inpActualPayment.value = subtract(total, frm.inpCredit.value);
------------------------------------------------------------------------------
vRanger cuts backup time in half-while increasing security.
With the market-leading solution for virtual backup and recovery,
you get blazing-fast, flexible, and affordable data protection.
Download your free trial now.
http://p.sf.net/sfu/quest-d2dcopy1
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
