details: https://code.openbravo.com/erp/devel/main/rev/9464c0252b01 changeset: 31026:9464c0252b01 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Wed Dec 21 09:50:56 2016 +0100 summary: Related with issue 34523: The copyright date updated.
The year of the copyright of "ProcessMonitor" have been updated. details: https://code.openbravo.com/erp/devel/main/rev/6352395146ac changeset: 31027:6352395146ac user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Wed Dec 21 09:57:25 2016 +0100 summary: fixes issue 34791: Null values in reports if parent org address is empty The standard reports make use of the applyCountryDateFormat and getCountryNumberFormat utility methods to format dates and numbers. These methods obtain the formats from the Location Settings defined for the organization's country whose id is received as parameter. In case the organization received from this methods does not have a country (address) defined, then these methods were failing silently. Since now, if the organization does not have an address defined properly, these methods are using the default formats. details: https://code.openbravo.com/erp/devel/main/rev/b6cf90d3df89 changeset: 31028:b6cf90d3df89 user: Alvaro Ferraz <alvaro.ferraz <at> openbravo.com> date: Wed Dec 21 10:52:39 2016 +0100 summary: Related to issue 34432: Backout changeset 92ddb12457b2 details: https://code.openbravo.com/erp/devel/main/rev/112334d02c09 changeset: 31029:112334d02c09 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Wed Dec 21 11:32:24 2016 +0100 summary: fixes issue 34796: Ability to compile subreports in process definition reports A new method isCompilingSubreports() has been added. This method can be overriden by those handlers extending BaseReportActionHandler that need to compile sub-reports at runtime. In that case this method must return true. details: https://code.openbravo.com/erp/devel/main/rev/57c269c28d7e changeset: 31030:57c269c28d7e user: RM packaging bot <staff.rm <at> openbravo.com> date: Wed Dec 21 13:49:24 2016 +0000 summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/6b520396354e changeset: 31031:6b520396354e user: Rafael Queralta Pozo <rqueralta <at> nauta.cu> date: Mon Nov 21 10:14:44 2016 -0500 summary: Fixes issue 34589: Error message when voiding an invoice with a related payment An error message is shown in case of voiding an invoice having an "Awaiting Execution" or "Awaiting Payment" payment related. details: https://code.openbravo.com/erp/devel/main/rev/c305082199cf changeset: 31032:c305082199cf user: Mark <markmm82 <at> gmail.com> date: Mon Dec 19 13:56:15 2016 -0500 summary: Related to issue 34589: Code review improvements Merged two conditions in only one to evaluate if an Invoice has an awaiting execution payment related. details: https://code.openbravo.com/erp/devel/main/rev/6d2315567e5f changeset: 31033:6d2315567e5f user: Mark <markmm82 <at> gmail.com> date: Wed Dec 21 09:15:42 2016 -0500 summary: Related to issue 34589: Fixed code format details: https://code.openbravo.com/erp/devel/main/rev/abc21394bfb8 changeset: 31034:abc21394bfb8 user: RM packaging bot <staff.rm <at> openbravo.com> date: Wed Dec 21 19:38:19 2016 +0000 summary: CI: update AD_MODULE to version 31033 diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml | 12 ++ 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/ProcessInvoice.java | 22 +++++ modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- 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/report/BaseReportActionHandler.java | 30 +++++- modules/org.openbravo.client.application/src/org/openbravo/client/application/report/ReportingUtils.java | 44 +++++----- 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.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- 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 | 22 ++-- src-db/database/sourcedata/AD_MODULE.xml | 4 +- src/org/openbravo/erpCommon/ad_forms/AcctServer.java | 9 -- src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java | 10 +-- src/org/openbravo/erpCommon/utility/Utility.java | 27 ++++-- src/org/openbravo/scheduling/ProcessMonitor.java | 2 +- 53 files changed, 187 insertions(+), 145 deletions(-) diffs (truncated from 1271 to 300 lines): diff -r f743e6a8fb9a -r abc21394bfb8 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Tue Dec 20 10:58:44 2016 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Wed Dec 21 19:38:19 2016 +0000 @@ -300,6 +300,18 @@ <!--2EE9E3A8A29044C5B6A1BCB77EB37B87--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> <!--2EE9E3A8A29044C5B6A1BCB77EB37B87--></AD_MESSAGE> +<!--2FCA4882990D431BB1E0AB7CA7505E6B--><AD_MESSAGE> +<!--2FCA4882990D431BB1E0AB7CA7505E6B--> <AD_MESSAGE_ID><![CDATA[2FCA4882990D431BB1E0AB7CA7505E6B]]></AD_MESSAGE_ID> +<!--2FCA4882990D431BB1E0AB7CA7505E6B--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--2FCA4882990D431BB1E0AB7CA7505E6B--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--2FCA4882990D431BB1E0AB7CA7505E6B--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--2FCA4882990D431BB1E0AB7CA7505E6B--> <VALUE><![CDATA[APRM_InvoiceAwaitingExcutionPaymentRelated]]></VALUE> +<!--2FCA4882990D431BB1E0AB7CA7505E6B--> <MSGTEXT><![CDATA[Invoice can not be voided as there is an awaiting execution payment related. Please either execute that payment or cancel it]]></MSGTEXT> +<!--2FCA4882990D431BB1E0AB7CA7505E6B--> <MSGTYPE><![CDATA[E]]></MSGTYPE> +<!--2FCA4882990D431BB1E0AB7CA7505E6B--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--2FCA4882990D431BB1E0AB7CA7505E6B--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> +<!--2FCA4882990D431BB1E0AB7CA7505E6B--></AD_MESSAGE> + <!--2FD618C9D5064C75BFF13B57B767C912--><AD_MESSAGE> <!--2FD618C9D5064C75BFF13B57B767C912--> <AD_MESSAGE_ID><![CDATA[2FD618C9D5064C75BFF13B57B767C912]]></AD_MESSAGE_ID> <!--2FD618C9D5064C75BFF13B57B767C912--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r f743e6a8fb9a -r abc21394bfb8 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Tue Dec 20 10:58:44 2016 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Wed Dec 21 19:38:19 2016 +0000 @@ -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.31020]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.31033]]></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 f743e6a8fb9a -r abc21394bfb8 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 Tue Dec 20 10:58:44 2016 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Dec 21 19:38:19 2016 +0000 @@ -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.31020]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.31033]]></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.31020]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.31033]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r f743e6a8fb9a -r abc21394bfb8 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java Tue Dec 20 10:58:44 2016 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java Wed Dec 21 19:38:19 2016 +0000 @@ -253,6 +253,28 @@ return; } + // If Invoice has a awaiting execution payment related, show an Error + List<FIN_PaymentSchedule> psl = invoice.getFINPaymentScheduleList(); + for (FIN_PaymentSchedule ps : psl) { + List<FIN_PaymentScheduleDetail> psdl = ps + .getFINPaymentScheduleDetailInvoicePaymentScheduleList(); + for (FIN_PaymentScheduleDetail psd : psdl) { + FIN_PaymentDetail pd = psd.getPaymentDetails(); + if (pd != null + && (pd.getFinPayment().getStatus().equals("RPAE") || pd.getFinPayment() + .getStatus().equals("RPAP"))) { + msg = new OBError(); + msg.setType("Error"); + msg.setTitle(Utility.messageBD(this, "Error", vars.getLanguage())); + msg.setMessage(OBMessageUtils + .messageBD("APRM_InvoiceAwaitingExcutionPaymentRelated")); + vars.setMessage(strTabId, msg); + printPageClosePopUp(response, vars, Utility.getTabURL(strTabId, "R", true)); + return; + } + } + } + // Reversed invoice's date: voidDate in Purchase Invoice, new Date() in Sales Invoice Date reversedDate = voidDate != null ? voidDate : new Date(); diff -r f743e6a8fb9a -r abc21394bfb8 modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml Tue Dec 20 10:58:44 2016 +0100 +++ b/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml Wed Dec 21 19:38:19 2016 +0000 @@ -6,7 +6,7 @@ <!--8A098711BB324335A19833286BDB093D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--8A098711BB324335A19833286BDB093D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--8A098711BB324335A19833286BDB093D--> <NAME><![CDATA[Apache External Connection Pool]]></NAME> -<!--8A098711BB324335A19833286BDB093D--> <VERSION><![CDATA[1.0.31020]]></VERSION> +<!--8A098711BB324335A19833286BDB093D--> <VERSION><![CDATA[1.0.31033]]></VERSION> <!--8A098711BB324335A19833286BDB093D--> <DESCRIPTION><![CDATA[Apache External Connection Pool]]></DESCRIPTION> <!--8A098711BB324335A19833286BDB093D--> <HELP><![CDATA[This module implements the Apache JDBC Connection Pool (http://wiki.openbravo.com/wiki/Modules:Apache_JDBC_Connection_Pool).]]></HELP> <!--8A098711BB324335A19833286BDB093D--> <TYPE><![CDATA[M]]></TYPE> diff -r f743e6a8fb9a -r abc21394bfb8 modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Dec 20 10:58:44 2016 +0100 +++ b/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Dec 21 19:38:19 2016 +0000 @@ -7,7 +7,7 @@ <!--1467C397BC5F4999A5606F39CD6FF8A4--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--1467C397BC5F4999A5606F39CD6FF8A4--> <AD_MODULE_ID><![CDATA[8A098711BB324335A19833286BDB093D]]></AD_MODULE_ID> <!--1467C397BC5F4999A5606F39CD6FF8A4--> <AD_DEPENDENT_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_DEPENDENT_MODULE_ID> -<!--1467C397BC5F4999A5606F39CD6FF8A4--> <STARTVERSION><![CDATA[2.1.31020]]></STARTVERSION> +<!--1467C397BC5F4999A5606F39CD6FF8A4--> <STARTVERSION><![CDATA[2.1.31033]]></STARTVERSION> <!--1467C397BC5F4999A5606F39CD6FF8A4--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--1467C397BC5F4999A5606F39CD6FF8A4--> <DEPENDANT_MODULE_NAME><![CDATA[Openbravo 3.0 Framework]]></DEPENDANT_MODULE_NAME> <!--1467C397BC5F4999A5606F39CD6FF8A4--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r f743e6a8fb9a -r abc21394bfb8 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 Tue Dec 20 10:58:44 2016 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Wed Dec 21 19:38:19 2016 +0000 @@ -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.31020]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.31033]]></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 f743e6a8fb9a -r abc21394bfb8 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 Tue Dec 20 10:58:44 2016 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Dec 21 19:38:19 2016 +0000 @@ -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.31020]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.31033]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r f743e6a8fb9a -r abc21394bfb8 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 Tue Dec 20 10:58:44 2016 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Wed Dec 21 19:38:19 2016 +0000 @@ -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.31020]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.31033]]></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 f743e6a8fb9a -r abc21394bfb8 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 Tue Dec 20 10:58:44 2016 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Dec 21 19:38:19 2016 +0000 @@ -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.31020]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.31033]]></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.31020]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.31033]]></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.31020]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.31033]]></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.31020]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.31033]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r f743e6a8fb9a -r abc21394bfb8 modules/org.openbravo.client.application/src/org/openbravo/client/application/report/BaseReportActionHandler.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/report/BaseReportActionHandler.java Tue Dec 20 10:58:44 2016 +0100 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/report/BaseReportActionHandler.java Wed Dec 21 19:38:19 2016 +0000 @@ -337,8 +337,7 @@ log.debug("Report: {}. Start export JR process.", report.getId()); long t1 = System.currentTimeMillis(); - doJRExport(jrTemplatePath, expType, jrParams, strTmpFileName, getReportConnectionProvider(), - getReportData(allParametersMap)); + doJRExport(jrTemplatePath, expType, strTmpFileName, allParametersMap); log.debug("Report: {}. Finish export JR process. Elapsed time: {}", report.getId(), System.currentTimeMillis() - t1); @@ -552,6 +551,7 @@ * map that contains the parameters of the HTTP request and the parameters that will be * sent to the jasper report * + * @return a JRDataSource object containing the report data */ protected JRDataSource getReportData(Map<String, Object> parameters) { return null; @@ -561,15 +561,29 @@ * Get the connection provider to use in report generation. Override this method to put logic for * getting the connection provider * + * @return the ConnectionProvider to use during the report generation */ protected ConnectionProvider getReportConnectionProvider() { return null; } - private static void doJRExport(String jrTemplatePath, ExportType expType, - Map<String, Object> parameters, String strFileName, ConnectionProvider connection, - JRDataSource data) { + /** + * Override this method to define if the sub-reports generated with the handler must be compiled. + * If true, it will compile all sub-report jrxml files placed in the same folder as the main + * report and whose related parameter name starts with SUBREP_ + * + * @return true if the handler must compile the sub-reports. Otherwise, it returns false. + */ + protected boolean isCompilingSubreports() { + return false; + } + + private void doJRExport(String jrTemplatePath, ExportType expType, String strFileName, + Map<String, Object> parameters) { ReportSemaphoreHandling.getInstance().acquire(); + @SuppressWarnings("unchecked") + Map<String, Object> jrParameters = (Map<String, Object>) parameters + .get(JASPER_REPORT_PARAMETERS); Map<Object, Object> localExportParameters = null; try { if (ExportType.HTML.equals(expType)) { @@ -580,8 +594,10 @@ localExportParameters.put(ReportingUtils.IMAGES_URI, localAddress + "/servlets/image?image={0}"); } - ReportingUtils.exportJR(jrTemplatePath, expType, parameters, strFileName, true, connection, - data, localExportParameters); + ReportingUtils.exportJR(jrTemplatePath, expType, jrParameters, + new File(ReportingUtils.getTempFolder(), strFileName), true, + getReportConnectionProvider(), getReportData(parameters), localExportParameters, + isCompilingSubreports()); } finally { ReportSemaphoreHandling.getInstance().release(); } diff -r f743e6a8fb9a -r abc21394bfb8 modules/org.openbravo.client.application/src/org/openbravo/client/application/report/ReportingUtils.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/report/ReportingUtils.java Tue Dec 20 10:58:44 2016 +0100 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/report/ReportingUtils.java Wed Dec 21 19:38:19 2016 +0000 @@ -36,6 +36,24 @@ import javax.servlet.ServletContext; import javax.servlet.http.HttpSession; +import org.openbravo.base.ConfigParameters; +import org.openbravo.base.exception.OBException; +import org.openbravo.base.session.OBPropertiesProvider; +import org.openbravo.client.kernel.reference.UIDefinitionController; +import org.openbravo.client.kernel.reference.UIDefinitionController.FormatDefinition; +import org.openbravo.dal.core.DalContextListener; +import org.openbravo.dal.core.OBContext; +import org.openbravo.dal.service.OBDal; +import org.openbravo.database.ConnectionProvider; +import org.openbravo.erpCommon.utility.JRFormatFactory; +import org.openbravo.erpCommon.utility.OBMessageUtils; +import org.openbravo.model.ad.utility.FileType; +import org.openbravo.service.db.DalConnectionProvider; +import org.openbravo.uiTranslation.TranslationHandler; +import org.openbravo.utils.Replace; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import net.sf.jasperreports.engine.JRDataSource; import net.sf.jasperreports.engine.JRException; import net.sf.jasperreports.engine.JRParameter; @@ -68,24 +86,6 @@ import net.sf.jasperreports.j2ee.servlets.ImageServlet; import net.sf.jasperreports.web.util.WebHtmlResourceHandler; -import org.openbravo.base.ConfigParameters; -import org.openbravo.base.exception.OBException; -import org.openbravo.base.session.OBPropertiesProvider; -import org.openbravo.client.kernel.reference.UIDefinitionController; -import org.openbravo.client.kernel.reference.UIDefinitionController.FormatDefinition; -import org.openbravo.dal.core.DalContextListener; -import org.openbravo.dal.core.OBContext; -import org.openbravo.dal.service.OBDal; -import org.openbravo.database.ConnectionProvider; -import org.openbravo.erpCommon.utility.JRFormatFactory; -import org.openbravo.erpCommon.utility.OBMessageUtils; -import org.openbravo.model.ad.utility.FileType; -import org.openbravo.service.db.DalConnectionProvider; -import org.openbravo.uiTranslation.TranslationHandler; -import org.openbravo.utils.Replace; ------------------------------------------------------------------------------ Developer Access Program for Intel Xeon Phi Processors Access to Intel Xeon Phi processor-based developer platforms. With one year of Intel Parallel Studio XE. Training and support from Colfax. Order your platform today.http://sdm.link/intel _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
