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

[jftempo]

=== modified file 'addons/openerp/controllers/search.py'
--- addons/openerp/controllers/search.py	2019-01-28 15:54:39 +0000
+++ addons/openerp/controllers/search.py	2020-11-02 12:53:21 +0000
@@ -91,6 +91,8 @@
         proxy = rpc.RPCProxy(model)
         params.search_text = False
 
+        if model == 'financing.contract.account.quadruplet':
+            proxy.gen_quadruplet(ctx)
         # parent's search_view has no business being in m2o or m2m
         if '_terp_context' in params and 'search_view' in params['_terp_context']:
             params.get('_terp_context').pop('search_view', None)

=== 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">