Merge lp:~dorian-kemps/unifield-web/UW-5436 into lp:unifield-web

[jftempo]

=== modified file 'addons/openerp/static/javascript/listgrid.js'
--- addons/openerp/static/javascript/listgrid.js	2019-02-13 14:15:09 +0000
+++ addons/openerp/static/javascript/listgrid.js	2019-04-24 15:18:07 +0000
@@ -59,6 +59,7 @@
 
         this.sort_order = null;
         this.sort_key = null;
+        this.sort_column = null;
     },
 
     get_previously_selected: function() {
@@ -323,6 +324,12 @@
         else this.sort_order = 'asc';
 
         this.sort_key = column;
+        var field_d = jQuery(field)
+        if (field_d.attr('sort_column')) {
+            this.sort_key = field_d.attr('sort_column');
+        }
+
+        this.sort_column = column;
         if(this.ids.length) {
             this.reload();
         }
@@ -364,6 +371,10 @@
         if (group_by_context == '[]' && this.sort_order) {
             sort_order = this.sort_order;
             sort_key = this.sort_key;
+            col = jQuery('#grid-data-column/'+sort_key)
+            if (col && col.attr('sort_column')) {
+                sort_key = col.attr('sort_column')
+            }
         }
         if (jQuery(group).hasClass('group-expand')) {
             // get listview selectable value, so we know if we are in
@@ -1089,12 +1100,12 @@
 
                 MochiKit.Signal.signal(__listview, 'onreload');
 
-                if(self.sort_key != null) {
+                if(self.sort_column != null) {
                     var $th;
                     if(self.name != '_terp_list') {
-                        $th = jQuery(idSelector('grid-data-column/' + self.name + '/' + self.sort_key));
+                        $th = jQuery(idSelector('grid-data-column/' + self.name + '/' + self.sort_column));
                     } else {
-                        $th = jQuery(idSelector('grid-data-column/' + self.sort_key));
+                        $th = jQuery(idSelector('grid-data-column/' + self.sort_column));
                     }
                     $th.append(
                         jQuery('<span>&nbsp;</span>')

=== modified file 'addons/openerp/widgets/templates/listgrid/listgrid.mako'
--- addons/openerp/widgets/templates/listgrid/listgrid.mako	2019-02-10 18:09:25 +0000
+++ addons/openerp/widgets/templates/listgrid/listgrid.mako	2019-04-24 15:18:07 +0000
@@ -326,7 +326,11 @@
                                     % if (field_attrs.get('function') and not field_attrs.get('store') and not field_attrs.get('allow_sort')) 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)">${field_attrs['string']|br}</th>
+                                        <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)"
+                                        % if field_attrs.get('sort_column'):
+                                            sort_column="${field_attrs.get('sort_column')}"
+                                        % endif
+                                        >${field_attrs['string']|br}</th>
                                     % endif
                                     % endif
                                 % endfor

=== modified file 'addons/openerp/widgets/templates/listgrid/listgroup.mako'
--- addons/openerp/widgets/templates/listgrid/listgroup.mako	2019-01-21 14:10:10 +0000
+++ addons/openerp/widgets/templates/listgrid/listgroup.mako	2019-04-24 15:18:07 +0000
@@ -47,7 +47,12 @@
                             % if field == 'button':
                                 <th class="grid-cell"><div style="width: 0;"></div></th>
                             % elif not 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')}" style="cursor: pointer;" onclick="new ListView('${name}').sort_by_order('${field}', this)">${field_attrs['string']}</th>
+                                <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)"
+                                % if field_attrs.get('sort_column'):
+                                    sort_column="${field_attrs.get('sort_column')}"
+                                % endif
+                                
+                                >${field_attrs['string']}</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')}">${field_attrs['string']}</th>
                             % endif