[MERGE] forward port branch saas-15 up to d1fcca1504a

25 files changed, 71 insertions, 13 deletions

diff --git a/addons/account/models/chart_template.py b/addons/account/models/chart_template.py
index 83ecd07ea89..4965b28e022 100644
--- a/addons/account/models/chart_template.py
+++ b/addons/account/models/chart_template.py
@@ -41,6 +41,12 @@ def migrate_tags_on_taxes(cr, registry):
         if len(tax_id.ids) == 1:
             tax_id.sudo().write({'tag_ids': [(6, 0, tax_template.tag_ids.ids)]})
 
+def preserve_existing_tags_on_taxes(cr, registry, module):
+    ''' This is a utility function used to preserve existing previous tags during upgrade of the module.'''
+    env = api.Environment(cr, SUPERUSER_ID, {})
+    xml_records = env['ir.model.data'].search([('model', '=', 'account.account.tag'), ('module', 'like', module)])
+    if xml_records:
+        cr.execute("update ir_model_data set noupdate = 't' where id in %s", [tuple(xml_records.ids)])
 
 #  ---------------------------------------------------------------
 #   Account Templates: Account, Tax, Tax Code and chart. + Wizard
diff --git a/addons/account_asset/models/account_asset.py b/addons/account_asset/models/account_asset.py
index 313f0fa0f75..aeacccb7641 100644
--- a/addons/account_asset/models/account_asset.py
+++ b/addons/account_asset/models/account_asset.py
@@ -478,6 +478,8 @@ class AccountAssetDepreciationLine(models.Model):
         created_moves = self.env['account.move']
         prec = self.env['decimal.precision'].precision_get('Account')
         for line in self:
+            if line.move_id:
+                raise UserError(_('This depreciation is already linked to a journal entry! Please post or delete it.'))
             category_id = line.asset_id.category_id
             depreciation_date = self.env.context.get('depreciation_date') or line.depreciation_date or fields.Date.context_today(self)
             company_currency = line.asset_id.company_id.currency_id
diff --git a/addons/l10n_fr/__init__.py b/addons/l10n_fr/__init__.py
index 422c6ad09a7..779ab9a056c 100644
--- a/addons/l10n_fr/__init__.py
+++ b/addons/l10n_fr/__init__.py
@@ -4,3 +4,8 @@
 # Copyright (c) 2008 JAILLET Simon - CrysaLEAD - www.crysalead.fr
 
 from . import models
+
+
+def _preserve_tag_on_taxes(cr, registry):
+    from odoo.addons.account.models.chart_template import preserve_existing_tags_on_taxes
+    preserve_existing_tags_on_taxes(cr, registry, 'l10n_fr')
diff --git a/addons/l10n_fr/__manifest__.py b/addons/l10n_fr/__manifest__.py
index a9026705999..4270cc57b90 100644
--- a/addons/l10n_fr/__manifest__.py
+++ b/addons/l10n_fr/__manifest__.py
@@ -40,4 +40,5 @@ configuration of their taxes and fiscal positions manually.
         'data/account_reconcile_model_template.xml',
         'data/account_chart_template_data.yml',
     ],
+    'post_init_hook': '_preserve_tag_on_taxes',
 }
diff --git a/addons/l10n_lu/__init__.py b/addons/l10n_lu/__init__.py
index 67dee8c60db..4ca483f7aff 100644
--- a/addons/l10n_lu/__init__.py
+++ b/addons/l10n_lu/__init__.py
@@ -1,2 +1,7 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+
+def _preserve_tag_on_taxes(cr, registry):
+    from odoo.addons.account.models.chart_template import preserve_existing_tags_on_taxes
+    preserve_existing_tags_on_taxes(cr, registry, 'l10n_lu')
diff --git a/addons/l10n_lu/__manifest__.py b/addons/l10n_lu/__manifest__.py
index 59025f62596..6123ab2c81b 100644
--- a/addons/l10n_lu/__manifest__.py
+++ b/addons/l10n_lu/__manifest__.py
@@ -39,4 +39,5 @@ Notes:
         'data/account.chart.template.csv',
         'data/account_chart_template_data.yml',
     ],
+    'post_init_hook': '_preserve_tag_on_taxes',
 }
