[MERGE] forward port branch saas-14 up to 5728e39181

addons/account_asset/report/account_asset_report_views.xml

@@ -33,6 +33,7 @@
                 <field name="depreciation_date"/>
                 <filter string="Draft" domain="[('state','=','draft')]" help="Assets in draft state"/>
                 <filter string="Running" domain="[('state','=','open')]" help="Assets in running state"/>
+                <filter string="Not archived" name="only_active" domain="[('asset_id.active','=', True)]"/>
                 <separator/>
                 <filter string="Posted" name="posted" domain="[('move_check','=',True)]" help="Posted depreciation lines" context="{'unposted_value_visible': 0}"/>
                 <field name="asset_id"/>
@@ -62,7 +63,7 @@
         <field name="view_mode">pivot,graph</field>
         <field name="search_view_id" ref="view_asset_asset_report_search"/>
         <field name="domain">[('asset_category_id.type', '=', 'purchase')]</field>
-        <field name="context">{}</field>  <!-- force empty -->
+        <field name="context">{'search_default_only_active': 1}</field>
         <field name="help" type="html">
           <p>
             From this report, you can have an overview on all depreciations. The

addons/mrp_byproduct/models/mrp_subproduct.py

@@ -13,7 +13,7 @@ class MrpSubProduct(models.Model):
     product_qty = fields.Float(
         'Product Qty',
         default=1.0, digits=dp.get_precision('Product Unit of Measure'), required=True)
-    product_uom_id = fields.Many2one('product.uom', 'Unit of Measure', required=True)
+    product_uom_id = fields.Many2one('product.uom', 'Unit of Measure', required=True, oldname='product_uom')
     bom_id = fields.Many2one('mrp.bom', 'BoM', ondelete='cascade')
     operation_id = fields.Many2one('mrp.routing.workcenter', 'Produced at Operation')
 

addons/website_hr_recruitment/models/hr_recruitment.py

@@ -47,7 +47,7 @@ class Job(models.Model):
         default_description = self.env["ir.model.data"].xmlid_to_object("website_hr_recruitment.default_website_description")
         return (default_description.render() if default_description else "")
 
-    website_description = fields.Html('Website description', translate=html_translate, sanitize_attributes=False, default=_get_default_website_description)
+    website_description = fields.Html('Website description', translate=html_translate, sanitize_attributes=False, default=_get_default_website_description, prefetch=False)
 
     @api.multi
     def _compute_website_url(self):

setup.py

@@ -80,7 +80,6 @@ def py2exe_options():
                         'encodings',
                         'HTMLParser',
                         'imaplib',
-                        'jinja2',
                         'lxml', 'lxml._elementpath', 'lxml.builder', 'lxml.etree', 'lxml.objectify',
                         'mako',
                         'markupsafe',
@@ -112,7 +111,7 @@ def py2exe_options():
                         'xml', 'xml.dom',
                         'yaml',
                     ],
-                    'excludes': ['Tkconstants', 'Tkinter', 'tcl'],
+                    'excludes': ['jinja2.asyncsupport', 'Tkconstants', 'Tkinter', 'tcl'],  # do not forward-port 11.0 does not use py2exe
                 }
             },
             'data_files': py2exe_datafiles()