Merge lp:~unifield-team/unifield-web/jfb-utp-732-727 into lp:unifield-web

[jftempo]

=== modified file 'addons/openerp/controllers/actions.py'
--- addons/openerp/controllers/actions.py	2013-03-13 11:56:19 +0000
+++ addons/openerp/controllers/actions.py	2013-09-09 15:31:28 +0000
@@ -192,8 +192,8 @@
     except rpc.RPCException, e:
         raise e
 
-def act_window_close(*args):
-    return close_popup()
+def act_window_close(action=False, *args, **b):
+    return close_popup(o2m_refresh=action.get('o2m_refresh'))
 
 def act_window(action, data):
     if not action.get('opened'):
@@ -498,7 +498,7 @@
 
 
 @tools.expose(template="/openerp/controllers/templates/closepopup.mako")
-def close_popup(reload=True):
+def close_popup(reload=True, o2m_refresh=False):
     """ Closes an opened dialog box or popup.
 
     :param reload: whether the background view should be reloaded when closing the popup
@@ -511,7 +511,7 @@
     if getattr(cherrypy.request, 'params', []):
         if getattr(cherrypy.request.params, 'context', {}):
             active_id = cherrypy.request.params.context.get('active_id')
-    return {'reload': reload, 'active_id': active_id}
+    return {'reload': reload, 'active_id': active_id, 'o2m_refresh': o2m_refresh}
 
 @tools.expose(template="/openerp/controllers/templates/report.mako")
 def report_link(report_name, **kw):

=== modified file 'addons/openerp/controllers/listgrid.py'
--- addons/openerp/controllers/listgrid.py	2013-03-06 09:06:34 +0000
+++ addons/openerp/controllers/listgrid.py	2013-09-09 15:31:28 +0000
@@ -259,7 +259,7 @@
                 if k.startswith('search_default') and k[15:] not in params['_terp_search_data'].get('group_by_ctx',{}):
                     del params['_terp_context'][k]
 
-        if params.get('_terp_clear'):
+        if params.get('_terp_clear') or params.get('_terp_ids_to_show'):
             params.search_domain, params.filter_domain, params.ids = [], [], []
             params.search_data = {}
             for k,v in params.context.items():
@@ -270,6 +270,7 @@
                 del params.context['group_by']
             params.group_by_ctx = []
 
+
         if source == '_terp_list':
             if not params.view_type == 'graph':
                 params.view_type = 'tree'
@@ -280,6 +281,9 @@
             if params.filter_domain:
                 params.domain += params.filter_domain
 
+        if params.get('_terp_ids_to_show'):
+            params.search_domain = [('id', 'in', params.get('_terp_ids_to_show'))]
+
         # default_get context
         current = params.chain_get(source)
         if current and params.source_default_get:
@@ -290,6 +294,7 @@
             res = wizard.Wizard().execute(params)
             frm = res['form']
         else:
+            params.get_source = source
             frm = form.Form().create_form(params)
 
         if params.view_type == 'graph':
@@ -334,7 +339,6 @@
         id = (id or False) and int(id)
         ids = (id or []) and [id]
         list_grid = params.list_grid or '_terp_list'
-
         try:
 
             if btype == 'workflow':
@@ -348,6 +352,8 @@
             elif btype == 'object':
                 ctx = params.context or {}
                 ctx.update(rpc.session.context.copy())
+                if list_grid != '_terp_list':
+                    ctx['from_list_grid'] = list_grid
                 res = rpc.session.execute('object', 'execute', model, name, ids, ctx)
 
                 if isinstance(res, dict):

=== modified file 'addons/openerp/controllers/templates/closepopup.mako'
--- addons/openerp/controllers/templates/closepopup.mako	2012-07-03 16:04:27 +0000
+++ addons/openerp/controllers/templates/closepopup.mako	2013-09-09 15:31:28 +0000
@@ -32,25 +32,29 @@
             /*
             % if reload:
             */
-            var $doc = jQuery(topWindow.document);
-            switch($doc.find('#_terp_view_type').val()) {
-            	case 'form':
-                    var terp_id = jQuery(idSelector('_terp_id'),$doc).val();
-                    if(terp_id == "False") {
-                    	terp_id = '${active_id}';
-                    }
-                    if(terp_id == "False" || !terp_id) {
-                    	topWindow.location.href = '/openerp';
-                    	return;
-                    } else {
-                    	topWindow.editRecord(terp_id);
-                    	return;
-                    }
-                case 'tree':
-                    new topWindow.ListView('_terp_list').reload();
-                    return;
-            }
-            topWindow.location.reload();
+                % if o2m_refresh:
+                    new topWindow.ListView('${o2m_refresh}').reload();
+                % else:
+                    var $doc = jQuery(topWindow.document);
+                    switch($doc.find('#_terp_view_type').val()) {
+                        case 'form':
+                            var terp_id = jQuery(idSelector('_terp_id'),$doc).val();
+                            if(terp_id == "False") {
+                                terp_id = '${active_id}';
+                            }
+                            if(terp_id == "False" || !terp_id) {
+                                topWindow.location.href = '/openerp';
+                                return;
+                            } else {
+                                topWindow.editRecord(terp_id);
+                                return;
+                            }
+                        case 'tree':
+                            new topWindow.ListView('_terp_list').reload();
+                            return;
+                    }
+                    topWindow.location.reload();
+                % endif
             /*
             % endif
             */

=== modified file 'addons/openerp/controllers/templates/search.mako'
--- addons/openerp/controllers/templates/search.mako	2012-02-29 13:26:45 +0000
+++ addons/openerp/controllers/templates/search.mako	2013-09-09 15:31:28 +0000
@@ -72,9 +72,9 @@
                 }
 		        function do_select(id) {
                     jQuery.m2m('close',
-                        id ? [parseInt(id, 10)]
-                           : ListView('_terp_list').$getSelectedItems().map(function () {
-                                return parseInt(this.value, 10); }).get()
+                        id ? [parseInt(id, 10)].concat(ListView('_terp_list').get_previously_selected())
+                           : ListView('_terp_list').get_previously_selected()
+
                     );
 		        }
 		    </script>
@@ -100,7 +100,8 @@
         <input type="hidden" id="_terp_search_domain" name="_terp_search_domain" value="${params.search_domain}"/>
         <input type="hidden" id="_terp_filter_domain" name="_terp_filter_domain" value="${params.filter_domain}"/>
         <input type="hidden" id="_terp_search_data" name="_terp_search_data" value="${params.search_data}"/>
-		<input type="hidden" id="_terp_search_text" name="_terp_search_text" value="${params.search_text}"/>
+        <input type="hidden" id="_terp_search_text" name="_terp_search_text" value="${params.search_text}"/>
+        <input type="hidden" id="_terp_previously_selected" name="_terp_previously_selected" />
         <table width="100%" border="0" cellpadding="2">
             <tr>
                 <td>
@@ -117,6 +118,13 @@
                 <td>${form.search.display()}</td>
             </tr>
             <tr>
+                <td>
+                % if params.selectable == KINDS['M2M']:
+                    <a style="cursor:pointer" title="${_('View selected records.')}" onclick="new ListView('_terp_list').show_selected_records();"><span id="num_selected">0</span> selected record(s)</a>
+                % endif
+                </td>
+            </tr>
+            <tr>
                 <td class="toolbar" style="padding: 4px 5px 0px;">
                     <table cellpadding="0" cellspacing="0">
                         <tr>

=== modified file 'addons/openerp/static/javascript/form.js'
--- addons/openerp/static/javascript/form.js	2013-08-21 09:39:55 +0000
+++ addons/openerp/static/javascript/form.js	2013-09-09 15:31:28 +0000
@@ -238,6 +238,13 @@
     var $src = jQuery(src);
     var action = $src.attr('action');
     var relation = $src.attr('relation');
+    if (relation) {
+        var lv = ListView(relation);
+        var sel = lv.$getSelectedItems().map(function () {
+                return parseInt(this.value, 10);
+            }).get()
+        lv.set_previously_selected(sel);
+    }
     return relation ? new ListView(relation).go(action) : submit_form(action ? action : 'find');
 }
 

=== modified file 'addons/openerp/static/javascript/listgrid.js'
--- addons/openerp/static/javascript/listgrid.js	2013-08-29 12:34:05 +0000
+++ addons/openerp/static/javascript/listgrid.js	2013-09-09 15:31:28 +0000
@@ -61,8 +61,65 @@
         this.sort_key = null;
     },
 
+    get_previously_selected: function() {
+        var prefix = this.name == '_terp_list' ? '' : this.name + '/';
+        var previous_field = jQuery('[id*="'+prefix + '_terp_previously_selected'+'"]')
+        if (previous_field) {
+            sel = previous_field.val() || "";
+            if (!sel) {return []};
+            return sel.split(',').map(function(b) {return parseInt(b, 10)});
+        }
+        return [];
+    },
+
+    update_previously_selected: function(value_arr) {
+        var prefix = this.name == '_terp_list' ? '' : this.name + '/';
+        field_previously_selected = jQuery('[id*="'+prefix + '_terp_previously_selected'+'"]');
+        if (field_previously_selected) {
+            field_previously_selected.val(value_arr.join(','));
+            $('#num_selected').html(value_arr.length);
+        }
+    },
+
+    set_previously_selected: function(value) {
+        var previous = this.get_previously_selected()
+        for (var v in value) {
+            if (previous.indexOf(value[v]) == -1) {
+                previous.push(value[v])
+            }
+        }
+        this.update_previously_selected(previous);
+    },
+
+    add_previously_selected: function(value) {
+        if (value) {
+            this.set_previously_selected([parseInt(value, 10)]);
+        }
+    },
+
+    remove_previously_selected: function(value) {
+        if (value) {
+            value = parseInt(value, 10);
+            var previous = this.get_previously_selected()
+            var pos = previous.indexOf(value)
+            if (pos != -1) {
+                previous.splice(pos, 1);
+                this.update_previously_selected(previous);
+            }
+        }
+    },
+
     checkAll: function(clear) {
-        jQuery('[id="' + this.name + '"] input.grid-record-selector').attr('checked', !clear);
+        var self = this
+        jQuery('[id="' + this.name + '"] input.grid-record-selector').each(function(){
+            jthis = jQuery(this)
+            if (clear && jthis.attr('checked')) {
+                self.remove_previously_selected(jthis.val());
+            } else if (!clear && !jthis.attr('checked')) {
+                self.add_previously_selected(jthis.val());
+            }
+            jthis.attr('checked', !clear);
+        });
         this.onBooleanClicked();
     },
 
@@ -116,14 +173,16 @@
     },
 
     getSelectedRecords: function() {
-        return this.$getSelectedItems().map(function() {
+        return this.get_previously_selected();
+
+        /*return this.$getSelectedItems().map(function() {
             if(this.value) {
                 return this.value
             } else {
                 var box_id = this.id.split('/');
                 return box_id[box_id.length - 1]
             }
-        }).get();
+        }).get();*/
     },
 
     $getSelectedItems: function () {
@@ -139,6 +198,15 @@
     },
 
     onBooleanClicked: function() {
+        if (arguments.length == 2) {
+            var clicked = !arguments[0];
+            var id = arguments[1];
+            if (clicked) {
+                this.add_previously_selected(id);
+            } else {
+                this.remove_previously_selected(id);
+            }
+        }
         var $sidebar = jQuery('.toggle-sidebar');
         if ($sidebar.is('.closed')) {
             $sidebar.click()
@@ -392,6 +460,12 @@
             self.reload();
         });
     },
+    
+    show_selected_records: function() {
+        group_by = new Array();
+        filter_context = [];
+        this.reload(null, null, this.default_get_ctx, false, this.getSelectedRecords())
+    },
 
     clear: function() {
         group_by = new Array();
@@ -644,6 +718,8 @@
         var self = this;
         var args = getFormParams('_terp_concurrency_info');
 
+        var todel = [];
+
         if(ids==0) {
             var $o2m = jQuery(idSelector('_terp_default_o2m/' + this.name));
             var $tr = jQuery(arguments[1]).parents('tr.grid-row:first');
@@ -658,16 +734,31 @@
             return;
         }
         else if (!ids) {
-            ids = this.getSelectedRecords();
+            ids = this.$getSelectedItems().map(function() {
+                if(this.value) {
+                    return this.value
+                } else {
+                    var box_id = this.id.split('/');
+                    return box_id[box_id.length - 1]
+                }
+            }).get();
+            //ids = this.getSelectedRecords();
             if (ids.length > 0) {
+                todel = ids.slice(0)
                 ids = '[' + ids.join(', ') + ']';
             }
+        } else {
+            todel = [ids]
         }
 
         if(ids.length == 0 || !confirm(_('Do you really want to delete selected record(s) ?'))) {
             return false;
         }
 
+        $.each(todel, function() {
+            self.remove_previously_selected(this);
+        });
+
         var $terp_ids;
         var $terp_count;
 
@@ -736,7 +827,7 @@
         this.reload();
     },
 
-    reload: function(edit_inline, concurrency_info, default_get_ctx, clear) {
+    reload: function(edit_inline, concurrency_info, default_get_ctx, clear, ids_to_show) {
         if (openobject.http.AJAX_COUNT > 0) {
             return callLater(1, bind(this.reload, this), edit_inline, concurrency_info);
         }
@@ -773,6 +864,10 @@
             args['_terp_clear'] = true;
         }
 
+        if (ids_to_show) {
+            args['_terp_ids_to_show'] = '['+ids_to_show.join(',')+']';
+            args['_terp_offset'] = 0;
+        }
         jQuery(idSelector(self.name) + ' .loading-list').show();
         jQuery.ajax({
             url: '/openerp/listgrid/get',
@@ -829,6 +924,22 @@
                     $list.parent().replaceWith(obj.view);
                 }
 
+                var selfname = self.name
+                var has_selected = false;
+                var all_selected = self.getSelectedRecords()
+                $.each(all_selected, function() {
+                    var el = jQuery(idSelector(selfname+'/'+this));
+                    if (el.length) {
+                        has_selected = true;
+                        el.attr('checked', true);
+                    }
+                });
+                if (has_selected) {
+                    jQuery(idSelector(self.name + '_delete_record')).parent().show();
+                }
+                if (all_selected.length) {
+                    self.selectedRow_sum();
+                }
                 var $editors = self.$adjustEditors(
                         document.getElementById(self.name));
                 if ($editors.length > 0) {

=== modified file 'addons/openerp/widgets/_views.py'
--- addons/openerp/widgets/_views.py	2011-07-26 16:11:01 +0000
+++ addons/openerp/widgets/_views.py	2013-09-09 15:31:28 +0000
@@ -63,7 +63,9 @@
                            context=screen.context,
                            editable=screen.editable,
                            readonly=screen.readonly,
-                           nodefault=screen.nodefault, nolinks=screen.link)
+                           nodefault=screen.nodefault,
+                           nolinks=screen.link,
+                           get_source=screen.get_source)
 
         if not screen.is_wizard and screen.ids is None:
             limit = screen.limit or 50

=== modified file 'addons/openerp/widgets/form/_form.py'
--- addons/openerp/widgets/form/_form.py	2013-03-10 20:53:18 +0000
+++ addons/openerp/widgets/form/_form.py	2013-09-09 15:31:28 +0000
@@ -747,7 +747,7 @@
     params = ['id']
     member_widgets = ['frame', 'concurrency_info']
 
-    def __init__(self, prefix, model, view, ids=[], domain=[], context=None, editable=True, readonly=False, nodefault=False, nolinks=1):
+    def __init__(self, prefix, model, view, ids=[], domain=[], context=None, editable=True, readonly=False, nodefault=False, nolinks=1, get_source=False):
 
         super(Form, self).__init__(prefix=prefix, model=model, editable=editable, readonly=readonly, nodefault=nodefault)
         dom = xml.dom.minidom.parseString(view['arch'].encode('utf-8'))
@@ -772,13 +772,24 @@
         defaults = {}
         try:
             if ids:
-                lval = proxy.read(ids[:1], fields.keys() + ['__last_update'], self.context)
+                if get_source:
+                    fields_to_read = [get_source]
+                    if 'state' in fields:
+                        fields_to_read.append('state')
+                    newfields = {}
+                    for k in fields_to_read:
+                        newfields[k] = fields[k]
+                    fields = newfields
+                else:
+                    fields_to_read = fields.keys()
+                lval = proxy.read(ids[:1], fields_to_read + ['__last_update'], self.context)
+                
                 if lval:
                     values = lval[0]
                     self.id = ids[0]
                     
                     for f in fields:
-                        if fields[f]['type'] == 'many2one' and isinstance(values[f], tuple):
+                        if fields[f]['type'] == 'many2one' and f in values and isinstance(values[f], tuple):
                             values[f] = values[f][0]
                             
                     ConcurrencyInfo.update(self.model, [values])
@@ -895,7 +906,8 @@
 
             elif node.localName == 'field':
                 name = attrs['name']
-
+                if name not in fields:
+                    continue
                 try:
                     fields[name]['link'] = attrs.get('link', '1')
                     fields[name].update(attrs)
@@ -987,7 +999,6 @@
         if attrs.get('get_selection') and kind == 'selection' and attrs.get('type2') == 'many2one' and self.id:
             proxy = rpc.RPCProxy(self.model)
             attrs['selection'] = getattr(proxy, attrs['get_selection'])(self.id, name)
-           
         field = get_widget(kind)(**attrs)
 
         if isinstance(field, TinyInputWidget):

=== modified file 'addons/openerp/widgets/form/_o2m.py'
--- addons/openerp/widgets/form/_o2m.py	2012-08-16 13:16:20 +0000
+++ addons/openerp/widgets/form/_o2m.py	2013-09-09 15:31:28 +0000
@@ -169,7 +169,7 @@
                 limit = current.limit
                 if current.limit == -1:
                     limit = 0
-                ids = rpc.RPCProxy(self.model).search(domain, current.offset, limit, params.sort_key + ' '+params.sort_order, current.context)
+                ids = rpc.RPCProxy(self.model).search(domain, current.offset, limit, params.sort_key + ' '+params.sort_order+',id', current.context)
                 id = ids[0]
         if current and params.source and isinstance(params.source, basestring) and self.name in params.source.split('/'):
             id = current.id

=== modified file 'addons/openerp/widgets/form_view.py'
--- addons/openerp/widgets/form_view.py	2011-07-26 16:11:01 +0000
+++ addons/openerp/widgets/form_view.py	2013-09-09 15:31:28 +0000
@@ -33,7 +33,7 @@
 
     template = "/openerp/widgets/templates/viewform.mako"
 
-    params = ['limit', 'offset', 'count', 'search_domain', 'search_data', 'filter_domain', 'notebook_tab', 'context_menu']
+    params = ['limit', 'offset', 'count', 'search_domain', 'search_data', 'filter_domain', 'notebook_tab', 'context_menu', 'previously_selected', 'previously_selected_length']
     member_widgets = ['screen', 'search', 'sidebar', 'logs']
 
     def __init__(self, params, **kw):
@@ -48,6 +48,12 @@
         editable = params.editable
         readonly = params.readonly
 
+        self.previously_selected = None
+        self.previously_selected_length = 0
+        if params.get('_terp_ids_to_show'):
+            self.previously_selected = ','.join(map(str, params.get('_terp_ids_to_show')))
+            self.previously_selected_length = len(params.get('_terp_ids_to_show'))
+
         if editable is None:
             editable = True
 
@@ -85,9 +91,10 @@
             params.search_domain = self.search.listof_domain
             params.filter_domain = self.search.custom_filter_domain
             params.group_by_ctx = self.search.groupby
-            
+        
+        get_source = params.get_source or False
         self.screen = Screen(prefix='', hastoolbar=True, hassubmenu=True, editable=editable, readonly=readonly,
-                             selectable=params.selectable or 2)
+                             selectable=params.selectable or 2, get_source=get_source)
 
         if self.screen.widget and self.screen.view_type in ['form', 'tree']:
             self.logs = Logs()

=== modified file 'addons/openerp/widgets/listgrid.py'
--- addons/openerp/widgets/listgrid.py	2013-03-13 08:15:04 +0000
+++ addons/openerp/widgets/listgrid.py	2013-09-09 15:31:28 +0000
@@ -173,7 +173,7 @@
         if not default_data and not self.o2m and not self.m2m:
             if self.limit > 0:
                 if self.sort_key:
-                    ids = proxy.search(search_param, self.offset, self.limit, self.sort_key + ' ' +self.sort_order, context)
+                    ids = proxy.search(search_param, self.offset, self.limit, self.sort_key + ' ' +self.sort_order + ',id', context)
                 else:
                     if search_text:
                         if self.source == '_terp_list':

=== modified file 'addons/openerp/widgets/screen.py'
--- addons/openerp/widgets/screen.py	2013-01-25 15:29:01 +0000
+++ addons/openerp/widgets/screen.py	2013-09-09 15:31:28 +0000
@@ -58,6 +58,8 @@
         
         self.m2m = kw.get('_m2m', 0)
         self.o2m = kw.get('_o2m', 0)
+        self.get_source = kw.get('get_source', False)
+
         self.is_dashboard = False
         if self.model == 'board.board' and self.view_type == 'form':
             self.is_dashboard = True
@@ -86,7 +88,6 @@
                 self.count = len(self.ids)
             else:
                 self.count = rpc.RPCProxy(self.model).search_count(self.domain, self.context)
-                
         self.prefix             = prefix
         self.views_preloaded    = views_preloaded or (params.views or {})
 

=== modified file 'addons/openerp/widgets/templates/viewform.mako'
--- addons/openerp/widgets/templates/viewform.mako	2013-04-05 14:12:18 +0000
+++ addons/openerp/widgets/templates/viewform.mako	2013-09-09 15:31:28 +0000
@@ -59,6 +59,12 @@
                 </table>
             </td>
         </tr>
+        <tr>
+            <td class="view_form_options">
+                <a style="cursor:pointer;" onclick="new ListView('_terp_list').show_selected_records();" title="${_('View selected records.')}"><span id="num_selected">${previously_selected_length}</span> selected record(s)</a>
+                <input type="hidden" id="${name}_terp_previously_selected" name="${name}_terp_previously_selected"  value="${previously_selected}"/>
+            </td>
+        </tr>
         % endif
         <tr>
             <td valign="top">${display_member(screen)}</td>