From 803a7e75d4f84332792ec8beaa71d6fdf433318b Mon Sep 17 00:00:00 2001 From: Rashik Kalathiya Date: Thu, 28 Jan 2016 10:57:30 +0530 Subject: [PATCH] [MOV] report_webkit: reorganized file structure as per new API guidelines --- addons/report_webkit/__init__.py | 7 +------ addons/report_webkit/__openerp__.py | 10 +++++----- addons/report_webkit/{ => data}/default_header.html | 0 .../{data.xml => data/report_webkit_data.xml} | 0 addons/report_webkit/models/__init__.py | 12 ++++++++++++ addons/report_webkit/{ => models}/company.py | 0 addons/report_webkit/{ => models}/convert.py | 0 addons/report_webkit/{ => models}/header.py | 0 addons/report_webkit/{ => models}/ir_report.py | 0 addons/report_webkit/{ => models}/report_helper.py | 0 addons/report_webkit/{ => models}/webkit_report.py | 0 addons/report_webkit/report/webkit_report_demo.py | 2 +- .../{company_view.xml => views/company_views.xml} | 0 .../{header_view.xml => views/header_views.xml} | 0 .../ir_report_views.xml} | 0 ...ions_view.xml => report_webkit_actions_views.xml} | 0 16 files changed, 19 insertions(+), 12 deletions(-) rename addons/report_webkit/{ => data}/default_header.html (100%) rename addons/report_webkit/{data.xml => data/report_webkit_data.xml} (100%) create mode 100644 addons/report_webkit/models/__init__.py rename addons/report_webkit/{ => models}/company.py (100%) rename addons/report_webkit/{ => models}/convert.py (100%) rename addons/report_webkit/{ => models}/header.py (100%) rename addons/report_webkit/{ => models}/ir_report.py (100%) rename addons/report_webkit/{ => models}/report_helper.py (100%) rename addons/report_webkit/{ => models}/webkit_report.py (100%) rename addons/report_webkit/{company_view.xml => views/company_views.xml} (100%) rename addons/report_webkit/{header_view.xml => views/header_views.xml} (100%) rename addons/report_webkit/{ir_report_view.xml => views/ir_report_views.xml} (100%) rename addons/report_webkit/wizard/{report_webkit_actions_view.xml => report_webkit_actions_views.xml} (100%) diff --git a/addons/report_webkit/__init__.py b/addons/report_webkit/__init__.py index 16cfa3bd97c..6c9306f5721 100644 --- a/addons/report_webkit/__init__.py +++ b/addons/report_webkit/__init__.py @@ -4,11 +4,6 @@ # Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com) # Author : Nicolas Bessi (Camptocamp) -import header -import company -import report_helper -import webkit_report -import ir_report +import models import wizard -import convert import report diff --git a/addons/report_webkit/__openerp__.py b/addons/report_webkit/__openerp__.py index a0d230ef214..f13e521e348 100644 --- a/addons/report_webkit/__openerp__.py +++ b/addons/report_webkit/__openerp__.py @@ -59,11 +59,11 @@ TODO: 'category': 'Hidden', # i.e a technical module, not shown in Application install menu 'url': 'http://http://www.camptocamp.com/', 'data': [ 'security/ir.model.access.csv', - 'data.xml', - 'wizard/report_webkit_actions_view.xml', - 'company_view.xml', - 'header_view.xml', - 'ir_report_view.xml', + 'data/report_webkit_data.xml', + 'wizard/report_webkit_actions_views.xml', + 'views/company_views.xml', + 'views/header_views.xml', + 'views/ir_report_views.xml', ], 'demo': [ "report/webkit_report_demo.xml", diff --git a/addons/report_webkit/default_header.html b/addons/report_webkit/data/default_header.html similarity index 100% rename from addons/report_webkit/default_header.html rename to addons/report_webkit/data/default_header.html diff --git a/addons/report_webkit/data.xml b/addons/report_webkit/data/report_webkit_data.xml similarity index 100% rename from addons/report_webkit/data.xml rename to addons/report_webkit/data/report_webkit_data.xml diff --git a/addons/report_webkit/models/__init__.py b/addons/report_webkit/models/__init__.py new file mode 100644 index 00000000000..02138f3222a --- /dev/null +++ b/addons/report_webkit/models/__init__.py @@ -0,0 +1,12 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com) +# Author : Nicolas Bessi (Camptocamp) + +import company +import convert +import header +import ir_report +import report_helper +import webkit_report diff --git a/addons/report_webkit/company.py b/addons/report_webkit/models/company.py similarity index 100% rename from addons/report_webkit/company.py rename to addons/report_webkit/models/company.py diff --git a/addons/report_webkit/convert.py b/addons/report_webkit/models/convert.py similarity index 100% rename from addons/report_webkit/convert.py rename to addons/report_webkit/models/convert.py diff --git a/addons/report_webkit/header.py b/addons/report_webkit/models/header.py similarity index 100% rename from addons/report_webkit/header.py rename to addons/report_webkit/models/header.py diff --git a/addons/report_webkit/ir_report.py b/addons/report_webkit/models/ir_report.py similarity index 100% rename from addons/report_webkit/ir_report.py rename to addons/report_webkit/models/ir_report.py diff --git a/addons/report_webkit/report_helper.py b/addons/report_webkit/models/report_helper.py similarity index 100% rename from addons/report_webkit/report_helper.py rename to addons/report_webkit/models/report_helper.py diff --git a/addons/report_webkit/webkit_report.py b/addons/report_webkit/models/webkit_report.py similarity index 100% rename from addons/report_webkit/webkit_report.py rename to addons/report_webkit/models/webkit_report.py diff --git a/addons/report_webkit/report/webkit_report_demo.py b/addons/report_webkit/report/webkit_report_demo.py index 2d826c26ab5..e45c11eaa69 100644 --- a/addons/report_webkit/report/webkit_report_demo.py +++ b/addons/report_webkit/report/webkit_report_demo.py @@ -1,6 +1,6 @@ -from openerp.addons.report_webkit.webkit_report import webkit_report_extender +from openerp.addons.report_webkit.models.webkit_report import webkit_report_extender from openerp import SUPERUSER_ID @webkit_report_extender("report_webkit.webkit_demo_report") diff --git a/addons/report_webkit/company_view.xml b/addons/report_webkit/views/company_views.xml similarity index 100% rename from addons/report_webkit/company_view.xml rename to addons/report_webkit/views/company_views.xml diff --git a/addons/report_webkit/header_view.xml b/addons/report_webkit/views/header_views.xml similarity index 100% rename from addons/report_webkit/header_view.xml rename to addons/report_webkit/views/header_views.xml diff --git a/addons/report_webkit/ir_report_view.xml b/addons/report_webkit/views/ir_report_views.xml similarity index 100% rename from addons/report_webkit/ir_report_view.xml rename to addons/report_webkit/views/ir_report_views.xml diff --git a/addons/report_webkit/wizard/report_webkit_actions_view.xml b/addons/report_webkit/wizard/report_webkit_actions_views.xml similarity index 100% rename from addons/report_webkit/wizard/report_webkit_actions_view.xml rename to addons/report_webkit/wizard/report_webkit_actions_views.xml