From ecc9b144707e3c03c74163da30e60fa44c96ddf4 Mon Sep 17 00:00:00 2001
From: "Denis Vermylen (dve)" <dve@odoo.com>
Date: Tue, 12 Jul 2016 17:08:23 +0200
Subject: [PATCH 1/2] [MOV] account_cancel: reorganize files according to
 guidelines

---
 addons/account_cancel/__openerp__.py                          | 4 ++--
 .../{account_cancel_view.xml => views/account_views.xml}      | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename addons/account_cancel/{account_cancel_view.xml => views/account_views.xml} (100%)

diff --git a/addons/account_cancel/__openerp__.py b/addons/account_cancel/__openerp__.py
index 9dbb9b08884..2f307784413 100644
--- a/addons/account_cancel/__openerp__.py
+++ b/addons/account_cancel/__openerp__.py
@@ -13,8 +13,8 @@ This module adds 'Allow Canceling Entries' field on form view of account journal
 If set to true it allows user to cancel entries & invoices.
     """,
     'website': 'https://www.odoo.com/page/accounting',
-    'depends' : ['account'],
-    'data': ['account_cancel_view.xml' ],
+    'depends': ['account'],
+    'data': ['views/account_views.xml'],
     'demo': [],
     'installable': True,
     'auto_install': False,
diff --git a/addons/account_cancel/account_cancel_view.xml b/addons/account_cancel/views/account_views.xml
similarity index 100%
rename from addons/account_cancel/account_cancel_view.xml
rename to addons/account_cancel/views/account_views.xml

From 153c7dcfa4aba9b43d5b9eff642a3a670d3b09ed Mon Sep 17 00:00:00 2001
From: "Denis Vermylen (dve)" <dve@odoo.com>
Date: Tue, 12 Jul 2016 17:09:50 +0200
Subject: [PATCH 2/2] [IMP] account_cancel: clean imports, openerp tags and
 correct exceptions

---
 addons/account_cancel/models/account_bank_statement.py | 6 +++---
 addons/account_cancel/views/account_views.xml          | 9 +++------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/addons/account_cancel/models/account_bank_statement.py b/addons/account_cancel/models/account_bank_statement.py
index b1461dc9bb0..c671d1ee566 100644
--- a/addons/account_cancel/models/account_bank_statement.py
+++ b/addons/account_cancel/models/account_bank_statement.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from openerp import models, api, _
-from openerp.exceptions import Warning
+from odoo import models, api, _
+from odoo.exceptions import UserError
 
 
 class BankStatement(models.Model):
@@ -25,5 +25,5 @@ class BankStatementLine(models.Model):
         if not self.env.context.get('bank_statement_cancel'):
             for line in self:
                 if line.statement_id.state == 'confirm':
-                    raise Warning(_("Please set the bank statement to New before canceling."))
+                    raise UserError(_("Please set the bank statement to New before canceling."))
         return super(BankStatementLine, self).cancel()
diff --git a/addons/account_cancel/views/account_views.xml b/addons/account_cancel/views/account_views.xml
index 017f5a24832..550cee2dd6f 100644
--- a/addons/account_cancel/views/account_views.xml
+++ b/addons/account_cancel/views/account_views.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
         <record id="view_account_journal_form_inherit" model="ir.ui.view">
             <field name="name">account.journal.form</field>
             <field name="model">account.journal</field>
@@ -69,6 +68,4 @@
                 </xpath>
             </field>
         </record>
-
-    </data>
-</openerp>
+</odoo>