details: https://code.openbravo.com/erp/devel/main/rev/dafeaac0d99a changeset: 21368:dafeaac0d99a user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue Oct 22 23:41:46 2013 +0200 summary: CI: merge back from main
details: https://code.openbravo.com/erp/devel/main/rev/16187b3a7c1e changeset: 21369:16187b3a7c1e user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Wed Oct 23 11:04:37 2013 +0200 summary: Fixes issue 24951: Grid always fetches properties used in subtabs display logic In order for the display logics of a subtab to be evaluated properly, the properties that belong to an ancestor tab must be loaded in that tab. A new utility method called getTabSubtabs has been added to the KernelUtils class. details: https://code.openbravo.com/erp/devel/main/rev/5f9a1bf7005c changeset: 21370:5f9a1bf7005c user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Wed Oct 23 11:55:11 2013 +0200 summary: Fixes bug 24995: Moving to the next record in the grid with 'Tab' does not work In this changeset [1] it was wrongly assumed that the newRow property represented whether the record being edit was new, but it represents if the grid is about to move to a new line. To check if the row is being created, this.getEditForm().isNew should be used. [1] https://code.openbravo.com/erp/devel/pi/rev/9138cdfbcb9badfceaf1a0eb54b4be87fec6eb35 details: https://code.openbravo.com/erp/devel/main/rev/1f5e7edaeeaf changeset: 21371:1f5e7edaeeaf user: RM packaging bot <staff.rm <at> openbravo.com> date: Wed Oct 23 12:04:27 2013 +0200 summary: Merge back from main details: https://code.openbravo.com/erp/devel/main/rev/ae421dd5cfd8 changeset: 21372:ae421dd5cfd8 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Wed Oct 23 12:24:02 2013 +0200 summary: fixes issue 24857: If the minimum stock demand is the first transaction the Manufacturing Plan should work in another way details: https://code.openbravo.com/erp/devel/main/rev/e3a359452601 changeset: 21373:e3a359452601 user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Mon Oct 21 17:23:59 2013 +0530 summary: Fixes Issue 24979: Warehouses that should be available in purchase transactions details: https://code.openbravo.com/erp/devel/main/rev/af69b7e7a6c8 changeset: 21374:af69b7e7a6c8 user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Tue Oct 22 11:06:09 2013 +0530 summary: Fixes Issue 0024841: Heartbeat Configuration Windows has 2 tabs on level 0 which is forbidden Moved Heartbeat configuration log tab to level 1 as it is already showing in level 1. details: https://code.openbravo.com/erp/devel/main/rev/acb7c4bb1944 changeset: 21375:acb7c4bb1944 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Tue Oct 22 09:11:41 2013 +0200 summary: Related to issue 24309 details: https://code.openbravo.com/erp/devel/main/rev/fff6d1f95d3c changeset: 21376:fff6d1f95d3c user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Thu Oct 24 13:09:55 2013 +0530 summary: Fixes Issue 0024802: Incorrect rowcount The updateRowCountDisplay has a delay associated with it, so prevent returning incorrect row count if there a request while on delay. details: https://code.openbravo.com/erp/devel/main/rev/decd52611c97 changeset: 21377:decd52611c97 user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Thu Oct 24 13:40:04 2013 +0530 summary: Fixes Issue 0024960: Field groups are not displayed under some circumstances. The focus item value is lost during form reflow in some particular scenarios. Do overcome this, retrieved the lost focus item value and set it again after form redraw if they are not the same. details: https://code.openbravo.com/erp/devel/main/rev/824d700983d1 changeset: 21378:824d700983d1 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Thu Oct 24 10:33:39 2013 +0200 summary: Related to issue 24995: Enables tab key while creating a record in the grid details: https://code.openbravo.com/erp/devel/main/rev/491a3b333503 changeset: 21379:491a3b333503 user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Thu Oct 24 14:27:52 2013 +0530 summary: Related to Issue 24802 : Checked form availability before updating row count. Updating the row count to null only if filter editor and editForm are available. details: https://code.openbravo.com/erp/devel/main/rev/d0465c5073ba changeset: 21380:d0465c5073ba user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Oct 24 19:45:44 2013 +0200 summary: CI: update AD_MODULE to version 21379 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.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/DynamicExpressionParser.java | 14 +++ modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java | 11 ++ modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java | 14 +++- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java | 22 +++++- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js | 7 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 12 ++- 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.kernel/src/org/openbravo/client/kernel/KernelUtils.java | 35 +++++++++ modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelUtils_data.xsql | 38 ++++++++++ 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/C_COMMISSIONRUN_PROCESS.xml | 11 +- src-db/database/model/functions/C_ORDER_POST1.xml | 10 ++ src-db/database/model/functions/MRP_RUN_EXPLODE.xml | 11 ++- src-db/database/model/functions/M_INOUT_POST.xml | 10 ++ src-db/database/sourcedata/AD_MODULE.xml | 2 +- src-db/database/sourcedata/AD_TAB.xml | 2 +- 56 files changed, 267 insertions(+), 94 deletions(-) diffs (truncated from 1304 to 300 lines): diff -r a362c560793b -r d0465c5073ba .hgsigs --- a/.hgsigs Tue Oct 22 23:23:17 2013 +0200 +++ b/.hgsigs Thu Oct 24 19:45:44 2013 +0200 @@ -126,6 +126,7 @@ 92028616e00a984620b7b5cb5185d5347a7d8e27 0 iEYEABECAAYFAlJWJuwACgkQCX/oGf+2qkOI6wCgpWwN1yrx+LccTz/Unl85E/iB1lkAoKkM5ffnfpaOxl+sSPqCwHfS7oDe 1216d879483850c7a6ebd1b87b989bbdfebc7f38 0 iEYEABECAAYFAlJhLy0ACgkQCX/oGf+2qkPOzQCeKwXy9EQPSyYq/b5eALoFRQsHescAoL8RolWFBxkn+CGl4yR5gBgBp7mR b79dd1dc55aa66c08d26a88c004c167253307b9a 0 iEYEABECAAYFAlIyoXQACgkQCX/oGf+2qkPMWACg2suFjCYsdws4IU2H5S0wdXHkI+MAnjiRIQd2XaN/Yw6iAsj6jgI+y3Bx +7b352c5386cbb6385d62d4ab3d41ccc1f24e51a5 0 iEYEABECAAYFAlJk27gACgkQCX/oGf+2qkO9egCfXPguGi2lAvNPrFV4Dw5pwtpmdOgAniLN/zfdCv2VlxUw/e5HC/kVOaKn f56c14fc0212d08ec0e9663d957dfdbf4ff42543 0 iEYEABECAAYFAlJbyIkACgkQCX/oGf+2qkOXiACgggW09+Z5WL1BrxaSVcZB0ykapr4AoKSn91Y1yvImj5/sEmdM5f37Y2RM ffdd47e41d59e56bf2f85033679accff7feaa941 0 iEYEABECAAYFAlJfscwACgkQCX/oGf+2qkOJFQCg/olIlg4QV8DcH3aJWB9NVlpgvG4An1P8ZPJjX7Rtaav0sb+N1DF9YaSh 3dff4a5ade8aa7966fde9139428e968fb7f04218 0 iEYEABECAAYFAlJlPOMACgkQCX/oGf+2qkPsbgCg4w/JC1tFhyxz6mXa6UBOaEYz6esAnRCq24eVAcoNGrAfIfhXvKUBuQMQ diff -r a362c560793b -r d0465c5073ba .hgtags --- a/.hgtags Tue Oct 22 23:23:17 2013 +0200 +++ b/.hgtags Thu Oct 24 19:45:44 2013 +0200 @@ -137,6 +137,7 @@ f731bd4e0332d5976149e92aed53d49ed1852557 3.0MP26.3 98e29b4482b8200f26d0409b025ee58a5ead5a05 3.0MP26.4 5bc4ca20d6f5c30e0cb179912df555607df04577 3.0MP27 +eb7e3648c517b2b1e9d8c85eff550d43013ca922 3.0MP27.1 db86a9cfecc308c3382feb357d53091f51ad3a4a 3.0MP28 750dc95742e0d15c3ed8b484fa8dbc4aa689c627 3.0MP28.1 0c73b69e61c55d8de0b3a0dfcc2e7511fa8a295f 3.0MP28.2 diff -r a362c560793b -r d0465c5073ba 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 23:23:17 2013 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Thu Oct 24 19:45:44 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.21350]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.21379]]></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 a362c560793b -r d0465c5073ba 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 23:23:17 2013 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Oct 24 19:45:44 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.21350]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.21379]]></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.21350]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.21379]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r a362c560793b -r d0465c5073ba 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 23:23:17 2013 +0200 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Thu Oct 24 19:45:44 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.21350]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.21379]]></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 a362c560793b -r d0465c5073ba 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 23:23:17 2013 +0200 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Oct 24 19:45:44 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.21350]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.21379]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r a362c560793b -r d0465c5073ba 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 23:23:17 2013 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Thu Oct 24 19:45:44 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.21350]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.21379]]></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 a362c560793b -r d0465c5073ba 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 23:23:17 2013 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Oct 24 19:45:44 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.21350]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.21379]]></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.21350]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.21379]]></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.21350]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.21379]]></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.21350]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.21379]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r a362c560793b -r d0465c5073ba modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java Tue Oct 22 23:23:17 2013 +0200 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java Thu Oct 24 19:45:44 2013 +0200 @@ -65,6 +65,7 @@ } private List<Field> fieldsInExpression = new ArrayList<Field>(); + private List<String> otherTokensInExpression = new ArrayList<String>(); private List<Parameter> parametersInExpression = new ArrayList<Parameter>(); private List<AuxiliaryInput> auxInputsInExpression = new ArrayList<AuxiliaryInput>(); private List<String> sessionAttributesInExpression = new ArrayList<String>(); @@ -209,6 +210,15 @@ } /** + * Returns the list of tokens that are not fields of the tab It is only used when parsing the + * display logic of the tabs + * + */ + public List<String> getOtherTokensInExpression() { + return otherTokensInExpression; + } + + /** * Returns the list of Parameters used in the dynamic expression * */ @@ -334,6 +344,10 @@ return new DisplayLogicElement( "OB.Utilities.getValue(currentValues,'" + fieldName + "')", uiDef instanceof YesNoUIDefinition); + } else if (tabLevelDisplayLogic) { + if (!otherTokensInExpression.contains(token)) { + otherTokensInExpression.add(token); + } } } for (AuxiliaryInput auxIn : auxIns) { diff -r a362c560793b -r d0465c5073ba modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java Tue Oct 22 23:23:17 2013 +0200 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java Thu Oct 24 19:45:44 2013 +0200 @@ -472,6 +472,17 @@ return columnName; } + public boolean isField(String columnName) { + final List<Field> adFields = new ArrayList<Field>(tab.getADFieldList()); + for (Field field : adFields) { + if (field.getColumn() != null + && columnName.equalsIgnoreCase(field.getColumn().getDBColumnName())) { + return true; + } + } + return false; + } + interface OBViewFieldDefinition { public int getGridSort(); diff -r a362c560793b -r d0465c5073ba 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 23:23:17 2013 +0200 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java Thu Oct 24 19:45:44 2013 +0200 @@ -249,16 +249,21 @@ public List<String> getRequiredGridProperties() { List<String> requiredGridProperties = new ArrayList<String>(); requiredGridProperties.add("id"); + // Needed to check if the record is readonly (check addWritableAttribute method of DefaultJsonDataService) requiredGridProperties.add("client"); requiredGridProperties.add("organization"); + // Audit fields are mandatory because the FIC does not returned them when called in EDIT mode requiredGridProperties.add("updatedBy"); requiredGridProperties.add("updated"); requiredGridProperties.add("creationDate"); requiredGridProperties.add("createdBy"); + + // Always include all the properties that are part of the identifier of the entity for (Property identifierProperty : this.entity.getIdentifierProperties()) { requiredGridProperties.add(identifierProperty.getName()); } + // Properties related to buttons that have label values List<ButtonField> buttonFields = getViewTab().getButtonFields(); for (ButtonField buttonField : buttonFields) { if (!buttonField.getLabelValues().isEmpty()) { @@ -266,13 +271,20 @@ } } + // List of properties that are part of the display logic of the subtabs + List<String> tabDisplayLogicFields = getViewTab().getDisplayLogicFields(); + for (String tabDisplayLogicField : tabDisplayLogicFields) { + requiredGridProperties.add(tabDisplayLogicField); + } + + // List of properties that are part of the display logic of buttons List<String> propertiesInButtonFieldDisplayLogic = getViewTab().getFieldHandler() .getPropertiesInButtonFieldDisplayLogic(); - for (String propertyName : propertiesInButtonFieldDisplayLogic) { requiredGridProperties.add(propertyName); } + // Always include the propertyt that links to the parent tab String linkToParentPropertyName = this.getLinkToParentPropertyName(); if (linkToParentPropertyName != null && !linkToParentPropertyName.isEmpty()) { requiredGridProperties.add(linkToParentPropertyName); diff -r a362c560793b -r d0465c5073ba modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java Tue Oct 22 23:23:17 2013 +0200 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java Thu Oct 24 19:45:44 2013 +0200 @@ -563,7 +563,6 @@ final DynamicExpressionParser parser = new DynamicExpressionParser(tab.getDisplayLogic(), tab, inpColumnNames); jsExpression = parser.getJSExpression(); - // Retrieves the preference attributes used in the display logic of the tab setPreferenceAttributesFromParserResult(parser, this.getWindowId()); } @@ -604,6 +603,27 @@ return preferenceAttributes; } + // Return the list of fields of these tab that are part of the display logic of its subtabs + public List<String> getDisplayLogicFields() { + boolean getOnlyFirstLevelSubTabs = false; + List<Tab> subTabs = KernelUtils.getInstance().getTabSubtabs(tab, getOnlyFirstLevelSubTabs); + List<String> displayLogicFields = new ArrayList<String>(); + for (Tab subTab : subTabs) { + if (subTab.getDisplayLogic() != null && !subTab.getDisplayLogic().isEmpty()) { + boolean inpColumnNames = true; + final DynamicExpressionParser parser = new DynamicExpressionParser( + subTab.getDisplayLogic(), tab, inpColumnNames); + List<String> tokens = parser.getOtherTokensInExpression(); + for (String token : tokens) { + if (!displayLogicFields.contains(token) && fieldHandler.isField(token)) { + displayLogicFields.add(token); + } + } + } + } + return displayLogicFields; + } + public class ButtonField { private static final String AD_DEF_ERROR = "AD definition error: process parameter (%s) is using %s reference without %s"; private String id; diff -r a362c560793b -r d0465c5073ba modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js Tue Oct 22 23:23:17 2013 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js Thu Oct 24 19:45:44 2013 +0200 @@ -1941,9 +1941,16 @@ }, redraw: function () { + var focusItemValue; this._isRedrawing = true; + //fetch the focus item value as it is lost sometimes during reflow. Refer issue https://issues.openbravo.com/view.php?id=24960 + focusItemValue = this.getFocusItem() !== null ? this.getFocusItem().getValue() : null; this.Super('redraw', arguments); delete this._isRedrawing; + //reset focus item value if lost + if (focusItemValue !== null && this.getFocusItem() !== null && this.getFocusItem().getValue() !== focusItemValue) { + this.getFocusItem().setValue(focusItemValue); + } if (this.selectOnFocusStored) { this.selectOnFocus = this.previousSelectOnFocus; delete this.previousSelectOnFocus; diff -r a362c560793b -r d0465c5073ba modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js Tue Oct 22 23:23:17 2013 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js Thu Oct 24 19:45:44 2013 +0200 @@ -1484,7 +1484,7 @@ // mode is opened ------------------------------------------------------------------------------ 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 [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
