details: https://code.openbravo.com/erp/devel/pi/rev/c748fcb063d8 changeset: 16495:c748fcb063d8 user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Mon May 07 10:53:04 2012 +0200 summary: fixes bug 20427: Java Class name should be a session value for Matching Algorithm
details: https://code.openbravo.com/erp/devel/pi/rev/566af5c10315 changeset: 16496:566af5c10315 user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Mon May 07 10:54:55 2012 +0200 summary: Fixes bug 20428: Record_ID2 column is taking values when posting documents of the new financial flows when it should point just debt/payments details: https://code.openbravo.com/erp/devel/pi/rev/c7d28f77823d changeset: 16497:c7d28f77823d user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Mon May 07 10:56:04 2012 +0200 summary: Fixes bug 20429: Add Payment from Transaction does not allow to filter by amounts when creating a payment details: https://code.openbravo.com/erp/devel/pi/rev/f8752c98c5d9 changeset: 16498:f8752c98c5d9 user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Fri May 11 18:47:35 2012 +0200 summary: Fixes bug 20472: General Ledger does not calculate previous amount taking into account all the movement history. diffstat: modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/UpdateRecordId2Value.class | 0 modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/UpdateRecordId2ValueData.class | 0 modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/UpdateRecordId2Value.java | 39 + modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/UpdateRecordId2Value_data.xsql | 39 + modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/src/org/openbravo/advpaymentmngt/modulescript/UpdateRecordId2ValueData.java | 114 ++++ modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html | 94 +++- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java | 13 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.xml | 2 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java | 26 +- src-db/database/sourcedata/AD_COLUMN.xml | 2 +- src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 11 - src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java | 2 +- src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java | 2 +- src/org/openbravo/erpCommon/ad_forms/DocInvoice.java | 2 +- src/org/openbravo/erpCommon/ad_forms/DocLine_FINFinAccTransaction.java | 2 +- src/org/openbravo/erpCommon/ad_forms/DocLine_FINPayment.java | 3 +- src/org/openbravo/erpCommon/ad_forms/DocLine_FINReconciliation.java | 2 +- src/org/openbravo/erpCommon/ad_forms/DocLine_FinPaymentSchedule.java | 2 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.html | 50 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java | 238 +++------ src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.xml | 4 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger_data.xsql | 257 +++++++++- 22 files changed, 688 insertions(+), 216 deletions(-) diffs (truncated from 1395 to 300 lines): diff -r f789211d10bf -r f8752c98c5d9 modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/UpdateRecordId2Value.class Binary file modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/UpdateRecordId2Value.class has changed diff -r f789211d10bf -r f8752c98c5d9 modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/UpdateRecordId2ValueData.class Binary file modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/UpdateRecordId2ValueData.class has changed diff -r f789211d10bf -r f8752c98c5d9 modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/UpdateRecordId2Value.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/UpdateRecordId2Value.java Fri May 11 18:47:35 2012 +0200 @@ -0,0 +1,39 @@ +/* + ************************************************************************* + * The contents of this file are subject to the Openbravo Public License + * Version 1.0 (the "License"), being the Mozilla Public License + * Version 1.1 with a permitted attribution clause; you may not use this + * file except in compliance with the License. You may obtain a copy of + * the License at http://www.openbravo.com/legal/license.html + * Software distributed under the License is distributed on an "AS IS" + * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the + * License for the specific language governing rights and limitations + * under the License. + * The Original Code is Openbravo ERP. + * The Initial Developer of the Original Code is Openbravo SLU + * All portions are Copyright (C) 2012 Openbravo SLU + * All Rights Reserved. + * Contributor(s): ______________________________________. + ************************************************************************* + */ +package org.openbravo.advpaymentmngt.modulescript; + +import org.openbravo.database.ConnectionProvider; +import org.openbravo.modulescript.ModuleScript; + +public class UpdateRecordId2Value extends ModuleScript { + + /** + * This modulescript removes value for record_id2 in fact_acct table when this + * one points no debt/paymnet. + */ + @Override + public void execute() { + try { + ConnectionProvider cp = getConnectionProvider(); + UpdateRecordId2ValueData.update(cp); + } catch (Exception e) { + handleError(e); + } + } +} diff -r f789211d10bf -r f8752c98c5d9 modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/UpdateRecordId2Value_data.xsql --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/UpdateRecordId2Value_data.xsql Fri May 11 18:47:35 2012 +0200 @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!-- + ************************************************************************* + * The contents of this file are subject to the Openbravo Public License + * Version 1.0 (the "License"), being the Mozilla Public License + * Version 1.1 with a permitted attribution clause; you may not use this + * file except in compliance with the License. You may obtain a copy of + * the License at http://www.openbravo.com/legal/license.html + * Software distributed under the License is distributed on an "AS IS" + * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the + * License for the specific language governing rights and limitations + * under the License. + * The Original Code is Openbravo ERP. + * The Initial Developer of the Original Code is Openbravo SLU + * All portions are Copyright (C) 2012 Openbravo SLU + * All Rights Reserved. + * Contributor(s): ______________________________________. + ************************************************************************* +--> +<SqlClass name="UpdateRecordId2ValueData" package="org.openbravo.advpaymentmngt.modulescript"> + <SqlClassComment></SqlClassComment> + <SqlMethod name="select" type="preparedStatement" return="multiple"> + <SqlMethodComment></SqlMethodComment> + <Sql> + <![CDATA[ + SELECT 1 as name from dual + ]]> + </Sql> + </SqlMethod> + <SqlMethod name="update" type="preparedStatement" return="rowCount"> + <SqlMethodComment></SqlMethodComment> + <Sql> + <![CDATA[ + UPDATE FACT_ACCT SET RECORD_ID2 = NULL + WHERE NOT EXISTS (SELECT 1 FROM C_DEBT_PAYMENT WHERE C_DEBT_PAYMENT_ID = RECORD_ID2) + ]]> + </Sql> + </SqlMethod> +</SqlClass> \ No newline at end of file diff -r f789211d10bf -r f8752c98c5d9 modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/src/org/openbravo/advpaymentmngt/modulescript/UpdateRecordId2ValueData.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/src/org/openbravo/advpaymentmngt/modulescript/UpdateRecordId2ValueData.java Fri May 11 18:47:35 2012 +0200 @@ -0,0 +1,114 @@ +//Sqlc generated V1.O00-1 +package org.openbravo.advpaymentmngt.modulescript; + +import java.sql.*; + +import org.apache.log4j.Logger; + +import javax.servlet.ServletException; + +import org.openbravo.data.FieldProvider; +import org.openbravo.database.ConnectionProvider; +import org.openbravo.data.UtilSql; +import java.util.*; + +class UpdateRecordId2ValueData implements FieldProvider { +static Logger log4j = Logger.getLogger(UpdateRecordId2ValueData.class); + private String InitRecordNumber="0"; + public String name; + + public String getInitRecordNumber() { + return InitRecordNumber; + } + + public String getField(String fieldName) { + if (fieldName.equalsIgnoreCase("name")) + return name; + else { + log4j.debug("Field does not exist: " + fieldName); + return null; + } + } + + public static UpdateRecordId2ValueData[] select(ConnectionProvider connectionProvider) throws ServletException { + return select(connectionProvider, 0, 0); + } + + public static UpdateRecordId2ValueData[] select(ConnectionProvider connectionProvider, int firstRegister, int numberRegisters) throws ServletException { + String strSql = ""; + strSql = strSql + + " SELECT 1 as name from dual"; + + ResultSet result; + Vector<java.lang.Object> vector = new Vector<java.lang.Object>(0); + PreparedStatement st = null; + + try { + st = connectionProvider.getPreparedStatement(strSql); + + result = st.executeQuery(); + long countRecord = 0; + long countRecordSkip = 1; + boolean continueResult = true; + while(countRecordSkip < firstRegister && continueResult) { + continueResult = result.next(); + countRecordSkip++; + } + while(continueResult && result.next()) { + countRecord++; + UpdateRecordId2ValueData objectUpdateRecordId2ValueData = new UpdateRecordId2ValueData(); + objectUpdateRecordId2ValueData.name = UtilSql.getValue(result, "name"); + objectUpdateRecordId2ValueData.InitRecordNumber = Integer.toString(firstRegister); + vector.addElement(objectUpdateRecordId2ValueData); + if (countRecord >= numberRegisters && numberRegisters != 0) { + continueResult = false; + } + } + result.close(); + } catch(SQLException e){ + log4j.error("SQL error in query: " + strSql + "Exception:"+ e); + throw new ServletException("@CODE=" + Integer.toString(e.getErrorCode()) + "@" + e.getMessage()); + } catch(Exception ex){ + log4j.error("Exception in query: " + strSql + "Exception:"+ ex); + throw new ServletException("@CODE=@" + ex.getMessage()); + } finally { + try { + connectionProvider.releasePreparedStatement(st); + } catch(Exception ignore){ + ignore.printStackTrace(); + } + } + UpdateRecordId2ValueData objectUpdateRecordId2ValueData[] = new UpdateRecordId2ValueData[vector.size()]; + vector.copyInto(objectUpdateRecordId2ValueData); + return(objectUpdateRecordId2ValueData); + } + + public static int update(ConnectionProvider connectionProvider) throws ServletException { + String strSql = ""; + strSql = strSql + + " UPDATE FACT_ACCT SET RECORD_ID2 = NULL " + + " WHERE NOT EXISTS (SELECT 1 FROM C_DEBT_PAYMENT WHERE C_DEBT_PAYMENT_ID = RECORD_ID2)"; + + int updateCount = 0; + PreparedStatement st = null; + + try { + st = connectionProvider.getPreparedStatement(strSql); + + updateCount = st.executeUpdate(); + } catch(SQLException e){ + log4j.error("SQL error in query: " + strSql + "Exception:"+ e); + throw new ServletException("@CODE=" + Integer.toString(e.getErrorCode()) + "@" + e.getMessage()); + } catch(Exception ex){ + log4j.error("Exception in query: " + strSql + "Exception:"+ ex); + throw new ServletException("@CODE=@" + ex.getMessage()); + } finally { + try { + connectionProvider.releasePreparedStatement(st); + } catch(Exception ignore){ + ignore.printStackTrace(); + } + } + return(updateCount); + } +} diff -r f789211d10bf -r f8752c98c5d9 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 11 12:49:05 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html Fri May 11 18:47:35 2012 +0200 @@ -104,7 +104,9 @@ OB.APRM.APFT_dt !== frmMain['inpDocumentType'].value || OB.APRM.APFT_cu !== frmMain['inpCurrencyId'].value || OB.APRM.APFT_dn !== frmMain['inpDocumentNo'].value || - OB.APRM.APFT_re !== frmMain['isReceipt'].value) { + OB.APRM.APFT_re !== frmMain['isReceipt'].value || + OB.APRM.APFT_af !== frmMain['inpAmountFrom'].value || + OB.APRM.APFT_at !== frmMain['inpAmountTo'].value) { OB.APRM.APFT_bp = frmMain['inpcBpartnerId'].value; OB.APRM.APFT_fa = frmMain['inpFinancialAccountId'].value; @@ -116,6 +118,8 @@ OB.APRM.APFT_cu = frmMain['inpCurrencyId'].value; OB.APRM.APFT_dn = frmMain['inpDocumentNo'].value; OB.APRM.APFT_re = frmMain['isReceipt'].value; + OB.APRM.APFT_af = frmMain['inpAmountFrom'].value; + OB.APRM.APFT_at = frmMain['inpAmountTo'].value; try { var url = '../org.openbravo.advpaymentmngt.ad_actionbutton/AddPaymentFromTransaction.html'; @@ -1357,7 +1361,21 @@ <td class="TextBox_ContentCell"> <table style="border: 0px none; border-collapse: collapse;"> <tr><td style="padding-top: 0px;"> - <input type="text" id="paramTransDateFrom" class="dojoValidateValid TextBox_btn_OneCell_width" value="" maxlength="10" name="inpTransDateFrom" onkeyup="autoCompleteDate(this);" onkeydown="changeToEditingMode('onkeydown');" onkeypress="changeToEditingMode('onkeypress');" oncut="changeToEditingMode('oncut');" onpaste="changeToEditingMode('onpaste');" oncontextmenu="changeToEditingMode('oncontextmenu');" onblur="expandDateYear(this.id);" onchange="validateDateTextBox(this.id); validateDate(this);return true;" displayFormat="xx" saveFormat="xx"></input> + <input type="text" id="paramTransDateFrom" + class="dojoValidateValid TextBox_btn_OneCell_width" + value="" + maxlength="10" + name="inpTransDateFrom" + onkeyup="autoCompleteDate(this);" + onkeydown="changeToEditingMode('onkeydown');" + onkeypress="changeToEditingMode('onkeypress');" + oncut="changeToEditingMode('oncut');" + onpaste="changeToEditingMode('onpaste');" + oncontextmenu="changeToEditingMode('oncontextmenu');" + onblur="expandDateYear(this.id);" + onchange="validateDateTextBox(this.id); validateDate(this);return true;" + displayFormat="xx" + saveFormat="xx"></input> </td></tr> </table> <span id="paramTransDateFrominvalidSpan" style="display: none;" class="TextBox_MsgContainer_span"> @@ -1413,6 +1431,78 @@ </table> </td> </tr> + <tr> + <td class="TitleCell"><span class="LabelText" id="lblAmountFrom">Amount From</span></td> + <td class="TextBox_btn_ContentCell"> + <table border="0" cellspacing="0" cellpadding="0" summary="" style="padding-top: 0px;" id="paramAmountFromCell"> + <tr> + <td class="Textbox_ContentCell"> + <table style="border: 0px none; border-collapse: collapse;"> + <tr><td style="padding-top: 0px;"> + <input type="text" onblur="numberInputEvent('onblur', this);" onfocus="numberInputEvent('onfocus', this);" outputformat="euroEdition" onchange="loadGridList();return true;" onpaste="changeToEditingMode('onpaste');" oncut="changeToEditingMode('oncut');" onkeypress="changeToEditingMode('onkeypress');" onkeydown="changeToEditingMode('onkeydown'); numberInputEvent('onkeydown', this, event);" onkeyup="" name="inpAmountFrom" maxlength="22" value="" required="false" class="dojoValidateValid TextBox_btn_OneCell_width number" id="paramAmountFrom"/> + </td></tr> + </table> + <span id="paramAmountFrominvalidSpan" style="display: none;" class="TextBox_MsgContainer_span"> + <table class="TextBox_MsgContainer_table"> + <tbody><tr class="TextBox_MsgContainer_tr"> + <td class="TextBox_MsgContainer_td"><div class="TextBox_MsgContainer_div"></div></td><td></td> + </tr> + <tr> + <td class="invalid" colspan="2"><div name="invalidText" id="paramAmountFrominvalidSpanText" class="TextBox_MsgContainer_div2">* The value entered is not valid.</div></td> + </tr> + </tbody></table> + </span> + </td> + <td class="FieldButton_ContentCell"> + <a class="FieldButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Amount From'; return true;" onblur=" window.status=''; return true;" onkeypress="this.className='FieldButtonLink_active'; return true;" onkeyup="this.className='FieldButtonLink_focus'; return true;" onclick="calculator('frmMain.inpAmountFrom', document.frmMain.inpAmountFrom.value, false);return false;"> + <table class="FieldButton" onmouseout="this.className='FieldButton';window.status='';return true;" onmouseover="this.className='FieldButton_hover';window.status='';return true;" onmousedown="this.className='FieldButton_active';return true;" onmouseup="this.className='FieldButton';return true;" id="NoPackageslinkCalc"> + <tr> + <td class="FieldButton_bg"> + <img alt="Calculator" class="FieldButton_Icon FieldButton_Icon_Calc" title="Amount" src="../../../../../web/images/blank.gif" border="0" id="buttonCalc"></img> + </td> + </tr> + </table> + </a> + </td> + </tr> + </table> + </td> + <td class="TitleCell"><span class="LabelText" id="lblAmountTo">Amount To</span></td> + <td class="TextBox_btn_ContentCell"> + <table border="0" cellspacing="0" cellpadding="0" summary="" style="padding-top: 0px;" id="paramAmountToCell"> + <tr> + <td class="Textbox_ContentCell"> ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
