details: https://code.openbravo.com/erp/devel/pi/rev/71682af8063c changeset: 24116:71682af8063c user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Thu Jul 24 17:54:20 2014 +0200 summary: Improve and remove log errors
details: https://code.openbravo.com/erp/devel/pi/rev/661190e92d0b changeset: 24117:661190e92d0b user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Thu Jul 24 18:45:22 2014 +0200 summary: Fixes bug 27182: Wrong source payment selected when refunding diffstat: modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentActionHandler.java | 6 +- src/org/openbravo/erpCommon/ad_forms/AcctServer.java | 1 + src/org/openbravo/erpCommon/ad_forms/DocMatchInv.java | 36 +++++---- 3 files changed, 24 insertions(+), 19 deletions(-) diffs (114 lines): diff -r 7c7efd35f42f -r 661190e92d0b modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentActionHandler.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentActionHandler.java Thu Jul 24 17:41:49 2014 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentActionHandler.java Thu Jul 24 18:45:22 2014 +0200 @@ -172,7 +172,7 @@ || strAction.equals("PPW")) { OBError message = processPayment(payment, strAction, strDifferenceAction, differenceAmount, - exchangeRate); + exchangeRate, jsonparams); JSONObject errorMessage = new JSONObject(); errorMessage.put("severity", message.getType().toLowerCase()); errorMessage.put("title", message.getTitle()); @@ -329,6 +329,7 @@ creditPayment.setDescription(truncateDescription); // Set Used Credit = Amount + Previous used credit introduced by the user creditPayment.setUsedCredit(usedCreditAmt.add(creditPayment.getUsedCredit())); + ; FIN_PaymentProcess.linkCreditPayment(payment, usedCreditAmt, creditPayment); OBDal.getInstance().save(creditPayment); } @@ -468,7 +469,7 @@ } private OBError processPayment(FIN_Payment payment, String strAction, String strDifferenceAction, - BigDecimal refundAmount, BigDecimal exchangeRate) throws Exception { + BigDecimal refundAmount, BigDecimal exchangeRate, JSONObject jsonparams) throws Exception { ConnectionProvider conn = new DalConnectionProvider(true); VariablesSecureApp vars = RequestContext.get().getVariablesSecureApp(); @@ -497,6 +498,7 @@ conn = new DalConnectionProvider(true); OBDal.getInstance().getSession().clear(); payment = OBDal.getInstance().get(FIN_Payment.class, payment.getId()); + addCredit(payment, jsonparams); } if (!strDifferenceAction.equals("refund")) { return message; diff -r 7c7efd35f42f -r 661190e92d0b src/org/openbravo/erpCommon/ad_forms/AcctServer.java --- a/src/org/openbravo/erpCommon/ad_forms/AcctServer.java Thu Jul 24 17:41:49 2014 +0200 +++ b/src/org/openbravo/erpCommon/ad_forms/AcctServer.java Thu Jul 24 18:45:22 2014 +0200 @@ -708,6 +708,7 @@ Status = AcctServer.STATUS_Error; save(conn, vars.getUser()); log4j.warn(e); + log4j.warn("RecordId: " + strClave + " - tableId" + AD_Table_ID); e.printStackTrace(); } } catch (ServletException e) { diff -r 7c7efd35f42f -r 661190e92d0b src/org/openbravo/erpCommon/ad_forms/DocMatchInv.java --- a/src/org/openbravo/erpCommon/ad_forms/DocMatchInv.java Thu Jul 24 17:41:49 2014 +0200 +++ b/src/org/openbravo/erpCommon/ad_forms/DocMatchInv.java Thu Jul 24 18:45:22 2014 +0200 @@ -66,8 +66,8 @@ super(AD_Client_ID, AD_Org_ID, connectionProvider); } - public void loadObjectFieldProvider(ConnectionProvider conn, - @SuppressWarnings("hiding") String AD_Client_ID, String Id) throws ServletException { + public void loadObjectFieldProvider(ConnectionProvider conn, @SuppressWarnings("hiding") + String AD_Client_ID, String Id) throws ServletException { setObjectFieldProvider(DocMatchInvData.selectRegistro(conn, AD_Client_ID, Id)); } @@ -149,16 +149,19 @@ } if (data == null || data.length == 0) return null; - for (int i = 0; i < data.length; i++) { - DocLine_Material docLine = new DocLine_Material(DocumentType, Record_ID, strInOutLineId); - docLine.loadAttributes(data[i], this); + + try { OBContext.setAdminMode(false); - String strQty = data[i].movementqty; - docLine.setQty(strQty); - - list.add(docLine); - } - // Return Array + for (int i = 0; i < data.length; i++) { + DocLine_Material docLine = new DocLine_Material(DocumentType, Record_ID, strInOutLineId); + docLine.loadAttributes(data[i], this); + String strQty = data[i].movementqty; + docLine.setQty(strQty); + list.add(docLine); + } + } finally { + OBContext.restorePreviousMode(); + } // Return Array DocLine[] dl = new DocLine[list.size()]; list.toArray(dl); return dl; @@ -503,17 +506,16 @@ } // updateProductInfo private MaterialTransaction getTransaction(String matchInvId) { - OBContext.setAdminMode(false); MaterialTransaction transaction; - if (OBDal.getInstance().get(ReceiptInvoiceMatch.class, matchInvId).getGoodsShipmentLine() - .getMaterialMgmtMaterialTransactionList().size() == 0) { - return null; - } try { + OBContext.setAdminMode(false); + if (OBDal.getInstance().get(ReceiptInvoiceMatch.class, matchInvId).getGoodsShipmentLine() + .getMaterialMgmtMaterialTransactionList().size() == 0) { + return null; + } transaction = OBDal.getInstance().get(ReceiptInvoiceMatch.class, matchInvId) .getGoodsShipmentLine().getMaterialMgmtMaterialTransactionList().get(0); } finally { - OBContext.restorePreviousMode(); } return transaction; ------------------------------------------------------------------------------ Want fast and easy access to all the code in your enterprise? Index and search up to 200,000 lines of code with a free copy of Black Duck Code Sight - the same software that powers the world's largest code search on Ohloh, the Black Duck Open Hub! Try it now. http://p.sf.net/sfu/bds _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