diff --git a/addons/l10n_no/__init__.py b/addons/l10n_no/__init__.py
index 67dee8c60db..52c150be0f0 100644
--- a/addons/l10n_no/__init__.py
+++ b/addons/l10n_no/__init__.py
@@ -1,2 +1,7 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+
+def _preserve_tag_on_taxes(cr, registry):
+    from odoo.addons.account.models.chart_template import preserve_existing_tags_on_taxes
+    preserve_existing_tags_on_taxes(cr, registry, 'l10n_no')
diff --git a/addons/l10n_no/__manifest__.py b/addons/l10n_no/__manifest__.py
index ca292e63a93..6668e79bacb 100644
--- a/addons/l10n_no/__manifest__.py
+++ b/addons/l10n_no/__manifest__.py
@@ -15,4 +15,5 @@ Updated for Odoo 9 by Bringsvor Consulting AS <www.bringsvor.com>
              'data/account_tax_data.xml',
              'data/account_chart_template_data.yml'],
     "active": False,
+    'post_init_hook': '_preserve_tag_on_taxes',
 }
diff --git a/addons/l10n_pl/__init__.py b/addons/l10n_pl/__init__.py
index 67dee8c60db..6575c176947 100644
--- a/addons/l10n_pl/__init__.py
+++ b/addons/l10n_pl/__init__.py
@@ -1,2 +1,7 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+
+def _preserve_tag_on_taxes(cr, registry):
+    from odoo.addons.account.models.chart_template import preserve_existing_tags_on_taxes
+    preserve_existing_tags_on_taxes(cr, registry, 'l10n_pl')
diff --git a/addons/l10n_pl/__manifest__.py b/addons/l10n_pl/__manifest__.py
index 8416f87a235..02253500138 100644
--- a/addons/l10n_pl/__manifest__.py
+++ b/addons/l10n_pl/__manifest__.py
@@ -28,4 +28,5 @@ Wewnętrzny numer wersji OpenGLOBE 1.02
               'data/res_country_state_data.xml',
               'data/account_chart_template_data.yml'
     ],
+    'post_init_hook': '_preserve_tag_on_taxes',
 }
diff --git a/addons/l10n_sg/__init__.py b/addons/l10n_sg/__init__.py
index b286495ed4a..e2f7da260d0 100644
--- a/addons/l10n_sg/__init__.py
+++ b/addons/l10n_sg/__init__.py
@@ -2,3 +2,8 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 # Copyright (C) 2014 Tech Receptives (<http://techreceptives.com>).
+
+
+def _preserve_tag_on_taxes(cr, registry):
+    from odoo.addons.account.models.chart_template import preserve_existing_tags_on_taxes
+    preserve_existing_tags_on_taxes(cr, registry, 'l10n_sg')
diff --git a/addons/l10n_sg/__manifest__.py b/addons/l10n_sg/__manifest__.py
index 4dea21b3665..d692dc6536d 100644
--- a/addons/l10n_sg/__manifest__.py
+++ b/addons/l10n_sg/__manifest__.py
@@ -32,4 +32,5 @@ After installing this module, the Configuration wizard for accounting is launche
              'data/account_tax_data.xml',
              'data/account_chart_template_data.yml',
     ],
+    'post_init_hook': '_preserve_tag_on_taxes',
 }
diff --git a/addons/l10n_th/__init__.py b/addons/l10n_th/__init__.py
index 67dee8c60db..1b8d7518cd3 100644
--- a/addons/l10n_th/__init__.py
+++ b/addons/l10n_th/__init__.py
@@ -1,2 +1,7 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+
+def _preserve_tag_on_taxes(cr, registry):
+    from odoo.addons.account.models.chart_template import preserve_existing_tags_on_taxes
+    preserve_existing_tags_on_taxes(cr, registry, 'l10n_th')
diff --git a/addons/l10n_th/__manifest__.py b/addons/l10n_th/__manifest__.py
index e2b62ee77e8..2f1d26a4a49 100644
--- a/addons/l10n_th/__manifest__.py
+++ b/addons/l10n_th/__manifest__.py
@@ -18,4 +18,5 @@ Thai accounting chart and localization.
         'data/l10n_th_chart_data.xml',
         'data/account_chart_template_data.yml',
     ],
+    'post_init_hook': '_preserve_tag_on_taxes',
 }
diff --git a/addons/l10n_vn/__init__.py b/addons/l10n_vn/__init__.py
index 34293fdfe8d..490754ae534 100644
--- a/addons/l10n_vn/__init__.py
+++ b/addons/l10n_vn/__init__.py
@@ -2,3 +2,8 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 # This module is Copyright (c) 2009-2013 General Solutions (http://gscom.vn) All Rights Reserved.
+
+
+def _preserve_tag_on_taxes(cr, registry):
+    from odoo.addons.account.models.chart_template import preserve_existing_tags_on_taxes
+    preserve_existing_tags_on_taxes(cr, registry, 'l10n_vn')
diff --git a/addons/l10n_vn/__manifest__.py b/addons/l10n_vn/__manifest__.py
index ba785e72388..1f318b54b8a 100644
--- a/addons/l10n_vn/__manifest__.py
+++ b/addons/l10n_vn/__manifest__.py
@@ -28,5 +28,6 @@ with Chart of account under Circular No. 200/2014/TT-BTC
          'data/l10n_vn_chart_data.xml',
          'data/account_tax_data.xml',
          'data/account_chart_template_data.yml',
