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

[jftempo]

=== modified file 'addons/openerp/controllers/templates/search.mako'
--- addons/openerp/controllers/templates/search.mako	2017-06-01 13:48:36 +0000
+++ addons/openerp/controllers/templates/search.mako	2020-11-02 12:53:21 +0000
@@ -66,18 +66,21 @@
                 }
             </script>
         % else:
-		    <script type="text/javascript">
+            <script type="text/javascript">
                 function close_dialog() {
                     jQuery.m2m('close');
                 }
-		        function do_select(id) {
-                    jQuery.m2m('close',
-                        id ? [parseInt(id, 10)].concat(ListView('_terp_list').get_previously_selected())
-                           : ListView('_terp_list').get_previously_selected()
-
-                    );
-		        }
-		    </script>
+                function do_select(id) {
+                    var prev_selected = ListView('_terp_list').get_previously_selected();
+                    if (id) {
+                        var int_id = parseInt(id, 10);
+                        if (jQuery.inArray(int_id, prev_selected) == -1) {
+                            prev_selected.push(int_id);
+                        }
+                    }
+                    jQuery.m2m('close', prev_selected);
+                }
+            </script>
         % endif
     % endif
     <script type="text/javascript">

=== modified file 'addons/openerp/widgets/form/_m2m.py'
--- addons/openerp/widgets/form/_m2m.py	2019-05-03 12:59:31 +0000
+++ addons/openerp/widgets/form/_m2m.py	2020-11-02 12:53:21 +0000
@@ -150,7 +150,10 @@
         if self.editable is False:
             selectable = 0
         else:
-            selectable = 2
+            if attrs.get("m2m_selectable"):
+                selectable = 2
+            else:
+                selectable = 3
 
         # try to get original input values if creating validation form
         if not params.filter_action:

=== modified file 'addons/openerp/widgets/form/templates/many2many.mako'
--- addons/openerp/widgets/form/templates/many2many.mako	2010-08-31 07:05:04 +0000
+++ addons/openerp/widgets/form/templates/many2many.mako	2020-11-02 12:53:21 +0000
@@ -9,6 +9,7 @@
             % else:
             	<input type="hidden" class="${css_class}" id='${name}_set' kind="${kind}" ${py.attrs(attrs)} style="width: 100%;"/>
             % endif
+            <input type="hidden" name="${name}/_terp_previously_selected" id="${name}/_terp_previously_selected" />
             % if error:
             	<span class="fielderror">${error}</span>
             % endif

=== modified file 'addons/openerp/widgets/templates/listgrid/listgrid.mako'
--- addons/openerp/widgets/templates/listgrid/listgrid.mako	2020-08-06 14:23:27 +0000
+++ addons/openerp/widgets/templates/listgrid/listgrid.mako	2020-11-02 12:53:21 +0000
@@ -95,18 +95,16 @@
     % if selector:
         <td class="grid-cell selector">
         % if not data['id'] or data['id'] not in notselectable:
-            % if not m2m:
-                <%
-                    nosidedar = name != '_terp_list' and 'true' or 'false'
-                    selector_click = "new ListView('%s').onBooleanClicked(!this.checked, '%s', %s);" % (name, data['id'], nosidedar)
-                    if selector == "radio":
-                        selector_click += " do_select();"
-                %>
-                <input type="${selector}" class="${selector} grid-record-selector"
-                    id="${name}/${data['id']}" name="${(checkbox_name or None) and name}"
-                    value="${data['id']}"
-                    onclick="${selector_click}"/>
-            % endif
+            <%
+                nosidedar = name != '_terp_list' and 'true' or 'false'
+                selector_click = "new ListView('%s').onBooleanClicked(!this.checked, '%s', %s);" % (name, data['id'], nosidedar)
+                if selector == "radio":
+                    selector_click += " do_select();"
+            %>
+            <input type="${selector}" class="${selector} grid-record-selector"
+                id="${name}/${data['id']}" name="${(checkbox_name or None) and name}"
+                value="${data['id']}"
+                onclick="${selector_click}"/>
         % endif
         </td>
     % endif
@@ -340,10 +338,10 @@
                             <tr class="grid-header">
                                 % if selector:
                                     <th width="1" class="grid-cell selector">
-                                        % if selector == 'checkbox' and not m2m:
+                                        % if selector == 'checkbox':
                                             <input type="checkbox" class="checkbox grid-record-selector" id="${name}_check_all"  onclick="new ListView('${name}').checkAll(!this.checked)"/>
                                         % endif
-                                        % if selector != 'checkbox' and not m2m:
+                                        % if selector != 'checkbox':
                                             <span>&nbsp;</span>
                                         % endif
                                     </th>