From bcb8d12b694214f28002107313d609cb4658781e Mon Sep 17 00:00:00 2001 From: Elouan Date: Mon, 9 Sep 2019 12:01:35 +0200 Subject: [PATCH] beesdoo_base module : migration to version 11.0 --- beesdoo_base/__init__.py | 7 +++---- beesdoo_base/__manifest__.py | 1 - beesdoo_base/controllers/__init__.py | 2 +- beesdoo_base/controllers/report.py | 5 ++--- beesdoo_base/models/__init__.py | 2 +- beesdoo_base/models/membercard.py | 1 - beesdoo_base/models/partner.py | 1 - beesdoo_base/report/beescard.xml | 2 +- beesdoo_base/wizard/__init__.py | 2 +- beesdoo_base/wizard/member_card.py | 1 - beesdoo_base/wizard/partner.py | 1 - 11 files changed, 9 insertions(+), 16 deletions(-) diff --git a/beesdoo_base/__init__.py b/beesdoo_base/__init__.py index eca5f1d..fab5aef 100644 --- a/beesdoo_base/__init__.py +++ b/beesdoo_base/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- -import models -import wizard -import controllers \ No newline at end of file +from . import models +from . import wizard +from . import controllers \ No newline at end of file diff --git a/beesdoo_base/__manifest__.py b/beesdoo_base/__manifest__.py index 8753643..0532140 100644 --- a/beesdoo_base/__manifest__.py +++ b/beesdoo_base/__manifest__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- { 'name': "Beescoop Base Module", diff --git a/beesdoo_base/controllers/__init__.py b/beesdoo_base/controllers/__init__.py index 097e4d2..3c21757 100644 --- a/beesdoo_base/controllers/__init__.py +++ b/beesdoo_base/controllers/__init__.py @@ -1 +1 @@ -import report \ No newline at end of file +from . import report \ No newline at end of file diff --git a/beesdoo_base/controllers/report.py b/beesdoo_base/controllers/report.py index 3a2c45a..db16d4b 100644 --- a/beesdoo_base/controllers/report.py +++ b/beesdoo_base/controllers/report.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. from odoo.addons.web.http import Controller, route, request @@ -42,7 +41,7 @@ class ReportCustom(ReportController): response = self.report_routes(reportname, docids=docids, converter='pdf') else: # Particular report: - data = url_decode(url.split('?')[1]).items() # decoding the args represented in JSON + data = list(url_decode(url.split('?')[1]).items()) # decoding the args represented in JSON response = self.report_routes(reportname, converter='pdf', **dict(data)) cr, uid = request.cr, request.uid @@ -63,7 +62,7 @@ class ReportCustom(ReportController): return response else: return - except Exception, e: + except Exception as e: se = _serialize_exception(e) error = { 'code': 200, diff --git a/beesdoo_base/models/__init__.py b/beesdoo_base/models/__init__.py index f95b336..0b8946f 100644 --- a/beesdoo_base/models/__init__.py +++ b/beesdoo_base/models/__init__.py @@ -1 +1 @@ -import partner, membercard \ No newline at end of file +from . import partner, membercard \ No newline at end of file diff --git a/beesdoo_base/models/membercard.py b/beesdoo_base/models/membercard.py index 243e5d8..6a91f38 100644 --- a/beesdoo_base/models/membercard.py +++ b/beesdoo_base/models/membercard.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from odoo import models, fields, api import uuid diff --git a/beesdoo_base/models/partner.py b/beesdoo_base/models/partner.py index 3409944..5e6470a 100644 --- a/beesdoo_base/models/partner.py +++ b/beesdoo_base/models/partner.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from odoo import models, fields, api, _ from odoo.exceptions import ValidationError diff --git a/beesdoo_base/report/beescard.xml b/beesdoo_base/report/beescard.xml index 34be32d..d32cac4 100644 --- a/beesdoo_base/report/beescard.xml +++ b/beesdoo_base/report/beescard.xml @@ -29,7 +29,7 @@ - +
diff --git a/beesdoo_base/wizard/__init__.py b/beesdoo_base/wizard/__init__.py index 5368e4a..1bfe4ce 100644 --- a/beesdoo_base/wizard/__init__.py +++ b/beesdoo_base/wizard/__init__.py @@ -1,2 +1,2 @@ -import member_card, partner, portal_wizard +from . import member_card, partner, portal_wizard diff --git a/beesdoo_base/wizard/member_card.py b/beesdoo_base/wizard/member_card.py index f5441cd..5d4b69f 100644 --- a/beesdoo_base/wizard/member_card.py +++ b/beesdoo_base/wizard/member_card.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from odoo import models, fields, api class NewMemberCardWizard(models.TransientModel): diff --git a/beesdoo_base/wizard/partner.py b/beesdoo_base/wizard/partner.py index 45f540a..3a707d7 100644 --- a/beesdoo_base/wizard/partner.py +++ b/beesdoo_base/wizard/partner.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from odoo import models, fields, api class NewEaterWizard(models.TransientModel):