diff options
| author | P. Christeas <p_christ@hol.gr> | 2009-10-26 12:56:50 +0200 |
|---|---|---|
| committer | P. Christeas <p_christ@hol.gr> | 2009-10-26 12:56:50 +0200 |
| commit | 5ee5a1caef3c2e28622e53ecddf2c13c0efcf4c4 (patch) | |
| tree | 8a520aaf907ebd233fee957d0529c5c41333a832 /bin/addons/base | |
| parent | c716ecb7319af022447d9685b61e92ab45cc0b80 (diff) | |
| parent | da2e99051a57989c592418668ab4614baf142c4e (diff) | |
Merge remote branch 'origin/master' into optimize
Conflicts:
bin/osv/expression.py
bin/osv/orm.py
bzr revid: p_christ@hol.gr-20091026105650-49wvuk3o7qw1ybkn
Diffstat (limited to 'bin/addons/base')
| -rw-r--r-- | bin/addons/base/ir/ir_model.py | 3 | ||||
| -rw-r--r-- | bin/addons/base/module/report/ir_module_reference_print.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/bin/addons/base/ir/ir_model.py b/bin/addons/base/ir/ir_model.py index d69688bf6fc..641e9d30006 100644 --- a/bin/addons/base/ir/ir_model.py +++ b/bin/addons/base/ir/ir_model.py @@ -415,7 +415,8 @@ class ir_model_data(osv.osv): _defaults = { 'date_init': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'), 'date_update': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'), - 'noupdate': lambda *a: False + 'noupdate': lambda *a: False, + 'module': lambda *a: '' } _sql_constraints = [ ('module_name_uniq', 'unique(name, module)', 'You can not have multiple records with the same id for the same module'), diff --git a/bin/addons/base/module/report/ir_module_reference_print.py b/bin/addons/base/module/report/ir_module_reference_print.py index 14f23a57541..7b379f2af68 100644 --- a/bin/addons/base/module/report/ir_module_reference_print.py +++ b/bin/addons/base/module/report/ir_module_reference_print.py @@ -25,7 +25,7 @@ from report import report_sxw class ir_module_reference_print(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(ir_module_reference_print, self).__init__(cr, uid, name, context) + super(ir_module_reference_print, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'time': time, 'findobj': self._object_find, |