Merge lp:~fabien-morin/unifield-web/fm-us-1588 into lp:unifield-web

[jftempo]

=== modified file 'addons/openerp/controllers/actions.py'
--- addons/openerp/controllers/actions.py	2017-03-15 10:18:04 +0000
+++ addons/openerp/controllers/actions.py	2017-05-17 07:01:17 +0000
@@ -64,7 +64,8 @@
 
 def execute_window(view_ids, model, res_id=False, domain=None, view_type='form', context=None,
                    mode='form,tree', name=None, target=None, limit=None, search_view=None,
-                   context_menu=False, display_menu_tip=False, action_id=None):
+                   context_menu=False, display_menu_tip=False, action_id=None,
+                   sidebar_open=False):
     """Performs `actions.act_window` action.
 
     @param view_ids: view ids
@@ -74,6 +75,7 @@
     @param view_type: view type, eigther `form` or `tree`
     @param context: the context
     @param mode: view mode, eigther `form,tree` or `tree,form` or None
+    @param sidebar_open: force the side bar to the open position if True
 
     @return: view (mostly XHTML code)
     """
@@ -89,6 +91,7 @@
     params.search_view = search_view
     params['context_menu'] = context_menu
     params['display_menu_tip'] = display_menu_tip
+    params['sidebar_open'] = sidebar_open
     params['target'] = target or None
     cherrypy.request._terp_view_name = name or None
     cherrypy.request._terp_view_target = target or None
@@ -363,7 +366,8 @@
                           search_view=data['search_view'],
                           context_menu=data.get('context_menu'),
                           display_menu_tip=display_menu_tip,
-                          action_id=action.get('id'))
+                          action_id=action.get('id'),
+                          sidebar_open=action.get('sidebar_open'))
 
 def server(action, data):
     context = dict(data.get('context', {}),

=== modified file 'addons/openerp/controllers/form.py'
--- addons/openerp/controllers/form.py	2017-02-06 11:21:15 +0000
+++ addons/openerp/controllers/form.py	2017-05-17 07:01:17 +0000
@@ -273,7 +273,7 @@
             tips = tips
 
         is_dashboard = form.screen.is_dashboard or False
-        return dict(form=form, pager=pager, buttons=buttons, path=self.path, can_shortcut=can_shortcut, shortcut_ids=shortcut_ids, display_name=display_name, title=title, tips=tips, obj_process=obj_process, is_dashboard=is_dashboard, sidebar_closed=params._terp_sidebar_closed)
+        return dict(form=form, pager=pager, buttons=buttons, path=self.path, can_shortcut=can_shortcut, shortcut_ids=shortcut_ids, display_name=display_name, title=title, tips=tips, obj_process=obj_process, is_dashboard=is_dashboard, sidebar_closed=params._terp_sidebar_closed, sidebar_open=params.sidebar_open)
 
     @expose('json', methods=('POST',))
     def close_or_disable_tips(self):

=== modified file 'addons/openerp/controllers/templates/form.mako'
--- addons/openerp/controllers/templates/form.mako	2017-01-02 14:59:00 +0000
+++ addons/openerp/controllers/templates/form.mako	2017-05-17 07:01:17 +0000
@@ -176,7 +176,7 @@
                 <%
                   if sidebar_closed:
                       sidebar_class="closed"
-                  elif form.screen.view_type in ['form', 'calendar', 'gantt']:
+                  elif form.screen.view_type in ['form', 'calendar', 'gantt'] or sidebar_open:
                       sidebar_class="open"
                   else:
                       sidebar_class="closed"