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

[jftempo]

=== modified file 'addons/openerp/controllers/templates/base.mako'
--- addons/openerp/controllers/templates/base.mako	2020-02-25 13:53:15 +0000
+++ addons/openerp/controllers/templates/base.mako	2020-03-24 15:50:11 +0000
@@ -33,7 +33,7 @@
     <link rel="stylesheet" type="text/css" href="/openerp/static/css/notebook.css?v=16.0rc2"/>
 
     <link rel="stylesheet" type="text/css" href="/openerp/static/css/pager.css"/>
-    <link rel="stylesheet" type="text/css" href="/openerp/static/css/listgrid.css?v=16.0rc2"/>
+    <link rel="stylesheet" type="text/css" href="/openerp/static/css/listgrid.css?v=16.1"/>
     <link rel="stylesheet" type="text/css" href="/openerp/static/css/autocomplete.css"/>
 
     <!--[if lt IE 9]>

=== modified file 'addons/openerp/static/css/listgrid.css'
--- addons/openerp/static/css/listgrid.css	2020-02-25 10:55:25 +0000
+++ addons/openerp/static/css/listgrid.css	2020-03-24 15:50:11 +0000
@@ -86,7 +86,6 @@
     font-weight: bold;
     position: sticky;
     top: 0;
-    z-index: 1;
     text-align: center !important;
 }
 
@@ -230,14 +229,28 @@
     color: #7D7979;
     font-size: 0.9em;
 }
-
+.o2m_filter_block {
+    width: 99.5%;
+    border-bottom: 1px solid rgb(153, 153, 153);
+    padding-bottom: 5px;
+}
 .o2m_header_filter td {
     padding-right: 10px;
     padding-left: 4px;
+    padding-top: 10px;
+    padding-bottom: 10px;
 }
 .o2m_header_filter img {
     cursor: pointer;
 }
