Merge remote-tracking branch 'odoo/14.0' into 14.0

addons/account/models/sequence_mixin.py

@@ -156,9 +156,9 @@ class SequenceMixin(models.AbstractModel):
         if self._sequence_field not in self._fields or not self._fields[self._sequence_field].store:
             raise ValidationError(_('%s is not a stored field', self._sequence_field))
         where_string, param = self._get_last_sequence_domain(relaxed)
-        if self.id or self.id.origin:
+        if self._origin.id:
             where_string += " AND id != %(id)s "
-            param['id'] = self.id or self.id.origin
+            param['id'] = self._origin.id
 
         query = f"""
                 SELECT {{field}} FROM {self._table}

addons/portal/i18n/portal.pot

@@ -55,6 +55,16 @@ msgstr ""
 msgid "<i class=\"fa fa-pencil\"/> Edit"
 msgstr ""
 
+#. module: portal
+#: model_terms:ir.ui.view,arch_db:portal.portal_my_details
+msgid "<option value=\"\">Country...</option>"
+msgstr ""
+
+#. module: portal
+#: model_terms:ir.ui.view,arch_db:portal.portal_my_details
+msgid "<option value=\"\">select...</option>"
+msgstr ""
+
 #. module: portal
 #: model_terms:ir.ui.view,arch_db:portal.portal_searchbar
 msgid "<span class=\"small mr-1 navbar-text\">Filter By:</span>"
@@ -320,11 +330,6 @@ msgstr ""
 msgid "Country"
 msgstr ""
 
-#. module: portal
-#: model_terms:ir.ui.view,arch_db:portal.portal_my_details
-msgid "Country..."
-msgstr ""
-
 #. module: portal
 #: model:ir.model.fields,field_description:portal.field_portal_share__create_uid
 #: model:ir.model.fields,field_description:portal.field_portal_wizard__create_uid
@@ -1084,11 +1089,6 @@ msgstr ""
 msgid "password"
 msgstr ""
 
-#. module: portal
-#: model_terms:ir.ui.view,arch_db:portal.portal_my_details
-msgid "select..."
-msgstr ""
-
 #. module: portal
 #. openerp-web
 #: code:addons/portal/static/src/xml/portal_chatter.xml:0

addons/website_crm_partner_assign/i18n/website_crm_partner_assign.pot

@@ -47,6 +47,16 @@ msgstr ""
 msgid "<i class=\"fa fa-plus\"/> Create New"
 msgstr ""
 
+#. module: website_crm_partner_assign
+#: model_terms:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
+msgid "<option>Countries...</option>"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model_terms:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
+msgid "<option>States...</option>"
+msgstr ""
+
 #. module: website_crm_partner_assign
 #: code:addons/website_crm_partner_assign/models/crm_lead.py:0
 #, python-format
@@ -428,11 +438,6 @@ msgstr ""
 msgid "Contents"
 msgstr ""
 
-#. module: website_crm_partner_assign
-#: model_terms:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
-msgid "Countries..."
-msgstr ""
-
 #. module: website_crm_partner_assign
 #: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_partner_report_assign__country_id
 msgid "Country"
@@ -1132,11 +1137,6 @@ msgstr ""
 msgid "Stage"
 msgstr ""
 
-#. module: website_crm_partner_assign
-#: model_terms:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
-msgid "States..."
-msgstr ""
-
 #. module: website_crm_partner_assign
 #: model_terms:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
 msgid "Street"

addons/website_profile/i18n/website_profile.pot

@@ -72,6 +72,11 @@ msgstr ""
 msgid "<i class=\"text-muted\"> awarded users</i>"
 msgstr ""
 
+#. module: website_profile
+#: model_terms:ir.ui.view,arch_db:website_profile.user_profile_edit_content
+msgid "<option value=\"\">Country...</option>"
+msgstr ""
+
 #. module: website_profile
 #: model_terms:ir.ui.view,arch_db:website_profile.user_profile_content
 msgid "<small class=\"font-weight-bold mr-2\">Current rank:</small>"
@@ -305,11 +310,6 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#. module: website_profile
-#: model_terms:ir.ui.view,arch_db:website_profile.user_profile_edit_content
-msgid "Country..."
-msgstr ""
-
 #. module: website_profile
 #: model:ir.model.fields,field_description:website_profile.field_gamification_badge__display_name
 #: model:ir.model.fields,field_description:website_profile.field_res_users__display_name

addons/website_sale/i18n/website_sale.pot

@@ -235,6 +235,16 @@ msgstr ""
 msgid "<i class=\"fa fa-shopping-cart\"/> Add to Cart"
 msgstr ""
 
+#. module: website_sale
+#: model_terms:ir.ui.view,arch_db:website_sale.address
+msgid "<option value=\"\">Country...</option>"
+msgstr ""
+
+#. module: website_sale
+#: model_terms:ir.ui.view,arch_db:website_sale.address
+msgid "<option value=\"\">State / Province...</option>"
+msgstr ""
+
 #. module: website_sale
 #: code:addons/website_sale/models/crm_team.py:0
 #, python-format
@@ -946,11 +956,6 @@ msgstr ""
 msgid "Country"
 msgstr ""
 
-#. module: website_sale
-#: model_terms:ir.ui.view,arch_db:website_sale.address
-msgid "Country..."
-msgstr ""
-
 #. module: website_sale
 #: model_terms:ir.actions.act_window,help:website_sale.product_template_action_website
 msgid "Create a new product"
@@ -2689,11 +2694,6 @@ msgstr ""
 msgid "State / Province"
 msgstr ""
 
-#. module: website_sale
-#: model_terms:ir.ui.view,arch_db:website_sale.address
-msgid "State / Province..."
-msgstr ""
-
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_res_company__website_sale_onboarding_payment_acquirer_state
 msgid "State of the website sale onboarding payment acquirer step"

odoo/addons/base/i18n/base.pot

@@ -14898,6 +14898,12 @@ msgstr ""
 msgid "Invalid 'group by' parameter"
 msgstr ""
+#. module: base
+#: code:addons/template_inheritance.py:0
+#, python-format
+msgid "Invalid Expression while parsing xpath %r"
+msgstr ""
+
 #. module: base
 #: code:addons/base/models/ir_default.py:0
 #, python-format

odoo/tools/template_inheritance.py

@@ -7,6 +7,7 @@ import logging
 
 from odoo.tools.translate import _
 from odoo.tools import SKIPPED_ELEMENT_TYPES
+from odoo.exceptions import ValidationError
 _logger = logging.getLogger(__name__)
 
 
@@ -56,9 +57,8 @@ def locate_node(arch, spec):
         expr = spec.get('expr')
         try:
             xPath = etree.ETXPath(expr)
-        except etree.XPathSyntaxError:
-            _logger.error("XPathSyntaxError while parsing xpath %r", expr)
-            raise
+        except etree.XPathSyntaxError as e:
+            raise ValidationError(_("Invalid Expression while parsing xpath %r", expr)) from e
         nodes = xPath(arch)
         return nodes[0] if nodes else None
     elif spec.tag == 'field':