diff options
| author | Jérome Maes <jem@openerp.com> | 2016-06-15 10:40:18 +0200 |
|---|---|---|
| committer | Jérome Maes <jem@openerp.com> | 2016-07-14 14:04:33 +0200 |
| commit | b535461e4723258b196e8b2f750d5c01d94ddc26 (patch) | |
| tree | a617122689e0027977b0a6b071f53203b6dfaf03 | |
| parent | 2a36b54f14c1e2ac5efe51de9f37b67e00722ccc (diff) | |
[MOV] calendar: reoganize module directory
| -rw-r--r-- | addons/calendar/__init__.py | 3 | ||||
| -rw-r--r-- | addons/calendar/__openerp__.py | 12 | ||||
| -rw-r--r-- | addons/calendar/data/calendar_cron.xml (renamed from addons/calendar/calendar_cron.xml) | 0 | ||||
| -rw-r--r-- | addons/calendar/data/calendar_data.xml (renamed from addons/calendar/calendar_data.xml) | 0 | ||||
| -rw-r--r-- | addons/calendar/data/calendar_demo.xml (renamed from addons/calendar/calendar_demo.xml) | 0 | ||||
| -rw-r--r-- | addons/calendar/models/__init__.py | 5 | ||||
| -rw-r--r-- | addons/calendar/models/calendar.py (renamed from addons/calendar/calendar.py) | 0 | ||||
| -rw-r--r-- | addons/calendar/models/contacts.py (renamed from addons/calendar/contacts.py) | 0 | ||||
| -rw-r--r-- | addons/calendar/views/calendar_templates.xml (renamed from addons/calendar/views/calendar.xml) | 0 | ||||
| -rw-r--r-- | addons/calendar/views/calendar_views.xml (renamed from addons/calendar/calendar_view.xml) | 0 |
10 files changed, 13 insertions, 7 deletions
diff --git a/addons/calendar/__init__.py b/addons/calendar/__init__.py index 74719d7f424..ac0011716f6 100644 --- a/addons/calendar/__init__.py +++ b/addons/calendar/__init__.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from . import calendar import controllers -import contacts +import models diff --git a/addons/calendar/__openerp__.py b/addons/calendar/__openerp__.py index e7551ad181c..7422127163a 100644 --- a/addons/calendar/__openerp__.py +++ b/addons/calendar/__openerp__.py @@ -20,14 +20,16 @@ If you need to manage your meetings, you should install the CRM module. """, 'category': 'Extra Tools', 'website': 'https://www.odoo.com/page/crm', - 'demo': ['calendar_demo.xml'], + 'demo': [ + 'data/calendar_demo.xml' + ], 'data': [ - 'calendar_cron.xml', 'security/ir.model.access.csv', 'security/calendar_security.xml', - 'calendar_view.xml', - 'calendar_data.xml', - 'views/calendar.xml', + 'data/calendar_cron.xml', + 'data/calendar_data.xml', + 'views/calendar_templates.xml', + 'views/calendar_views.xml', ], 'qweb': ['static/src/xml/*.xml'], 'test': [ diff --git a/addons/calendar/calendar_cron.xml b/addons/calendar/data/calendar_cron.xml index 313a0211fa4..313a0211fa4 100644 --- a/addons/calendar/calendar_cron.xml +++ b/addons/calendar/data/calendar_cron.xml diff --git a/addons/calendar/calendar_data.xml b/addons/calendar/data/calendar_data.xml index d02c1028745..d02c1028745 100644 --- a/addons/calendar/calendar_data.xml +++ b/addons/calendar/data/calendar_data.xml diff --git a/addons/calendar/calendar_demo.xml b/addons/calendar/data/calendar_demo.xml index ac91e7e7680..ac91e7e7680 100644 --- a/addons/calendar/calendar_demo.xml +++ b/addons/calendar/data/calendar_demo.xml diff --git a/addons/calendar/models/__init__.py b/addons/calendar/models/__init__.py new file mode 100644 index 00000000000..d5f1dcfd725 --- /dev/null +++ b/addons/calendar/models/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +import calendar +import contacts diff --git a/addons/calendar/calendar.py b/addons/calendar/models/calendar.py index c7504394f26..c7504394f26 100644 --- a/addons/calendar/calendar.py +++ b/addons/calendar/models/calendar.py diff --git a/addons/calendar/contacts.py b/addons/calendar/models/contacts.py index 6f8c24ee727..6f8c24ee727 100644 --- a/addons/calendar/contacts.py +++ b/addons/calendar/models/contacts.py diff --git a/addons/calendar/views/calendar.xml b/addons/calendar/views/calendar_templates.xml index 7929fce158e..7929fce158e 100644 --- a/addons/calendar/views/calendar.xml +++ b/addons/calendar/views/calendar_templates.xml diff --git a/addons/calendar/calendar_view.xml b/addons/calendar/views/calendar_views.xml index ea5fcb693cb..ea5fcb693cb 100644 --- a/addons/calendar/calendar_view.xml +++ b/addons/calendar/views/calendar_views.xml |