f7fca3faf96e08411eb149689054bedf346630c5
Steps to reproduce the issue: * In a clean v16 db install base_setup * Log in into DB, switch language to French (install and activate it) * Upgrade to saas-16.1 Issue: The main settings page under Companies settings (Sociétés in Frech) shows ``` <span class="o_form_label">Mise en page du document</span> <span class="fa fa-lg fa-building-o" title="Les valeurs définies ici sont spécifiques à l'entreprise." aria-label="Values set here are company-specific." groups="base.group_multi_company" role="img"/> ``` instead of just ``` Mise en page du document ``` The issue comes from this difference, 16.0: https://github.com/odoo/odoo/blob/fb02720aed0b0be00df8f5d0e1932b948c300b92/addons/base_setup/views/res_config_settings_views.xml#L78-L79 vs saas-16.1: https://github.com/odoo/odoo/blob/80bc702ecfe6f704af05f9830d272b162018f2ad/addons/base_setup/views/res_config_settings_views.xml#L79 Note that `Document Layout` is used in two different contexts. In 16.0 it comes within an xml/html block containing a `<span>` tag, and more importantly it is the **text** part of the xml tag. In saas-16.1 the same `Document Layout` is used as an **attribute** of the `setting` tag. Thus we cannot blindly assign the whole term (block with tags) to the attribute when upgrading to saas-16.1, it is only safe to update the translation from xml to text. Updating a text entry with something that seems to have other xml elements is unsafe and can lead to the issue showcased here. For more context, at the time of updating the terms here is the situation: * `closest_matches` is `['Document Layout']` * `closest_term` is `Document Layout` * `old_term` is ``` <span class="o_form_label">Document Layout</span> <span class="fa fa-lg fa-building-o" title="Values set here are company-specific." aria-label="Values set here are company-specific." groups="base.group_multi_company" role="img"/> ``` closes odoo/odoo#123540 X-original-commit: 6cd49293fe4d0d86fbbfa2476e113deadeba7348 Signed-off-by: Wang Chong (cwg) <cwg@odoo.com> Signed-off-by: Alvaro Fuentes Suarez (afu) <afu@odoo.com> Co-authored-by: Chong Wang(cwg) <cwg@odoo.com>
…
…
Odoo
Odoo is a suite of web based open source business apps.
The main Odoo Apps include an Open Source CRM, Website Builder, eCommerce, Warehouse Management, Project Management, Billing & Accounting, Point of Sale, Human Resources, Marketing, Manufacturing, ...
Odoo Apps can be used as stand-alone applications, but they also integrate seamlessly so you get a full-featured Open Source ERP when you install several Apps.
Getting started with Odoo
For a standard installation please follow the Setup instructions from the documentation.
To learn the software, we recommend the Odoo eLearning, or Scale-up, the business game. Developers can start with the developer tutorials
Languages
Python
49.6%
JavaScript
47.8%
SCSS
2%
CSS
0.3%
HTML
0.2%