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

[jftempo]

=== modified file 'addons/openerp/static/css/screen.css'
--- addons/openerp/static/css/screen.css	2020-02-25 13:27:26 +0000
+++ addons/openerp/static/css/screen.css	2020-11-02 12:53:20 +0000
@@ -2447,11 +2447,14 @@
 }
 #rr-chrono .elt {
 }
+#rr-chrono .oplt {
+  width: 16.66%;
+}
 #rr-chrono .oclt {
-  width: 25%;
+  width: 16.66%;
 }
 #rr-chrono .ovlt {
-  width: 25%;
+  width: 16.66%;
 }
 #rr-chrono .slt {
   width: 25%;

=== modified file 'addons/openerp/static/javascript/form.js'
--- addons/openerp/static/javascript/form.js	2020-08-06 14:23:27 +0000
+++ addons/openerp/static/javascript/form.js	2020-11-02 12:53:20 +0000
@@ -441,10 +441,6 @@
             s_ids = ListView('move_lines').getSelectedRecords();
         } else if (model == 'shipment' && jQuery('[id="pack_family_memory_ids"]').length > 0){
             s_ids = ListView('pack_family_memory_ids').getSelectedRecords();
-        }  else if (model =='replenishment.inventory.review' && jQuery('[id="line_ids"]').length > 0){
-            s_ids = ListView('line_ids').getSelectedRecords();
-        } else if (model =='replenishment.segment' && jQuery('[id="line_ids"]').length > 0){
-            s_ids = ListView('line_ids').getSelectedRecords();
         } else if (model =='wizard.compare.rfq' && jQuery('[id="line_ids"]').length > 0){
         s_ids = ListView('line_ids').getSelectedRecords();
         }

=== modified file 'addons/openerp/static/javascript/listgrid.js'
--- addons/openerp/static/javascript/listgrid.js	2020-01-13 15:25:16 +0000
+++ addons/openerp/static/javascript/listgrid.js	2020-11-02 12:53:20 +0000
@@ -131,11 +131,11 @@
     selectedRow_sum: function() {
         var selected_ids = this.getSelectedRecords();
         var $delete_record_option = jQuery(idSelector(this.name + '_delete_record')).parent();
-        
+
         if (selected_ids.length != 0) {
             $delete_record_option.show();
         } else {
-        	$delete_record_option.hide();
+            $delete_record_option.hide();
         }
 
         var $sum_fields = jQuery('.field_sum', idSelector(this.name));

=== modified file 'addons/openerp/widgets/form/_form.py'
--- addons/openerp/widgets/form/_form.py	2020-06-15 13:17:38 +0000
+++ addons/openerp/widgets/form/_form.py	2020-11-02 12:53:20 +0000
@@ -493,7 +493,7 @@
 #            self.default = 0.0
 
     def set_value(self, value):
-        if self.with_null and value is False:
+        if self.with_null and (value is False or value is None):
             self.default = ''
         else:
             self.default = value or 0.0
@@ -970,7 +970,7 @@
             elif node.localName=='separator':
                 views.append(Separator(**attrs))
 
-            elif node.localName=='label':
+            elif node.localName=='label' and not attrs.get('html'):
                 text = attrs.get('string', '')
 
                 if not text:

=== modified file 'addons/openerp/widgets/templates/listgrid/listgrid.mako'
--- addons/openerp/widgets/templates/listgrid/listgrid.mako	2020-08-06 14:23:27 +0000
+++ addons/openerp/widgets/templates/listgrid/listgrid.mako	2020-11-02 12:53:20 +0000
@@ -102,7 +102,7 @@
                     if selector == "radio":
                         selector_click += " do_select();"
                 %>
-                <input type="${selector}" class="${selector} grid-record-selector"
+                <input type="${selector}" class="${selector} grid-record-selector ignore_changes_when_leaving_page"
                     id="${name}/${data['id']}" name="${(checkbox_name or None) and name}"
                     value="${data['id']}"
                     onclick="${selector_click}"/>
@@ -341,7 +341,7 @@
                                 % if selector:
                                     <th width="1" class="grid-cell selector">
                                         % if selector == 'checkbox' and not m2m:
-                                            <input type="checkbox" class="checkbox grid-record-selector" id="${name}_check_all"  onclick="new ListView('${name}').checkAll(!this.checked)"/>
+                                            <input type="checkbox" class="checkbox grid-record-selector ignore_changes_when_leaving_page" id="${name}_check_all"  onclick="new ListView('${name}').checkAll(!this.checked)"/>
                                         % endif
                                         % if selector != 'checkbox' and not m2m:
                                             <span>&nbsp;</span>

=== modified file 'addons/openerp/widgets/templates/pager.mako'
--- addons/openerp/widgets/templates/pager.mako	2017-06-01 13:48:36 +0000
+++ addons/openerp/widgets/templates/pager.mako	2020-11-02 12:53:20 +0000
@@ -42,6 +42,7 @@
         <select id='_${name+str(pager_id)}_limit'
                 action="filter"
                 relation="${name}"
+                class="ignore_changes_when_leaving_page"
                 onchange="jQuery('[id=${name_base}_terp_limit]').val(jQuery(this).val());
                           jQuery('[id=${name_base}_terp_offset]').val(0);
                       pager_action(this)" style="min-width: 25px;">

=== modified file 'openobject/i18n/format.py'
--- openobject/i18n/format.py	2018-09-17 13:18:04 +0000
+++ openobject/i18n/format.py	2020-11-02 12:53:20 +0000
@@ -307,12 +307,15 @@
     if kwargs.get('computation', False):
         # fixed min decimal value
         min_digits = 2
+        if kwargs['computation'] == -1:
+            min_digits = 0
         # remove trailing zeros
         decimals = decimals.rstrip('0')
         # if less than two digits, we add padding - possible improvement, add the padding size in the decimal precision object
         if len(decimals) < min_digits:
             decimals = decimals + '0'*(min_digits - len(decimals))
-
+        if not decimals:
+            return val
     result = val + unicode(numbers.get_decimal_symbol(locale) + decimals)
     return result