diff options
| -rw-r--r-- | addons/base_import/__init__.py | 4 | ||||
| -rw-r--r-- | addons/base_import/__openerp__.py | 4 | ||||
| -rw-r--r-- | addons/base_import/controllers/__init__.py | 4 | ||||
| -rw-r--r-- | addons/base_import/controllers/main.py (renamed from addons/base_import/controllers.py) | 0 | ||||
| -rw-r--r-- | addons/base_import/models/__init__.py | 5 | ||||
| -rw-r--r-- | addons/base_import/models/base_import.py (renamed from addons/base_import/models.py) | 0 | ||||
| -rw-r--r-- | addons/base_import/models/odf_ods_reader.py (renamed from addons/base_import/odf_ods_reader.py) | 0 | ||||
| -rw-r--r-- | addons/base_import/models/test_models.py (renamed from addons/base_import/test_models.py) | 0 | ||||
| -rw-r--r-- | addons/base_import/static/src/js/base_import.js (renamed from addons/base_import/static/src/js/import.js) | 0 | ||||
| -rw-r--r-- | addons/base_import/static/src/less/base_import.less (renamed from addons/base_import/static/src/less/import.less) | 0 | ||||
| -rw-r--r-- | addons/base_import/static/src/xml/base_import.xml (renamed from addons/base_import/static/src/xml/import.xml) | 0 | ||||
| -rw-r--r-- | addons/base_import/tests/__init__.py | 5 | ||||
| -rw-r--r-- | addons/base_import/tests/test_base_import.py (renamed from addons/base_import/tests/test_cases.py) | 0 | ||||
| -rw-r--r-- | addons/base_import/views/base_import_templates.xml (renamed from addons/base_import/views/base_import.xml) | 4 |
14 files changed, 20 insertions, 6 deletions
diff --git a/addons/base_import/__init__.py b/addons/base_import/__init__.py index 939a8173e38..ac0011716f6 100644 --- a/addons/base_import/__init__.py +++ b/addons/base_import/__init__.py @@ -1,3 +1,5 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + import controllers import models -import test_models diff --git a/addons/base_import/__openerp__.py b/addons/base_import/__openerp__.py index 737621221b9..0a02a7228f2 100644 --- a/addons/base_import/__openerp__.py +++ b/addons/base_import/__openerp__.py @@ -27,7 +27,7 @@ Re-implement openerp's file import system: 'auto_install': True, 'data': [ 'security/ir.model.access.csv', - 'views/base_import.xml', + 'views/base_import_templates.xml', ], - 'qweb': ['static/src/xml/import.xml'], + 'qweb': ['static/src/xml/base_import.xml'], } diff --git a/addons/base_import/controllers/__init__.py b/addons/base_import/controllers/__init__.py new file mode 100644 index 00000000000..f48716d3a69 --- /dev/null +++ b/addons/base_import/controllers/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +import main diff --git a/addons/base_import/controllers.py b/addons/base_import/controllers/main.py index 84b645f149f..84b645f149f 100644 --- a/addons/base_import/controllers.py +++ b/addons/base_import/controllers/main.py diff --git a/addons/base_import/models/__init__.py b/addons/base_import/models/__init__.py new file mode 100644 index 00000000000..0c98d751b68 --- /dev/null +++ b/addons/base_import/models/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +import base_import +import test_models diff --git a/addons/base_import/models.py b/addons/base_import/models/base_import.py index 36cd41fa7f0..36cd41fa7f0 100644 --- a/addons/base_import/models.py +++ b/addons/base_import/models/base_import.py diff --git a/addons/base_import/odf_ods_reader.py b/addons/base_import/models/odf_ods_reader.py index 0f0142f3f04..0f0142f3f04 100644 --- a/addons/base_import/odf_ods_reader.py +++ b/addons/base_import/models/odf_ods_reader.py diff --git a/addons/base_import/test_models.py b/addons/base_import/models/test_models.py index 274f7c84d5f..274f7c84d5f 100644 --- a/addons/base_import/test_models.py +++ b/addons/base_import/models/test_models.py diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/base_import.js index d12e9292fde..d12e9292fde 100644 --- a/addons/base_import/static/src/js/import.js +++ b/addons/base_import/static/src/js/base_import.js diff --git a/addons/base_import/static/src/less/import.less b/addons/base_import/static/src/less/base_import.less index 8b55d2fbf88..8b55d2fbf88 100644 --- a/addons/base_import/static/src/less/import.less +++ b/addons/base_import/static/src/less/base_import.less diff --git a/addons/base_import/static/src/xml/import.xml b/addons/base_import/static/src/xml/base_import.xml index dce2ab6fe36..dce2ab6fe36 100644 --- a/addons/base_import/static/src/xml/import.xml +++ b/addons/base_import/static/src/xml/base_import.xml diff --git a/addons/base_import/tests/__init__.py b/addons/base_import/tests/__init__.py index 54ecbe9baab..cdc1b5d8187 100644 --- a/addons/base_import/tests/__init__.py +++ b/addons/base_import/tests/__init__.py @@ -1 +1,4 @@ -from . import test_cases +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +import test_base_import diff --git a/addons/base_import/tests/test_cases.py b/addons/base_import/tests/test_base_import.py index d9b6e16b2f4..d9b6e16b2f4 100644 --- a/addons/base_import/tests/test_cases.py +++ b/addons/base_import/tests/test_base_import.py diff --git a/addons/base_import/views/base_import.xml b/addons/base_import/views/base_import_templates.xml index daebee78d84..1416618f137 100644 --- a/addons/base_import/views/base_import.xml +++ b/addons/base_import/views/base_import_templates.xml @@ -3,9 +3,9 @@ <data> <template id="assets_backend" name="base_import assets" inherit_id="web.assets_backend"> <xpath expr="." position="inside"> - <link rel="stylesheet" href="/base_import/static/src/less/import.less"/> + <link rel="stylesheet" href="/base_import/static/src/less/base_import.less"/> <script type="text/javascript" src="/base_import/static/lib/javascript-state-machine/state-machine.js"></script> - <script type="text/javascript" src="/base_import/static/src/js/import.js"></script> + <script type="text/javascript" src="/base_import/static/src/js/base_import.js"></script> </xpath> </template> </data> |