details: https://code.openbravo.com/erp/devel/main/rev/eaae54aaa147 changeset: 21345:eaae54aaa147 user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue Oct 22 07:12:28 2013 +0200 summary: CI: merge back from main
details: https://code.openbravo.com/erp/devel/main/rev/5eedba0298f0 changeset: 21346:5eedba0298f0 user: Naiara Garcia <naiara.garcia <at> openbravo.com> date: Thu Oct 17 18:28:13 2013 +0200 summary: Fixed issue 24264: The c_elementvalue_trg is performing and update when it is not needed. Can cause performance issues in some cases details: https://code.openbravo.com/erp/devel/main/rev/c4d4ca9a75dc changeset: 21347:c4d4ca9a75dc user: Naiara Garcia <naiara.garcia <at> openbravo.com> date: Mon Oct 21 17:37:49 2013 +0200 summary: Fixed issue 24493: When creating a price list based on costs, new engine costs not found if the product has a cost type defined details: https://code.openbravo.com/erp/devel/main/rev/0c6559f88e5a changeset: 21348:0c6559f88e5a user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Mon Oct 21 12:26:36 2013 +0530 summary: Fixes Issue 24778, Fixes Issue 24768 Payment Monitor doesn't udpate invoice status when voiding a payment Payment Monitor NullPointer Exception in method calculateAmounts() details: https://code.openbravo.com/erp/devel/main/rev/bb980d7198e0 changeset: 21349:bb980d7198e0 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Tue Oct 22 10:53:35 2013 +0200 summary: Fixes issue 24985: Audit data values are not shown in the form view One of the changes introduced by the grid datasource project [1] was that the grid does not load all the properties for each row, only the ones that are visible in the grid (plus a few other required ones). When a record is opened in form view there is call to the FIC in EDIT mode to retrieve all the record values. The problem is that the audit values are not being returned in that FIC call, because there are no fields for those values. To fix this, the audit values have been added to the list of mandatory properties, so they will be loaded to the grid even if they are not being shown. [1] https://code.openbravo.com/erp/devel/pi/rev/94d0fb151919 details: https://code.openbravo.com/erp/devel/main/rev/e41c0cc46855 changeset: 21350:e41c0cc46855 user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue Oct 22 11:06:19 2013 +0200 summary: Merge back from main details: https://code.openbravo.com/erp/devel/main/rev/a362c560793b changeset: 21351:a362c560793b user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue Oct 22 23:23:17 2013 +0200 summary: CI: update AD_MODULE to version 21350 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/process/FIN_PaymentMonitorProcess.java | 33 ++++++--- 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/OBViewGridComponent.java | 5 +- 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 ++-- src-db/database/model/functions/M_PRICELIST_CREATE.xml | 16 +++- src-db/database/model/triggers/C_ELEMENTVALUE_TRG.xml | 4 +- src-db/database/sourcedata/AD_MODULE.xml | 2 +- 47 files changed, 121 insertions(+), 101 deletions(-) diffs (truncated from 1021 to 300 lines): diff -r 3b86a5f1e686 -r a362c560793b .hgsigs --- a/.hgsigs Tue Oct 22 06:53:55 2013 +0200 +++ b/.hgsigs Tue Oct 22 23:23:17 2013 +0200 @@ -128,3 +128,4 @@ b79dd1dc55aa66c08d26a88c004c167253307b9a 0 iEYEABECAAYFAlIyoXQACgkQCX/oGf+2qkPMWACg2suFjCYsdws4IU2H5S0wdXHkI+MAnjiRIQd2XaN/Yw6iAsj6jgI+y3Bx f56c14fc0212d08ec0e9663d957dfdbf4ff42543 0 iEYEABECAAYFAlJbyIkACgkQCX/oGf+2qkOXiACgggW09+Z5WL1BrxaSVcZB0ykapr4AoKSn91Y1yvImj5/sEmdM5f37Y2RM ffdd47e41d59e56bf2f85033679accff7feaa941 0 iEYEABECAAYFAlJfscwACgkQCX/oGf+2qkOJFQCg/olIlg4QV8DcH3aJWB9NVlpgvG4An1P8ZPJjX7Rtaav0sb+N1DF9YaSh +3dff4a5ade8aa7966fde9139428e968fb7f04218 0 iEYEABECAAYFAlJlPOMACgkQCX/oGf+2qkPsbgCg4w/JC1tFhyxz6mXa6UBOaEYz6esAnRCq24eVAcoNGrAfIfhXvKUBuQMQ diff -r 3b86a5f1e686 -r a362c560793b .hgtags --- a/.hgtags Tue Oct 22 06:53:55 2013 +0200 +++ b/.hgtags Tue Oct 22 23:23:17 2013 +0200 @@ -139,3 +139,4 @@ 5bc4ca20d6f5c30e0cb179912df555607df04577 3.0MP27 db86a9cfecc308c3382feb357d53091f51ad3a4a 3.0MP28 750dc95742e0d15c3ed8b484fa8dbc4aa689c627 3.0MP28.1 +0c73b69e61c55d8de0b3a0dfcc2e7511fa8a295f 3.0MP28.2 diff -r 3b86a5f1e686 -r a362c560793b modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Tue Oct 22 06:53:55 2013 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Tue Oct 22 23:23:17 2013 +0200 @@ -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.21338]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.21350]]></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 3b86a5f1e686 -r a362c560793b 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 Oct 22 06:53:55 2013 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Oct 22 23:23:17 2013 +0200 @@ -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.21338]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.21350]]></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.21338]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.21350]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 3b86a5f1e686 -r a362c560793b 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 Tue Oct 22 06:53:55 2013 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentMonitorProcess.java Tue Oct 22 23:23:17 2013 +0200 @@ -22,10 +22,11 @@ import java.math.BigDecimal; import java.math.RoundingMode; import java.text.SimpleDateFormat; -import java.util.ArrayList; import java.util.Date; import java.util.HashMap; +import java.util.HashSet; import java.util.List; +import java.util.Set; import org.hibernate.criterion.Projections; import org.hibernate.criterion.Restrictions; @@ -87,10 +88,11 @@ StringBuilder whereClause = new StringBuilder(); whereClause.append(" as i"); - whereClause.append(" left join i.fINPaymentScheduleList fps"); + whereClause.append(" left join i.fINPaymentScheduleList fps "); whereClause.append(" where i.processed=true"); - whereClause.append(" and (i.paymentComplete=false"); - whereClause.append(" or i.outstandingAmount <> 0"); + whereClause.append(" and (i.paymentComplete=false "); + whereClause.append(" or fps.updated >= i.lastCalculatedOnDate "); + whereClause.append(" or i.outstandingAmount <> 0"); if (migration != null) { whereClause.append(" or (i.finalSettlementDate is null"); whereClause.append(" and fps.id is not null"); @@ -107,7 +109,7 @@ obc.setFilterOnReadableClients(false); obc.setFilterOnReadableOrganization(false); } - final List<String> invoiceIds = new ArrayList<String>(); + final Set<String> invoiceIds = new HashSet<String>(); for (Invoice invoice : obc.list()) { invoiceIds.add(invoice.getId()); } @@ -179,6 +181,7 @@ OBDal.getInstance().save(invoice); OBDal.getInstance().flush(); + } catch (Exception e) { } finally { OBContext.restorePreviousMode(); } @@ -257,19 +260,23 @@ } if (paymentSchedule.getPaidAmount().compareTo(paid) != 0) { - logger.log("ERROR Invoice " + invoice.getDocumentNo() - + ": wrong payment plan info, paid amount is " - + paymentSchedule.getPaidAmount().toPlainString() + " when it should be " - + paid.toPlainString()); + if (logger != null) { + logger.log("ERROR Invoice " + invoice.getDocumentNo() + + ": wrong payment plan info, paid amount is " + + paymentSchedule.getPaidAmount().toPlainString() + " when it should be " + + paid.toPlainString()); + } paymentSchedule.setPaidAmount(paid); OBDal.getInstance().save(paymentSchedule); } if (paymentSchedule.getOutstandingAmount().compareTo( paymentSchedule.getAmount().subtract(paid)) != 0) { - logger.log("ERROR Invoice " + invoice.getDocumentNo() - + ": wrong payment plan info, outstanding amount is " - + paymentSchedule.getOutstandingAmount().toPlainString() + " when it should be " - + paymentSchedule.getAmount().subtract(paid).toPlainString()); + if (logger != null) { + logger.log("ERROR Invoice " + invoice.getDocumentNo() + + ": wrong payment plan info, outstanding amount is " + + paymentSchedule.getOutstandingAmount().toPlainString() + " when it should be " + + paymentSchedule.getAmount().subtract(paid).toPlainString()); + } paymentSchedule.setOutstandingAmount(paymentSchedule.getAmount().subtract(paid)); OBDal.getInstance().save(paymentSchedule); } diff -r 3b86a5f1e686 -r a362c560793b 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 Oct 22 06:53:55 2013 +0200 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Tue Oct 22 23:23:17 2013 +0200 @@ -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.21338]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.21350]]></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 3b86a5f1e686 -r a362c560793b 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 Oct 22 06:53:55 2013 +0200 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Oct 22 23:23:17 2013 +0200 @@ -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.21338]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.21350]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 3b86a5f1e686 -r a362c560793b 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 Oct 22 06:53:55 2013 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Tue Oct 22 23:23:17 2013 +0200 @@ -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.21338]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.21350]]></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 3b86a5f1e686 -r a362c560793b 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 Oct 22 06:53:55 2013 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Oct 22 23:23:17 2013 +0200 @@ -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.21338]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.21350]]></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.21338]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.21350]]></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.21338]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.21350]]></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.21338]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.21350]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 3b86a5f1e686 -r a362c560793b modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java Tue Oct 22 06:53:55 2013 +0200 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java Tue Oct 22 23:23:17 2013 +0200 @@ -251,7 +251,10 @@ requiredGridProperties.add("id"); requiredGridProperties.add("client"); requiredGridProperties.add("organization"); - + requiredGridProperties.add("updatedBy"); + requiredGridProperties.add("updated"); + requiredGridProperties.add("creationDate"); + requiredGridProperties.add("createdBy"); for (Property identifierProperty : this.entity.getIdentifierProperties()) { requiredGridProperties.add(identifierProperty.getName()); } diff -r 3b86a5f1e686 -r a362c560793b 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 Oct 22 06:53:55 2013 +0200 +++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml Tue Oct 22 23:23:17 2013 +0200 @@ -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.21338]]></VERSION> +<!--D393BE6F22BB44B7B728259B34FC795A--> <VERSION><![CDATA[1.0.21350]]></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 3b86a5f1e686 -r a362c560793b 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 Oct 22 06:53:55 2013 +0200 +++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Oct 22 23:23:17 2013 +0200 @@ -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.21338]]></STARTVERSION> +<!--DCE798FBC5B648F7A3C81A6941720A57--> <STARTVERSION><![CDATA[2.1.21350]]></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 3b86a5f1e686 -r a362c560793b 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 Oct 22 06:53:55 2013 +0200 +++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml Tue Oct 22 23:23:17 2013 +0200 @@ -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.21338]]></VERSION> +<!--4B828F4D03264080AA1D2057B13F613C--> <VERSION><![CDATA[2.1.21350]]></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 3b86a5f1e686 -r a362c560793b 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 Oct 22 06:53:55 2013 +0200 +++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Oct 22 23:23:17 2013 +0200 @@ -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.21338]]></STARTVERSION> +<!--26B041893E844A53AFA58BC326C4F0D7--> <STARTVERSION><![CDATA[3.0.21350]]></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.21338]]></STARTVERSION> +<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F--> <STARTVERSION><![CDATA[1.1.21350]]></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.21338]]></STARTVERSION> +<!--D7BA4BB0844942C58DC46B9E23CF8E67--> <STARTVERSION><![CDATA[2.0.21350]]></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 3b86a5f1e686 -r a362c560793b 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 Oct 22 06:53:55 2013 +0200 +++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml Tue Oct 22 23:23:17 2013 +0200 @@ -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.21338]]></VERSION> +<!--2758CD25B2704AF6BBAD10365FC82C06--> <VERSION><![CDATA[2.1.21350]]></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 3b86a5f1e686 -r a362c560793b 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 Oct 22 06:53:55 2013 +0200 +++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Oct 22 23:23:17 2013 +0200 ------------------------------------------------------------------------------ October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register > http://pubads.g.doubleclick.net/gampad/clk?id=60135991&iu=/4140/ostg.clktrk _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
