From f3e2b159ae88f2bc97ad84a89c0f653638023987 Mon Sep 17 00:00:00 2001
From: Florian da Costa <florian.dacosta@akretion.com>
Date: Sun, 6 Nov 2016 15:33:05 +0100
Subject: [PATCH] Fix payment field + automatic reconciliation on validation

---
 .../models/account_deposit.py                  | 16 ++++++++--------
 .../views/account_deposit_view.xml             | 18 +++++++++++++++++-
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/account_check_deposit/models/account_deposit.py b/account_check_deposit/models/account_deposit.py
index 076775c4d..38f37feda 100644
--- a/account_check_deposit/models/account_deposit.py
+++ b/account_check_deposit/models/account_deposit.py
@@ -198,19 +198,21 @@ class AccountCheckDeposit(models.Model):
     @api.multi
     def validate_deposit(self):
         am_obj = self.env['account.move']
+        move_line_obj = self.env['account.move.line']
         for deposit in self:
             move_vals = self._prepare_account_move_vals(deposit)
+            move = am_obj.create(move_vals)
             total_debit = 0.0
             total_amount_currency = 0.0
             to_reconcile_lines = []
-            mv_lines_vals = []
             for line in deposit.check_payment_ids:
                 total_debit += line.debit
                 total_amount_currency += line.amount_currency
                 line_vals = self._prepare_move_line_vals(line)
-                mv_lines_vals.append((0, 0, line_vals))
-
-                to_reconcile_lines.append(line)
+                line_vals['move_id'] = move.id
+                move_line = move_line_obj.with_context(
+                    check_move_validity=False).create(line_vals)
+                to_reconcile_lines.append(line + move_line)
 
             # Create counter-part
             if not deposit.company_id.check_deposit_account_id:
@@ -220,10 +222,8 @@ class AccountCheckDeposit(models.Model):
 
             counter_vals = self._prepare_counterpart_move_lines_vals(
                 deposit, total_debit, total_amount_currency)
-            mv_lines_vals.append((0, 0, counter_vals))
-            move_vals['line_ids'] = mv_lines_vals
-            move = am_obj.create(move_vals)
-            to_reconcile_lines.extend(move.line_ids)
+            counter_vals['move_id'] = move.id
+            move_line_obj.create(counter_vals)
 
             move.post()
             deposit.write({'state': 'done', 'move_id': move.id})
diff --git a/account_check_deposit/views/account_deposit_view.xml b/account_check_deposit/views/account_deposit_view.xml
index f09700ef8..7d178d400 100644
--- a/account_check_deposit/views/account_deposit_view.xml
+++ b/account_check_deposit/views/account_deposit_view.xml
@@ -61,7 +61,23 @@
                                             ('currency_id', '=', currency_none_same_company_id),
                                             ('account_id', '=', journal_default_account_id)]"
                                     context="{'currency': currency_id,
-                                        'journal_id': journal_id}" />
+                                        'journal_id': journal_id}">
+                                <tree>
+                                    <field name="date"/>
+                                    <field name="date_maturity"/>
+                                    <field name="move_id"/>
+                                    <field name="journal_id"/>
+                                    <field name="name"/>
+                                    <field name="ref"/>
+                                    <field name="partner_id"/>
+                                    <field name="account_id"/>
+                                    <field name="debit" sum="Total Debit"/>
+                                    <field name="credit" sum="Total Credit"/>
+                                    <field name="name"/>
+                                    <field name="amount_currency" readonly="True" groups="base.group_multi_currency"/>
+                                    <field name="full_reconcile_id"/>
+                                </tree>
+                            </field>
                         </group>
                     </sheet>
                 </form>