details: https://code.openbravo.com/erp/devel/pi/rev/97e4440ca52d changeset: 25748:97e4440ca52d user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Jan 15 12:19:06 2015 +0100 summary: [share props] removed unused variable
details: https://code.openbravo.com/erp/devel/pi/rev/3d206cc14a35 changeset: 25749:3d206cc14a35 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Jan 20 09:24:01 2015 +0100 summary: [share props] define different properties in Tomcat clustering environments details: https://code.openbravo.com/erp/devel/pi/rev/3ff0f420fdbd changeset: 25750:3ff0f420fdbd user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Jan 20 09:33:56 2015 +0100 summary: [share props] fixed build dependencies Previous changeset made an indirect depencency from OBPropertiesProvider to dal generated code, which caused not to be possible to generete entities. The problem has been fixed by accessing ServletContext from OBConfigFileProvider which has no this dependency. details: https://code.openbravo.com/erp/devel/pi/rev/0522f7110df3 changeset: 25751:0522f7110df3 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Jan 20 16:41:17 2015 +0100 summary: [share props] allow to reset Openbravo.properties This flow is used when restarting Tomcat from MMC. Do not fail nor show warn message. details: https://code.openbravo.com/erp/devel/pi/rev/fdd30bd81889 changeset: 25752:fdd30bd81889 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Wed Jan 21 12:56:19 2015 +0100 summary: [share props] added ant taks to know host name to be executed by ant host.name details: https://code.openbravo.com/erp/devel/pi/rev/b75d054ba4b4 changeset: 25753:b75d054ba4b4 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Wed Jan 21 12:58:16 2015 +0100 summary: [share props] make classes dir before execute host.name task details: https://code.openbravo.com/erp/devel/pi/rev/0f5de5c0746d changeset: 25754:0f5de5c0746d user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Wed Jan 21 13:09:39 2015 +0100 summary: [share props] host.name task uses System.out instead of log4j In this way it can be executed without having compiled appenders defined for log4j. details: https://code.openbravo.com/erp/devel/pi/rev/ad079bdad031 changeset: 25755:ad079bdad031 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon Jan 26 10:04:44 2015 +0100 summary: fixed issue 28605: allow to overwrite properties per instance Support for propreties overwriting in instances running in tomcat clustering More details: http://wiki.openbravo.com/wiki/Projects:Share_Openbravo.properties diffstat: build.xml | 13 +- modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/Issue28591UpdatePSD.class | 0 modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/Issue28591UpdatePSDData.class | 0 modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/Issue28591UpdatePSD.java | 41 + modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/Issue28591UpdatePSD_data.xsql | 85 + modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/src/org/openbravo/advpaymentmngt/modulescript/Issue28591UpdatePSDData.java | 292 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentMonitorProcess.java | 28 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java | 8 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addTransaction.js | 8 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-matchStatement.js | 15 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java | 4 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-param-window-parameter.ftl | 5 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewParameterHandler.java | 15 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js | 3 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 5 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-number.js | 15 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js | 13 +- modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.java | 6 +- src-core/src/org/openbravo/base/ConfigParameters.java | 98 +- src-core/src/org/openbravo/base/HttpBaseServlet.java | 5 +- src-db/database/lib/dbsourcemanager.jar | 0 src-db/database/model/functions/GL_JOURNAL_POST.xml | 4 +- src-db/database/model/functions/M_INOUT_CREATE.xml | 37 +- src-db/database/model/functions/M_REQUISITION_CREATEPO.xml | 8 +- src-db/database/model/tables/C_INVOICE.xml | 3 + src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 11 + src-db/database/sourcedata/AD_COLUMN.xml | 5 +- src-db/database/sourcedata/AD_FIELD.xml | 27 + src-db/database/sourcedata/AD_MESSAGE.xml | 12 + src-db/database/sourcedata/AD_PROCESS_PARA.xml | 2 +- src-db/database/sourcedata/AD_REF_LIST.xml | 12 + src-db/database/sourcedata/AD_TAB.xml | 2 +- src-db/database/sourcedata/AD_VAL_RULE.xml | 19 + src-test/src/org/openbravo/test/AllWebserviceTests.java | 4 +- src-test/src/org/openbravo/test/costing/TestCosting.java | 13666 +++++++++- src/org/openbravo/base/secureApp/HttpSecureAppServlet.java | 67 +- src/org/openbravo/base/session/HostNameTask.java | 57 + src/org/openbravo/base/session/OBPropertiesProvider.java | 25 +- src/org/openbravo/common/actionhandler/ManageReservationActionHandler.java | 15 +- src/org/openbravo/dal/core/DalContextListener.java | 25 +- src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java | 6 +- src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual_data.xsql | 2 - src/org/openbravo/erpCommon/ad_forms/Role.java | 4 +- src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports.java | 6 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java | 4 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java | 4 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournalDetail.java | 6 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesJR.java | 4 +- src/org/openbravo/erpCommon/ad_reports/ReportPurchaseDimensionalAnalysesJR.java | 7 +- src/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyzeJR.java | 2 +- src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java | 12 +- src/org/openbravo/event/BusinessPartnerEventHandler.java | 21 +- src/org/openbravo/materialmgmt/VariantAutomaticGenerationProcess.java | 9 +- 53 files changed, 14424 insertions(+), 323 deletions(-) diffs (truncated from 15805 to 300 lines): diff -r 71010e80cfed -r ad079bdad031 build.xml --- a/build.xml Wed Jan 14 09:39:32 2015 +0100 +++ b/build.xml Mon Jan 26 10:04:44 2015 +0100 @@ -12,7 +12,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU -* All portions are Copyright (C) 2001-2014 Openbravo SLU +* All portions are Copyright (C) 2001-2015 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -1132,4 +1132,15 @@ propertiesFile="${base.config}/Openbravo.properties"/> </target> + <target name="host.name" + description="Prints this machine's name. This name can be used to overwrite common Openbravo.properties by machine.name.Openbravo properties file"> + <mkdir dir="build/classes"/> + <javac srcdir="src/org/openbravo/base/session" includes="HostNameTask.java" destdir="build/classes" fork="true" deprecation="off" encoding="UTF-8" debug="true" debuglevel="lines,vars,source" includeantruntime="false"> + <classpath refid="project.class.path"/> + </javac> + <taskdef name="hostName" classname="org.openbravo.base.session.HostNameTask"> + <classpath refid="project.class.path"/> + </taskdef> + <hostName/> + </target> </project> diff -r 71010e80cfed -r ad079bdad031 modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/Issue28591UpdatePSD.class Binary file modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/Issue28591UpdatePSD.class has changed diff -r 71010e80cfed -r ad079bdad031 modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/Issue28591UpdatePSDData.class Binary file modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/Issue28591UpdatePSDData.class has changed diff -r 71010e80cfed -r ad079bdad031 modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/Issue28591UpdatePSD.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/Issue28591UpdatePSD.java Mon Jan 26 10:04:44 2015 +0100 @@ -0,0 +1,41 @@ +/* + ************************************************************************* + * 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) 2015 Openbravo SLU + * All Rights Reserved. + * Contributor(s): ______________________________________. + ************************************************************************* + */ +package org.openbravo.advpaymentmngt.modulescript; + +import org.openbravo.database.ConnectionProvider; +import org.openbravo.modulescript.ModuleScript; +import java.math.BigDecimal; + +public class Issue28591UpdatePSD extends ModuleScript { + public void execute() { + try { + ConnectionProvider cp = getConnectionProvider(); + boolean issue28591UpdatePSD = Issue28591UpdatePSDData.updateWrongPSD(cp); + if(!issue28591UpdatePSD) { + Issue28591UpdatePSDData[] data = Issue28591UpdatePSDData.selectPSD(cp); + for (Issue28591UpdatePSDData upsd : data) { + Issue28591UpdatePSDData.updatePSDAmount(cp, upsd.outstandingamt, upsd.finPaymentScheduledetailId); + } + Issue28591UpdatePSDData.createPreference(cp); + } + } catch (Exception e) { + handleError(e); + } + } +} \ No newline at end of file diff -r 71010e80cfed -r ad079bdad031 modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/Issue28591UpdatePSD_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/Issue28591UpdatePSD_data.xsql Mon Jan 26 10:04:44 2015 +0100 @@ -0,0 +1,85 @@ +<?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) 2015 Openbravo SLU + * All Rights Reserved. + * Contributor(s): ______________________________________. + ************************************************************************* +--> +<SqlClass name="Issue28591UpdatePSDData" package="org.openbravo.advpaymentmngt.modulescript"> + <SqlClassComment></SqlClassComment> + <SqlMethod name="select" type="preparedStatement" return="multiple"> + <SqlMethodComment></SqlMethodComment> + <Sql> + <![CDATA[ + SELECT '' as fin_payment_scheduledetail_id, '' as outstandingamt, '' as wrongamt, + '' as fin_payment_schedule_id, '' as c_invoice_id, '' as c_currency_id, '' as bp_currency_id, + '' as fin_payment_id, '' as fin_payment_detail_id, '' as isreceipt, '' as c_bpartner_id + FROM DUAL + ]]> + </Sql> + </SqlMethod> + <SqlMethod name="selectPSD" type="preparedStatement" return="multiple"> + <SqlMethodComment></SqlMethodComment> + <Sql> + <![CDATA[ + select ps.outstandingamt as outstandingamt, max(psd.fin_payment_scheduledetail_id) as fin_payment_scheduledetail_id + from fin_payment_scheduledetail psd + LEFT JOIN fin_payment_schedule ps ON ps.fin_payment_schedule_id = COALESCE(psd.fin_payment_schedule_invoice,psd.fin_payment_schedule_order) + where psd.fin_payment_detail_id is null and ps.outstandingamt > 0 + group by ps.outstandingamt, ps.fin_payment_schedule_id + having sum(psd.amount) <> ps.outstandingamt + ]]> + </Sql> + </SqlMethod> + <SqlMethod name="updatePSDAmount" type="preparedStatement" return="rowcount"> + <SqlMethodComment></SqlMethodComment> + <Sql> + <![CDATA[ + UPDATE FIN_PAYMENT_SCHEDULEDETAIL SET AMOUNT=TO_NUMBER(?), + updatedby='0', updated=now() + WHERE FIN_PAYMENT_SCHEDULEDETAIL_ID = ? + ]]> + </Sql> + <Parameter name="outStandingAmount"/> + <Parameter name="finPaymentScheduledetailId"/> + </SqlMethod> + <SqlMethod name="updateWrongPSD" type="preparedStatement" return="boolean"> + <SqlMethodComment></SqlMethodComment> + <Sql> + <![CDATA[ + SELECT count(*) as exist + FROM DUAL + WHERE EXISTS (SELECT 1 FROM ad_preference + WHERE attribute = 'Issue28591updateWrongPSD') + ]]> + </Sql> + </SqlMethod> + <SqlMethod name="createPreference" type="preparedStatement" return="rowcount"> + <SqlMethodComment></SqlMethodComment> + <Sql> + <![CDATA[ + INSERT INTO ad_preference ( + ad_preference_id, ad_client_id, ad_org_id, isactive, + createdby, created, updatedby, updated, + attribute + ) VALUES ( + get_uuid(), '0', '0', 'Y', + '0', NOW(), '0', NOW(), + 'Issue28591updateWrongPSD' + ) + ]]> + </Sql> + </SqlMethod> + </SqlClass> diff -r 71010e80cfed -r ad079bdad031 modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/src/org/openbravo/advpaymentmngt/modulescript/Issue28591UpdatePSDData.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/Issue28591UpdatePSDData.java Mon Jan 26 10:04:44 2015 +0100 @@ -0,0 +1,292 @@ +//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 Issue28591UpdatePSDData implements FieldProvider { +static Logger log4j = Logger.getLogger(Issue28591UpdatePSDData.class); + private String InitRecordNumber="0"; + public String finPaymentScheduledetailId; + public String outstandingamt; + public String wrongamt; + public String finPaymentScheduleId; + public String cInvoiceId; + public String cCurrencyId; + public String bpCurrencyId; + public String finPaymentId; + public String finPaymentDetailId; + public String isreceipt; + public String cBpartnerId; + + public String getInitRecordNumber() { + return InitRecordNumber; + } + + public String getField(String fieldName) { + if (fieldName.equalsIgnoreCase("fin_payment_scheduledetail_id") || fieldName.equals("finPaymentScheduledetailId")) + return finPaymentScheduledetailId; + else if (fieldName.equalsIgnoreCase("outstandingamt")) + return outstandingamt; + else if (fieldName.equalsIgnoreCase("wrongamt")) + return wrongamt; + else if (fieldName.equalsIgnoreCase("fin_payment_schedule_id") || fieldName.equals("finPaymentScheduleId")) + return finPaymentScheduleId; + else if (fieldName.equalsIgnoreCase("c_invoice_id") || fieldName.equals("cInvoiceId")) + return cInvoiceId; + else if (fieldName.equalsIgnoreCase("c_currency_id") || fieldName.equals("cCurrencyId")) + return cCurrencyId; + else if (fieldName.equalsIgnoreCase("bp_currency_id") || fieldName.equals("bpCurrencyId")) + return bpCurrencyId; + else if (fieldName.equalsIgnoreCase("fin_payment_id") || fieldName.equals("finPaymentId")) + return finPaymentId; + else if (fieldName.equalsIgnoreCase("fin_payment_detail_id") || fieldName.equals("finPaymentDetailId")) + return finPaymentDetailId; + else if (fieldName.equalsIgnoreCase("isreceipt")) + return isreceipt; + else if (fieldName.equalsIgnoreCase("c_bpartner_id") || fieldName.equals("cBpartnerId")) + return cBpartnerId; + else { + log4j.debug("Field does not exist: " + fieldName); + return null; + } + } + + public static Issue28591UpdatePSDData[] select(ConnectionProvider connectionProvider) throws ServletException { + return select(connectionProvider, 0, 0); + } + + public static Issue28591UpdatePSDData[] select(ConnectionProvider connectionProvider, int firstRegister, int numberRegisters) throws ServletException { + String strSql = ""; + strSql = strSql + + " SELECT '' as fin_payment_scheduledetail_id, '' as outstandingamt, '' as wrongamt, " + + " '' as fin_payment_schedule_id, '' as c_invoice_id, '' as c_currency_id, '' as bp_currency_id," + + " '' as fin_payment_id, '' as fin_payment_detail_id, '' as isreceipt, '' as c_bpartner_id" + + " 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++; + Issue28591UpdatePSDData objectIssue28591UpdatePSDData = new Issue28591UpdatePSDData(); + objectIssue28591UpdatePSDData.finPaymentScheduledetailId = UtilSql.getValue(result, "fin_payment_scheduledetail_id"); + objectIssue28591UpdatePSDData.outstandingamt = UtilSql.getValue(result, "outstandingamt"); + objectIssue28591UpdatePSDData.wrongamt = UtilSql.getValue(result, "wrongamt"); + objectIssue28591UpdatePSDData.finPaymentScheduleId = UtilSql.getValue(result, "fin_payment_schedule_id"); + objectIssue28591UpdatePSDData.cInvoiceId = UtilSql.getValue(result, "c_invoice_id"); + objectIssue28591UpdatePSDData.cCurrencyId = UtilSql.getValue(result, "c_currency_id"); + objectIssue28591UpdatePSDData.bpCurrencyId = UtilSql.getValue(result, "bp_currency_id"); + objectIssue28591UpdatePSDData.finPaymentId = UtilSql.getValue(result, "fin_payment_id"); + objectIssue28591UpdatePSDData.finPaymentDetailId = UtilSql.getValue(result, "fin_payment_detail_id"); + objectIssue28591UpdatePSDData.isreceipt = UtilSql.getValue(result, "isreceipt"); + objectIssue28591UpdatePSDData.cBpartnerId = UtilSql.getValue(result, "c_bpartner_id"); + objectIssue28591UpdatePSDData.InitRecordNumber = Integer.toString(firstRegister); + vector.addElement(objectIssue28591UpdatePSDData); + 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(); + } + } + Issue28591UpdatePSDData objectIssue28591UpdatePSDData[] = new Issue28591UpdatePSDData[vector.size()]; + vector.copyInto(objectIssue28591UpdatePSDData); + return(objectIssue28591UpdatePSDData); + } + + public static Issue28591UpdatePSDData[] selectPSD(ConnectionProvider connectionProvider) throws ServletException { ------------------------------------------------------------------------------ Dive into the World of Parallel Programming. The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net/ _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
