From d72346df0216a1627e2b3651a8abc302cee321fa Mon Sep 17 00:00:00 2001
From: Yannick Tivisse <yti@odoo.com>
Date: Wed, 4 May 2016 14:29:12 +0200
Subject: [PATCH] [MOV] report_intrastat: Restructured files matching new api
 guidelines

---
 addons/report_intrastat/__init__.py                       | 3 ++-
 addons/report_intrastat/__openerp__.py                    | 8 ++++----
 .../report_intrastat/{ => data}/report_intrastat_data.xml | 0
 addons/report_intrastat/models/__init__.py                | 4 ++++
 addons/report_intrastat/{ => models}/report_intrastat.py  | 0
 addons/report_intrastat/report/__init__.py                | 4 ++++
 .../report_intrastat_invoice_template.xml}                | 0
 addons/report_intrastat/report/report_intrastat_report.py | 0
 .../report_intrastat_report.xml}                          | 0
 .../report_intrastat_views.xml}                           | 0
 10 files changed, 14 insertions(+), 5 deletions(-)
 rename addons/report_intrastat/{ => data}/report_intrastat_data.xml (100%)
 create mode 100644 addons/report_intrastat/models/__init__.py
 rename addons/report_intrastat/{ => models}/report_intrastat.py (100%)
 create mode 100644 addons/report_intrastat/report/__init__.py
 rename addons/report_intrastat/{views/report_intrastatinvoice.xml => report/report_intrastat_invoice_template.xml} (100%)
 create mode 100644 addons/report_intrastat/report/report_intrastat_report.py
 rename addons/report_intrastat/{intrastat_report.xml => report/report_intrastat_report.xml} (100%)
 rename addons/report_intrastat/{report_intrastat_view.xml => views/report_intrastat_views.xml} (100%)

diff --git a/addons/report_intrastat/__init__.py b/addons/report_intrastat/__init__.py
index cf695e10a9b..c2abfbdfea8 100644
--- a/addons/report_intrastat/__init__.py
+++ b/addons/report_intrastat/__init__.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-import report_intrastat
+import models
+import report
\ No newline at end of file
diff --git a/addons/report_intrastat/__openerp__.py b/addons/report_intrastat/__openerp__.py
index 9bd64e5ec8e..d6cdaee5f04 100644
--- a/addons/report_intrastat/__openerp__.py
+++ b/addons/report_intrastat/__openerp__.py
@@ -13,12 +13,12 @@ This module gives the details of the goods traded between the countries of
 European Union.""",
     'depends': ['base', 'product', 'delivery', 'stock', 'sale', 'purchase'],
     'data': [
+        'data/report_intrastat_data.xml',
+        'report/report_intrastat_invoice_template.xml',
+        'report/report_intrastat_report.xml',
         'security/ir.model.access.csv',
         'security/report_intrastat_security.xml',
-        'report_intrastat_view.xml',
-        'intrastat_report.xml',
-        'report_intrastat_data.xml',
-        'views/report_intrastatinvoice.xml',
+        'views/report_intrastat_views.xml',
     ],
     'demo': [],
     'test': ['../account/test/account_minimal_test.xml', 'test/report_intrastat_report.yml'],
diff --git a/addons/report_intrastat/report_intrastat_data.xml b/addons/report_intrastat/data/report_intrastat_data.xml
similarity index 100%
rename from addons/report_intrastat/report_intrastat_data.xml
rename to addons/report_intrastat/data/report_intrastat_data.xml
diff --git a/addons/report_intrastat/models/__init__.py b/addons/report_intrastat/models/__init__.py
new file mode 100644
index 00000000000..c19bfaae61f
--- /dev/null
+++ b/addons/report_intrastat/models/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import report_intrastat
\ No newline at end of file
diff --git a/addons/report_intrastat/report_intrastat.py b/addons/report_intrastat/models/report_intrastat.py
similarity index 100%
rename from addons/report_intrastat/report_intrastat.py
rename to addons/report_intrastat/models/report_intrastat.py
diff --git a/addons/report_intrastat/report/__init__.py b/addons/report_intrastat/report/__init__.py
new file mode 100644
index 00000000000..85ca75b5d4c
--- /dev/null
+++ b/addons/report_intrastat/report/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import report_intrastat_report
diff --git a/addons/report_intrastat/views/report_intrastatinvoice.xml b/addons/report_intrastat/report/report_intrastat_invoice_template.xml
similarity index 100%
rename from addons/report_intrastat/views/report_intrastatinvoice.xml
rename to addons/report_intrastat/report/report_intrastat_invoice_template.xml
diff --git a/addons/report_intrastat/report/report_intrastat_report.py b/addons/report_intrastat/report/report_intrastat_report.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/addons/report_intrastat/intrastat_report.xml b/addons/report_intrastat/report/report_intrastat_report.xml
similarity index 100%
rename from addons/report_intrastat/intrastat_report.xml
rename to addons/report_intrastat/report/report_intrastat_report.xml
diff --git a/addons/report_intrastat/report_intrastat_view.xml b/addons/report_intrastat/views/report_intrastat_views.xml
similarity index 100%
rename from addons/report_intrastat/report_intrastat_view.xml
rename to addons/report_intrastat/views/report_intrastat_views.xml