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

[jftempo]

=== modified file 'addons/openerp/controllers/form.py'
--- addons/openerp/controllers/form.py	2021-07-15 16:22:13 +0000
+++ addons/openerp/controllers/form.py	2021-08-25 19:28:46 +0000
@@ -139,6 +139,16 @@
 
     params.nodefault = True
     params.validation_form = True
+
+    # validation from wizard popup: hide save/edit buttons and attachements sidebar if fields (date) validation fails
+    target = params._terp_view_target
+    if target in ('new', 'same'):
+        # tw.form_view.ViewForm uses params.target to display or not the sidebar
+        params.target = target
+
+        # create_from uses cherrypy.request._terp_view_target to hide save/save&edit button on wizard
+        cherrypy.request._terp_view_target = target
+
     form = self.create_form(params)
     cherrypy.request.terp_form = form
 
@@ -185,6 +195,13 @@
         params.count = params.count or 0
         params.approximation = params.approximation or False
         params.view_type = params.view_type or params.view_mode[0]
+        target = getattr(cherrypy.request, '_terp_view_target', None)
+        if target in ('new', 'same'):
+            # for target='new' keep orignal value as '_terp_view_target' hidden field,
+            # that's necessary to keep wizard without toolbar button (new, save, pager, etc...)
+            hidden_fields = params.hidden_fields or []
+            hidden_fields.append(tw.form.Hidden(name='_terp_view_target', default=ustr(target)))
+            params.hidden_fields = hidden_fields
 
         return tw.form_view.ViewForm(params, name="view_form", action="/openerp/form/save")
 
@@ -210,16 +227,9 @@
         if params.view_type == 'tree':
             params.editable = True
 
-        target = getattr(cherrypy.request, '_terp_view_target', None)
-        if target in ('new', 'same'):
-            # for target='new' keep orignal value as '_terp_view_target' hidden field,
-            # that's necessary to keep wizard without toolbar button (new, save, pager, etc...)
-            hidden_fields = params.hidden_fields or []
-            hidden_fields.append(tw.form.Hidden(name='_terp_view_target', default=ustr(target)))
-            params.hidden_fields = hidden_fields
-
         form = self.create_form(params, tg_errors)
 
+
         if not tg_errors:
             try:
                 cherrypy.session.pop('remember_notebooks')
@@ -248,6 +258,7 @@
         for kind, view in get_registered_views():
             buttons.views.append(dict(kind=kind, name=view.name, desc=view.desc))
 
+        target = getattr(cherrypy.request, '_terp_view_target', None)
         buttons.toolbar = (target not in ('new', 'same') and not form.is_dashboard) or mode == 'diagram'
 
         pager = None
@@ -1396,7 +1407,7 @@
 
         field = field.split('/')[-1]
 
-        res = rpc.RPCProxy(model).default_get([field])
+        res = rpc.RPCProxy(model).default_get([field], {}, True)
         value = res.get(field)
 
         return dict(value=value)

=== modified file 'addons/openerp/controllers/templates/form.mako'
--- addons/openerp/controllers/templates/form.mako	2020-01-29 15:22:30 +0000
+++ addons/openerp/controllers/templates/form.mako	2021-08-25 19:28:46 +0000
@@ -75,7 +75,7 @@
                         <br style="clear: both"/>
                     </div>
                 % endif
-                % if form.screen.view_type == 'form' and form.logs.logs:
+                % if form.screen.view_type == 'form' and form.logs and form.logs.logs:
                     ${form.logs.display()}
                 % endif
                 <div id="body_form">
@@ -107,7 +107,7 @@
                             <small>Help</small>
                         </a>
                     % endif
-                    % if form.screen.view_type == 'form' and form.logs.logs:
+                    % if form.screen.view_type == 'form' and form.logs and form.logs.logs:
                       <a id="show_server_logs" class="logs" href="javascript: void(0)"
                           title="${_('Show Logs...')}">
                           <small>Logs</small>

=== modified file 'addons/openerp/static/javascript/form.js'
--- addons/openerp/static/javascript/form.js	2021-07-08 09:43:54 +0000
+++ addons/openerp/static/javascript/form.js	2021-08-25 19:28:46 +0000
@@ -1353,7 +1353,12 @@
         jQuery('[id="' + field_id + '"]')
                 .val(obj.value);
         // jQuery().change doesn't trigger Mochikit's handler?
-        signal(field_id, "onchange");
+        f = $('#'+field_id)
+        if (f && f.attr('kind') == 'many2one') {
+            ManyToOne(field_id).on_change();
+        } else {
+            signal(field_id, "onchange");
+        }
     });
 }