details: https://code.openbravo.com/erp/devel/main/rev/9cd579c40b28 changeset: 14948:9cd579c40b28 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Wed Dec 21 09:52:54 2011 +0100 summary: fixed bug 19339: Cloned trial instance shows NPE in Instance Activation window
details: https://code.openbravo.com/erp/devel/main/rev/222a1f0084c5 changeset: 14949:222a1f0084c5 user: Antonio Moreno <antonio.moreno <at> openbravo.com> date: Wed Dec 21 12:10:00 2011 +0100 summary: Fixed issue 19338. When computing session attributes, readonly logic will be considered in addition to display logic details: https://code.openbravo.com/erp/devel/main/rev/dd7797ef2a18 changeset: 14950:dd7797ef2a18 user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Wed Dec 21 09:56:48 2011 +0100 summary: Fixes issue 19198: There is a column not implemented with code related details: https://code.openbravo.com/erp/devel/main/rev/f6414bbcade5 changeset: 14951:f6414bbcade5 user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Wed Dec 21 16:01:20 2011 +0100 summary: Fixes issue 19223: Payment Method selected for a payment term line is not the one used in the corresponding payment in/out plan line. details: https://code.openbravo.com/erp/devel/main/rev/d17b74061474 changeset: 14952:d17b74061474 user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Dec 22 03:52:53 2011 +0100 summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/296d6aad21a5 changeset: 14953:296d6aad21a5 user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com> date: Wed Dec 21 18:48:09 2011 +0100 summary: Removed don't needed fields from core. details: https://code.openbravo.com/erp/devel/main/rev/57cc2b93df7a changeset: 14954:57cc2b93df7a user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Thu Dec 22 11:46:30 2011 +0100 summary: Fixes issue 19190: Transaction with incorrect amount amount when you try to pay an invoice having the default account of the BP in other currency details: https://code.openbravo.com/erp/devel/main/rev/d06684d8f8db changeset: 14955:d06684d8f8db user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Fri Dec 23 08:25:29 2011 +0100 summary: Fixes issue 19354: Problems in SL_Order_Amt callout details: https://code.openbravo.com/erp/devel/main/rev/2bf1f5aa29ad changeset: 14956:2bf1f5aa29ad user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com> date: Fri Dec 23 10:22:56 2011 +0100 summary: Fixed issue 19010.Fix issue with ConnectionProvider declaration. details: https://code.openbravo.com/erp/devel/main/rev/b119b4dd48de changeset: 14957:b119b4dd48de user: Víctor Villar <victor.villar <at> openbravo.com> date: Mon Dec 19 15:53:27 2011 +0100 summary: Fixed issue 19332:Add Leave as credit process to F&B details: https://code.openbravo.com/erp/devel/main/rev/b0cfd95061fd changeset: 14958:b0cfd95061fd user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Fri Dec 23 13:48:05 2011 +0100 summary: Updated legal/ foler to cover recent changes details: https://code.openbravo.com/erp/devel/main/rev/f7638eff9760 changeset: 14959:f7638eff9760 user: Martin Taal <martin.taal <at> openbravo.com> date: Tue Dec 27 20:22:17 2011 +0100 summary: Fixes issue 19364: Payment Monitor section in the Invoices does not appear Solve typo and change the way the visibility of section is computed details: https://code.openbravo.com/erp/devel/main/rev/05d50af83cc8 changeset: 14960:05d50af83cc8 user: RM packaging bot <staff.rm <at> openbravo.com> date: Wed Dec 28 04:29:47 2011 +0100 summary: CI: update AD_MODULE to version 14959 diffstat: legal/Licensing.txt | 39 +++ lib/README | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml | 22 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java | 5 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentMonitorProcess.java | 7 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java | 33 ++- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-section.js | 13 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js | 22 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 24 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 18 +- referencedata/sampledata/F_B_International_Group.xml | 9 + src-db/database/model/functions/C_INVOICE_POST.xml | 18 +- src-db/database/sourcedata/AD_FIELD.xml | 113 +--------- src-db/database/sourcedata/AD_MODULE.xml | 4 +- src/org/openbravo/erpCommon/ad_callouts/SL_Order_Stock_data.xsql | 4 +- src/org/openbravo/erpCommon/obps/ActivationKey.java | 14 +- 54 files changed, 218 insertions(+), 247 deletions(-) diffs (truncated from 1445 to 300 lines): diff -r f319f22df5fb -r 05d50af83cc8 legal/Licensing.txt --- a/legal/Licensing.txt Wed Dec 21 09:21:17 2011 +0100 +++ b/legal/Licensing.txt Wed Dec 28 04:29:47 2011 +0100 @@ -101,6 +101,7 @@ # batik-xml.jar # catalina-ant.jar # commons-beanutils-1.8.3.jar +# commons-betwixt-0.8.jar # commons-codec-1.5.jar # commons-collections-3.2.1.jar # commons-dbcp-1.4.jar @@ -113,10 +114,12 @@ # commons-pool-1.5.6.jar # fop.jar # google-collections.jar +# jakarta-oro-2.0.8.jar # jettison-1.3.jar # log4j-1.2.16.jar # quartz-1.6.2.jar # tika-core-0.9.jar +# wstx-asl-3.0.2.jar # xercesImpl.jar All files under Apache Software License 2.0, available at @@ -167,7 +170,9 @@ Under the CPL license (available at http://www.opensource.org/licenses/cpl1.0.php) # js.jar +# ob-rhino-1.6R7.jar Under MPL/GPL License (available at https://developer.mozilla.org/en/Rhino_License) +ob-rhino-1.6R7.jar is the same code as js.jar repackaged to be available under org.openbravo # javassist-3.14.0-GA.jar Under MPL License (included as MPL-1.1.txt in this folder) @@ -233,11 +238,20 @@ # shrinkwrap-spi-1.0.0-alpha-11.jar # validation-api-1.0.0.GA.jar # jsmin.0.2.4.jar +# httpcore-4.0.1.jar +# httpclient-4.0.jar +# httpmime-4.1.jar +# guice-2.0.jar +# openid4java-0.9.6.jar Under the Apache 2.0 license (included as Apache_license-2.0.txt in this folder) # jslint4java-1.4.7.jar Under the New BSD license (available at http://www.opensource.org/licenses/bsd-license.php) +# CSSMinimizer.java +CSSMin Copyright License Agreement (BSD License), Copyright (c) 2011, Barry van Oudtshoorn +The full license text is embedded within the CSSMinimizer.java file itself + # org.openbravo.client.kernel LAB.min.js is available under the MIT license (available at http://www.opensource.org/licenses/mit-license.php) @@ -247,6 +261,31 @@ directory are licensed under the terms of the LGPL 3.0, available at http://www.gnu.org/licenses/lgpl-3.0.html +# BigDecimal-all-1.0.1.min.js +BigDecimal implementation in JavaScript under the ICU4J license which is available in the file ICU4J-1.3.1.txt in this folder or with more explanation at: +https://github.com/dtrebbien/BigDecimal.js + +# scopeleaks.js +# scopeleaks.min.js +A modified version of scopeleaks by Rui Lopes available from https://github.com/ruidlopes/scopeleaks +(The MIT License), Copyright © 2011 Rui Lopes +The full license text is embedded within the scopeleaks.js file + +# benchmark.js +Copyright 2010-2011 Mathias Bynens <http://mths.be/> +Based on JSLitmus.js, copyright Robert Kieffer <http://broofa.com/> +Modified by John-David Dalton <http://allyoucanleet.com/> +Available under MIT license <http://mths.be/mit> + +# qunit.js +http://docs.jquery.com/QUnit +Copyright (c) 2011 John Resig, Jörn Zaefferer +Dual licensed under the MIT (MIT-LICENSE.txt) or GPL (GPL-LICENSE.txt) licenses. + +# web/org.openbravo.client.kernel/docs +Beautiful documentation, dynamically generated from source code in the browser. +From the code-illuminated project at: http://code.google.com/p/code-illuminated/, under the MPL 1.1 + The license files for this third party software are available in the legal folder of this distribution. diff -r f319f22df5fb -r 05d50af83cc8 lib/README --- a/lib/README Wed Dec 21 09:21:17 2011 +0100 +++ b/lib/README Wed Dec 28 04:29:47 2011 +0100 @@ -1,3 +1,3 @@ When adding or removing libraries to Openbravo ERP please update this page with your changes: -http://wiki.openbravo.com/wiki/ERP/2.50/Openbravo_Libraries +http://wiki.openbravo.com/wiki/Openbravo_Libraries diff -r f319f22df5fb -r 05d50af83cc8 modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml Wed Dec 21 09:21:17 2011 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml Wed Dec 28 04:29:47 2011 +0100 @@ -258,14 +258,16 @@ FOR cur_payments IN ( SELECT line, percentage, onremainder, excludetax, - COALESCE(paymentrule, v_paymentrule) AS paymentrule, + COALESCE(cptl.paymentrule, v_paymentrule) AS paymentrule, (CASE isduefixed WHEN 'N' THEN null ELSE fixmonthday END) AS fixmonthday, (CASE isduefixed WHEN 'N' THEN null ELSE fixmonthday2 END) AS Fixmonthday2, (CASE isduefixed WHEN 'N' THEN null ELSE fixmonthday3 END) AS fixmonthday3, - netdays, fixmonthoffset, netday, isnextbusinessday - FROM c_paymenttermline - WHERE c_paymentterm_id=v_paymentterm - AND isactive = 'Y' + netdays, fixmonthoffset, netday, isnextbusinessday, + COALESCE(cptl.fin_paymentmethod_id,c.fin_paymentmethod_id) as fin_paymentmethod_id + FROM c_paymenttermline cptl,c_invoice c + WHERE cptl.c_paymentterm_id=v_paymentterm + AND cptl.isactive = 'Y' + AND c_invoice_id = p_record_id UNION -- Header of paymentTerm is processed at last SELECT 9999 AS line, 100 AS percentage, 'Y' AS onremainder, 'N' AS excludetax, @@ -273,9 +275,11 @@ (CASE isduefixed WHEN 'N' THEN null ELSE fixmonthday END) AS fixmonthday, (CASE isduefixed WHEN 'N' THEN null ELSE fixmonthday2 END) AS Fixmonthday2, (CASE isduefixed WHEN 'N' THEN null ELSE fixmonthday3 END) AS fixmonthday3, - netdays, fixmonthoffset, netday, isnextbusinessday - FROM c_paymentterm - WHERE c_paymentterm_id=v_paymentterm + netdays, fixmonthoffset, netday, isnextbusinessday, + c.fin_paymentmethod_id + FROM c_paymentterm cpt ,c_invoice c + WHERE cpt.c_paymentterm_id=v_paymentterm + AND c_invoice_id = p_record_id ORDER BY line ) LOOP @@ -313,7 +317,7 @@ v_payment_schedule_invoice, v_client_id, v_org_id, 'Y', now(), p_user, now(), p_user, p_record_id, v_currency_id, null, - v_PaymentMethod, + cur_payments.fin_paymentmethod_id, v_scheduledamount, v_planneddate, v_scheduledamount, v_PaymentPriority ); diff -r f319f22df5fb -r 05d50af83cc8 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Wed Dec 21 09:21:17 2011 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Wed Dec 28 04:29:47 2011 +0100 @@ -6,7 +6,7 @@ <!--A918E3331C404B889D69AA9BFAFB23AC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--A918E3331C404B889D69AA9BFAFB23AC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--A918E3331C404B889D69AA9BFAFB23AC--> <NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></NAME> -<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.14891]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.14959]]></VERSION> <!--A918E3331C404B889D69AA9BFAFB23AC--> <DESCRIPTION><![CDATA[Managing your finances with an ERP does not have to be difficult. Enjoy a radically improved user experience that combines the power of an enterprise grade financial application with the simplicity and ease of a web 2.0 personal accounting service.]]></DESCRIPTION> <!--A918E3331C404B889D69AA9BFAFB23AC--> <HELP><![CDATA[Advanced Payables and Receivables Management simplifies and automates the business processes around the management of financial accounts, from the receipt and issue of payment, to the reconciliation of those events with bank statements. If you would like to help shape this module you are welcome to take part in the forum discussions or register feature requests or issues in the corresponding (Forum and Bug Tracking) sections in the Advanced Payables and Receivable project in the OB Forge.]]></HELP> diff -r f319f22df5fb -r 05d50af83cc8 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Dec 21 09:21:17 2011 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Dec 28 04:29:47 2011 +0100 @@ -7,7 +7,7 @@ <!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID> -<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.14891]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.14959]]></STARTVERSION> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <DEPENDANT_MODULE_NAME><![CDATA[User Interface Selector]]></DEPENDANT_MODULE_NAME> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -21,7 +21,7 @@ <!--B97FC854C6DD41E692161585645A900F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--B97FC854C6DD41E692161585645A900F--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--B97FC854C6DD41E692161585645A900F--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.14891]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.14959]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r f319f22df5fb -r 05d50af83cc8 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java Wed Dec 21 09:21:17 2011 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java Wed Dec 28 04:29:47 2011 +0100 @@ -339,6 +339,11 @@ } xmlDocument.setParameter("sectionDetailFinancialAccount", finAccountComboHtml); + if (account != null){ + if (!financialAccounts.contains(account)){ + strFinancialAccountId = financialAccounts.get(0).getId(); + } + } // Currency xmlDocument.setParameter("CurrencyId", strCurrencyId); final Currency paymentCurrency = dao.getObject(Currency.class, strCurrencyId); diff -r f319f22df5fb -r 05d50af83cc8 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentMonitorProcess.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentMonitorProcess.java Wed Dec 21 09:21:17 2011 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentMonitorProcess.java Wed Dec 28 04:29:47 2011 +0100 @@ -54,11 +54,9 @@ public class FIN_PaymentMonitorProcess extends DalBaseProcess { private static ProcessLogger logger; - private static ConnectionProvider conn = null; public void doExecute(ProcessBundle bundle) throws Exception { logger = bundle.getLogger(); - conn = bundle.getConnection(); // Check to know if PaymentMonitor property is set in the system. try { Preferences.getPreferenceValue("PaymentMonitor", true, null, null, OBContext.getOBContext() @@ -439,9 +437,8 @@ Date ConvDate, String client, String org) { if (CurFrom_ID == null || CurTo_ID == null || CurFrom_ID.equals(CurTo_ID)) return Amt; - if (conn == null) { - conn = new DalConnectionProvider(); - } + ConnectionProvider conn = new DalConnectionProvider(false); + String dateFormat = OBPropertiesProvider.getInstance().getOpenbravoProperties() .getProperty("dateFormat.java"); SimpleDateFormat dateFormater = new SimpleDateFormat(dateFormat); diff -r f319f22df5fb -r 05d50af83cc8 modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Wed Dec 21 09:21:17 2011 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Wed Dec 28 04:29:47 2011 +0100 @@ -6,7 +6,7 @@ <!--C70732EA90A14EC0916078B85CC33D2D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--C70732EA90A14EC0916078B85CC33D2D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--C70732EA90A14EC0916078B85CC33D2D--> <NAME><![CDATA[JBoss Weld]]></NAME> -<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.14891]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.14959]]></VERSION> <!--C70732EA90A14EC0916078B85CC33D2D--> <DESCRIPTION><![CDATA[JBoss Weld]]></DESCRIPTION> <!--C70732EA90A14EC0916078B85CC33D2D--> <HELP><![CDATA[Provides the JBoss Weld framework: Java Contexts and Dependency Injection for the Java EE platform (CDI). For more information see http://seamframework.org/Weld]]></HELP> <!--C70732EA90A14EC0916078B85CC33D2D--> <URL><![CDATA[http://forge.openbravo.com/projects/weld]]></URL> diff -r f319f22df5fb -r 05d50af83cc8 modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Dec 21 09:21:17 2011 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Dec 28 04:29:47 2011 +0100 @@ -7,7 +7,7 @@ <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <AD_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_MODULE_ID> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.14891]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.14959]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r f319f22df5fb -r 05d50af83cc8 modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Wed Dec 21 09:21:17 2011 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Wed Dec 28 04:29:47 2011 +0100 @@ -6,7 +6,7 @@ <!--9BA0836A3CD74EE4AB48753A47211BCC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <NAME><![CDATA[User Interface Application]]></NAME> -<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.14891]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.14959]]></VERSION> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <DESCRIPTION><![CDATA[Provides the main application components for the openbravo user interface]]></DESCRIPTION> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <HELP><![CDATA[Provides the main application components for the openbravo user interface. The main layout incorporates a navigation bar and a main view area.]]></HELP> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <URL><![CDATA[http://forge.openbravo.com/projects/clientapplication]]></URL> diff -r f319f22df5fb -r 05d50af83cc8 modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Dec 21 09:21:17 2011 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Dec 28 04:29:47 2011 +0100 @@ -7,7 +7,7 @@ <!--15D7CE8D95D043189162DBABA54A1F61--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--15D7CE8D95D043189162DBABA54A1F61--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--15D7CE8D95D043189162DBABA54A1F61--> <AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID> -<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.14891]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.14959]]></STARTVERSION> <!--15D7CE8D95D043189162DBABA54A1F61--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--15D7CE8D95D043189162DBABA54A1F61--> <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME> <!--15D7CE8D95D043189162DBABA54A1F61--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -21,7 +21,7 @@ <!--60A170212F36499D83B8AD38D01F46B3--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--60A170212F36499D83B8AD38D01F46B3--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--60A170212F36499D83B8AD38D01F46B3--> <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID> -<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.14891]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.14959]]></STARTVERSION> <!--60A170212F36499D83B8AD38D01F46B3--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--60A170212F36499D83B8AD38D01F46B3--> <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME> <!--60A170212F36499D83B8AD38D01F46B3--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -35,7 +35,7 @@ <!--824D60CB352E4099B1D8C903CA139DAE--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--824D60CB352E4099B1D8C903CA139DAE--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--824D60CB352E4099B1D8C903CA139DAE--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.14891]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.14959]]></STARTVERSION> <!--824D60CB352E4099B1D8C903CA139DAE--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--824D60CB352E4099B1D8C903CA139DAE--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--824D60CB352E4099B1D8C903CA139DAE--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -49,7 +49,7 @@ <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID> -<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.14891]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.14959]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r f319f22df5fb -r 05d50af83cc8 modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java Wed Dec 21 09:21:17 2011 +0100 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java Wed Dec 28 04:29:47 2011 +0100 @@ -382,16 +382,16 @@ if (field.getDisplayLogic() != null && field.isDisplayed() && field.isActive()) { final DynamicExpressionParser parser = new DynamicExpressionParser( ------------------------------------------------------------------------------ Write once. Port to many. Get the SDK and tools to simplify cross-platform app development. Create new or port existing apps to sell to consumers worldwide. Explore the Intel AppUpSM program developer opportunity. appdeveloper.intel.com/join http://p.sf.net/sfu/intel-appdev _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
