details: https://code.openbravo.com/erp/devel/pi/rev/2a1d61ea3efc changeset: 13626:2a1d61ea3efc user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com> date: Wed Aug 31 10:34:18 2011 +0200 summary: Fixed issue 18362.Prevent NPE error.
details: https://code.openbravo.com/erp/devel/pi/rev/3b5f56734bca changeset: 13627:3b5f56734bca user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com> date: Wed Aug 31 10:40:02 2011 +0200 summary: Fixed issue 18394.Fix check on FIN_Utilities.js. diffstat: modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js | 8 ++++---- src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diffs (45 lines): diff -r e08696bbaa47 -r 3b5f56734bca modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js --- a/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js Tue Aug 30 19:37:56 2011 +0200 +++ b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js Wed Aug 31 10:40:02 2011 +0200 @@ -385,9 +385,9 @@ frm.inpActualPayment.value = frm.inpGeneratedCredit.value; } updateDifference(); - if (OB.APRM.HasGLItems === 'undefined' || !OB.APRM.HasGLItems) { + //if (OB.APRM.HasGLItems === 'undefined' || !OB.APRM.HasGLItems) { //return; - } + //} } else if (!chk.length) { scheduledPaymentDetailId = frm.inpRecordId0.value; pendingAmount = frm.elements["inpRecordAmt" + scheduledPaymentDetailId].value; @@ -613,7 +613,7 @@ if (!validateSelectedAmounts(chk.value, compare(selectedTotal, '<', actualPayment), action)) { return false; } - } else if ( !allowNotSelectingPendingPayment || compare(document.frmMain.inpDifference.value, '==', "0") ){ + } else if ( !allowNotSelectingPendingPayment || compare(actualPayment, '==', "0")){ showJSMessage('APRM_JSNOTLINESELECTED'); return false; } @@ -629,7 +629,7 @@ } } if (!isAnyChecked && - (!allowNotSelectingPendingPayment || compare(document.frmMain.inpDifference.value, '==', "0")) + (!allowNotSelectingPendingPayment || compare(actualPayment, '==', "0")) ) { showJSMessage('APRM_JSNOTLINESELECTED'); return false; diff -r e08696bbaa47 -r 3b5f56734bca src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java --- a/src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java Tue Aug 30 19:37:56 2011 +0200 +++ b/src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java Wed Aug 31 10:40:02 2011 +0200 @@ -469,7 +469,7 @@ .getDepositAmount().toString(), transaction.getPaymentAmount().toString(), Fact_Acct_Group_ID, nextSeqNo(SeqNo), DocumentType, null, docToSchemaConversionRate, EXCHANGE_DOCTYPE_Transaction, transaction.getId(), conn); - if (!transaction.getForeignCurrency().equals(as.getC_Currency_ID())) { + if (!as.getC_Currency_ID().equals(transaction.getForeignCurrency())) { MultiCurrency = true; createFactCurrencyBalancing(as, conn, fact, Fact_Acct_Group_ID, transaction); } ------------------------------------------------------------------------------ Special Offer -- Download ArcSight Logger for FREE! Finally, a world-class log management solution at an even better price-free! And you'll get a free "Love Thy Logs" t-shirt when you download Logger. Secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsisghtdev2dev _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
