From 0b2127c25fc4cb8d17307eadcdbda748fa06ab06 Mon Sep 17 00:00:00 2001 From: "Denis Vermylen (dve)" Date: Wed, 13 Jul 2016 12:14:22 +0200 Subject: [PATCH] [MOV] account_asset: reorganise module directory --- addons/account_asset/__init__.py | 3 +-- addons/account_asset/__openerp__.py | 16 ++++++++-------- .../account_asset_data.xml} | 0 .../{ => data}/account_asset_demo.yml | 0 addons/account_asset/models/__init__.py | 5 +++++ .../account_asset/{ => models}/account_asset.py | 0 .../account_invoice.py} | 0 ...t_view.xml => account_asset_report_views.xml} | 0 ...unt_asset.xml => account_asset_templates.xml} | 0 ...nt_asset_view.xml => account_asset_views.xml} | 0 ...nvoice_view.xml => account_invoice_views.xml} | 0 addons/account_asset/wizard/__init__.py | 4 ++-- ...=> asset_depreciation_confirmation_wizard.py} | 0 ...t_depreciation_confirmation_wizard_views.xml} | 0 ..._asset_change_duration.py => asset_modify.py} | 0 ..._duration_view.xml => asset_modify_views.xml} | 0 16 files changed, 16 insertions(+), 12 deletions(-) rename addons/account_asset/{account_asset_cron.xml => data/account_asset_data.xml} (100%) rename addons/account_asset/{ => data}/account_asset_demo.yml (100%) create mode 100644 addons/account_asset/models/__init__.py rename addons/account_asset/{ => models}/account_asset.py (100%) rename addons/account_asset/{account_asset_invoice.py => models/account_invoice.py} (100%) rename addons/account_asset/report/{account_asset_report_view.xml => account_asset_report_views.xml} (100%) rename addons/account_asset/views/{account_asset.xml => account_asset_templates.xml} (100%) rename addons/account_asset/views/{account_asset_view.xml => account_asset_views.xml} (100%) rename addons/account_asset/views/{account_asset_invoice_view.xml => account_invoice_views.xml} (100%) rename addons/account_asset/wizard/{wizard_asset_compute.py => asset_depreciation_confirmation_wizard.py} (100%) rename addons/account_asset/wizard/{wizard_asset_compute_view.xml => asset_depreciation_confirmation_wizard_views.xml} (100%) rename addons/account_asset/wizard/{account_asset_change_duration.py => asset_modify.py} (100%) rename addons/account_asset/wizard/{account_asset_change_duration_view.xml => asset_modify_views.xml} (100%) diff --git a/addons/account_asset/__init__.py b/addons/account_asset/__init__.py index f826640892b..ee052fe0c50 100644 --- a/addons/account_asset/__init__.py +++ b/addons/account_asset/__init__.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- -import account_asset -import account_asset_invoice +import models import wizard import report diff --git a/addons/account_asset/__openerp__.py b/addons/account_asset/__openerp__.py index f323fe820b5..a59e1b13aba 100644 --- a/addons/account_asset/__openerp__.py +++ b/addons/account_asset/__openerp__.py @@ -15,7 +15,7 @@ Keeps track of depreciations, and creates corresponding journal entries. 'category': 'Accounting', 'sequence': 32, 'demo': [ - 'account_asset_demo.yml', + 'data/account_asset_demo.yml', ], # 'test': [ # '../account/test/account_minimal_test.xml', @@ -24,13 +24,13 @@ Keeps track of depreciations, and creates corresponding journal entries. 'data': [ 'security/account_asset_security.xml', 'security/ir.model.access.csv', - 'wizard/account_asset_change_duration_view.xml', - 'wizard/wizard_asset_compute_view.xml', - 'views/account_asset_view.xml', - 'views/account_asset_invoice_view.xml', - 'report/account_asset_report_view.xml', - 'views/account_asset.xml', - 'account_asset_cron.xml', + 'wizard/asset_depreciation_confirmation_wizard_views.xml', + 'wizard/asset_modify_views.xml', + 'views/account_asset_views.xml', + 'views/account_invoice_views.xml', + 'views/account_asset_templates.xml', + 'report/account_asset_report_views.xml', + 'data/account_asset_data.xml', ], 'qweb': [ "static/src/xml/account_asset_template.xml", diff --git a/addons/account_asset/account_asset_cron.xml b/addons/account_asset/data/account_asset_data.xml similarity index 100% rename from addons/account_asset/account_asset_cron.xml rename to addons/account_asset/data/account_asset_data.xml diff --git a/addons/account_asset/account_asset_demo.yml b/addons/account_asset/data/account_asset_demo.yml similarity index 100% rename from addons/account_asset/account_asset_demo.yml rename to addons/account_asset/data/account_asset_demo.yml diff --git a/addons/account_asset/models/__init__.py b/addons/account_asset/models/__init__.py new file mode 100644 index 00000000000..a34a91f91b1 --- /dev/null +++ b/addons/account_asset/models/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +import account_asset +import account_asset_invoice diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/models/account_asset.py similarity index 100% rename from addons/account_asset/account_asset.py rename to addons/account_asset/models/account_asset.py diff --git a/addons/account_asset/account_asset_invoice.py b/addons/account_asset/models/account_invoice.py similarity index 100% rename from addons/account_asset/account_asset_invoice.py rename to addons/account_asset/models/account_invoice.py diff --git a/addons/account_asset/report/account_asset_report_view.xml b/addons/account_asset/report/account_asset_report_views.xml similarity index 100% rename from addons/account_asset/report/account_asset_report_view.xml rename to addons/account_asset/report/account_asset_report_views.xml diff --git a/addons/account_asset/views/account_asset.xml b/addons/account_asset/views/account_asset_templates.xml similarity index 100% rename from addons/account_asset/views/account_asset.xml rename to addons/account_asset/views/account_asset_templates.xml diff --git a/addons/account_asset/views/account_asset_view.xml b/addons/account_asset/views/account_asset_views.xml similarity index 100% rename from addons/account_asset/views/account_asset_view.xml rename to addons/account_asset/views/account_asset_views.xml diff --git a/addons/account_asset/views/account_asset_invoice_view.xml b/addons/account_asset/views/account_invoice_views.xml similarity index 100% rename from addons/account_asset/views/account_asset_invoice_view.xml rename to addons/account_asset/views/account_invoice_views.xml diff --git a/addons/account_asset/wizard/__init__.py b/addons/account_asset/wizard/__init__.py index 0425aadb5d8..21a4fb76a53 100644 --- a/addons/account_asset/wizard/__init__.py +++ b/addons/account_asset/wizard/__init__.py @@ -1,4 +1,4 @@ # -*- coding: utf-8 -*- -import account_asset_change_duration -import wizard_asset_compute +import asset_depreciation_confirmation_wizard +import asset_modify diff --git a/addons/account_asset/wizard/wizard_asset_compute.py b/addons/account_asset/wizard/asset_depreciation_confirmation_wizard.py similarity index 100% rename from addons/account_asset/wizard/wizard_asset_compute.py rename to addons/account_asset/wizard/asset_depreciation_confirmation_wizard.py diff --git a/addons/account_asset/wizard/wizard_asset_compute_view.xml b/addons/account_asset/wizard/asset_depreciation_confirmation_wizard_views.xml similarity index 100% rename from addons/account_asset/wizard/wizard_asset_compute_view.xml rename to addons/account_asset/wizard/asset_depreciation_confirmation_wizard_views.xml diff --git a/addons/account_asset/wizard/account_asset_change_duration.py b/addons/account_asset/wizard/asset_modify.py similarity index 100% rename from addons/account_asset/wizard/account_asset_change_duration.py rename to addons/account_asset/wizard/asset_modify.py diff --git a/addons/account_asset/wizard/account_asset_change_duration_view.xml b/addons/account_asset/wizard/asset_modify_views.xml similarity index 100% rename from addons/account_asset/wizard/account_asset_change_duration_view.xml rename to addons/account_asset/wizard/asset_modify_views.xml