Merge lp:~jfb-tempo-consulting/unifield-web/jfb-int into lp:unifield-web

[jftempo]

[lp:~jfb-tempo-consulting/unifield-web/jfb-int]

4872. By jftempo on 2017-10-27

US-2937 [IMP] JS code optimization

lp:~alexaubin/unifield-web/US-2937

4873. By jftempo on 2017-10-27

US-3589 [FIX] ir.ui.menu bug

lp:~alexaubin/unifield-web/US-3589-fix-ir-ui-menu

4874. By jftempo on 2017-10-27

US-2923 [FIX] account.mcdb: don't store the 'original domain' when searching for an existing query as it would lead to an inconsistent SQL request

lp:~julie-w/unifield-web/US-2923

4875. By jftempo on 2017-10-27

US-3211 [FIX] Error message on field validation

lp:~alexaubin/unifield-web/US-3211

4876. By jftempo on 2017-10-27

US-3381 [IMP] New attribute auto_refresh on tree view to auto reload page

lp:~fabien-morin/unifield-web/fm-us-3381

4877. By jftempo on 2017-10-27

US-3172 [IMP] Keyboard shortcuts: popup help

lp:~fabien-morin/unifield-web/fm-us-3172

4878. By jftempo on 2017-10-27

US-2310 [FIX] Standard Import: keep context

lp:~julie-w/unifield-web/US-2310

=== modified file 'addons/openerp/controllers/__init__.py'
--- addons/openerp/controllers/__init__.py	2017-06-19 14:54:07 +0000
+++ addons/openerp/controllers/__init__.py	2017-10-27 15:15:39 +0000
@@ -16,6 +16,7 @@
 import selection
 import shortcuts
 import banner
+import shortcut_tooltip
 import requests
 import unifield_version
 import openm2o
 
=== modified file 'addons/openerp/controllers/actions.py'
--- addons/openerp/controllers/actions.py	2017-05-16 12:26:11 +0000
+++ addons/openerp/controllers/actions.py	2017-10-27 15:15:39 +0000
@@ -65,7 +65,7 @@
 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,