+
+.htmlbox {
+    display: flex;
+    align-items: center;
+}
+.warning {
+    margin-right: 3px;
+}
 /**
  * vim: sts=4 st=4 et
  *

=== modified file 'addons/openerp/widgets/form/_form.py'
--- addons/openerp/widgets/form/_form.py	2020-02-24 15:15:02 +0000
+++ addons/openerp/widgets/form/_form.py	2020-03-24 15:50:11 +0000
@@ -799,6 +799,12 @@
 
 register_widget(HtmlView, ["html"])
 
+class HtmlText(Char):
+
+    template = "/openerp/widgets/form/templates/html.mako"
+
+register_widget(HtmlText, ["html_text"])
+
 class Form(TinyInputWidget):
     """A generic form widget
     """

=== added file 'addons/openerp/widgets/form/templates/html.mako'
--- addons/openerp/widgets/form/templates/html.mako	1970-01-01 00:00:00 +0000
+++ addons/openerp/widgets/form/templates/html.mako	2020-03-24 15:50:11 +0000
@@ -0,0 +1,2 @@
+    <span kind="${kind}" id="${name}" value="${value}">${value|n}</span>
+

=== modified file 'addons/openerp/widgets/listgrid.py'
--- addons/openerp/widgets/listgrid.py	2020-02-25 11:28:30 +0000
+++ addons/openerp/widgets/listgrid.py	2020-03-24 15:50:11 +0000
@@ -594,6 +594,9 @@
     def __str__(self):
         return ustr(self.text)
 
+class HtmlText(Char):
+    template = "/openerp/widgets/templates/listgrid/html.mako"
+
 class Reference(Char):
 
     def get_text(self):
@@ -900,4 +903,5 @@
     'progressbar' : ProgressBar,
     'separator': Separator,
     'human_size': HumanSize,
+    'html_text': HtmlText,
 }

=== modified file 'addons/openerp/widgets/listgroup.py'
--- addons/openerp/widgets/listgroup.py	2020-01-24 11:10:44 +0000
+++ addons/openerp/widgets/listgroup.py	2020-03-24 15:50:11 +0000
@@ -226,17 +226,33 @@
 
         self.group_by_ctx, self.hiddens, self.headers = parse(self.group_by_ctx, self.hiddens, self.headers, None, self.group_by_ctx)
 
-        self.grp_records = proxy.read_group(self.context.get('__domain', []) + (self.domain or []),
-                                            fields.keys(), self.group_by_ctx, 0, False, self.context)
 
+        limited_groupby = self.model == 'replenishment.product.list'
+        order_by = ''
         terp_params = getattr(cherrypy.request, 'terp_params', [])
         if terp_params.sort_key and terp_params.sort_key in self.group_by_ctx and self.group_by_ctx.index(terp_params.sort_key) == 0:
+            order_by = terp_params.sort_key
             if terp_params.sort_order == 'desc':
                 rev = True
+                order_by += ' desc'
             else:
                 rev = False
+                order_by += ' asc'
+
+        read_offset = 0
+        read_limit = False
+        read_groupby = False
+        if limited_groupby:
+            read_offset = terp_offset
+            read_limit = terp_limit
+            read_groupby = order_by
+            order_by = False
+
+        self.grp_records = proxy.read_group(self.context.get('__domain', []) + (self.domain or []),
+                                            fields.keys(), self.group_by_ctx, read_offset, read_limit, self.context, read_groupby)
+
+        if order_by:
             self.grp_records = sorted(self.grp_records, key=itemgetter(terp_params.sort_key), reverse=rev)
-
         for grp_rec in self.grp_records:
             if not grp_rec.get('__domain'):
                 grp_rec['__domain'] = self.context.get('__domain', []) + (self.domain or [])
@@ -246,14 +262,19 @@
         self.grouped, grp_ids = parse_groups(self.group_by_ctx, self.grp_records, self.headers, self.ids, model, terp_offset, terp_limit, self.context, self.data, self.field_total, fields, self.rounding_values)
 
         if self.pageable:
-            self.count = len(self.grouped)
+            if limited_groupby:
+                self.count = proxy.read_group(self.context.get('__domain', []) + (self.domain or []), fields.keys(), self.group_by_ctx, 0, False, self.context, False, True)
+            else:
+                self.count = len(self.grouped)
+
             self.pager = Pager(ids=self.ids, offset=self.offset, limit=self.limit, count=self.count)
             self.pager._name = self.name
 
         # Display only the lines according to pager
-        start_index = self.offset
-        end_index = self.offset + self.limit
-        self.grp_records = self.grp_records[start_index:end_index]
+        if not limited_groupby:
+            start_index = self.offset
+            end_index = self.offset + self.limit
+            self.grp_records = self.grp_records[start_index:end_index]
 
 
 class MultipleGroup(List):

=== added file 'addons/openerp/widgets/templates/listgrid/html.mako'
--- addons/openerp/widgets/templates/listgrid/html.mako	1970-01-01 00:00:00 +0000
+++ addons/openerp/widgets/templates/listgrid/html.mako	2020-03-24 15:50:11 +0000
@@ -0,0 +1,1 @@
+<span name="${name}" value="${value}" class="htmlbox">${text|n}</span>

=== modified file 'addons/openerp/widgets/templates/listgrid/listgrid.mako'
--- addons/openerp/widgets/templates/listgrid/listgrid.mako	2020-02-21 09:16:40 +0000
+++ addons/openerp/widgets/templates/listgrid/listgrid.mako	2020-03-24 15:50:11 +0000
@@ -189,6 +189,38 @@
 </%def>
 
 <div class="box-a list-a">
+% if any([field != 'button' and field_attrs.get('filter_selector') for field, field_attrs in headers]):
+<div class="o2m_filter_block">
+    <table id="${name}_o2m_filter" class="o2m_header_filter"><tr>
+        % for (field, field_attrs) in headers:
+            % if field != 'button' and field_attrs.get('filter_selector'):
+               <% has_filter = True %>
+                <td> ${field_attrs['string']|br}:
+                    % if field_attrs['type'] == 'selection':
+                        <select id="${name}_${field}" class="paging ignore_changes_when_leaving_page" style="width: auto" field="${field}" kind="selection">
+                            <option value=""></option>
+                            % for key, val in field_attrs['selection']:
+                                <option value="${key}">${val}</option>
+                            % endfor
+                        </select>
+                    % elif field_attrs['type'] == 'boolean':
+                        <select id="${name}_${field}" class="paging ignore_changes_when_leaving_page" style="width: auto" field="${field}" kind="boolean">
+                            <option value=""></option>
+                            <option value="t">${_('Yes')}</option>
+                            <option value="f">${_('No')}</option>
+                        </select>
+                    % else:
+                        <input id="${name}_${field}" type="text" class="paging ignore_changes_when_leaving_page" style="width: auto" field="${field}" onkeydown="if (event.keyCode == 13) new ListView('${name}').update_o2m_filter();"/>
+                    % endif
+                </td>
+            % endif
+        % endfor
+        <td><button type="button" onclick="new ListView('${name}').update_o2m_filter()">${_('Search')}</button></td>
+        <td><button type="button" onclick="new ListView('${name}').clear_filter()">${_('Clear')}</button></td>
+    </table>
+</div>
+% endif
+
     <div class="inner">
         <table id="${name}" class="gridview" width="100%" cellspacing="0" cellpadding="0">
             % if pageable:
@@ -291,38 +323,8 @@
                                 </td>
                                 % else:
                                 <td class="pager-cell" style="width: 90%">
-                                    <% has_filter = False %>
-                                    <table id="${name}_o2m_filter" class="o2m_header_filter"><tr>
-                                        % for (field, field_attrs) in headers:
-                                            % if field != 'button' and field_attrs.get('filter_selector'):
-                                               <% has_filter = True %>
-                                                <td> ${field_attrs['string']|br}:
-                                                    % if field_attrs['type'] == 'selection':
-                                                        <select id="${name}_${field}" class="paging ignore_changes_when_leaving_page" style="width: auto" field="${field}" kind="selection">
-                                                            <option value=""></option>
-                                                            % for key, val in field_attrs['selection']:
-                                                                <option value="${key}">${val}</option>
-                                                            % endfor
-                                                        </select>
-                                                    % elif field_attrs['type'] == 'boolean':
-                                                        <select id="${name}_${field}" class="paging ignore_changes_when_leaving_page" style="width: auto" field="${field}" kind="boolean">
-                                                            <option value=""></option>
-                                                            <option value="t">${_('Yes')}</option>
-                                                            <option value="f">${_('No')}</option>
-                                                        </select>
-                                                    % else:
-                                                        <input id="${name}_${field}" type="text" class="paging ignore_changes_when_leaving_page" style="width: auto" field="${field}" onkeydown="if (event.keyCode == 13) new ListView('${name}').update_o2m_filter();"/>
-                                                    % endif
-                                                </td>
-                                            % endif
-                                        % endfor
-                                        % if has_filter:
-                                            <td><button type="button" onclick="new ListView('${name}').update_o2m_filter()">${_('Search')}</button></td>
-                                            <td><button type="button" onclick="new ListView('${name}').clear_filter()">${_('Clear')}</button></td>
-                                        % endif
-                                    </table>
                                 </td>
-                                % endif 
+                                % endif
                                 <td class="pager-cell" style="width: 90%">
                                     ${pager.display()}
                                 </td>

=== modified file 'addons/openerp/widgets/templates/listgrid/listgroup.mako'
--- addons/openerp/widgets/templates/listgrid/listgroup.mako	2019-05-06 13:41:44 +0000
+++ addons/openerp/widgets/templates/listgrid/listgroup.mako	2020-03-24 15:50:11 +0000
@@ -85,7 +85,7 @@
                                     % if field_attrs.get('type') == 'progressbar':
                                         ${grouped[j][field].display()}
                                     % else:
-                                        % if grp_row.get(field):
+                                        % if grp_row.get(field) or grp_row.get(field) == 0:
                                             % if field_attrs.get('type') == 'many2one':
                                                 ${isinstance(grp_row.get(field), (int, long)) and " " or grp_row.get(field)[-1]}
                                             % elif field_attrs.get('type') == 'selection':