diff options
| author | Vir (Open ERP) <vir@tinyerp.com> | 2010-06-01 11:08:40 +0530 |
|---|---|---|
| committer | Vir (Open ERP) <vir@tinyerp.com> | 2010-06-01 11:08:40 +0530 |
| commit | b2a6a5f79c0ae1cc13f207ca0135d1eb401f2c35 (patch) | |
| tree | 7aeea0e54926957c1b3181a92f3681626ccd1939 /bin/addons/base/module/wizard | |
| parent | 9a7c0bfa75a8138b442160e96074bd7652f42c10 (diff) | |
| parent | 2a1d7c24c0e06c5fc383cce4778ca525ecfa5eef (diff) | |
[Merge] Merge with Trunk Server
bzr revid: vir@tinyerp.com-20100601053840-z183q5is7js83sb9
Diffstat (limited to 'bin/addons/base/module/wizard')
| -rw-r--r-- | bin/addons/base/module/wizard/add_new.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/bin/addons/base/module/wizard/add_new.py b/bin/addons/base/module/wizard/add_new.py index 0e2028e7624..c6eddab2adb 100644 --- a/bin/addons/base/module/wizard/add_new.py +++ b/bin/addons/base/module/wizard/add_new.py @@ -3,6 +3,7 @@ # # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). +# Copyright (C) 2010 OpenERP s.a. (<http://openerp.com>). # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -56,7 +57,7 @@ class wizard_install_module(wizard.interface): terp = mod_obj.get_module_info(module) if not terp.get('installable', True): continue - + # XXX check if this code is correct... fm = imp.find_module(module) try: @@ -65,12 +66,8 @@ class wizard_install_module(wizard.interface): if fm[0]: fm[0].close() - mod_id = mod_obj.create(cr, uid, { - 'name': module, - 'state': 'uninstalled', - 'description': terp.get('description', ''), - 'shortdesc': terp.get('name', ''), - 'author': terp.get('author', 'Unknown')}) + values = mod_obj.get_values_from_terp(terp) + mod_id = mod_obj.create(cr, uid, dict(name=module, state='uninstalled', **values)) dependencies = terp.get('depends', []) for d in dependencies: cr.execute('insert into ir_module_module_dependency (module_id,name) values (%s, %s)', (mod_id, d)) |