From 05b6a04bb0fe14b7f1e84a5592df348e95589428 Mon Sep 17 00:00:00 2001
From: Laetitia Gangloff <laetitia.gangloff@acsone.eu>
Date: Wed, 15 Jul 2015 15:26:54 +0200
Subject: [PATCH] correct comparison function name call. correct drill_down

---
 mis_builder/models/aep.py         | 10 ++++++----
 mis_builder/models/mis_builder.py |  9 +++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/mis_builder/models/aep.py b/mis_builder/models/aep.py
index 2fb7816a..dc17b1e9 100644
--- a/mis_builder/models/aep.py
+++ b/mis_builder/models/aep.py
@@ -195,10 +195,10 @@ class AccountingExpressionProcessor(object):
         """Test if an string contains an accounting variable."""
         return bool(cls.ACC_RE.search(expr))
 
-    def get_aml_domain_for_expr(self, expr,
+    def get_aml_domain_for_expr(self, cr, uid, expr,
                                 date_from, date_to,
                                 period_from, period_to,
-                                target_move):
+                                target_move, context=None):
         """ Get a domain on account.move.line for an expression.
 
         Prerequisite: done_parsing() must have been invoked.
@@ -221,9 +221,11 @@ class AccountingExpressionProcessor(object):
             aml_domains.append(expression.normalize_domain(aml_domain))
             if mode not in date_domain_by_mode:
                 date_domain_by_mode[mode] = \
-                    self.get_aml_domain_for_dates(date_from, date_to,
+                    self.get_aml_domain_for_dates(cr, uid,
+                                                  date_from, date_to,
                                                   period_from, period_to,
-                                                  mode, target_move)
+                                                  mode, target_move,
+                                                  context=context)
         return expression.OR(aml_domains) + \
             expression.OR(date_domain_by_mode.values())
 
diff --git a/mis_builder/models/mis_builder.py b/mis_builder/models/mis_builder.py
index a3a1f006..48965ecd 100644
--- a/mis_builder/models/mis_builder.py
+++ b/mis_builder/models/mis_builder.py
@@ -495,12 +495,13 @@ class MisReportInstancePeriod(orm.Model):
             aep.done_parsing(cr, uid, this.report_instance_id.root_account,
                              context=context)
             domain = aep.get_aml_domain_for_expr(
-                expr,
+                cr, uid, expr,
                 this.date_from, this.date_to,
                 this.period_from, this.period_to,
-                this.report_instance_id.target_move)
+                this.report_instance_id.target_move,
+                context=context)
             return {
-                'name': expr + ' - ' + self.name,
+                'name': expr + ' - ' + this.name,
                 'domain': domain,
                 'type': 'ir.actions.act_window',
                 'res_model': 'account.move.line',
@@ -849,7 +850,7 @@ class MisReportInstance(orm.Model):
                     # add comparison values
                     for kpi in r.report_id.kpi_ids:
                         rows_by_kpi_name[kpi.name]['cols'].append({
-                            'val_r': kpi_obj.render_comparison(
+                            'val_r': kpi_obj._render_comparison(
                                 cr,
                                 uid,
                                 lang_id,