From 62a1c97d37fbf6c61cd64187bf6b33342e021316 Mon Sep 17 00:00:00 2001
From: "Denis Vermylen (dve)" <dve@odoo.com>
Date: Mon, 1 Aug 2016 09:59:43 +0200
Subject: [PATCH] [MIG] account_asset: Migrate to new API

---
 addons/account_asset/__init__.py                      |  1 +
 addons/account_asset/__openerp__.py                   |  8 +-------
 addons/account_asset/models/account.py                |  1 +
 addons/account_asset/models/account_asset.py          |  7 ++++---
 addons/account_asset/models/account_invoice.py        | 11 +++++------
 addons/account_asset/models/product.py                |  1 +
 addons/account_asset/report/__init__.py               |  1 +
 addons/account_asset/report/account_asset_report.py   | 10 ++++++----
 addons/account_asset/test/account_asset_demo_test.xml |  2 +-
 addons/account_asset/tests/__init__.py                |  3 +--
 addons/account_asset/tests/test_account_asset.py      |  9 +++++----
 addons/account_asset/views/account_asset_views.xml    |  1 +
 addons/account_asset/views/account_invoice_views.xml  |  2 +-
 addons/account_asset/wizard/__init__.py               |  1 +
 .../wizard/asset_depreciation_confirmation_wizard.py  |  4 +++-
 addons/account_asset/wizard/asset_modify.py           |  8 +++++---
 16 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/addons/account_asset/__init__.py b/addons/account_asset/__init__.py
index ee052fe0c50..8f7bf4b27dd 100644
--- a/addons/account_asset/__init__.py
+++ b/addons/account_asset/__init__.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 import models
 import wizard
