diff options
| author | Jigar Patel <jat@openerp.com> | 2016-05-23 15:32:24 +0530 |
|---|---|---|
| committer | Yannick Tivisse <yti@odoo.com> | 2016-07-05 14:37:05 +0200 |
| commit | d5752d814e93580e02057acbc06bba65dbbd2695 (patch) | |
| tree | db19298ff640eea82bd58f8bc2cf6364ca528a49 /addons/pad | |
| parent | 7e72de3f2e8473539cf6290bcbcb955ccd10e8b0 (diff) | |
[MOV] pad: Re-organized file structure
Diffstat (limited to 'addons/pad')
| -rw-r--r-- | addons/pad/__init__.py | 3 | ||||
| -rw-r--r-- | addons/pad/__openerp__.py | 4 | ||||
| -rw-r--r-- | addons/pad/data/pad_demo.xml (renamed from addons/pad/pad_demo.xml) | 0 | ||||
| -rw-r--r-- | addons/pad/models/__init__.py | 5 | ||||
| -rw-r--r-- | addons/pad/models/pad.py (renamed from addons/pad/pad.py) | 2 | ||||
| -rw-r--r-- | addons/pad/models/res_company.py (renamed from addons/pad/res_company.py) | 0 | ||||
| -rw-r--r-- | addons/pad/views/res_company.xml (renamed from addons/pad/res_company.xml) | 0 |
7 files changed, 9 insertions, 5 deletions
diff --git a/addons/pad/__init__.py b/addons/pad/__init__.py index 262cfc7323a..89d26e2f597 100644 --- a/addons/pad/__init__.py +++ b/addons/pad/__init__.py @@ -1,3 +1,2 @@ # -*- coding: utf-8 -*- -import pad -import res_company +import models diff --git a/addons/pad/__openerp__.py b/addons/pad/__openerp__.py index 0f6f6c63d4b..65464bf9d8b 100644 --- a/addons/pad/__openerp__.py +++ b/addons/pad/__openerp__.py @@ -13,10 +13,10 @@ pads (by default, http://etherpad.com/). 'website': 'https://www.odoo.com/page/notes', 'depends': ['web'], 'data': [ - 'res_company.xml', + 'views/res_company.xml', 'views/pad.xml', ], - 'demo': ['pad_demo.xml'], + 'demo': ['data/pad_demo.xml'], 'installable': True, 'auto_install': False, 'web': True, diff --git a/addons/pad/pad_demo.xml b/addons/pad/data/pad_demo.xml index 4441565a157..4441565a157 100644 --- a/addons/pad/pad_demo.xml +++ b/addons/pad/data/pad_demo.xml diff --git a/addons/pad/models/__init__.py b/addons/pad/models/__init__.py new file mode 100644 index 00000000000..53c307d5e75 --- /dev/null +++ b/addons/pad/models/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +import pad +import res_company diff --git a/addons/pad/pad.py b/addons/pad/models/pad.py index c0d8b72a801..80191a2e5cc 100644 --- a/addons/pad/pad.py +++ b/addons/pad/models/pad.py @@ -8,7 +8,7 @@ import logging from openerp import models, SUPERUSER_ID from openerp.tools.translate import _ from openerp.tools import html2plaintext -from py_etherpad import EtherpadLiteClient +from ..py_etherpad import EtherpadLiteClient from openerp.exceptions import UserError _logger = logging.getLogger(__name__) diff --git a/addons/pad/res_company.py b/addons/pad/models/res_company.py index 3776079e0b0..3776079e0b0 100644 --- a/addons/pad/res_company.py +++ b/addons/pad/models/res_company.py diff --git a/addons/pad/res_company.xml b/addons/pad/views/res_company.xml index 1e2184c61a3..1e2184c61a3 100644 --- a/addons/pad/res_company.xml +++ b/addons/pad/views/res_company.xml |