Merge remote branch 'origin/master' into optimize

Conflicts: bin/osv/expression.py bin/osv/orm.py bzr revid: p_christ@hol.gr-20091026105650-49wvuk3o7qw1ybkn
2009-10-26 12:56:50 +02:00
parent c716ecb731 da2e99051a
commit 5ee5a1caef
6 changed files with 153 additions and 43 deletions
@@ -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,