diff options
| author | Fabien Pinckaers <fp@tinyerp.com> | 2008-09-09 11:12:13 +0200 |
|---|---|---|
| committer | Fabien Pinckaers <fp@tinyerp.com> | 2008-09-09 11:12:13 +0200 |
| commit | 2eee257959c4e6d39fa83e2beb6dbdb7fa3ec570 (patch) | |
| tree | e6bd7f23f6e69c607ef97f9aeeac065e1d97fba4 | |
| parent | f9cc58e368eda8c44f2c515f7ef38a13f98cd8ed (diff) | |
| parent | 0a25f1b6a09ab1d3f46ba52abab023ca2c858279 (diff) | |
merge
bzr revid: fp@tinyerp.com-20080909091213-i1co1buzhwzrn8tw
| -rw-r--r-- | addons/base_module_record/base_module_record.py | 2 | ||||
| -rw-r--r-- | addons/base_module_record/wizard/base_module_save.py | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/addons/base_module_record/base_module_record.py b/addons/base_module_record/base_module_record.py index 6c130549f64..1a623b2dbb5 100644 --- a/addons/base_module_record/base_module_record.py +++ b/addons/base_module_record/base_module_record.py @@ -209,7 +209,7 @@ def fnct_call(fnct): pool = pooler.get_pool(args[0]) mod = pool.get('ir.module.record') if mod and mod.recording: - if args[4] not in ('default_get','read','fields_view_get','fields_get','search','name_search','name_get','get','request_get', 'get_sc'): + if args[4] not in ('default_get','read','fields_view_get','fields_get','search','search_count','name_search','name_get','get','request_get', 'get_sc'): mod.recording_data.append(('query', args, argv,res)) return res return execute diff --git a/addons/base_module_record/wizard/base_module_save.py b/addons/base_module_record/wizard/base_module_save.py index 1b26c34ea65..458e57404cc 100644 --- a/addons/base_module_record/wizard/base_module_save.py +++ b/addons/base_module_record/wizard/base_module_save.py @@ -74,7 +74,7 @@ intro_save_form = '''<?xml version="1.0"?> <separator string="Module successfully created !" colspan="4"/> <field name="module_filename"/> <newline/> - <field name="module_file"/> + <field name="module_file" filename="module_filename"/> <separator string="Information" colspan="4"/> <label string="If you think your module could interrest others people, we'd like you to publish it on TinyERP.com, in the 'Modules' section. You can do it through the website or using features of the 'base_module_publish' module." colspan="4" align="0.0"/> <label string="Thanks in advance for your contribution." colspan="4" align="0.0"/> @@ -146,7 +146,6 @@ def _create_module(self, cr, uid, data, context): info.external_attr = 2175008768 zip.writestr(info, datastr) zip.close() - print data['form'] return { 'module_file': base64.encodestring(s.getvalue()), 'module_filename': data['form']['directory_name']+'-'+data['form']['version']+'.zip' |
