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

[jftempo]

=== modified file 'addons/openerp/widgets/form/_o2m.py'
--- addons/openerp/widgets/form/_o2m.py	2020-02-10 17:05:00 +0000
+++ addons/openerp/widgets/form/_o2m.py	2020-06-10 07:55:50 +0000
@@ -212,6 +212,9 @@
                 else:
                     sort_key_order = False
 
+                if current.context and not current.context.get('lang') and rpc.session.context and rpc.session.context.get('lang'):
+                    current.context['lang'] =  rpc.session.context['lang']
+
                 ids = rpc.RPCProxy(self.model).search(domain, current.offset, limit, sort_key_order, current.context)
                 id = ids[0] if ids else None
                 current.id = id
 
=== modified file 'addons/openerp/widgets/templates/listgrid/listgrid.mako'
--- addons/openerp/widgets/templates/listgrid/listgrid.mako	2020-04-30 15:59:44 +0000
+++ addons/openerp/widgets/templates/listgrid/listgrid.mako	2020-06-10 07:55:50 +0000
@@ -361,7 +361,7 @@
                                             <th class="grid-cell"><div style="width: 0;"></div></th>
                                         % endif
                                     % elif field_attrs.get('displayon') != 'editable':
-                                    % if (field_attrs.get('function') and not field_attrs.get('store') and not field_attrs.get('allow_sort')) or field_attrs.get('not_sortable'):
+                                    % if (field_attrs.get('function') and not field_attrs.get('store') and not field_attrs.get('allow_sort')) and not field_attrs.get('sort_column') or field_attrs.get('not_sortable'):
                                         <th id="grid-data-column/${(name != '_terp_list' or None) and (name + '/')}${field}" class="grid-cell ${field_attrs.get('type', 'char')}" kind="${field_attrs.get('type', 'char')}">${field_attrs['string']|br}</th>
                                     % else:
                                         <th id="grid-data-column/${(name != '_terp_list' or None) and (name + '/')}${field}" class="grid-cell ${field_attrs.get('type', 'char')}" kind="${field_attrs.get('type', 'char')}" style="cursor: pointer;" onclick="new ListView('${name}').sort_by_order('${field}', this)"