[MIG] website_crm : migration to new api

8 files changed, 38 insertions, 22 deletions

diff --git a/addons/website_crm/__init__.py b/addons/website_crm/__init__.py
index 9f86759e32b..ac0011716f6 100644
--- a/addons/website_crm/__init__.py
+++ b/addons/website_crm/__init__.py
@@ -1,2 +1,5 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
 import controllers
 import models
diff --git a/addons/website_crm/controllers/main.py b/addons/website_crm/controllers/main.py
index aa52154ac2b..fd13143975a 100644
--- a/addons/website_crm/controllers/main.py
+++ b/addons/website_crm/controllers/main.py
@@ -1,15 +1,14 @@
 # -*- coding: utf-8 -*-
-from openerp import http
-from openerp.http import request
-from dateutil.relativedelta import relativedelta
-from datetime import datetime, date, timedelta
-from math import floor
-import time
-import operator
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
 import babel
+from datetime import datetime, timedelta
+
+from odoo import http
+from odoo.http import request
 
-from openerp.addons.website.controllers.backend import WebsiteBackend
-from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT, DEFAULT_SERVER_DATE_FORMAT
+from odoo.addons.website.controllers.backend import WebsiteBackend
+from odoo.tools import DEFAULT_SERVER_DATETIME_FORMAT, DEFAULT_SERVER_DATE_FORMAT
 
 
 class WebsiteCrmBackend(WebsiteBackend):
diff --git a/addons/website_crm/data/website_crm_data.xml b/addons/website_crm/data/website_crm_data.xml
index 5604d8bc9b6..66ac5d58151 100644
--- a/addons/website_crm/data/website_crm_data.xml
+++ b/addons/website_crm/data/website_crm_data.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
+<odoo>
     <data>
-        <record id="crm.model_crm_lead" model="ir.model">         
+        <record id="crm.model_crm_lead" model="ir.model">
             <field name="website_form_default_field_id" ref="crm.field_crm_lead_description" />
             <field name="website_form_access">True</field>
             <field name="website_form_label">Create a lead</field>
@@ -36,4 +36,4 @@
             <field name="use_opportunities" eval="False"/>
         </record>
     </data>
-</openerp>
+</odoo>
diff --git a/addons/website_crm/models/__init__.py b/addons/website_crm/models/__init__.py
index 4970d37d01b..f1e958daae0 100644
--- a/addons/website_crm/models/__init__.py
+++ b/addons/website_crm/models/__init__.py
@@ -1 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
 import crm_lead
diff --git a/addons/website_crm/models/crm_lead.py b/addons/website_crm/models/crm_lead.py
index b9b29aa37ab..54cfd76f361 100644
--- a/addons/website_crm/models/crm_lead.py
+++ b/addons/website_crm/models/crm_lead.py
@@ -1,4 +1,8 @@
-from openerp import models, SUPERUSER_ID
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import models
+
 
 class Lead(models.Model):
     _inherit = 'crm.lead'
diff --git a/addons/website_crm/tests/__init__.py b/addons/website_crm/tests/__init__.py
index 7c1af2a6172..cbbefc2a128 100644
--- a/addons/website_crm/tests/__init__.py
+++ b/addons/website_crm/tests/__init__.py
@@ -1 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
 import test_website_crm
diff --git a/addons/website_crm/tests/test_website_crm.py b/addons/website_crm/tests/test_website_crm.py
index d97cee5f55d..3d1c85856a8 100644
--- a/addons/website_crm/tests/test_website_crm.py
+++ b/addons/website_crm/tests/test_website_crm.py
@@ -1,8 +1,14 @@
-from openerp.api import Environment
-import openerp.tests
-@openerp.tests.common.at_install(False)
-@openerp.tests.common.post_install(True)
-class TestWebsiteCrm(openerp.tests.HttpCase):
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo.api import Environment
+import odoo.tests
+
+
+@odoo.tests.common.at_install(False)
+@odoo.tests.common.post_install(True)
+class TestWebsiteCrm(odoo.tests.HttpCase):
+
     def test_tour(self):
         self.phantom_js("/", "odoo.__DEBUG__.services['web.Tour'].run('website_crm_tour', 'test')", "odoo.__DEBUG__.services['web.Tour'].tours.website_crm_tour")
 
diff --git a/addons/website_crm/views/website_crm_templates.xml b/addons/website_crm/views/website_crm_templates.xml
index 0fd6f6bd562..fa31d68e6d8 100644
--- a/addons/website_crm/views/website_crm_templates.xml
+++ b/addons/website_crm/views/website_crm_templates.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
+<odoo>
         <template id="contactus_form" name="Contact Form" inherit_id="website.contactus" customize_show="True">
             <xpath expr="//div[@name='mail_button']" position="replace">
                 <div>
@@ -97,5 +96,4 @@
           </xpath>
         </template>
 
-    </data>
-</openerp>
+</odoo>