From e722bcf08d848b3db598b6795d69c70e7b6e7552 Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis@via.ecp.fr>
Date: Fri, 4 Jul 2014 00:15:06 +0200
Subject: [PATCH] Continue the work on port to v8.0

---
 intrastat_base/company_view.xml | 2 +-
 intrastat_base/country_view.xml | 7 +++----
 intrastat_base/product_view.xml | 2 +-
 intrastat_base/tax_view.xml     | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/intrastat_base/company_view.xml b/intrastat_base/company_view.xml
index 14cf1fe..650d492 100644
--- a/intrastat_base/company_view.xml
+++ b/intrastat_base/company_view.xml
@@ -9,7 +9,7 @@
 <openerp>
 <data>
 
-<record id="intrastat_company_form" model="ir.ui.view">
+<record id="view_company_form" model="ir.ui.view">
     <field name="name">intrastat.company.form</field>
     <field name="model">res.company</field>
     <field name="inherit_id" ref="base.view_company_form" />
diff --git a/intrastat_base/country_view.xml b/intrastat_base/country_view.xml
index 2177dbb..a8c9da2 100644
--- a/intrastat_base/country_view.xml
+++ b/intrastat_base/country_view.xml
@@ -9,7 +9,7 @@
 <data>
 
 <!-- Add intrastat field on res_country -->
-<record id="intrastat_base_country_tree" model="ir.ui.view">
+<record id="view_country_tree" model="ir.ui.view">
     <field name="name">intrastat.base.country.tree</field>
     <field name="model">res.country</field>
     <field name="inherit_id" ref="base.view_country_tree" />
@@ -20,7 +20,7 @@
     </field>
 </record>
 
-<record id="intrastat_base_country_form" model="ir.ui.view">
+<record id="view_country_form" model="ir.ui.view">
     <field name="name">intrastat.base.country.form</field>
     <field name="model">res.country</field>
     <field name="inherit_id" ref="base.view_country_form" />
@@ -32,7 +32,7 @@
 </record>
 
 <!-- there is no native search view, so I can't inherit -->
-<record id="intrastat_base_country_search" model="ir.ui.view">
+<record id="view_country_search" model="ir.ui.view">
     <field name="name">intrastat.base.country.search</field>
     <field name="model">res.country</field>
     <field name="arch" type="xml">
@@ -46,6 +46,5 @@
 </record>
 
 
-
 </data>
 </openerp>
diff --git a/intrastat_base/product_view.xml b/intrastat_base/product_view.xml
index a79da20..dc61ca5 100644
--- a/intrastat_base/product_view.xml
+++ b/intrastat_base/product_view.xml
@@ -9,7 +9,7 @@
 <openerp>
 <data>
 
-<record id="intrastat_base_product_template_form" model="ir.ui.view">
+<record id="product_template_form_view" model="ir.ui.view">
     <field name="name">intrastat.base.product.template.form</field>
     <field name="model">product.template</field>
     <field name="inherit_id" ref="account.product_template_form_view"/>
diff --git a/intrastat_base/tax_view.xml b/intrastat_base/tax_view.xml
index c481490..e927aa5 100644
--- a/intrastat_base/tax_view.xml
+++ b/intrastat_base/tax_view.xml
@@ -10,7 +10,7 @@
 <data>
 
 <!-- Add 'exclude_from_intrastat_if_present' on tax form view -->
-<record id="intrastat_base_tax" model="ir.ui.view">
+<record id="view_tax_form" model="ir.ui.view">
     <field name="name">intrastat.base.tax</field>
     <field name="model">account.tax</field>
     <field name="type">form</field>