From 721defc2901b0d3b19d44902842e39be3cbff9f5 Mon Sep 17 00:00:00 2001
From: Damien Crier <damien.crier@camptocamp.com>
Date: Fri, 26 Jun 2015 15:40:44 +0200
Subject: [PATCH] [FIX] fix according to functionnal tests

---
 account_easy_reconcile/base_reconciliation.py   | 17 +++++++++--------
 account_easy_reconcile/easy_reconcile.xml       |  4 ++--
 .../easy_reconcile_history.py                   |  4 ++--
 account_easy_reconcile/simple_reconciliation.py |  1 -
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/account_easy_reconcile/base_reconciliation.py b/account_easy_reconcile/base_reconciliation.py
index 8795643d..16843f77 100644
--- a/account_easy_reconcile/base_reconciliation.py
+++ b/account_easy_reconcile/base_reconciliation.py
@@ -138,7 +138,8 @@ class EasyReconcileBase(models.AbstractModel):
 
         def last_period(mlines):
             period_ids = [ml['period_id'] for ml in mlines]
-            return max(period_ids, key=attrgetter('date_stop'))
+            periods = self.env['account.period'].browse(period_ids)
+            return max(periods, key=attrgetter('date_stop'))
 
         def last_date(mlines):
             return max(mlines, key=itemgetter('date'))
@@ -193,11 +194,11 @@ class EasyReconcileBase(models.AbstractModel):
             period_id = self.env['account.period'].find(dt=date)[0]
             if self.analytic_account_id:
                 rec_ctx['analytic_id'] = self.analytic_account_id.id
-            ml_obj.with_context(rec_ctx).reconcile(
-                line_ids,
+            line_rs = ml_obj.browse(line_ids)
+            line_rs.with_context(rec_ctx).reconcile(
                 type='auto',
                 writeoff_acc_id=writeoff_account_id,
-                writeoff_period_id=period_id,
+                writeoff_period_id=period_id.id,
                 writeoff_journal_id=self.journal_id.id
                 )
             return True, True
@@ -229,12 +230,12 @@ class EasyReconcileBase(models.AbstractModel):
             period_id = self.env['account.period'].find(dt=date)[0]
             if self.analytic_account_id:
                 rec_ctx['analytic_id'] = self.analytic_account_id.id
-            ml_obj.with_context(rec_ctx).reconcile_partial(
-                line_ids,
+            line_rs = ml_obj.browse(line_ids)
+            line_rs.with_context(rec_ctx).reconcile(
                 type='manual',
                 writeoff_acc_id=writeoff_account_id,
-                writeoff_period_id=period_id,
-                writeoff_journal_id=self.journal_id.id,
+                writeoff_period_id=period_id.id,
+                writeoff_journal_id=self.journal_id.id
                 )
             return True, False
         return False, False
diff --git a/account_easy_reconcile/easy_reconcile.xml b/account_easy_reconcile/easy_reconcile.xml
index 076bd3b3..7de62cbc 100644
--- a/account_easy_reconcile/easy_reconcile.xml
+++ b/account_easy_reconcile/easy_reconcile.xml
@@ -136,7 +136,7 @@ The lines should have the same amount (with the write-off) and the same referenc
                 <field name="income_exchange_account_id" groups="base.group_multi_currency"/>
                 <field name="expense_exchange_account_id" groups="base.group_multi_currency"/>
                 <field name="journal_id" attrs="{'required':[('write_off','>',0)]}"/>
-                <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
+                <field name="analytic_account_id" domain="[('type', '!=', 'view')]" groups="analytic.group_analytic_accounting"/>
                 <field name="date_base_on"/>
             </form>
         </field>
@@ -156,7 +156,7 @@ The lines should have the same amount (with the write-off) and the same referenc
                 <field name="income_exchange_account_id" groups="base.group_multi_currency"/>
                 <field name="expense_exchange_account_id" groups="base.group_multi_currency"/>
                 <field name="journal_id" attrs="{'required':[('write_off','>',0)]}"/>
-                <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
+                <field name="analytic_account_id" domain="[('type', '!=', 'view')]" groups="analytic.group_analytic_accounting"/>
                 <field name="date_base_on"/>
             </tree>
         </field>
diff --git a/account_easy_reconcile/easy_reconcile_history.py b/account_easy_reconcile/easy_reconcile_history.py
index a05e4ceb..7bfaeca7 100644
--- a/account_easy_reconcile/easy_reconcile_history.py
+++ b/account_easy_reconcile/easy_reconcile_history.py
@@ -38,13 +38,13 @@ class EasyReconcileHistory(models.Model):
         for reconcile in self.reconcile_ids:
             move_lines = reconcile.mapped('line_id')
             move_line_ids.extend(move_lines.ids)
-        self.reconcile_line_ids = move_line_ids
+        self.reconcile_line_ids = (6, 0, move_line_ids)
 
         move_line_ids = []
         for reconcile in self.reconcile_partial_ids:
             move_lines = reconcile.mapped('line_partial_ids')
             move_line_ids.extend(move_lines.ids)
-        self.partial_line_ids = move_line_ids
+        self.partial_line_ids = (6, 0, move_line_ids)
 
     easy_reconcile_id = fields.Many2one(
         'account.easy.reconcile',
diff --git a/account_easy_reconcile/simple_reconciliation.py b/account_easy_reconcile/simple_reconciliation.py
index c5c360d1..b54ffd03 100644
--- a/account_easy_reconcile/simple_reconciliation.py
+++ b/account_easy_reconcile/simple_reconciliation.py
@@ -54,7 +54,6 @@ class EasyReconcileSimple(models.AbstractModel):
                 if not check:
                     continue
                 reconciled, dummy = self._reconcile_lines(
-                    self,
                     [credit_line, debit_line],
                     allow_partial=False
                     )