-                   sidebar_open=False):
+                   sidebar_open=False, auto_refresh=False):
     """Performs `actions.act_window` action.
 
     @param view_ids: view ids
@@ -93,6 +93,7 @@
     params['display_menu_tip'] = display_menu_tip
     params['sidebar_open'] = sidebar_open
     params['target'] = target or None
+    params['auto_refresh'] = auto_refresh
     cherrypy.request._terp_view_name = name or None
     cherrypy.request._terp_view_target = target or None
 
@@ -367,7 +368,8 @@
                           context_menu=data.get('context_menu'),
                           display_menu_tip=display_menu_tip,
                           action_id=action.get('id'),
-                          sidebar_open=action.get('sidebar_open'))
+                          sidebar_open=action.get('sidebar_open'),
+                          auto_refresh=action.get('auto_refresh'))
 
 def server(action, data):
     context = dict(data.get('context', {}),
 
=== modified file 'addons/openerp/controllers/form.py'
--- addons/openerp/controllers/form.py	2017-05-18 12:24:22 +0000
+++ addons/openerp/controllers/form.py	2017-10-27 15:15:39 +0000
@@ -273,7 +273,8 @@
             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, sidebar_open=params.sidebar_open)
+
+        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, auto_refresh=params.auto_refresh, tg_errors=tg_errors)
 
     @expose('json', methods=('POST',))
     def close_or_disable_tips(self):
 
=== modified file 'addons/openerp/controllers/impex.py'
--- addons/openerp/controllers/impex.py	2017-01-02 14:59:00 +0000
+++ addons/openerp/controllers/impex.py	2017-10-27 15:15:39 +0000
@@ -457,7 +457,7 @@
         tree.show_headers = False
         return dict(error=error, records=records, success=success,
                     model=params.model, source=params.source,
-                    tree=tree, fields=kw.get('fields', {}))
+                    tree=tree, fields=kw.get('fields', {}), ctx=ctx)
 
     @expose()
     def detect_data(self, csvfile, csvsep, csvdel, csvcode, csvskip, **kw):
@@ -566,7 +566,7 @@
                 **kw)
 
         datas = []
-        ctx = dict(rpc.session.context)
+        ctx = dict((params.context or {}), **rpc.session.context)
 
         if not isinstance(fields, list):
             fields = [fields]
 
=== modified file 'addons/openerp/controllers/search.py'
--- addons/openerp/controllers/search.py	2017-02-10 08:28:16 +0000
+++ addons/openerp/controllers/search.py	2017-10-27 15:15:39 +0000
@@ -398,8 +398,11 @@
         ncustom_domain = openobject.i18n.format.convert_date_format_in_domain(ncustom_domain, res, context)
 
         # (US-1360) Get the original domain used, convert it from String to List, and store it in the context
-        original_domain = all_domains.get('original_domain') and expr_eval(all_domains.get('original_domain')) or []
-        ctx.update({'original_domain': original_domain})
+        if model != 'account.mcdb':
+            # US-2923 When searching for a Saved query in the Selectors don't store the original_domain, otherwise it
+            # would later be used on the account.analytic.lines/account.move.lines and lead to an inconsistent SQL request
+            original_domain = all_domains.get('original_domain') and expr_eval(all_domains.get('original_domain')) or []
+            ctx.update({'original_domain': original_domain})
 
         return dict(domain=ustr(domain), context=ustr(ctx), search_data=ustr(search_data), filter_domain=ustr(ncustom_domain))
 
 
=== added file 'addons/openerp/controllers/shortcut_tooltip.py'
--- addons/openerp/controllers/shortcut_tooltip.py	1970-01-01 00:00:00 +0000
+++ addons/openerp/controllers/shortcut_tooltip.py	2017-10-27 15:15:39 +0000
@@ -0,0 +1,33 @@
+###############################################################################
+#
+#  Copyright (C) 2007-TODAY OpenERP SA. All Rights Reserved.
+#
+#  $Id$
+#
+#  Developed by OpenERP (http://openerp.com) and Axelor (http://axelor.com).
+#
+#  The OpenERP web client is distributed under the "OpenERP Public License".
+#  It's based on Mozilla Public License Version (MPL) 1.1 with following
+#  restrictions:
+#
+#  -   All names, links and logos of OpenERP must be kept as in original
+#      distribution without any changes in all software screens, especially
+#      in start-up page and the software header, even if the application
+#      source code has been changed or updated or code has been added.
+#
+#  You can see the MPL licence at: http://www.mozilla.org/MPL/MPL-1.1.html
+#
+###############################################################################
+from openerp.controllers import SecuredController
+from openerp.utils import rpc
+
+
+class ShortcutTooltip(SecuredController):
+
+    _cp_path = "/openerp/shortcut_tooltip"
+
+    def get_show_shortcut(self):
+        proxy = rpc.RPCProxy('sync.client.entity')
+        return proxy.display_shortcut_message()
+
+# vim: ts=4 sts=4 sw=4 si et
 
=== modified file 'addons/openerp/controllers/templates/base.mako'
--- addons/openerp/controllers/templates/base.mako	2017-09-14 13:33:18 +0000
+++ addons/openerp/controllers/templates/base.mako	2017-10-27 15:15:39 +0000
@@ -1,31 +1,31 @@
 <%inherit file="/openobject/controllers/templates/base.mako"/>
 
 <%def name="header()">
-    <script type="text/javascript" src="/openerp/static/javascript/openerp/openerp.base.js?v=6.0"></script>
+    <script type="text/javascript" src="/openerp/static/javascript/openerp/openerp.base.js?v=7.0"></script>
     <script type="text/javascript" src="/openerp/static/javascript/openerp/openerp.ui.js"></script>
     <script type="text/javascript" src="/openerp/static/javascript/openerp/openerp.ui.tips.js"></script>
     <script type="text/javascript" src="/openerp/static/javascript/openerp/openerp.ui.waitbox.js"></script>
     <script type="text/javascript" src="/openerp/static/javascript/openerp/openerp.ui.textarea.js"></script>
 
     <script type="text/javascript" src="/openerp/static/javascript/scripts.js"></script>
-    <script type="text/javascript" src="/openerp/static/javascript/form.js?v=6.0"></script>
+    <script type="text/javascript" src="/openerp/static/javascript/form.js?v=7.0"></script>
     <script type="text/javascript" src="/openerp/static/javascript/form_state.js?v=2.3b2"></script>
-    <script type="text/javascript" src="/openerp/static/javascript/listgrid.js?v=2.8b1"></script>
+    <script type="text/javascript" src="/openerp/static/javascript/listgrid.js?v=7.0"></script>
 
-    <script type="text/javascript" src="/openerp/static/javascript/m2o.js?v=2.6b4"></script>
-    <script type="text/javascript" src="/openerp/static/javascript/m2m.js"></script>
-    <script type="text/javascript" src="/openerp/static/javascript/o2m.js"></script>
+    <script type="text/javascript" src="/openerp/static/javascript/m2o.js?v=7.0"></script>
+    <script type="text/javascript" src="/openerp/static/javascript/m2m.js?v=7.0"></script>
+    <script type="text/javascript" src="/openerp/static/javascript/o2m.js?v=7.0"></script>
     <script type="text/javascript" src="/openerp/static/javascript/binary.js"></script>
     <script type="text/javascript" src="/openerp/static/jscal/calendar.js"></script>
     <script type="text/javascript" src="/openerp/static/jscal/calendar-setup.js"></script>
 
-    <script type="text/javascript" src="/openerp/static/javascript/web_keyboard_shortcuts.js"></script>
+    <script type="text/javascript" src="/openerp/static/javascript/web_keyboard_shortcuts.js?v=7.0"></script>
 
     <link rel="stylesheet" type="text/css" href="/openerp/static/css/style.css"/>
     <link rel="stylesheet" type="text/css" href="/openerp/static/css/menu.css?v=2.7b1"/>
-    <link rel="stylesheet" type="text/css" href="/openerp/static/css/tips.css"/>
+    <link rel="stylesheet" type="text/css" href="/openerp/static/css/tips.css?v=7.0"/>
     <link rel="stylesheet" type="text/css" href="/openerp/static/css/waitbox.css"/>
-    <link rel="stylesheet" type="text/css" href="/openerp/static/css/screen.css?v=2.7b1"/>
+    <link rel="stylesheet" type="text/css" href="/openerp/static/css/screen.css?v=7.0"/>
 
     <link rel="stylesheet" type="text/css" href="/openerp/static/jscal/calendar-blue.css"/>
     <link rel="stylesheet" type="text/css" href="/openerp/static/css/dashboard.css"/>
 
=== modified file 'addons/openerp/controllers/templates/exp.mako'
--- addons/openerp/controllers/templates/exp.mako	2017-08-29 09:33:08 +0000
+++ addons/openerp/controllers/templates/exp.mako	2017-10-27 15:15:39 +0000
@@ -286,7 +286,7 @@
                 <table width="100%">
                     <tr>
                         <td class="imp-header" align="right">
-                            <a class="button-a" href="javascript: void(0)" onclick="window.frameElement.close()">${_("Cancel")}</a>
+                            <a class="button-a oe_form_button_cancel" href="javascript: void(0)" onclick="window.frameElement.close()">${_("Cancel")}</a>
                             <a class="button-a" href="javascript: void(0)" onclick="do_export('view_form')">${_("Export to File")}</a>
                         </td>
                         <td width="5%"></td>
 
=== modified file 'addons/openerp/controllers/templates/form.mako'
--- addons/openerp/controllers/templates/form.mako	2017-06-01 13:48:36 +0000
+++ addons/openerp/controllers/templates/form.mako	2017-10-27 15:15:39 +0000
@@ -25,6 +25,15 @@
             /*
             % endif
             */
+            /*
+            % if auto_refresh :
+            */
+            setTimeout(function() {
+                location.reload();
+            }, ${auto_refresh}*1000);
+            /*
+            % endif
+            */
             setTimeout(function() {
                 jQuery('[autofocus="autofocus"]').focus();
             }, 10);
@@ -95,10 +104,10 @@
                     % endif
 
                     % if obj_process:
-	                    <a class="help" href="${py.url('/view_diagram/process', res_model=form.screen.model, title=form.screen.string, res_id=form.screen.id)}"
-	                       title="${_('Corporate Intelligence...')}">
-	                        <small>Help</small>
-	                    </a>
+                        <a class="help" href="${py.url('/view_diagram/process', res_model=form.screen.model, title=form.screen.string, res_id=form.screen.id)}"
+                           title="${_('Corporate Intelligence...')}">
+                            <small>Help</small>
+                        </a>
                     % endif
                     % if form.screen.view_type == 'form' and form.logs.logs:
                       <a id="show_server_logs" class="logs" href="javascript: void(0)"
@@ -166,6 +175,7 @@
                     % if buttons.pager:
                         ${pager.display()}
                     % endif
+
                 </div>
                 % endif
                 <div${ " class='non-editable'" if not form.screen.editable and form.screen.view_type == 'form' else "" | n }>${form.display()}</div>
@@ -209,6 +219,10 @@
                 $hide.click();
                 return false;
             })
+
+            % if tg_errors:
+            error_display(_("The form contains errors."));
+            % endif
         })
     </script>
 </%def>
 
=== modified file 'addons/openerp/controllers/templates/header.mako'
--- addons/openerp/controllers/templates/header.mako	2016-06-14 16:01:53 +0000
+++ addons/openerp/controllers/templates/header.mako	2017-10-27 15:15:39 +0000
@@ -4,7 +4,6 @@
     ROOT = cp.request.pool.get_controller("/openerp")
     SHORTCUTS = cp.request.pool.get_controller("/openerp/shortcuts")
     REQUESTS = cp.request.pool.get_controller("/openerp/requests")
-    UF_VERSION = cp.request.pool.get_controller("/openerp/unifield_version")
 
     shortcuts = SHORTCUTS.my()
     requests, total_request = REQUESTS.my()
@@ -30,9 +29,6 @@
 add_style = cp.config('server.environment') in css_style_dict.keys()
 if add_style:
     css_style = css_style_dict.get(cp.config('server.environment'), "")
-
-from openobject import release
-version = release.version
 %>
 <td id="top"
     % if add_style:
@@ -153,6 +149,6 @@
             src:this.href
         }, null, {
             height: 350
-        });
+        }).focus();
     });
 </script>
 
=== modified file 'addons/openerp/controllers/templates/imp.mako'
--- addons/openerp/controllers/templates/imp.mako	2015-10-23 08:08:51 +0000
+++ addons/openerp/controllers/templates/imp.mako	2017-10-27 15:15:39 +0000
@@ -71,6 +71,7 @@
     <input type="hidden" id="_terp_model" name="_terp_model" value="${model}"/>
     <input type="hidden" id="_terp_ids" name="_terp_ids" value="[]"/>
     <input type="hidden" id="_terp_fields2" name="_terp_fields2" value="[]"/>
+    <input type="hidden" id="_terp_context" name="_terp_context" value="${ctx}"/>
 
     <table class="view" cellspacing="5" border="0" width="100%">
         <tr>
@@ -202,7 +203,7 @@
                 <table width="100%">
                     <tr>
                         <td class="imp-header" align="left">
-                            <a class="button-a" href="javascript: void(0)" onclick="window.frameElement.close()">${_("Close")}</a>
+                            <a class="button-a oe_form_button_cancel" href="javascript: void(0)" onclick="window.frameElement.close()">${_("Close")}</a>
                             <a class="button-a" href="javascript: void(0)" onclick="do_import();">${_("Import File")}</a>
                         </td>
                         <td width="5%"></td>
 
=== modified file 'addons/openerp/controllers/templates/index.mako'
--- addons/openerp/controllers/templates/index.mako	2017-06-19 14:54:07 +0000
+++ addons/openerp/controllers/templates/index.mako	2017-10-27 15:15:39 +0000
@@ -94,6 +94,9 @@
             <tr>
                 <%include file="banner.mako"/>
             </tr>
+            <tr>
+                <%include file="shortcut_tooltip.mako"/>
+            </tr>
             % if tools is not None:
                 <tr>
                     <td id="secondary" class="sidenav-open">
 
=== modified file 'addons/openerp/controllers/templates/preferences/index.mako'
--- addons/openerp/controllers/templates/preferences/index.mako	2016-11-21 09:45:23 +0000
+++ addons/openerp/controllers/templates/preferences/index.mako	2017-10-27 15:15:39 +0000
@@ -35,7 +35,7 @@
                     <button type='button' class="static_boxes"
                             onclick="open_password(); return false;"
                             >${_("Change Password")}</button>
-                    <button type='button' class="static_boxes" onclick="window.frameElement.close();">${_("Cancel")}</button>
+                    <button type='button' class="static_boxes oe_form_button_cancel" onclick="window.frameElement.close();">${_("Cancel")}</button>
                     <button type='button' class="static_boxes" onclick="submit_form('ok');">${_("Save")}</button>
                 </td>
             </tr>
 
=== added file 'addons/openerp/controllers/templates/shortcut_tooltip.mako'
--- addons/openerp/controllers/templates/shortcut_tooltip.mako	1970-01-01 00:00:00 +0000
+++ addons/openerp/controllers/templates/shortcut_tooltip.mako	2017-10-27 15:15:39 +0000
@@ -0,0 +1,13 @@
+<%
+# put in try block to prevent improper redirection on connection refuse error
+try:
+    SHORTCUT = cp.request.pool.get_controller("/openerp/shortcut_tooltip")
+    display_message = SHORTCUT.get_show_shortcut()
+    message = _("You haven't recently used a keyboard shortcut. You can see what shortcuts are available on this screen by holding SHIFT + CTRL.")
+except:
+    display_message = False
+    message = 'toto'
+%>
+% if display_message:
+<td id="shortcut_message" colspan="3">${message | h}</td>
+% endif
 
=== modified file 'addons/openerp/po/javascript/fr.po'
--- addons/openerp/po/javascript/fr.po	2017-02-06 11:21:15 +0000
+++ addons/openerp/po/javascript/fr.po	2017-10-27 15:15:39 +0000
@@ -114,3 +114,7 @@
 #: static/javascript/form.js
 msgid "You cannot upload files bigger than %(max_size)sMB, current size is %(size)sMB"
 msgstr "Vous ne pouvez pas envoyer des fichiers plus gros que %(max_size)sMB, la taille actuelle est de  %(size)sMB"
+
+#: addons/openerp/controllers/templates/form.mako
+msgid "The form contains errors."
+msgstr "Le formulaire comporte des erreurs."
 
=== modified file 'addons/openerp/po/messages/fr.po'
--- addons/openerp/po/messages/fr.po	2017-01-02 14:59:00 +0000
+++ addons/openerp/po/messages/fr.po	2017-10-27 15:15:39 +0000
@@ -1775,3 +1775,7 @@
 #~ msgid "Click here to add new image."
 #~ msgstr "Cliquez ici pour ajouter une nouvelle image"
 
+#: controllers/templates/shortcut_tooltip.mako:6
+#, python-format
+msgid "You haven't recently used a keyboard shortcut. You can see what shortcuts are available on this screen by holding SHIFT + CTRL."
+msgstr "Vous n'avez pas utilisé de raccourci clavier récemment. Vous pouvez voir quels raccourcis sont disponibles sur cet écran en utilisant CTRL + SHIFT."
 
=== modified file 'addons/openerp/static/css/screen.css'
--- addons/openerp/static/css/screen.css	2017-07-10 08:56:45 +0000
+++ addons/openerp/static/css/screen.css	2017-10-27 15:15:39 +0000
@@ -2378,3 +2378,13 @@
     background: rgba(255, 165, 0, .6);
     white-space: pre-line;
 }
+
+#shortcut_message {
+    font-weight: bold;
+    font-size: 1.2em;
+    height: 2em;
+    text-align: center;
+    background: rgb(184, 222, 130);
+    background: rgba(184, 222, 130, .6);
+    white-space: pre-line;
+}
 
=== modified file 'addons/openerp/static/css/tips.css'
--- addons/openerp/static/css/tips.css	2010-11-23 10:11:52 +0000
+++ addons/openerp/static/css/tips.css	2017-10-27 15:15:39 +0000
@@ -39,3 +39,22 @@
     font-size: 12px;
 }
 
+
+.shortcut_tooltip {
+    padding: 4px;
+    text-align: center;
+    font-family: sans-serif;
+    font-size: 11px;
+    color: #666666;
+    z-index: 1000;
+    border-radius: 6px;
+    -moz-border-radius: 6px;
+    -webkit-border-radius: 6px;
+    background: #FCF9A7;
+    border: 1px solid #999;
+    max-width: 500px;
+    opacity: 1;
+    -webkit-transition: opacity 1000ms linear;
+    transition: opacity 1000ms linear;
+    font-weight: bold;
+}
 
=== modified file 'addons/openerp/static/javascript/form.js'
--- addons/openerp/static/javascript/form.js	2017-10-20 13:34:27 +0000
+++ addons/openerp/static/javascript/form.js	2017-10-27 15:15:39 +0000
@@ -97,6 +97,27 @@
 
     var prefix = src && src != '_terp_list' ? src + '/' : '';
 
+    // Here we do a sanity check that there aren't multiple element with
+    // the same id 'prefix/_terp_model'
+    // If this is the case, we introduce some delay (call back the same
+    // function later)
+    //
+    // This can happen in some asynchronous edge-case where the DOM is not 
+    // fully loaded yet and in particular there's a remaining element with 
+    // _terp_model =  ir.ui.menu
+    // which might trigger the opening of a completely unrealted view
+    //
+    // You might reproduce the issue by monitoring the value of
+    //    openobject.dom.get(prefix + '_terp_model').value
+    // when loading for instance the list of Commitment Vouchers
+    //
+    // See https://jira.unifield.org/browse/US-3589
+    //
+    if ($("[id="+prefix+"_terp_model]").length > 1) {
+        callLater(0.1, openRecord, id, src, target, readonly);
+        return;
+    }
+
     var args = {
         'model': openobject.dom.get(prefix + '_terp_model').value,
         'id': id || 'False',
@@ -255,11 +276,11 @@
 }
 
 
-function error_display(msg) {
+function error_display(msg, title='Warning Message') {
     var error = jQuery("<table>",{'width': '100%', 'height': '100%'}
                 ).append(
                     jQuery("<tr>").append(
-                        jQuery("<td>", {'colspan': 2, 'class': 'error_message_header'}).text(_('Warning Message'))
+                        jQuery("<td>", {'colspan': 2, 'class': 'error_message_header'}).text(_(title))
                     ),
                     jQuery("<tr>").append(
                         jQuery("<td>", {'css': 'padding: 4px 2px;'}).append(
@@ -275,7 +296,13 @@
                             .text('OK')
                         )
                 ));
-    window.top.jQuery.fancybox(error, {scrolling: 'no'});
+    error.find('.button-a').focus()
+    window.top.jQuery.fancybox(error, {
+        scrolling: 'no',
+        onComplete: function () {
+            $(this).find(".button-a").focus()
+        }
+    });
 }
 
 function get_sidebar_status(args, noterp) {
@@ -1022,7 +1049,18 @@
         }
 
         if (obj.error) {
-            return error_popup(obj.error)
+            // 'TinyForm' error case : obj.error is a string
+            if (obj.error_field) {
+                // Retrieve the label associated to the label and display the
+                // error
+                var error_field_label = $('label[for="'+obj.error_field+'"]').text().trim()
+                return error_display(error_field_label+" : "+obj.error);
+            }
+            // General exception case (no obj.error_field given)
+            // obj.error is a full HTML page (and error_popup will display it)
+            else {
+                return error_popup(obj); 
+            }
         }
 
         return obj;
@@ -1404,9 +1442,8 @@
         dataType: 'json',
         success: function(obj) {
             if(obj.error) {
-                error_popup(obj.error);
+                error_display(obj.error);
             }
-
             $attachment_line.remove();
         }
     });
 
=== modified file 'addons/openerp/static/javascript/form_state.js'
--- addons/openerp/static/javascript/form_state.js	2017-10-19 14:33:30 +0000
+++ addons/openerp/static/javascript/form_state.js	2017-10-27 15:15:39 +0000
@@ -190,11 +190,19 @@
 }
 
 function list_hookAttrChange(list_name) {
-    jQuery('table[id='+list_name+'_grid] [attrs]').each(function () {
-        var $this = jQuery(this);
+
+    // check if an editor exists
+    var editor_exists = $(".editors").length;
+   
+    // Loop on list elements which have an 'attrs' attribute 
+    var listgrids = jQuery('table[id='+list_name+'_grid] [attrs]');
+    for (var i = 0 ; i < listgrids.length ; i++)
+    {
+        var elem = listgrids[i];
+        var $this = jQuery(elem);
         var attrs = $this.attr('attrs') || '{}';
         var widget = $this.attr('widget') || '';
-        var container = this;
+        var container = elem;
         var prefix = widget.slice(0, widget.lastIndexOf('/')+1) || '';
 
         // Convert Python statement into it's equivalent in JavaScript.
@@ -207,11 +215,9 @@
         try {
             attrs = eval('(' + attrs + ')');
         } catch(e){
-            return;
+            continue;
         }
 
-        // check if an editor exists
-        var editor_exists = $(".editors").length;
         var cache_values = {};
 
         var row_is_editable = editor_exists && $this.parents('tr.grid-row').is('.editors');
@@ -225,6 +231,7 @@
                 return form_onAttrChange(container, widget, attr, attrs[attr], $this, cache_values);
             }
             forEach(attrs[attr], function(n) {
+
                 if (typeof(n) == "number") { // {'invisible': [1]}
                     return form_onAttrChange(container, widget, attr, n, $this, cache_values);
                 }
@@ -237,7 +244,7 @@
                 return form_onAttrChange(container, widget, attr, attrs[attr], $this, cache_values);
             });
         }
-    });
+    };
 }
 
 function form_onAttrChange(container, widgetName, attr, expr, elem, cache_values) {
 
=== modified file 'addons/openerp/static/javascript/listgrid.js'
--- addons/openerp/static/javascript/listgrid.js	2017-10-16 09:48:57 +0000
+++ addons/openerp/static/javascript/listgrid.js	2017-10-27 15:15:39 +0000
@@ -1155,7 +1155,7 @@
         }, null, {
             height: '98%',
             max_height: 600
-        });
+        }).focus();
     },
 
     importData: function() {
@@ -1169,7 +1169,7 @@
             height: '98%',
             max_height: 550,
             width: '95%'
-        });
+        }).focus();
     }
 });
 
 
=== modified file 'addons/openerp/static/javascript/m2m.js'
--- addons/openerp/static/javascript/m2m.js	2017-01-02 14:59:00 +0000
+++ addons/openerp/static/javascript/m2m.js	2017-10-27 15:15:39 +0000
@@ -190,7 +190,7 @@
         } else {
             url = '/openerp/search/new';
         }
-        return $.frame_dialog({
+        var $frame = $.frame_dialog({
                 src: openobject.http.getURL(url, options)
             }, {
                 'source-window': $this[0],
@@ -199,6 +199,8 @@
                 width: '90%',
                 height: '95%'
             });
+        $frame.focus();
+        return $frame;
     }
 
     /**
 
=== modified file 'addons/openerp/static/javascript/m2o.js'
--- addons/openerp/static/javascript/m2o.js	2017-06-01 13:48:36 +0000
+++ addons/openerp/static/javascript/m2o.js	2017-10-27 15:15:39 +0000
@@ -606,7 +606,7 @@
         } else {
             url = '/openerp/search/new';
         }
-        return $.frame_dialog({
+        var $frame = $.frame_dialog({
                 src: openobject.http.getURL(url, options)
             }, {
                 'source-window': $this[0],
@@ -616,6 +616,8 @@
                 max_width: 1200,
                 height: '95%'
             });
+        $frame.focus();
+        return $frame;
     }
 
     /**
@@ -681,7 +683,7 @@
         if(arguments[0] === "close") {
             return close($this, arguments[1]);
         } else {
-            return open($this, arguments[0]);
+            return open($this, arguments[0]).focus();
         }
     };
 })(jQuery);
 
=== modified file 'addons/openerp/static/javascript/o2m.js'
--- addons/openerp/static/javascript/o2m.js	2017-10-20 13:34:27 +0000
+++ addons/openerp/static/javascript/o2m.js	2017-10-27 15:15:39 +0000
@@ -260,7 +260,13 @@
         });
         $frame.load(function() {
             $frame_content = $frame.contents();
-            $frame_content.find("[autofocus='autofocus']").focus();
+            if ($frame_content.find("[autofocus='autofocus']").lenght) {
+                // if a field have an autofocus attribute, set the focus on it
+                $frame_content.find("[autofocus='autofocus']").focus();
+            }
+            else {
+                $frame.focus();  // set the focus on the whole frame
+            }
         });
         var $form = jQuery('<form>', {
             method: 'POST',
 
=== modified file 'addons/openerp/static/javascript/openerp/openerp.base.js'
--- addons/openerp/static/javascript/openerp/openerp.base.js	2017-10-17 09:38:02 +0000
+++ addons/openerp/static/javascript/openerp/openerp.base.js	2017-10-27 15:15:39 +0000
@@ -193,13 +193,14 @@
     var $dialogs = jQuery('.action-dialog');
     switch(target) {
         case 'new':
-            jQuery.frame_dialog({
+            $frame = jQuery.frame_dialog({
                 src: action_url,
                 'class': 'action-dialog'
             }, null, {
                 width: '90%',
                 height: '95%'
             });
+            $frame.focus();
             if (terp_id && !$dialogs.length) {
                 if (jQuery('#_terp_id').val() == 'False') {
                     // we are opening an action on an unsaved record,
 
=== modified file 'addons/openerp/static/javascript/web_keyboard_shortcuts.js'
--- addons/openerp/static/javascript/web_keyboard_shortcuts.js	2017-09-12 09:54:25 +0000
+++ addons/openerp/static/javascript/web_keyboard_shortcuts.js	2017-10-27 15:15:39 +0000
@@ -28,9 +28,107 @@
 
 $.ctrlshift = function(key, callback, args) {
     $(document).keydown(function(e) {
+        if (e.ctrlKey && e.shiftKey) {
+            var class_to_parse = null
+            if (key == 'S'){
+                class_to_parse = '.oe_form_button_save, .oe_form_button_save_line, .oe_form_button_save_close';
+            }
+            else if (key == 'E'){
+                class_to_parse = '.oe_form_button_save_edit, .oe_form_button_edit';
+            }
+            else if (key == '46'){
+                class_to_parse = '.oe_form_button_delete';
+            }
+            else if (key == 'Z'){
+                class_to_parse = '.oe_form_button_cancel';
+            }
+            else if (key == 'C'){
+                class_to_parse = '.oe_form_button_create, .oe_form_button_save_create';
+            }
+            else if (key == 'D'){
+                class_to_parse = '.oe_form_button_duplicate';
+            }
+            else if (key == '13'){
+                class_to_parse = '.oe_form_button_search';
+            }
+            else if (key == '38'){
+                class_to_parse = '.oe_button_pager[action="first"]';
+            }
+            else if (key == '37'){
+                class_to_parse = '.oe_button_pager[action="previous"]';
+            }
+            else if (key == '39'){
+                class_to_parse = '.oe_button_pager[action="next"]';
+            }
+            else if (key == '40'){
+                class_to_parse = '.oe_button_pager[action="last"]';
+            }
+            if (class_to_parse != null){
+                //$('.oe_form_button_save')
+                $(class_to_parse).each(function() {
+
+                    // do not display tooltips on hidden notebook-page
+                    if ($(this).closest('.notebook-page').length && !$(this).closest('.notebook-page-active').length){
+                        console.log('notebook page not active');
+
+                    }
+                    else {
+                        if (key == '46'){
+                            key_to_display = 'Del.'
+                        }
+                        else if (key == '13') {
+                            key_to_display = 'Enter&nbsp;&#8629;'  // Enter
+                            //key_to_display = 'Enter'  // Enter
+                        }
+                        else if (key == '38') {
+                            key_to_display = '&#8679;'  // UP
+                        }
+                        else if (key == '37') {
+                            key_to_display = '&#8678;'  // Left
+                        }
+                        else if (key == '39') {
+                            key_to_display = '&#8680;'  // Right
+                        }
+                        else if (key == '40') {
+                            key_to_display = '&#8681;'  // Down
+                        }
+                        else {
+                            key_to_display = key
+                        }
+                        if ($(this).width() == 0) {
+                            return false;
+                        }
+                        var $newdiv1 = $( "<span class='shortcut_tooltip'>" + key_to_display + "</span>" );
+                        $( "body" ).append($newdiv1);
+                        var postion = $(this).position();
+                        var new_top = postion.top + 20;
+                        if ($(this).width() <= 20){
+                            var new_left = postion.left - $newdiv1.width()/2;
+                        }
+                        else {
+                            var new_left = postion.left + $(this).width()/2 - $newdiv1.width()/2 + 6;
+                        }
+                        $newdiv1.css({top: new_top, left: new_left, position:'absolute'});
+                        setTimeout(function() {
+                            $newdiv1.css({'opacity': '0'});
+                        }, 1000);
+
+                        setTimeout(function() {
+                           $newdiv1.remove();
+                        }, 2000);
+                     }
+                });
+            }
+        }
         if(!args) args=[]; // IE barks when args is null
         if((e.keyCode == key.charCodeAt(0) || e.keyCode == key) && e.ctrlKey && e.shiftKey) {
             e.preventDefault();  // override the browser shortcut keys
+            if (!document.nb_shortcut_used){
+                document.nb_shortcut_used = 1;
+            }
+            else{
+                document.nb_shortcut_used += 1;
+            }
             callback.apply(this, args);
             return false;
         }
@@ -132,14 +230,14 @@
     });
 });
 
-//Previous object (arrow right)
+//Previous object (arrow left)
 $.ctrlshift('37', function() {
     $('.oe_button_pager[action="previous"]').each(function() {
         fake_click(this);
     });
 });
 
-//Next object (arrow left)
+//Next object (arrow right)
 $.ctrlshift('39', function() {
     $('.oe_button_pager[action="next"]').each(function() {
         fake_click(this);