details: https://code.openbravo.com/erp/devel/pi/rev/3a46437a6c9b
changeset: 13843:3a46437a6c9b
user: Mikel Irurita <mikel.irurita <at> openbravo.com>
date: Tue Sep 27 13:58:21 2011 +0200
summary: [APRM] Fixes issue 18378: Total amount not properly refreshed after
removing GL items
diffstat:
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html
| 13 ++++++---
1 files changed, 8 insertions(+), 5 deletions(-)
diffs (57 lines):
diff -r 273d6b934af5 -r 3a46437a6c9b
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html
Tue Sep 27 12:13:47 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html
Tue Sep 27 13:58:21 2011 +0200
@@ -109,14 +109,14 @@
OB.APRM.AOOI_ddt !== document.getElementById('paramDueDateTo').value ||
OB.APRM.AOOI_cu !== document.getElementById('paramCurrencyId').value)
{
- OB.APRM.AOOI_bp = document.getElementById('C_BPartner_ID').value;
+ OB.APRM.AOOI_bp = document.getElementById('C_BPartner_ID').value;
OB.APRM.AOOI_dt = document.getElementById('paramDocumentType').value;
OB.APRM.AOOI_pm =
document.getElementById('paramAlternativePaymentMethod').checked;
OB.APRM.AOOI_ddf = document.getElementById('paramDueDateFrom').value;
OB.APRM.AOOI_ddt = document.getElementById('paramDueDateTo').value;
OB.APRM.AOOI_cu = document.getElementById('paramCurrencyId').value;
- try {
+ try {
var url =
'../org.openbravo.advpaymentmngt.ad_actionbutton/AddOrderOrInvoice.html';
var paramXMLReq = null;
return submitXmlHttpRequest(callBackGrid, document.frmMain, 'GRIDLIST',
url, false, null, paramXMLReq);
@@ -137,6 +137,8 @@
table.innerHTML = '';
if (glitemCount === 0) {
OB.APRM.HasGLItems = false;
+ frm.inpGLSumAmount.value = '0';
+ updateTotal();
return;
}
OB.APRM.HasGLItems = true;
@@ -193,7 +195,7 @@
}
cellRemoveButton = row.insertCell(cellCount);
cellRemoveButton.innerHTML = '<div><button type="button"
id="buttonRemoveGLItem"'
- + ' class="ButtonLink_focus" onclick="removeGLItem(' + i + ', ' +
glitemAmount + ');return false;"'
+ + ' class="ButtonLink_focus" onclick="removeGLItem(' + i + ', ' +
applyFormatOBMaskedToJS(glitemAmount) + ');return false;"'
+ ' onfocus="buttonEvent(\'onfocus\', this); window.status=\'OK\';
return true;"'
+ ' onblur="buttonEvent(\'onblur\', this);"'
+ ' onkeyup="buttonEvent(\'onkeyup\', this);"'
@@ -279,6 +281,7 @@
loadGLItemList();
}
function removeGLItem(key, removedAmount) {
+ var removedAmount = applyFormatJSToOBMasked(removedAmount);
if (!isTrue('isReceipt')){
if ( compare(document.frmMain.inpActualPayment.value, '>', removedAmount)
) {
document.frmMain.inpActualPayment.value =
subtract(document.frmMain.inpActualPayment.value, removedAmount);
@@ -298,8 +301,8 @@
updateConvertedAmounts();
}
function displayMulticurrencyControls() {
- var invCurrency = document.getElementById('paramCurrencyId').value
- var accountCurrency =
document.getElementById('paramFinancialAccountCurrencyId').value
+ var invCurrency = document.getElementById('paramCurrencyId').value;
+ var accountCurrency =
document.getElementById('paramFinancialAccountCurrencyId').value;
var display = ( invCurrency && accountCurrency && invCurrency !=
accountCurrency );
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2dcopy1
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
