From 73f56875ab013ca84d1cbc76ee73da1b34a3dc4a Mon Sep 17 00:00:00 2001
From: Wolfgang Taferner <wtaferner@users.noreply.github.com>
Date: Tue, 5 May 2020 14:14:25 +0000
Subject: [PATCH] [FIX] base, l10n_at: address format, vat label and country
 states

Address format and vat label are not properly set for Austria and
country states are missing for localized needs.

closes odoo/odoo#51038

X-original-commit: 5f05e2f83a9ceebed1dac04ad9fd9f1791738c31
Signed-off-by: Martin Trigaux (mat) <mat@odoo.com>
---
 addons/l10n_at/__manifest__.py             |  1 +
 addons/l10n_at/data/res.country.state.csv  | 10 ++++++++++
 odoo/addons/base/data/res_country_data.xml |  3 ++-
 3 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 addons/l10n_at/data/res.country.state.csv

diff --git a/addons/l10n_at/__manifest__.py b/addons/l10n_at/__manifest__.py
index ccc6e8eb5f5..90e503fdc04 100644
--- a/addons/l10n_at/__manifest__.py
+++ b/addons/l10n_at/__manifest__.py
@@ -34,6 +34,7 @@ Austrian charts of accounts (Einheitskontenrahmen 2010).
         "base_vat",
     ],
     "data": [
+        'data/res.country.state.csv',
         'data/account_account_tag.xml',
         'data/account_account_template.xml',
         'data/account_chart_template.xml',
diff --git a/addons/l10n_at/data/res.country.state.csv b/addons/l10n_at/data/res.country.state.csv
new file mode 100644
index 00000000000..1c8d237f30f
--- /dev/null
+++ b/addons/l10n_at/data/res.country.state.csv
@@ -0,0 +1,10 @@
+"id","country_id:id","name","code"
+state_at_1,base.at,"Burgenland","1"
+state_at_2,base.at,"Kärnten","2"
+state_at_3,base.at,"Niederösterreich","3"
+state_at_4,base.at,"Oberösterreich","4"
+state_at_5,base.at,"Salzburg","5"
+state_at_6,base.at,"Steiermark","6"
+state_at_7,base.at,"Tirol","7"
+state_at_8,base.at,"Vorarlberg","8"
+state_at_9,base.at,"Wien","9"
diff --git a/odoo/addons/base/data/res_country_data.xml b/odoo/addons/base/data/res_country_data.xml
index 5b1a3149129..6f403db3b99 100644
--- a/odoo/addons/base/data/res_country_data.xml
+++ b/odoo/addons/base/data/res_country_data.xml
@@ -84,9 +84,10 @@
             <field name="name">Austria</field>
             <field name="code">at</field>
             <field file="base/static/img/country_flags/at.png" name="image" type="base64" />
+            <field eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" name="address_format" />
             <field name="currency_id" ref="EUR" />
             <field eval="43" name="phone_code" />
-            <field name="vat_label">VAT</field>
+            <field name="vat_label">USt</field>
         </record>
         <record id="au" model="res.country">
             <field name="name">Australia</field>