Merge lp:~openerp-dev/openobject-client/6.1-opw-578157-rgo into lp:openobject-client/6.1

[Ravi Gohil (OpenERP)]

Hello,

When `view_id` not specified for `ir.actions.act_window`, the view with the lowest sequence number is shown for the respective model whereas the view should be taken from the `view_ids` specified in action of the first type specified in `view_mode`.

To reproduce the issue(For Purchase Dashboard),
1) From menu `Setting/Customization/Actions/Windows Action`, search for `Monthly Purchase by Category` and remove the View Ref`(view_id),
2) go to `Setting/Customization/User Interface/Views` and search for graph views for object `purchase.report` and set the sequence to `15` of view named `product.month.graph`,
3) Open Purchase Dashboard,

You will have `product.month.graph` view for `Monthly Purchase by Category` action instead of `purchase.order.monthly.categ.graph`(which is in `view_ids` of action).

This fix fixes this issue, kindly review the fix.

Note: Currently, web loads first view from `view_ids` irrespective of `view_mode`.

Thanks.

[lp:~openerp-dev/openobject-client/6.1-opw-578157-rgo]

2089. By Chris Biersbach (OpenERP) on 2012-10-02

[FIX] When switching views, only the first view was correctly loaded in the previous revision. This revision makes sure all the views are correctly loaded both when using the switch_view button and when left clicking on a line

[Naresh(OpenERP) (nch-openerp)]

review: Approve

=== modified file 'bin/widget/screen/screen.py'
--- bin/widget/screen/screen.py	2011-10-11 06:15:57 +0000
+++ bin/widget/screen/screen.py	2012-10-02 09:21:29 +0000
@@ -570,7 +570,7 @@
                 view_id = self.view_ids and self.view_ids.pop(idx) or False
             else:
                 idx = 0
-                view_id = False
+                view_id = self.view_ids and self.view_ids.pop(idx) or False
             type = self.view_to_load.pop(idx)
             self.add_view_id(view_id,type)
 

=== modified file 'bin/widget/view/form_gtk/action.py'
--- bin/widget/view/form_gtk/action.py	2011-10-11 06:15:57 +0000
+++ bin/widget/view/form_gtk/action.py	2012-10-02 09:21:29 +0000
@@ -64,6 +64,10 @@
                 self.action_view_ids = map(lambda y:y[0], filter(lambda x:x[1] == 'tree',self.action['views']))
             if self.action['view_type']=='form':
                 mode = (self.action['view_mode'] or 'form,tree').split(',')
+                if not view_id:
+                    view_id = map(lambda y:y[0], filter(lambda x:x[1] == mode[0],self.action['views']))
+                for extra_mode in mode[1:]:
+                    view_id.extend(map(lambda y:y[0], filter(lambda x:x[1] == extra_mode, self.action['views'])))
                 self.screen = Screen(self.action['res_model'], view_type=mode, context=self.context, view_ids = view_id, domain=self.domain)
                 self.ui = openerp_gtk_builder('openerp.ui', ['widget_paned'])
                 self.ui.connect_signals({