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

[jftempo]

=== 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-09-26 07:32:43 +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, 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, tg_errors=tg_errors)
 
     @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-06-01 13:48:36 +0000
+++ addons/openerp/controllers/templates/form.mako	2017-09-26 07:32:43 +0000
@@ -166,6 +166,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 +210,10 @@
                 $hide.click();
                 return false;
             })
+                        
+            % if tg_errors:
+            error_display(_("The form contains errors."));
+            % endif
         })
     </script>
 </%def>

=== 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-09-26 07:32:43 +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/static/javascript/form.js'
--- addons/openerp/static/javascript/form.js	2017-09-11 10:35:51 +0000
+++ addons/openerp/static/javascript/form.js	2017-09-26 07:32:43 +0000
@@ -934,7 +934,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;
@@ -1316,9 +1327,8 @@
         dataType: 'json',
         success: function(obj) {
             if(obj.error) {
-                error_popup(obj.error);
+                error_display(obj.error);
             }
-
             $attachment_line.remove();
         }
     });