-    ]
+    ],
+    'post_init_hook': '_preserve_tag_on_taxes',
 }
diff --git a/addons/mrp/report/mrp_production_templates.xml b/addons/mrp/report/mrp_production_templates.xml
index 483ef283194..d8a90b371ac 100644
--- a/addons/mrp/report/mrp_production_templates.xml
+++ b/addons/mrp/report/mrp_production_templates.xml
@@ -23,8 +23,7 @@
                         </div>
                         <div class="col-xs-3">
                             <strong>Product:</strong><br/>
-                            <span t-field="o.product_id.code"/>
-                            <span t-field="o.product_id.name"/>
+                            <span t-field="o.product_id"/>
                         </div>
                         <div class="col-xs-3">
                             <strong>Quantity:</strong><br/>
diff --git a/addons/point_of_sale/static/src/js/db.js b/addons/point_of_sale/static/src/js/db.js
index ccdd0fb6616..b70b3517bf2 100644
--- a/addons/point_of_sale/static/src/js/db.js
+++ b/addons/point_of_sale/static/src/js/db.js
@@ -235,10 +235,12 @@ var PosDB = core.Class.extend({
         for(var i = 0, len = partners.length; i < len; i++){
             partner = partners[i];
 
-            if (    this.partner_write_date && 
+            var local_partner_date = (this.partner_write_date || '').replace(/^(\d{4}-\d{2}-\d{2}) ((\d{2}:?){3})$/, '$1T$2Z');
+            var dist_partner_date = (partner.write_date || '').replace(/^(\d{4}-\d{2}-\d{2}) ((\d{2}:?){3})$/, '$1T$2Z');
+            if (    this.partner_write_date &&
                     this.partner_by_id[partner.id] &&
-                    new Date(this.partner_write_date).getTime() + 1000 >=
-                    new Date(partner.write_date).getTime() ) {
+                    new Date(local_partner_date).getTime() + 1000 >=
+                    new Date(dist_partner_date).getTime() ) {
                 // FIXME: The write_date is stored with milisec precision in the database
                 // but the dates we get back are only precise to the second. This means when
                 // you read partners modified strictly after time X, you get back partners that were
diff --git a/addons/product/models/product.py b/addons/product/models/product.py
index f284f709eda..fc21bb7c4bd 100644
--- a/addons/product/models/product.py
+++ b/addons/product/models/product.py
@@ -543,7 +543,7 @@ class ProductProduct(models.Model):
         history = self.env['product.price.history'].search([
             ('company_id', '=', company_id),
             ('product_id', 'in', self.ids),
-            ('datetime', '<=', date or fields.Datetime.now())], limit=1)
+            ('datetime', '<=', date or fields.Datetime.now())], order='datetime desc,id desc', limit=1)
         return history.cost or 0.0
 
     def _need_procurement(self):
diff --git a/addons/purchase/models/purchase.py b/addons/purchase/models/purchase.py
index 456d999a123..385f04d403d 100644
--- a/addons/purchase/models/purchase.py
+++ b/addons/purchase/models/purchase.py
@@ -893,7 +893,7 @@ class ProcurementOrder(models.Model):
                         date=procurement.purchase_line_id.order_id.date_order and procurement.purchase_line_id.order_id.date_order[:10],
                         uom_id=procurement.purchase_line_id.product_uom)
 
-                    price_unit = self.env['account.tax']._fix_tax_included_price_company(seller.price, procurement.purchase_line_id.product_id.supplier_taxes_id, procurement.purchase_line_id.taxes_id, self.company_id) if seller else 0.0
+                    price_unit = self.env['account.tax']._fix_tax_included_price_company(seller.price, procurement.purchase_line_id.product_id.supplier_taxes_id, procurement.purchase_line_id.taxes_id, procurement.company_id) if seller else 0.0
                     if price_unit and seller and procurement.purchase_line_id.order_id.currency_id and seller.currency_id != procurement.purchase_line_id.order_id.currency_id:
                         price_unit = seller.currency_id.compute(price_unit, procurement.purchase_line_id.order_id.currency_id)
 
diff --git a/addons/sale/models/sale.py b/addons/sale/models/sale.py
index c933f2ef340..563536a66c3 100644
--- a/addons/sale/models/sale.py
+++ b/addons/sale/models/sale.py
@@ -704,7 +704,7 @@ class SaleOrderLine(models.Model):
     def create(self, values):
         values.update(self._prepare_add_missing_fields(values))
         line = super(SaleOrderLine, self).create(values)
-        if line.state == 'sale':
+        if line.order_id.state == 'sale':
             line._action_procurement_create()
             msg = _("Extra line with %s ") % (line.product_id.display_name,)
             line.order_id.message_post(body=msg)
diff --git a/addons/website_event/views/event_templates.xml b/addons/website_event/views/event_templates.xml
index 59ebcbd26b9..4eb4723186c 100644
--- a/addons/website_event/views/event_templates.xml
+++ b/addons/website_event/views/event_templates.xml
@@ -243,6 +243,7 @@
 
 <template id="template_location">
     <t t-call="website_event.layout">
+        <div class="oe_structure"/>
         <section class="container">
             <h1 class="text-center">Event Location</h1>
         </section>
@@ -251,6 +252,7 @@
                 "widget": "contact",
                 "fields": ["name", "address", "phone", "mobile", "fax"]
             }'/>
+        <div class="oe_structure"/>
     </t>
 </template>
 
diff --git a/addons/website_event_track/views/event_track_templates.xml b/addons/website_event_track/views/event_track_templates.xml
index 7aefb8c0b54..ecd617a98d5 100644
--- a/addons/website_event_track/views/event_track_templates.xml
+++ b/addons/website_event_track/views/event_track_templates.xml
@@ -42,6 +42,7 @@
 
 <template id="agenda">
     <t t-call="website_event.layout">
+        <div class="oe_structure"/>
         <section class="container">
             <h1 class="text-center" t-field="event.name"/>
             <div class="form-inline pull-right">
@@ -107,12 +108,14 @@
             </tr>
             </table>
         </section>
+        <div class="oe_structure"/>
     </t>
 </template>
 
 
 <template id="tracks">
     <t t-call="website_event.event_details">
+        <div class="oe_structure"/>
         <div id="left_column">
         </div>
         <div class="col-md-9">
@@ -151,6 +154,7 @@
                 </div>
             </div>
         </div>
+        <div class="oe_structure"/>
     </t>
 </template>
 
diff --git a/addons/website_sale/models/sale_order.py b/addons/website_sale/models/sale_order.py
index 22f4f47e9db..335e9796b54 100644
--- a/addons/website_sale/models/sale_order.py
+++ b/addons/website_sale/models/sale_order.py
@@ -245,12 +245,13 @@ class Website(models.Model):
         :param bool show_visible: if True, we don't display pricelist where selectable is False (Eg: Code promo)
         :returns: pricelist recordset
         """
-        website = request and request.website or None
+        website = request and hasattr(request, 'website') and request.website or None
         if not website:
             if self.env.context.get('website_id'):
                 website = self.browse(self.env.context['website_id'])
             else:
-                website = self.search([], limit=1)
+                # In the weird case we are coming from the backend (https://github.com/odoo/odoo/issues/20245)
+                website = len(self) == 1 and self or self.search([], limit=1)
         isocountry = request and request.session.geoip and request.session.geoip.get('country_code') or False
         partner = self.env.user.partner_id
         order_pl = partner.last_website_so_id and partner.last_website_so_id.state == 'draft' and partner.last_website_so_id.pricelist_id
diff --git a/addons/website_slides/view/website_slides_embed.xml b/addons/website_slides/view/website_slides_embed.xml
index c3c77fc676d..72614803325 100644
--- a/addons/website_slides/view/website_slides_embed.xml
+++ b/addons/website_slides/view/website_slides_embed.xml
@@ -59,7 +59,7 @@
                     <!--  PDF Viewer Body : contains the canvas, the loader, or the image-->
                     <div id="PDFSlideViewer" style="position:relative;"
                             t-attf-data-slideid="#{slide.id}"
-                            t-attf-data-slideurl="/slides/slide/#{slide.id}/pdf_content"
+                            t-attf-data-slideurl="/slides/slide/#{slug(slide)}/pdf_content"
                             t-attf-data-downloadable="#{slide.download_security}"
                             t-att-data-defaultpage="page">
                         <t t-if="is_embedded">
@@ -133,7 +133,7 @@
                                     <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4 text-center"></div>
                                 </div>
                                 <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2 pull-right text-right">
-                                    <a t-if="slide.download_security and not is_embedded" target="_top" t-attf-href="/slides/slide/#{slide.id}/download" title="Download" id="download">
+                                    <a t-if="slide.download_security and not is_embedded" target="_top" t-attf-href="/slides/slide/#{slug(slide)}/download" title="Download" id="download">
                                         <i class="fa fa-download fa-2x"></i>
                                     </a>
                                     <span id="fullscreen" title="View fullscreen">