From d28e8446daf8710d3a04c9ebc18ecbf61a1665ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Maes?= Date: Tue, 12 Jul 2016 13:30:22 +0200 Subject: [PATCH] [MIG] website_portal*: migration to new api Those modules were almost already migrated, this commit simply modified the import and the xml tags. --- addons/website_portal/__init__.py | 5 ++++- addons/website_portal/__openerp__.py | 3 +++ addons/website_portal/controllers/__init__.py | 5 ++++- addons/website_portal/controllers/main.py | 10 ++++++---- addons/website_portal_sale/__openerp__.py | 3 +++ addons/website_portal_sale/controllers/__init__.py | 3 +++ addons/website_portal_sale/controllers/main.py | 10 ++++++---- addons/website_portal_sale/models/sale_order.py | 7 ++++--- 8 files changed, 33 insertions(+), 13 deletions(-) diff --git a/addons/website_portal/__init__.py b/addons/website_portal/__init__.py index 355939a4922..bf7fb7b45c1 100644 --- a/addons/website_portal/__init__.py +++ b/addons/website_portal/__init__.py @@ -1 +1,4 @@ -import controllers \ No newline at end of file +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +import controllers diff --git a/addons/website_portal/__openerp__.py b/addons/website_portal/__openerp__.py index ae53ba0da3d..4d23e896a84 100644 --- a/addons/website_portal/__openerp__.py +++ b/addons/website_portal/__openerp__.py @@ -1,3 +1,6 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + { 'name': 'Website Portal', 'category': 'Website', diff --git a/addons/website_portal/controllers/__init__.py b/addons/website_portal/controllers/__init__.py index 039d9715fab..f48716d3a69 100644 --- a/addons/website_portal/controllers/__init__.py +++ b/addons/website_portal/controllers/__init__.py @@ -1 +1,4 @@ -import main \ No newline at end of file +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +import main diff --git a/addons/website_portal/controllers/main.py b/addons/website_portal/controllers/main.py index c6ab3c74923..1b4464ac331 100644 --- a/addons/website_portal/controllers/main.py +++ b/addons/website_portal/controllers/main.py @@ -1,8 +1,10 @@ # -*- coding: utf-8 -*- -from openerp import http -from openerp.http import request -from openerp import tools -from openerp.tools.translate import _ +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from odoo import http +from odoo.http import request +from odoo import tools +from odoo.tools.translate import _ from odoo.fields import Date diff --git a/addons/website_portal_sale/__openerp__.py b/addons/website_portal_sale/__openerp__.py index 7505963a917..c2b2263bc45 100644 --- a/addons/website_portal_sale/__openerp__.py +++ b/addons/website_portal_sale/__openerp__.py @@ -1,3 +1,6 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + { 'name': 'Website Portal for Sales', 'category': 'Website', diff --git a/addons/website_portal_sale/controllers/__init__.py b/addons/website_portal_sale/controllers/__init__.py index 8ee9bae18d9..f48716d3a69 100644 --- a/addons/website_portal_sale/controllers/__init__.py +++ b/addons/website_portal_sale/controllers/__init__.py @@ -1 +1,4 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + import main diff --git a/addons/website_portal_sale/controllers/main.py b/addons/website_portal_sale/controllers/main.py index 11da77648ea..44cb91bb4bc 100644 --- a/addons/website_portal_sale/controllers/main.py +++ b/addons/website_portal_sale/controllers/main.py @@ -1,11 +1,13 @@ # -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + import datetime -from openerp import http -from openerp.exceptions import AccessError -from openerp.http import request +from odoo import http +from odoo.exceptions import AccessError +from odoo.http import request -from openerp.addons.website_portal.controllers.main import website_account +from odoo.addons.website_portal.controllers.main import website_account class website_account(website_account): diff --git a/addons/website_portal_sale/models/sale_order.py b/addons/website_portal_sale/models/sale_order.py index b3d752f2396..838ef131cb7 100644 --- a/addons/website_portal_sale/models/sale_order.py +++ b/addons/website_portal_sale/models/sale_order.py @@ -1,10 +1,11 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from openerp import api, models +from odoo import api, models -class sale_order(models.Model): +class SaleOrder(models.Model): + _inherit = 'sale.order' @api.multi @@ -13,7 +14,7 @@ class sale_order(models.Model): of the classic form view, redirect to the online quote if exists. """ self.ensure_one() if self.state in ['draft', 'cancel']: - return super(sale_order, self).get_access_action() + return super(SaleOrder, self).get_access_action() return { 'type': 'ir.actions.act_url', 'url': '/my/orders/%s' % self.id,