From c67f6d879409e51d533ccb2dc32de33e7314e089 Mon Sep 17 00:00:00 2001
From: mreficent <miquel.raich@eficent.com>
Date: Fri, 13 Sep 2019 14:46:23 +0000
Subject: [PATCH] [FIX] pos_mercury: revert of 48b3893b84
The previous change was done to solve a case of duplicated xmlids in
v12. By some confusion, both xmlids were changed in separated
commits. This new commit returns the original xmlid of one and assures
to avoid more confusions by adding 'settings' to the other.
Closes odoo/odoo#36885
closes odoo/odoo#37755
Signed-off-by: Martin Trigaux (mat) <mat@odoo.com>
---
addons/pos_mercury/views/pos_config_setting_views.xml | 2 +-
addons/pos_mercury/views/pos_config_views.xml | 7 +------
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/addons/pos_mercury/views/pos_config_setting_views.xml b/addons/pos_mercury/views/pos_config_setting_views.xml
index cc92de56eea5..1e0e6f48eae9 100644
--- a/addons/pos_mercury/views/pos_config_setting_views.xml
+++ b/addons/pos_mercury/views/pos_config_setting_views.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
- <record id="res_config_view_form_inherit_pos_mercury" model="ir.ui.view">
+ <record id="res_config_settings_view_form_inherit_pos_mercury" model="ir.ui.view">
<field name="name">res.config.form.inherit.mercury</field>
<field name="model">res.config.settings</field>
<field name="inherit_id" ref="point_of_sale.res_config_settings_view_form"/>
diff --git a/addons/pos_mercury/views/pos_config_views.xml b/addons/pos_mercury/views/pos_config_views.xml
index 5fd9becf8813..06f292fc792e 100644
--- a/addons/pos_mercury/views/pos_config_views.xml
+++ b/addons/pos_mercury/views/pos_config_views.xml
@@ -1,11 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
- <!-- TODO the inherit for
- point_of_sale.res_config_settings_view_form in this module
- uses the pos_config_view_form_inherit_pos_mercury xml id
- already. It should be renamed to
- res_config_settings_view_form_inherit_pos_mercury. -->
- <record id="pos_config_view_form_inherit_pos_mercury_2" model="ir.ui.view">
+ <record id="pos_config_view_form_inherit_pos_mercury" model="ir.ui.view">
<field name="name">pos.config.form.view.inherit.mercury</field>
<field name="model">pos.config</field>
<field name="inherit_id" ref="point_of_sale.pos_config_view_form"/>
--
GitLab