From 42992965d296631d1074c39c1ffe4a5aad54898a Mon Sep 17 00:00:00 2001
From: Daniel Reis <dgreis@sapo.pt>
Date: Fri, 8 Jun 2018 13:05:10 +0100
Subject: [PATCH] Port to 10.0

---
 .travis.yml                                 | 2 +-
 oca_dependencies.txt                        | 2 --
 privacy/{__openerp__.py => __manifest__.py} | 2 +-
 privacy/security/data_protection.xml        | 4 ++--
 privacy/views/data_protection_menu_view.xml | 6 +++---
 5 files changed, 7 insertions(+), 9 deletions(-)
 rename privacy/{__openerp__.py => __manifest__.py} (95%)

diff --git a/.travis.yml b/.travis.yml
index d7d7966..a1004cd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,7 @@ addons:
 
 env:
   global:
-  - VERSION="9.0" TESTS="0" LINT_CHECK="0" TRANSIFEX="0"
+  - VERSION="10.0" TESTS="0" LINT_CHECK="0" TRANSIFEX="0"
   - PHANTOMJS_VERSION="latest"
   - WEBSITE_REPO="1"
   - TRANSIFEX_USER='transbot@odoo-community.org'
diff --git a/oca_dependencies.txt b/oca_dependencies.txt
index 7b65fee..480d897 100644
--- a/oca_dependencies.txt
+++ b/oca_dependencies.txt
@@ -2,5 +2,3 @@
 # Add a repository url and branch if you need a forked version
 #
 reporting-engine
-# https://github.com/OCA/OCB/pull/753
-odoo https://github.com/Eficent/odoo 9.0-fix-web_controller_report_datas2data
diff --git a/privacy/__openerp__.py b/privacy/__manifest__.py
similarity index 95%
rename from privacy/__openerp__.py
rename to privacy/__manifest__.py
index d4268c6..1bffddb 100644
--- a/privacy/__openerp__.py
+++ b/privacy/__manifest__.py
@@ -3,7 +3,7 @@
 # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
 {
     'name': 'Data Privacy and Protection',
-    'version': '9.0.1.0.0',
+    'version': '10.0.1.0.0',
     'category': 'Data Protection',
     'summary': 'Provides data privacy and protection features '
                'to comply to regulations, such as GDPR.',
diff --git a/privacy/security/data_protection.xml b/privacy/security/data_protection.xml
index cab31f5..41fffe7 100644
--- a/privacy/security/data_protection.xml
+++ b/privacy/security/data_protection.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2018 Eficent Business and IT Consulting Services S.L.
      License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl-3.0) -->
-<openerp>
+<odoo>
     <data noupdate="0">
 
         <record model="ir.module.category" id="module_category_data_protection">
@@ -22,4 +22,4 @@
         </record>
 
     </data>
-</openerp>
+</odoo>
diff --git a/privacy/views/data_protection_menu_view.xml b/privacy/views/data_protection_menu_view.xml
index 461dcba..56e892a 100644
--- a/privacy/views/data_protection_menu_view.xml
+++ b/privacy/views/data_protection_menu_view.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2018 Eficent Business and IT Consulting Services S.L.
      License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl-3.0) -->
-<openerp>
+<odoo>
 <data>
 
     <record id="action_data_protection_partner_form" model="ir.actions.act_window">
@@ -52,4 +52,4 @@
     />
 
 </data>
-</openerp>
+</odoo>