From bdd0491fb242b6f8b8844d5ae66c9936b31ef41e Mon Sep 17 00:00:00 2001
From: "Jacky (trj)" <trj@odoo.com>
Date: Tue, 22 Jun 2021 15:50:35 +0000
Subject: [PATCH] [REF] l10n_de: move `l10n_de_stnr` and `l10n_de_widnr` from
 `l10n_de_pos_cert` module

These fields are more relevant in the German localization rather than the German POS localization

closes odoo/odoo#72590

Related: odoo/enterprise#19183
Signed-off-by: pimodoo <pimodoo@users.noreply.github.com>
---
 addons/l10n_de/models/res_company.py       | 3 ++-
 addons/l10n_de/views/res_company_views.xml | 9 ++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/l10n_de/models/res_company.py b/addons/l10n_de/models/res_company.py
index 61f37fe25db..7e5d6d04147 100644
--- a/addons/l10n_de/models/res_company.py
+++ b/addons/l10n_de/models/res_company.py
@@ -7,4 +7,5 @@ from odoo import models, fields
 class ResCompany(models.Model):
     _inherit = 'res.company'
 
-    l10n_de_nat_tax_nb = fields.Char(string="National Tax ID")  # This is not the vat
+    l10n_de_stnr = fields.Char(string="St.-Nr.", help="Steuernummer. Scheme: ??FF0BBBUUUUP, e.g.: 2893081508152 https://de.wikipedia.org/wiki/Steuernummer")
+    l10n_de_widnr = fields.Char(string="W-IdNr.", help="Wirtschafts-Identifikationsnummer.")
diff --git a/addons/l10n_de/views/res_company_views.xml b/addons/l10n_de/views/res_company_views.xml
index e156470f279..5642baf3563 100644
--- a/addons/l10n_de/views/res_company_views.xml
+++ b/addons/l10n_de/views/res_company_views.xml
@@ -5,11 +5,10 @@
             <field name="model">res.company</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-            <data>
-                 <xpath expr="//field[@name='vat']" position="after">
-                    <field name="l10n_de_nat_tax_nb" attrs="{'invisible':[('country_code', '!=', 'DE')]}"/>
-                 </xpath>
-            </data>
+                <field name="vat" position="after">
+                    <field name="l10n_de_stnr" attrs="{'invisible':[('country_code', '!=', 'DE')]}"/>
+                    <field name="l10n_de_widnr" attrs="{'invisible':[('country_code', '!=', 'DE')]}"/>
+                </field>
             </field>
         </record>
 </odoo>