details: https://code.openbravo.com/erp/devel/main/rev/f512f9736b7e changeset: 24378:f512f9736b7e user: Inigo Sanchez <inigo.sanchez <at> openbravo.com> date: Thu Sep 04 10:57:16 2014 +0200 summary: Fixes issue 26383: If the delete toolbar button is pushed in treeGridView, selected record is not delete properly.
It has been solved by controlling the current view: tree grid view or grid view. Now, it can be possible delete in tree grid view in normal way. details: https://code.openbravo.com/erp/devel/main/rev/37e6593b3db7 changeset: 24379:37e6593b3db7 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Thu Sep 04 12:51:59 2014 +0200 summary: Related to issue 26383: Prevents jslint error The currentGrid attribute was being used without being previously defined. details: https://code.openbravo.com/erp/devel/main/rev/5e8878153d02 changeset: 24380:5e8878153d02 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Thu Sep 04 10:13:18 2014 +0200 summary: Fixes issue 27529: Param windows use context of owner view, not source view When in a parameter window the context info of the underlying tab is requested, the tab to be should should be the tab where the parameter window is declared, even if one of its subtabs is currently active. details: https://code.openbravo.com/erp/devel/main/rev/3b7074df4abe changeset: 24381:3b7074df4abe user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Sep 04 15:30:02 2014 +0000 summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/287a9ec20ad5 changeset: 24382:287a9ec20ad5 user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Fri Sep 05 10:54:04 2014 +0530 summary: Related to issue 27401: backout Incorrect fix. The select value was disabled on purpose. So the fix has to be done without enabling it. details: https://code.openbravo.com/erp/devel/main/rev/31b085cc025e changeset: 24383:31b085cc025e user: RM packaging bot <staff.rm <at> openbravo.com> date: Fri Sep 05 12:34:47 2014 +0000 summary: CI: update AD_MODULE to version 24382 diffstat: 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-db/database/sourcedata/AD_TAB.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-view-grid.js | 4 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 41 ++++++--- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js | 12 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js | 16 ++- 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.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js | 6 + 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/sourcedata/AD_MODULE.xml | 4 +- 47 files changed, 139 insertions(+), 106 deletions(-) diffs (truncated from 1113 to 300 lines): diff -r 9e3b5c07065b -r 31b085cc025e modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Thu Sep 04 13:33:10 2014 +0530 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Fri Sep 05 12:34:47 2014 +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.24371]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.24382]]></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 9e3b5c07065b -r 31b085cc025e 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 Thu Sep 04 13:33:10 2014 +0530 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri Sep 05 12:34:47 2014 +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.24371]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.24382]]></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.24371]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.24382]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 9e3b5c07065b -r 31b085cc025e modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml Thu Sep 04 13:33:10 2014 +0530 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml Fri Sep 05 12:34:47 2014 +0000 @@ -697,7 +697,7 @@ <!--D6E031B95C004672B30AB1E3543E0A07--> <ISSHOWTREENODEICONS><![CDATA[Y]]></ISSHOWTREENODEICONS> <!--D6E031B95C004672B30AB1E3543E0A07--> <EM_OBUIAPP_CAN_ADD><![CDATA[Y]]></EM_OBUIAPP_CAN_ADD> <!--D6E031B95C004672B30AB1E3543E0A07--> <EM_OBUIAPP_CAN_DELETE><![CDATA[Y]]></EM_OBUIAPP_CAN_DELETE> -<!--D6E031B95C004672B30AB1E3543E0A07--> <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT> +<!--D6E031B95C004672B30AB1E3543E0A07--> <EM_OBUIAPP_SHOW_SELECT><![CDATA[N]]></EM_OBUIAPP_SHOW_SELECT> <!--D6E031B95C004672B30AB1E3543E0A07--> <EM_OBUIAPP_NEWFN><![CDATA[OB.APRM.AddPayment.addNewGLItem]]></EM_OBUIAPP_NEWFN> <!--D6E031B95C004672B30AB1E3543E0A07--></AD_TAB> diff -r 9e3b5c07065b -r 31b085cc025e 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 Thu Sep 04 13:33:10 2014 +0530 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Fri Sep 05 12:34:47 2014 +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.24371]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.24382]]></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 9e3b5c07065b -r 31b085cc025e 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 Thu Sep 04 13:33:10 2014 +0530 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri Sep 05 12:34:47 2014 +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.24371]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.24382]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 9e3b5c07065b -r 31b085cc025e 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 Thu Sep 04 13:33:10 2014 +0530 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Fri Sep 05 12:34:47 2014 +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.24371]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.24382]]></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 9e3b5c07065b -r 31b085cc025e 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 Thu Sep 04 13:33:10 2014 +0530 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri Sep 05 12:34:47 2014 +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.24371]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.24382]]></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.24371]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.24382]]></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.24371]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.24382]]></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.24371]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.24382]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 9e3b5c07065b -r 31b085cc025e modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-view-grid.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-view-grid.js Thu Sep 04 13:33:10 2014 +0530 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-view-grid.js Fri Sep 05 12:34:47 2014 +0000 @@ -459,5 +459,9 @@ this.setData([]); this.fetchData(this.getCriteria()); } + }, + + isWritable: function (record) { + return !record._readOnly; } }); \ No newline at end of file diff -r 9e3b5c07065b -r 31b085cc025e modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js Thu Sep 04 13:33:10 2014 +0530 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js Fri Sep 05 12:34:47 2014 +0000 @@ -2111,7 +2111,7 @@ deleteSelectedRows: function (autoSaveDone) { var msg, dialogTitle, view = this, - deleteCount, callback; + deleteCount, callback, currentGrid; if (!this.readOnly && this.isDeleteableTable) { // first save what we have edited @@ -2124,14 +2124,18 @@ this.standardWindow.doActionAfterAutoSave(actionObject, false); return; } - - deleteCount = this.viewGrid.getSelection().length; + if (this.isShowingTree) { + currentGrid = this.treeGrid; + } else { + currentGrid = this.viewGrid; + } + deleteCount = currentGrid.getSelection().length; if (deleteCount === 1) { msg = OB.I18N.getLabel('OBUIAPP_DeleteConfirmationSingle'); dialogTitle = OB.I18N.getLabel('OBUIAPP_DialogTitle_DeleteRecord'); } else { - msg = OB.I18N.getLabel('OBUIAPP_DeleteConfirmationMultiple', [this.viewGrid.getSelection().length]); + msg = OB.I18N.getLabel('OBUIAPP_DeleteConfirmationMultiple', [deleteCount]); dialogTitle = OB.I18N.getLabel('OBUIAPP_DialogTitle_DeleteRecords'); } @@ -2149,7 +2153,7 @@ removeCallBack = function (resp, data, req) { var length, localData = resp.dataObject || resp.data || data, - i, updateTotalRows; + i, updateTotalRows, currentGrid; if (!localData) { // bail out, an error occured which should be displayed to the user now @@ -2165,6 +2169,11 @@ status = localData.response.status; } if (status === isc.RPCResponse.STATUS_SUCCESS) { + if (view.isShowingTree) { + currentGrid = view.treeGrid; + } else { + currentGrid = view.viewGrid; + } if (view.isShowingForm) { view.switchFormGridVisibility(); } @@ -2172,7 +2181,7 @@ if (deleteData) { // note totalrows is used when inserting a new row, to determine after which // record to add a new row - updateTotalRows = (view.viewGrid.data.getLength() === view.viewGrid.data.totalRows); + updateTotalRows = (currentGrid.data.getLength() === currentGrid.data.totalRows); // deleteData is computed below length = deleteData.ids.length; for (i = 0; i < length; i++) { @@ -2180,15 +2189,14 @@ id: deleteData.ids[i] }); } - view.viewGrid.data.handleUpdate('remove', recordInfos, false, req); + currentGrid.data.handleUpdate('remove', recordInfos, false, req); if (updateTotalRows) { - view.viewGrid.data.totalRows = view.viewGrid.data.getLength(); + currentGrid.data.totalRows = currentGrid.data.getLength(); } } else if (doUpdateTotalRows) { - view.viewGrid.data.totalRows = view.viewGrid.data.getLength(); + currentGrid.data.totalRows = currentGrid.data.getLength(); } view.viewGrid.updateRowCountDisplay(); - // Refresh the grid based on Refresh After Deletion preference if (OB.PropertyStore.get("OBUIAPP_RefreshAfterDeletion", view.standardWindow.windowId) === 'Y') { view.viewGrid.refreshGrid(); @@ -2215,9 +2223,16 @@ isc.clearPrompt(); }; if (ok) { - selection = view.viewGrid.getSelection().duplicate(); + + if (view.isShowingTree) { + currentGrid = view.treeGrid; + } else { + currentGrid = view.viewGrid; + } + + selection = currentGrid.getSelection().duplicate(); // deselect the current records - view.viewGrid.deselectAllRecords(); + currentGrid.deselectAllRecords(); if (selection.length > 1) { deleteData = {}; @@ -2233,7 +2248,7 @@ } else { // note totalrows is used when inserting a new row, to determine after which // record to add a new row - doUpdateTotalRows = (view.viewGrid.data.getLength() === view.viewGrid.data.totalRows); + doUpdateTotalRows = (currentGrid.data.getLength() === currentGrid.data.totalRows); // note remove data expects only the id, the record key as the first param view.viewGrid.removeData({ id: selection[0].id diff -r 9e3b5c07065b -r 31b085cc025e modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js Thu Sep 04 13:33:10 2014 +0530 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js Fri Sep 05 12:34:47 2014 +0000 @@ -179,7 +179,7 @@ currentValues = isc.shallowClone(form.getValues()); } OB.Utilities.fixNull250(currentValues); - parentContext = (this.view.sourceView && this.view.sourceView.getContextInfo(false, true, true, true)) || {}; + parentContext = this.view.getUnderLyingRecordContext(false, true, true, true); try { if (isc.isA.Function(this.originalShowIf)) { @@ -289,7 +289,7 @@ this.members.push(this.loading); this.Super('initWidget', arguments); - context = this.sourceView ? this.sourceView.getContextInfo(false, true, true, true) : {}; + context = this.getUnderLyingRecordContext(false, true, true, true); OB.RemoteCallManager.call('org.openbravo.client.application.process.DefaultsProcessActionHandler', context, { processId: this.processId, @@ -442,7 +442,7 @@ doProcess: function (btnValue) { var i, tmp, view = this, - grid, allProperties = (this.sourceView && this.sourceView.getContextInfo(false, true, false, true)) || {}, + grid, allProperties = this.getUnderLyingRecordContext(false, true, false, true), selection, len, allRows, params, tab, actionHandlerCall; // activeView = view.parentWindow && view.parentWindow.activeView, ???. if (this.resultLayout && this.resultLayout.destroy) { @@ -570,7 +570,7 @@ if (!form) { return; } - parentContext = (this.sourceView && this.sourceView.getContextInfo(false, true, true, true)) || {}; + parentContext = this.getUnderLyingRecordContext(false, true, true, true); fields = form.getFields(); for (i = 0; i < fields.length; i++) { @@ -617,6 +617,10 @@ return result; }, + getUnderLyingRecordContext: function (onlySessionProperties, classicMode, forceSettingContextVars, convertToClassicFormat) { + return (this.buttonOwnerView && this.buttonOwnerView.getContextInfo(onlySessionProperties, classicMode, forceSettingContextVars, convertToClassicFormat)) || {}; + }, + // returns true if any non-grid required parameter does not have a value allRequiredParametersSet: function () { var i, item, length = this.theForm.getItems().length, diff -r 9e3b5c07065b -r 31b085cc025e modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js Thu Sep 04 13:33:10 2014 +0530 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js Fri Sep 05 12:34:47 2014 +0000 @@ -159,16 +159,20 @@ updateState: function () { ------------------------------------------------------------------------------ Slashdot TV. Video for Nerds. Stuff that matters. http://tv.slashdot.org/ _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
