details: https://code.openbravo.com/erp/devel/main/rev/032fb3d55363 changeset: 23853:032fb3d55363 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Fri Jun 20 11:42:57 2014 +0200 summary: Fixes issue 23889: Multiple requests to selector datasource in manual popups
Pick lists and grids use a property called drawAllMaxCells, that is used to determine how many cells should be fetched from the datasource, its default value is 250. If after making a datasource call smartclient finds out that the number of retrieved cells is lower than drawAllMaxCells, it will do another datasource call, and repeat this process until the number of cells fetched are higher than drawAllMaxCells or until all cells have been fetched. This is not the intented behaviour, we want the rows to be fetched when the user scrolls down and is out of cached rows. This is achieved by setting drawAllMaxCells to 0. details: https://code.openbravo.com/erp/devel/main/rev/d615b5db09cd changeset: 23854:d615b5db09cd user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Jun 20 15:59:37 2014 +0200 summary: fixed bug 26914: Process Definition fail if they don't have a single grid param -Do not assume 1st param is a grid -Do not assume there is a grid at all -Do not do the conversion if there are several grids -In case of failure don't do the conversion but continue the flow details: https://code.openbravo.com/erp/devel/main/rev/ae57ca1f99dc changeset: 23855:ae57ca1f99dc user: RM packaging bot <staff.rm <at> openbravo.com> date: Fri Jun 20 15:52:00 2014 +0000 summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/0043e948d053 changeset: 23856:0043e948d053 user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Mon Jun 23 15:59:11 2014 +0530 summary: Fixes Issue 26838: Unpaged request in Financial Account Transaction Perform form refresh after completing button action only if current form is valid. In the issue, we are deleting the record using the button, so the form present after the delete action is invalid resulting in fetch with incorrect critieria to the server. The problems happens only in form view, as refresh grid is done with proper criteria. details: https://code.openbravo.com/erp/devel/main/rev/bc7151f88085 changeset: 23857:bc7151f88085 user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Mon Jun 23 16:12:52 2014 +0530 summary: Related to issue 26838 : Changed incorrect comment message details: https://code.openbravo.com/erp/devel/main/rev/e3da458ad088 changeset: 23858:e3da458ad088 user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Sun Jun 22 12:27:58 2014 +0530 summary: 26696: Table references work with display column other than identifiers When table references were displayed, always the identifier columns were displayed. The actual value was displayed in cases of composite identifiers which in turn was another identifier, eg., Financial account in Customer. Now it uses the display column in all cases. The criteriaDisplayField parameter is already being used for displaying the appropriate value. Set it's value correctly for table references Added additional logic in DefaultJsonDataService to include the display field column to the formed BOB object. This fix is not risky as it affects only the displaying of FK filter values from the fetched result. details: https://code.openbravo.com/erp/devel/main/rev/4639ca577e0b changeset: 23859:4639ca577e0b user: David Baz Fayos <david.baz <at> openbravo.com> date: Mon Jun 23 16:17:36 2014 +0200 summary: [treeimpr] Related to issue 26455: 'Default Tree View Logic' now only affects to the child views of the view where it applies. This is to fix the case where you cannot manually change between the tree/grid view mode and then move to another different record (inside the same view) preserving the previous manually set mode. details: https://code.openbravo.com/erp/devel/main/rev/391fdc807c26 changeset: 23860:391fdc807c26 user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Tue Jun 24 13:31:26 2014 +0530 summary: Related to issue 26696 : Handled NPE details: https://code.openbravo.com/erp/devel/main/rev/3fbe45f3957e changeset: 23861:3fbe45f3957e user: Miguel de Juana <miguel.dejuana <at> openbravo.com> date: Tue Jun 24 10:36:42 2014 +0200 summary: Fixed issue 0026839: Error in a Process Definition without parameters details: https://code.openbravo.com/erp/devel/main/rev/400fab36bc29 changeset: 23862:400fab36bc29 user: Miguel de Juana <miguel.dejuana <at> openbravo.com> date: Tue Jun 24 10:39:45 2014 +0200 summary: Fixed issue 0026840: onLoad function is not executed in Process Definition without Parameters details: https://code.openbravo.com/erp/devel/main/rev/b3671e259f50 changeset: 23863:b3671e259f50 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Tue Jun 24 12:10:40 2014 +0200 summary: Fixes issue 26898: Tree node is not hidden after being moved to the root If a tree node if moved to the root, the tree cache is invalidated to force redrawing it. Otherwise, the new root node is not shown until the tree is manually refreshed. details: https://code.openbravo.com/erp/devel/main/rev/f3972fa0041b changeset: 23864:f3972fa0041b user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Tue Jun 24 12:53:44 2014 +0200 summary: 26928: aprm_ispaymentconfirmed function return always 'N' when psd have glitem details: https://code.openbravo.com/erp/devel/main/rev/01ad2c4839e0 changeset: 23865:01ad2c4839e0 user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Tue Jun 24 19:05:24 2014 +0530 summary: Related to issue 26638 : Commented code used for selector pagination checks till it is fixed details: https://code.openbravo.com/erp/devel/main/rev/e78ccbaf0186 changeset: 23866:e78ccbaf0186 user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue Jun 24 23:19:20 2014 +0000 summary: CI: update AD_MODULE to version 23865 diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml | 7 +- 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/process/BaseProcessActionHandler.java | 46 ++++++++- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js | 4 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js | 4 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-view-grid.js | 20 ++- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 49 +++++++-- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js | 7 +- 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/reference/FKComboUIDefinition.java | 22 +--- 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.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java | 24 ++++- modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonConstants.java | 1 + 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-widget.js | 2 + 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 +- 52 files changed, 218 insertions(+), 132 deletions(-) diffs (truncated from 1243 to 300 lines): diff -r ccf086dfbe29 -r e78ccbaf0186 modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml Fri Jun 20 00:46:38 2014 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml Tue Jun 24 23:19:20 2014 +0000 @@ -33,6 +33,7 @@ TYPE RECORD IS REF CURSOR; Cur_Dbprefix RECORD; v_invoicepaidstatus VARCHAR2(32); + v_fin_payment_schedule_invoice VARCHAR2(32); BEGIN -- Check if the status exists SELECT count(*) INTO v_count FROM DUAL @@ -43,12 +44,12 @@ IF (v_count = 0) THEN RETURN 'N'; END IF; - select isinvoicepaid - into v_isinvoicepaid + select isinvoicepaid , fin_payment_schedule_invoice + into v_isinvoicepaid , v_fin_payment_schedule_invoice from fin_payment_scheduledetail where fin_payment_scheduledetail_id=p_fin_psd_id; - IF ((p_fin_psd_id <> '') AND (p_fin_psd_id is not null))THEN + IF (((p_fin_psd_id <> '') or (p_fin_psd_id is not null)) AND (v_fin_payment_schedule_invoice is not null))THEN IF(v_isinvoicepaid='Y')THEN -- core intermediate statuses v_isPaymentConfirmed := 'Y'; diff -r ccf086dfbe29 -r e78ccbaf0186 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Fri Jun 20 00:46:38 2014 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Tue Jun 24 23:19:20 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.23545]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.23865]]></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 ccf086dfbe29 -r e78ccbaf0186 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 Fri Jun 20 00:46:38 2014 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Jun 24 23:19:20 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.23545]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.23865]]></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.23545]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.23865]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r ccf086dfbe29 -r e78ccbaf0186 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 Fri Jun 20 00:46:38 2014 +0200 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Tue Jun 24 23:19:20 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.23545]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.23865]]></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 ccf086dfbe29 -r e78ccbaf0186 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 Fri Jun 20 00:46:38 2014 +0200 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Jun 24 23:19:20 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.23545]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.23865]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r ccf086dfbe29 -r e78ccbaf0186 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 Fri Jun 20 00:46:38 2014 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Tue Jun 24 23:19:20 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.23545]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.23865]]></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 ccf086dfbe29 -r e78ccbaf0186 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 Fri Jun 20 00:46:38 2014 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Jun 24 23:19:20 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.23545]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.23865]]></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.23545]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.23865]]></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.23545]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.23865]]></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.23545]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.23865]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r ccf086dfbe29 -r e78ccbaf0186 modules/org.openbravo.client.application/src/org/openbravo/client/application/process/BaseProcessActionHandler.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/process/BaseProcessActionHandler.java Fri Jun 20 00:46:38 2014 +0200 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/process/BaseProcessActionHandler.java Tue Jun 24 23:19:20 2014 +0000 @@ -32,6 +32,7 @@ import org.openbravo.client.application.ProcessAccess; import org.openbravo.client.kernel.BaseActionHandler; import org.openbravo.client.kernel.KernelConstants; +import org.openbravo.dal.core.DalUtil; import org.openbravo.dal.core.OBContext; import org.openbravo.dal.service.OBCriteria; import org.openbravo.dal.service.OBDal; @@ -50,6 +51,8 @@ private static final Logger log = Logger.getLogger(BaseProcessActionHandler.class); + private static final String GRID_REFERENCE_ID = "FF80818132D8F0F30132D9BC395D0038"; + @Override protected final JSONObject execute(Map<String, Object> parameters, String content) { @@ -95,14 +98,45 @@ Process process = OBDal.getInstance().get(Process.class, processId); String updatedContent = content; if (process.isGridlegacy()) { + log.warn("Process " + + process.getName() + + " is marked as Grid Legacy, you should consider migrating it to prevent parameter conversion"); + JSONObject jsonRequest = new JSONObject(content); if (!jsonRequest.isNull("_params")) { - JSONObject jsonparams = jsonRequest.getJSONObject("_params"); - String gridParamName = jsonparams.names().getString(0); - JSONObject jsongrid = jsonparams.getJSONObject(gridParamName); - jsonRequest.put("_selection", jsongrid.getJSONArray("_selection")); - jsonRequest.put("_allRows", jsongrid.getJSONArray("_allRows")); - updatedContent = jsonRequest.toString(); + try { + Parameter gridParameter = null; + boolean shouldConvert = false; + for (Parameter param : process.getOBUIAPPParameterList()) { + if (GRID_REFERENCE_ID.equals(DalUtil.getId(param.getReference()))) { + if (gridParameter != null) { + log.error("Error while trying to conver parameters to legacy mode. There are more than one grid parameter. Not converting it."); + shouldConvert = false; + } else { + gridParameter = param; + shouldConvert = true; + } + } + } + + if (gridParameter == null) { + log.info("There is no grid parameter in proces " + process.getName() + + ". No conversion is needed so Grid Legacy can be safelly unflagged."); + } + + if (shouldConvert) { + JSONObject jsonparams = jsonRequest.getJSONObject("_params"); + if (jsonparams.has(gridParameter.getDBColumnName()) + && !jsonparams.isNull(gridParameter.getDBColumnName())) { + JSONObject jsongrid = jsonparams.getJSONObject(gridParameter.getDBColumnName()); + jsonRequest.put("_selection", jsongrid.getJSONArray("_selection")); + jsonRequest.put("_allRows", jsongrid.getJSONArray("_allRows")); + } + updatedContent = jsonRequest.toString(); + } + } catch (Exception e) { + log.error("Error while converting parameters. Sending them without conversion", e); + } } } return doExecute(parameters, updatedContent); diff -r ccf086dfbe29 -r e78ccbaf0186 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js Fri Jun 20 00:46:38 2014 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js Tue Jun 24 23:19:20 2014 +0000 @@ -72,6 +72,10 @@ if (gridView) { requestProperties.params.tabId = gridView.tabId || (gridView.sourceView && gridView.sourceView.tabId); } + //send the display field in request params to add it to the list of fields to be fetched. + if (this.formItem && this.formItem.displayField) { + requestProperties.params.displayField = this.formItem.displayField; + } delete me.forceReload; }, diff -r ccf086dfbe29 -r e78ccbaf0186 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js Fri Jun 20 00:46:38 2014 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js Tue Jun 24 23:19:20 2014 +0000 @@ -597,6 +597,10 @@ field.filterEditorProperties.criteriaField = field.criteriaField; } + if (field.criteriaDisplayField) { + field.filterEditorProperties.criteriaDisplayField = field.criteriaDisplayField; + } + if (field.editorType && new Function('return isc.' + field.editorType + '.getPrototype().isAbsoluteTime')()) { // In the case of an absolute time, the time needs to be converted in order to avoid the UTC conversion // http://forums.smartclient.com/showthread.php?p=116135 diff -r ccf086dfbe29 -r e78ccbaf0186 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 Fri Jun 20 00:46:38 2014 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-view-grid.js Tue Jun 24 23:19:20 2014 +0000 @@ -135,13 +135,19 @@ // the new callback checks if the node movement has to be reverted var newCallback = function (dsResponse, data, dsRequest) { var i, node, parentNode; - for (i = 0; i < data.length; i++) { - node = data[i]; - if (node.revertMovement) { - parentNode = dsRequest.dragTree.find('id', node.parentId); - if (parentNode) { - // move the node back to its previous index - dsRequest.dragTree.move(node, parentNode, node.prevIndex); + if (dsRequest.newParentNode && dsRequest.dragTree && dsRequest.newParentNode.nodeId === dsRequest.dragTree.rootValue) { + // if the node is being moved to the root, reload the grid to force + // displaying properly the node in its new position. see issue https://issues.openbravo.com/view.php?id=26898 + dsRequest.dragTree.invalidateCache(); + } else { + for (i = 0; i < data.length; i++) { + node = data[i]; + if (node.revertMovement) { + parentNode = dsRequest.dragTree.find('id', node.parentId); + if (parentNode) { + // move the node back to its previous index + dsRequest.dragTree.move(node, parentNode, node.prevIndex); + } } } } diff -r ccf086dfbe29 -r e78ccbaf0186 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 Fri Jun 20 00:46:38 2014 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js Tue Jun 24 23:19:20 2014 +0000 @@ -389,10 +389,25 @@ }, - handleDefaultTreeView: function (parentContextInfo) { + // ** {{{ handleDefaultTreeView }}} ** + // + // Evaluates the 'Default Tree View Logic' to show the grid view or the tree view + // + // Parameters: + // * {{{handleCurrent}}}: 'false' by default. It specifies if the logic should be applied in current record. + // * {{{handleChilds}}}: 'true' by default. It specifies if the logic should be applied in child records. + // * {{{parentContextInfo}}}: the context info of the parent. To ensure that the childs (if 'handleChilds' is 'true') have also the context info of its parent. + handleDefaultTreeView: function (handleCurrent, handleChilds, parentContextInfo) { var contextInfo, tabViewPane, length, i, p; contextInfo = this.getContextInfo(false, true, true); + if (!handleCurrent) { + handleCurrent = false; + } + if (!handleChilds) { + handleChilds = true; + } + for (p in parentContextInfo) { // While evaluating the 'defaultTreeViewLogicIf' the parent contextInfo is needed // because based on the parent selected record, the current view will be shown @@ -402,27 +417,30 @@ } } - if (this.treeGrid && isc.isA.Function(this.defaultTreeViewLogicIf)) { ------------------------------------------------------------------------------ Open source business process management suite built on Java and Eclipse Turn processes into business applications with Bonita BPM Community Edition Quickly connect people, data, and systems into organized workflows Winner of BOSSIE, CODIE, OW2 and Gartner awards http://p.sf.net/sfu/Bonitasoft _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
