details: https://code.openbravo.com/erp/devel/main/rev/37eea9b878d6 changeset: 34818:37eea9b878d6 user: Mark <markmm82 <at> gmail.com> date: Tue Sep 25 09:44:32 2018 -0400 summary: Fixes issue 39268: Wrong accounting entry when reversing a prepayment against an order that was later invoiced
In those cases the reversed payment was considered as prepayment and it was wrong as the order is invoiced. To fix it the reversed payment detail is set as it is not a prepayment in this case. details: https://code.openbravo.com/erp/devel/main/rev/2790bbfd0b6a changeset: 34819:2790bbfd0b6a user: RM packaging bot <staff.rm <at> openbravo.com> date: Wed Sep 26 17:47:36 2018 +0000 summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/a053646fb68a changeset: 34820:a053646fb68a user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Sep 27 06:20:38 2018 +0000 summary: Merge back from main details: https://code.openbravo.com/erp/devel/main/rev/f6a34bc225f0 changeset: 34821:f6a34bc225f0 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Thu Sep 27 12:17:44 2018 +0200 summary: Fixed issue 39126 Force flush in reconciliation process Force flush because eventhandler is executed in the first flush and data updated in enventhandler needs to be flush in a admin mode block details: https://code.openbravo.com/erp/devel/main/rev/d8242c6b0bfe changeset: 34822:d8242c6b0bfe user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Sep 27 14:12:32 2018 +0000 summary: CI: update AD_MODULE to version 34821 diffstat: .hgsigs | 1 + .hgtags | 1 + 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/Reconciliation.java | 5 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java | 6 ++- 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.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 +- 49 files changed, 99 insertions(+), 90 deletions(-) diffs (truncated from 989 to 300 lines): diff -r 831c2aadbee3 -r d8242c6b0bfe .hgsigs --- a/.hgsigs Tue Sep 25 00:35:58 2018 +0530 +++ b/.hgsigs Thu Sep 27 14:12:32 2018 +0000 @@ -234,3 +234,4 @@ faeac12b1aad3dc7fb53f8ffda3ada9e3b7deaeb 0 iEYEABECAAYFAls/boQACgkQCX/oGf+2qkNdfACfaNh5oqLf0LzgGAYLmRWa97kbFj4AoL3KPdVDG0Mf6qKcxejAl7Kl12cd 69fa322764529bb77cd3ef3b7b5dd33f6667e560 0 iEYEABECAAYFAlt1MD4ACgkQCX/oGf+2qkPU4wCgnCdQrG3eWxbDWbitjSsm6XvbQ6IAni9v1H03pkrhgPmaS97Ft9MOHVhO bbb6e342b4af3c81bd1a49418a01e63fcb09e3c5 0 iEYEABECAAYFAltpYMEACgkQCX/oGf+2qkMblgCffRsYLqTbeixIj19Lm3dm6iMqkv0AoM3iSQaEFeV7ff9nYRd3vz227Ir6 +51e0d0e9566b3a1e0e7e08e8bd089b77ae779688 0 iEYEABECAAYFAlukneUACgkQCX/oGf+2qkP8ngCgiC3Jo4cDL8F35HXpqHL3QtD46kUAn0znm6h/Ad3r0f/rJXf6dJli+zjK diff -r 831c2aadbee3 -r d8242c6b0bfe .hgtags --- a/.hgtags Tue Sep 25 00:35:58 2018 +0530 +++ b/.hgtags Thu Sep 27 14:12:32 2018 +0000 @@ -245,3 +245,4 @@ 3f281a901fbbde5103faebca4df0c22b94ac5535 3.0PR18Q2.1 72cf5779eb218bb25914b1aadade7fde01c67842 3.0PR18Q2.2 5cbef591aff09f80e8a73a92202d438b792ad40f 3.0PR18Q3 +2f706d7a458e736b7b6add7ca445132c5e0b9758 3.0PR18Q3.1 diff -r 831c2aadbee3 -r d8242c6b0bfe modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Tue Sep 25 00:35:58 2018 +0530 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Thu Sep 27 14:12:32 2018 +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.34804]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.34821]]></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 831c2aadbee3 -r d8242c6b0bfe 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 Sep 25 00:35:58 2018 +0530 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Sep 27 14:12:32 2018 +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.34804]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.34821]]></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.34804]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.34821]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 831c2aadbee3 -r d8242c6b0bfe modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.java Tue Sep 25 00:35:58 2018 +0530 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.java Thu Sep 27 14:12:32 2018 +0000 @@ -134,8 +134,8 @@ private void updateTransactionStatus(HttpServletResponse response, String strFinancialAccountId, String strSelectedTransId, boolean isChecked) { - OBContext.setAdminMode(); try { + OBContext.setAdminMode(); if (strSelectedTransId != "") { FIN_FinaccTransaction trans = OBDal.getInstance().get(FIN_FinaccTransaction.class, strSelectedTransId); @@ -160,6 +160,9 @@ trans.setStatus(newStatus); OBDal.getInstance().save(trans); OBDal.getInstance().flush(); + // Force flush because eventhandler is executed in the first flush and data updated in + // enventhandler needs to be flush in a admin mode block + OBDal.getInstance().flush(); } response.setContentType("text/html; charset=UTF-8"); PrintWriter out = response.getWriter(); diff -r 831c2aadbee3 -r d8242c6b0bfe modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java Tue Sep 25 00:35:58 2018 +0530 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java Thu Sep 27 14:12:32 2018 +0000 @@ -11,7 +11,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) 2010-2017 Openbravo SLU + * All portions are Copyright (C) 2010-2018 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************* @@ -553,6 +553,10 @@ && pd.getFINPaymentScheduleDetailList().get(0).getOrderPaymentSchedule() == null) { reversedPaymentDetail.setPrepayment(true); reversedPaymentDetail.setRefund(true); + } else if (pd.isPrepayment() + && pd.getFINPaymentScheduleDetailList().get(0).getInvoicePaymentSchedule() != null) { + reversedPaymentDetail.setPrepayment(false); + reversedPaymentDetail.setRefund(false); } List<FIN_PaymentScheduleDetail> reversedSchedDetails = new ArrayList<FIN_PaymentScheduleDetail>(); OBDal.getInstance().save(reversedPaymentDetail); diff -r 831c2aadbee3 -r d8242c6b0bfe modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml Tue Sep 25 00:35:58 2018 +0530 +++ b/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml Thu Sep 27 14:12:32 2018 +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.34804]]></VERSION> +<!--8A098711BB324335A19833286BDB093D--> <VERSION><![CDATA[1.0.34821]]></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 831c2aadbee3 -r d8242c6b0bfe 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 Sep 25 00:35:58 2018 +0530 +++ b/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Sep 27 14:12:32 2018 +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.34804]]></STARTVERSION> +<!--1467C397BC5F4999A5606F39CD6FF8A4--> <STARTVERSION><![CDATA[2.1.34821]]></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 831c2aadbee3 -r d8242c6b0bfe 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 Sep 25 00:35:58 2018 +0530 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Thu Sep 27 14:12:32 2018 +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.34804]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.34821]]></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 831c2aadbee3 -r d8242c6b0bfe 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 Sep 25 00:35:58 2018 +0530 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Sep 27 14:12:32 2018 +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.34804]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.34821]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 831c2aadbee3 -r d8242c6b0bfe 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 Sep 25 00:35:58 2018 +0530 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Thu Sep 27 14:12:32 2018 +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.34804]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.34821]]></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 831c2aadbee3 -r d8242c6b0bfe 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 Sep 25 00:35:58 2018 +0530 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Sep 27 14:12:32 2018 +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.34804]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.34821]]></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.34804]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.34821]]></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.34804]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.34821]]></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.34804]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.34821]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 831c2aadbee3 -r d8242c6b0bfe modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml Tue Sep 25 00:35:58 2018 +0530 +++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml Thu Sep 27 14:12:32 2018 +0000 @@ -6,7 +6,7 @@ <!--D393BE6F22BB44B7B728259B34FC795A--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--D393BE6F22BB44B7B728259B34FC795A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--D393BE6F22BB44B7B728259B34FC795A--> <NAME><![CDATA[HTML Widget]]></NAME> -<!--D393BE6F22BB44B7B728259B34FC795A--> <VERSION><![CDATA[1.0.34804]]></VERSION> +<!--D393BE6F22BB44B7B728259B34FC795A--> <VERSION><![CDATA[1.0.34821]]></VERSION> <!--D393BE6F22BB44B7B728259B34FC795A--> <DESCRIPTION><![CDATA[Provides the HTML Widget superclass that allows to create widget classes that embed the html code.]]></DESCRIPTION> <!--D393BE6F22BB44B7B728259B34FC795A--> <HELP><![CDATA[With this module you can define your own widget classes just setting up your own html code or the html code provided by third parties.]]></HELP> <!--D393BE6F22BB44B7B728259B34FC795A--> <URL><![CDATA[http://forge.openbravo.com/projects/htmlwidget]]></URL> diff -r 831c2aadbee3 -r d8242c6b0bfe modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Sep 25 00:35:58 2018 +0530 +++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Sep 27 14:12:32 2018 +0000 @@ -7,7 +7,7 @@ <!--DCE798FBC5B648F7A3C81A6941720A57--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--DCE798FBC5B648F7A3C81A6941720A57--> <AD_MODULE_ID><![CDATA[D393BE6F22BB44B7B728259B34FC795A]]></AD_MODULE_ID> <!--DCE798FBC5B648F7A3C81A6941720A57--> <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID> -<!--DCE798FBC5B648F7A3C81A6941720A57--> <STARTVERSION><![CDATA[2.1.34804]]></STARTVERSION> +<!--DCE798FBC5B648F7A3C81A6941720A57--> <STARTVERSION><![CDATA[2.1.34821]]></STARTVERSION> <!--DCE798FBC5B648F7A3C81A6941720A57--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--DCE798FBC5B648F7A3C81A6941720A57--> <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME> <!--DCE798FBC5B648F7A3C81A6941720A57--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 831c2aadbee3 -r d8242c6b0bfe modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml Tue Sep 25 00:35:58 2018 +0530 +++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml Thu Sep 27 14:12:32 2018 +0000 @@ -6,7 +6,7 @@ <!--4B828F4D03264080AA1D2057B13F613C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--4B828F4D03264080AA1D2057B13F613C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--4B828F4D03264080AA1D2057B13F613C--> <NAME><![CDATA[User Interface Client Kernel]]></NAME> -<!--4B828F4D03264080AA1D2057B13F613C--> <VERSION><![CDATA[2.1.34804]]></VERSION> +<!--4B828F4D03264080AA1D2057B13F613C--> <VERSION><![CDATA[2.1.34821]]></VERSION> <!--4B828F4D03264080AA1D2057B13F613C--> <DESCRIPTION><![CDATA[Provides framework functionality for the Openbravo User Interface]]></DESCRIPTION> <!--4B828F4D03264080AA1D2057B13F613C--> <HELP><![CDATA[The user interface client kernel is a generation framework for generating client (browser) components used in Openbravo. Its components are mainly used by other modules to provide customizable and extendable user interfaces.]]></HELP> <!--4B828F4D03264080AA1D2057B13F613C--> <URL><![CDATA[http://forge.openbravo.com/projects/openbravoclientkernel]]></URL> diff -r 831c2aadbee3 -r d8242c6b0bfe modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Sep 25 00:35:58 2018 +0530 +++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Sep 27 14:12:32 2018 +0000 @@ -7,7 +7,7 @@ <!--26B041893E844A53AFA58BC326C4F0D7--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--26B041893E844A53AFA58BC326C4F0D7--> <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID> <!--26B041893E844A53AFA58BC326C4F0D7--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--26B041893E844A53AFA58BC326C4F0D7--> <STARTVERSION><![CDATA[3.0.34804]]></STARTVERSION> +<!--26B041893E844A53AFA58BC326C4F0D7--> <STARTVERSION><![CDATA[3.0.34821]]></STARTVERSION> <!--26B041893E844A53AFA58BC326C4F0D7--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--26B041893E844A53AFA58BC326C4F0D7--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--26B041893E844A53AFA58BC326C4F0D7--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -21,7 +21,7 @@ <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F--> <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID> <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F--> <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID> -<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F--> <STARTVERSION><![CDATA[1.1.34804]]></STARTVERSION> +<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F--> <STARTVERSION><![CDATA[1.1.34821]]></STARTVERSION> <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F--> <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME> <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -35,7 +35,7 @@ <!--D7BA4BB0844942C58DC46B9E23CF8E67--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--D7BA4BB0844942C58DC46B9E23CF8E67--> <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID> <!--D7BA4BB0844942C58DC46B9E23CF8E67--> <AD_DEPENDENT_MODULE_ID><![CDATA[F8D1B3ECB3474E8DA5C216473C840DF1]]></AD_DEPENDENT_MODULE_ID> -<!--D7BA4BB0844942C58DC46B9E23CF8E67--> <STARTVERSION><![CDATA[2.0.34804]]></STARTVERSION> +<!--D7BA4BB0844942C58DC46B9E23CF8E67--> <STARTVERSION><![CDATA[2.0.34821]]></STARTVERSION> <!--D7BA4BB0844942C58DC46B9E23CF8E67--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--D7BA4BB0844942C58DC46B9E23CF8E67--> <DEPENDANT_MODULE_NAME><![CDATA[JSON REST Webservice]]></DEPENDANT_MODULE_NAME> <!--D7BA4BB0844942C58DC46B9E23CF8E67--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 831c2aadbee3 -r d8242c6b0bfe modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml Tue Sep 25 00:35:58 2018 +0530 +++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml Thu Sep 27 14:12:32 2018 +0000 @@ -6,7 +6,7 @@ <!--2758CD25B2704AF6BBAD10365FC82C06--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--2758CD25B2704AF6BBAD10365FC82C06--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--2758CD25B2704AF6BBAD10365FC82C06--> <NAME><![CDATA[Workspace & Widgets]]></NAME> -<!--2758CD25B2704AF6BBAD10365FC82C06--> <VERSION><![CDATA[2.1.34804]]></VERSION> +<!--2758CD25B2704AF6BBAD10365FC82C06--> <VERSION><![CDATA[2.1.34821]]></VERSION> <!--2758CD25B2704AF6BBAD10365FC82C06--> <DESCRIPTION><![CDATA[Workspace & Widgets]]></DESCRIPTION> <!--2758CD25B2704AF6BBAD10365FC82C06--> <HELP><![CDATA[Provides the infrastructure of workspace tab (formerly My Openbravo)]]></HELP> <!--2758CD25B2704AF6BBAD10365FC82C06--> <URL><![CDATA[http://forge.openbravo.com/projects/myopenbravo]]></URL> diff -r 831c2aadbee3 -r d8242c6b0bfe modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Sep 25 00:35:58 2018 +0530 +++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Sep 27 14:12:32 2018 +0000 @@ -7,7 +7,7 @@ <!--15F51F03882F444CAB6593B4566DC929--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--15F51F03882F444CAB6593B4566DC929--> <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID> <!--15F51F03882F444CAB6593B4566DC929--> <AD_DEPENDENT_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_DEPENDENT_MODULE_ID> -<!--15F51F03882F444CAB6593B4566DC929--> <STARTVERSION><![CDATA[2.1.34804]]></STARTVERSION> +<!--15F51F03882F444CAB6593B4566DC929--> <STARTVERSION><![CDATA[2.1.34821]]></STARTVERSION> <!--15F51F03882F444CAB6593B4566DC929--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--15F51F03882F444CAB6593B4566DC929--> <DEPENDANT_MODULE_NAME><![CDATA[User Interface Application]]></DEPENDANT_MODULE_NAME> <!--15F51F03882F444CAB6593B4566DC929--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -21,7 +21,7 @@ <!--E71B28FC949D481D9F59C17D01E46EF9--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--E71B28FC949D481D9F59C17D01E46EF9--> <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID> <!--E71B28FC949D481D9F59C17D01E46EF9--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--E71B28FC949D481D9F59C17D01E46EF9--> <STARTVERSION><![CDATA[3.0.34804]]></STARTVERSION> +<!--E71B28FC949D481D9F59C17D01E46EF9--> <STARTVERSION><![CDATA[3.0.34821]]></STARTVERSION> <!--E71B28FC949D481D9F59C17D01E46EF9--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E71B28FC949D481D9F59C17D01E46EF9--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--E71B28FC949D481D9F59C17D01E46EF9--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 831c2aadbee3 -r d8242c6b0bfe modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml Tue Sep 25 00:35:58 2018 +0530 +++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml Thu Sep 27 14:12:32 2018 +0000 @@ -6,7 +6,7 @@ <!--0A060B2AF1974E8EAA8DB61388E9AECC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--0A060B2AF1974E8EAA8DB61388E9AECC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--0A060B2AF1974E8EAA8DB61388E9AECC--> <NAME><![CDATA[Query/List Widget]]></NAME> _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
