diff options
| author | Randhir Mayatra (OpenERP) <rma@tinyerp.com> | 2012-11-19 16:38:24 +0530 |
|---|---|---|
| committer | Randhir Mayatra (OpenERP) <rma@tinyerp.com> | 2012-11-19 16:38:24 +0530 |
| commit | d23c5c8dca985dd0fde280c9237dee85b7bb4d7a (patch) | |
| tree | cf03bc2a74a1d9e93b5ef571fb78070c09c9857b /addons/base_import | |
| parent | f4ab81afb8285a8157258232c5fb2a6745ae7f72 (diff) | |
| parent | 66afff1b52b7ab6ab8c340e18960fb6367cfb714 (diff) | |
[MERGE]merge with trunk
bzr revid: rma@tinyerp.com-20121119110824-rj4y32rfbszqln7g
Diffstat (limited to 'addons/base_import')
| -rw-r--r-- | addons/base_import/__openerp__.py | 6 | ||||
| -rw-r--r-- | addons/base_import/static/test/states.js | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/addons/base_import/__openerp__.py b/addons/base_import/__openerp__.py index 6555cd8e3e0..eb8b4561c7e 100644 --- a/addons/base_import/__openerp__.py +++ b/addons/base_import/__openerp__.py @@ -24,9 +24,12 @@ Re-implement openerp's file import system: 'category': 'Uncategorized', 'website': 'http://www.openerp.com', 'author': 'OpenERP SA', - 'depends': ['base'], + 'depends': ['web'], 'installable': True, 'auto_install': False, + 'data': [ + 'security/ir.model.access.csv', + ], 'css': [ 'static/lib/select2/select2.css', 'static/src/css/import.css', @@ -37,4 +40,5 @@ Re-implement openerp's file import system: 'static/src/js/import.js', ], 'qweb': ['static/src/xml/import.xml'], + 'test': ['static/test/states.js'], } diff --git a/addons/base_import/static/test/states.js b/addons/base_import/static/test/states.js new file mode 100644 index 00000000000..3e349907a6f --- /dev/null +++ b/addons/base_import/static/test/states.js @@ -0,0 +1,6 @@ +$(document).ready(function () { + module('foo'); + test('dummy', function () { + ok(42); + }); +}); |