diff --git a/addons/account_asset/__openerp__.py b/addons/account_asset/__openerp__.py
index 5ec4d3e4c65..20737a9887f 100644
--- a/addons/account_asset/__openerp__.py
+++ b/addons/account_asset/__openerp__.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Assets Management',
-    'version': '1.0',
     'depends': ['account_accountant'],
     'description': """
 Assets management
@@ -17,10 +17,6 @@ Keeps track of depreciations, and creates corresponding journal entries.
     'demo': [
         'data/account_asset_demo.yml',
     ],
-    # 'test': [
-    #     '../account/test/account_minimal_test.xml',
-    #     'test/account_asset_demo_test.xml',
-    # ],
     'data': [
         'security/account_asset_security.xml',
         'security/ir.model.access.csv',
@@ -36,6 +32,4 @@ Keeps track of depreciations, and creates corresponding journal entries.
     'qweb': [
         "static/src/xml/account_asset_template.xml",
     ],
-    'installable': True,
-    'application': False,
 }
diff --git a/addons/account_asset/models/account.py b/addons/account_asset/models/account.py
index f2ee6075f74..a0e7f76d459 100644
--- a/addons/account_asset/models/account.py
+++ b/addons/account_asset/models/account.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from openerp import api, fields, models
 
diff --git a/addons/account_asset/models/account_asset.py b/addons/account_asset/models/account_asset.py
index 1587731342b..e681f5ac37d 100644
--- a/addons/account_asset/models/account_asset.py
+++ b/addons/account_asset/models/account_asset.py
@@ -1,11 +1,12 @@
 # -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from datetime import date, datetime
 from dateutil.relativedelta import relativedelta
 
-from openerp import api, fields, models, _
-from openerp.exceptions import UserError, ValidationError
-from openerp.tools import DEFAULT_SERVER_DATE_FORMAT as DF
+from odoo import api, fields, models, _
+from odoo.exceptions import UserError, ValidationError
+from odoo.tools import DEFAULT_SERVER_DATE_FORMAT as DF
 
 
 class AccountAssetCategory(models.Model):
diff --git a/addons/account_asset/models/account_invoice.py b/addons/account_asset/models/account_invoice.py
index c188260e33c..7f4782dfb25 100644
--- a/addons/account_asset/models/account_invoice.py
+++ b/addons/account_asset/models/account_invoice.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
-from openerp import api, fields, models
-from openerp.exceptions import Warning
-from openerp.tools.translate import _
-import openerp.addons.decimal_precision as dp
-from openerp.tools import DEFAULT_SERVER_DATE_FORMAT as DF
+from odoo import api, fields, models
+from odoo.tools import DEFAULT_SERVER_DATE_FORMAT as DF
+
+import odoo.addons.decimal_precision as dp
 
 
 class AccountInvoice(models.Model):
@@ -85,7 +85,6 @@ class AccountInvoiceLine(models.Model):
         self.onchange_asset_category_id()
         return result
 
-
     @api.onchange('product_id')
     def _onchange_product_id(self):
         vals = super(AccountInvoiceLine, self)._onchange_product_id()
diff --git a/addons/account_asset/models/product.py b/addons/account_asset/models/product.py
index 10177f4f37d..42472f88e5d 100644
--- a/addons/account_asset/models/product.py
+++ b/addons/account_asset/models/product.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from openerp import api, fields, models
 
diff --git a/addons/account_asset/report/__init__.py b/addons/account_asset/report/__init__.py
index c60e4c9e043..8f70e34da0e 100644
--- a/addons/account_asset/report/__init__.py
+++ b/addons/account_asset/report/__init__.py
@@ -1,3 +1,4 @@
 # -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 import account_asset_report
diff --git a/addons/account_asset/report/account_asset_report.py b/addons/account_asset/report/account_asset_report.py
index 1cafe349079..d743f64c6fb 100644
--- a/addons/account_asset/report/account_asset_report.py
+++ b/addons/account_asset/report/account_asset_report.py
@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
-from openerp import fields, models, tools
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import api, fields, models
 
 
 class AssetAssetReport(models.Model):
@@ -24,9 +26,9 @@ class AssetAssetReport(models.Model):
     unposted_value = fields.Float(string='Unposted Amount', readonly=True)
     company_id = fields.Many2one('res.company', string='Company', readonly=True)
 
-    def init(self, cr):
-        tools.drop_view_if_exists(cr, 'asset_asset_report')
-        cr.execute("""
+    @api.model_cr
+    def init(self):
+        self._cr.execute("""
             create or replace view asset_asset_report as (
                 select
                     min(dl.id) as id,
diff --git a/addons/account_asset/test/account_asset_demo_test.xml b/addons/account_asset/test/account_asset_demo_test.xml
index c85a45707cd..c9e85df7323 100644
--- a/addons/account_asset/test/account_asset_demo_test.xml
+++ b/addons/account_asset/test/account_asset_demo_test.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data noupdate="1">
         <!-- 
diff --git a/addons/account_asset/tests/__init__.py b/addons/account_asset/tests/__init__.py
index 054eb7df4fe..66d50ad458c 100644
--- a/addons/account_asset/tests/__init__.py
+++ b/addons/account_asset/tests/__init__.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-#
-##############################################################################
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from . import test_account_asset
diff --git a/addons/account_asset/tests/test_account_asset.py b/addons/account_asset/tests/test_account_asset.py
index 0027c6db815..8ef0bf56ef9 100644
--- a/addons/account_asset/tests/test_account_asset.py
+++ b/addons/account_asset/tests/test_account_asset.py
@@ -1,15 +1,16 @@
 # -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from openerp import tools
-from openerp.tests import common
-from openerp.modules.module import get_module_resource
+from odoo import tools
+from odoo.tests import common
+from odoo.modules.module import get_resource_path
 
 
 class TestAccountAsset(common.TransactionCase):
 
     def _load(self, module, *args):
         tools.convert_file(self.cr, 'account_asset',
-                           get_module_resource(module, *args),
+                           get_resource_path(module, *args),
                            {}, 'init', False, 'test', self.registry._assertion_report)
 
     def test_00_account_asset_asset(self):
diff --git a/addons/account_asset/views/account_asset_views.xml b/addons/account_asset/views/account_asset_views.xml
index 1a54a50880a..5dbfb2b9f1b 100644
--- a/addons/account_asset/views/account_asset_views.xml
+++ b/addons/account_asset/views/account_asset_views.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
     <!--
diff --git a/addons/account_asset/views/account_invoice_views.xml b/addons/account_asset/views/account_invoice_views.xml
index aebd076638d..a4055631d01 100644
--- a/addons/account_asset/views/account_invoice_views.xml
+++ b/addons/account_asset/views/account_invoice_views.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
     <!-- Add "Asset Category" to supplier invoices -->
diff --git a/addons/account_asset/wizard/__init__.py b/addons/account_asset/wizard/__init__.py
index 21a4fb76a53..e793ab075f7 100644
--- a/addons/account_asset/wizard/__init__.py
+++ b/addons/account_asset/wizard/__init__.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 import asset_depreciation_confirmation_wizard
 import asset_modify
diff --git a/addons/account_asset/wizard/asset_depreciation_confirmation_wizard.py b/addons/account_asset/wizard/asset_depreciation_confirmation_wizard.py
index a7925dc4475..00b3fd3e36e 100644
--- a/addons/account_asset/wizard/asset_depreciation_confirmation_wizard.py
+++ b/addons/account_asset/wizard/asset_depreciation_confirmation_wizard.py
@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
-from openerp import api, fields, models, _
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import api, fields, models, _
 
 
 class AssetDepreciationConfirmationWizard(models.TransientModel):
diff --git a/addons/account_asset/wizard/asset_modify.py b/addons/account_asset/wizard/asset_modify.py
index 8b5f2d06d78..9f8ce7cd497 100644
--- a/addons/account_asset/wizard/asset_modify.py
+++ b/addons/account_asset/wizard/asset_modify.py
@@ -1,9 +1,11 @@
 # -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
 from lxml import etree
 
-from openerp import api, fields, models
-from openerp.osv.orm import setup_modifiers
-from openerp.tools.translate import _
+from odoo import api, fields, models, _
+from odoo.osv.orm import setup_modifiers
+
 
 class AssetModify(models.TransientModel):
     _name = 'asset.modify'