diff options
| author | nvi-openerp <nicolas.vanhoren@openerp.com> | 2010-11-08 11:22:22 +0100 |
|---|---|---|
| committer | nvi-openerp <nicolas.vanhoren@openerp.com> | 2010-11-08 11:22:22 +0100 |
| commit | 91c0e7621c3e34d7f4a9d13faaf8d4a00e175fd9 (patch) | |
| tree | 8775d6e11e06b862c63690b1ee7e2bc34feae64d /bin/addons/base/module/wizard | |
| parent | b2f7d0c4455c1ad119899933addc26ea55c2fa34 (diff) | |
| parent | 03ea39746de124ce2c0ad30578f55f11cba856ec (diff) | |
[merge]
bzr revid: nicolas.vanhoren@openerp.com-20101108102206-n49aylxp2sf6krp1
bzr revid: nicolas.vanhoren@openerp.com-20101108102222-hh2yawl34ofqwnke
Diffstat (limited to 'bin/addons/base/module/wizard')
| -rw-r--r-- | bin/addons/base/module/wizard/base_module_import_view.xml | 14 | ||||
| -rw-r--r-- | bin/addons/base/module/wizard/base_update_translations.py | 4 |
2 files changed, 11 insertions, 7 deletions
diff --git a/bin/addons/base/module/wizard/base_module_import_view.xml b/bin/addons/base/module/wizard/base_module_import_view.xml index b04bc050e97..8e43789b057 100644 --- a/bin/addons/base/module/wizard/base_module_import_view.xml +++ b/bin/addons/base/module/wizard/base_module_import_view.xml @@ -9,22 +9,22 @@ <field name="arch" type="xml"> <form string="Import module"> <group col="8"> - <group colspan="3"> + <group colspan="3" col="1"> <field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/> <newline/> - <label colspan="4" width="220" string="This wizard helps you add a new language to you OpenERP system. After loading a new language it becomes available as default interface language for users and partners."/> - <label colspan="4" width="220"/> - <label colspan="4" width="220" string="Please be patient, this operation may take a few minutes (depending on the number of modules currently installed)..."/> + <label width="220" string="This wizard helps you add a new language to you OpenERP system. After loading a new language it becomes available as default interface language for users and partners."/> + <label width="220"/> + <label width="220" string="Please be patient, this operation may take a few minutes (depending on the number of modules currently installed)..."/> <field name="state" invisible="1"/> </group> - <separator orientation="vertical" rowspan="15"/> + <separator orientation="vertical" rowspan="5"/> <group colspan="4"> <separator string="Module Import" colspan="4"/> - <group states="init" colspan="4" col="4"> + <group states="init" col="4"> <label string="Select module package to import (.zip file):" colspan="4"/> <field name="module_file" colspan="4"/> </group> - <group states="done" colspan="4" col="4"> + <group states="done" col="4"> <label string="Module file successfully imported!" colspan="4"/> </group> </group> diff --git a/bin/addons/base/module/wizard/base_update_translations.py b/bin/addons/base/module/wizard/base_update_translations.py index 94cb0ee2e18..b413e9d7093 100644 --- a/bin/addons/base/module/wizard/base_update_translations.py +++ b/bin/addons/base/module/wizard/base_update_translations.py @@ -52,6 +52,10 @@ class base_update_translations(osv.osv_memory): def default_get(self, cr, uid, fields, context=None): res = super(base_update_translations, self).default_get(cr, uid, fields, context=context) + + if context.get('active_model') != "res.lang": + return res + record_id = context and context.get('active_id', False) or False if record_id: lang = self.pool.get('res.lang').browse(cr, uid, record_id).code |