From 601997df6d5ff9393d4a9f49daae3d4943060797 Mon Sep 17 00:00:00 2001
From: Haresh Shyara <hsh@odoo.com>
Date: Fri, 21 Apr 2017 15:02:25 +0530
Subject: [PATCH] [IMP] account_check_printing: Assign the check number on
 payment confirmation

Purpose
=======

Avoid issues in checks numbering.

Specification
=============

When the manual numbering of the checks is ticked on the bank journal, assign and display number to the check only when the payment is confirmed, not when the check is still in draft.
---
 .../models/account_payment.py                 | 22 +++++++------------
 .../views/account_payment_views.xml           |  4 ----
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/addons/account_check_printing/models/account_payment.py b/addons/account_check_printing/models/account_payment.py
index 3af1cfea95b..3bcbfc39d55 100644
--- a/addons/account_check_printing/models/account_payment.py
+++ b/addons/account_check_printing/models/account_payment.py
@@ -49,13 +49,6 @@ class AccountPayment(models.Model):
         help="The selected journal is configured to print check numbers. If your pre-printed check paper already has numbers "
              "or if the current numbering is wrong, you can change it in the journal configuration page.")
 
-    @api.onchange('journal_id')
-    def _onchange_journal_id(self):
-        if hasattr(super(AccountPayment, self), '_onchange_journal_id'):
-            super(AccountPayment, self)._onchange_journal_id()
-        if self.journal_id.check_manual_sequencing:
-            self.check_number = self.journal_id.check_sequence_id.number_next_actual
-
     @api.onchange('amount','currency_id')
     def _onchange_amount(self):
         res = super(AccountPayment, self)._onchange_amount()
@@ -70,13 +63,14 @@ class AccountPayment(models.Model):
             if len(communication) > 60:
                 raise ValidationError(_("A check memo cannot exceed 60 characters."))
 
-    @api.model
-    def create(self, vals):
-        if vals['payment_method_id'] == self.env.ref('account_check_printing.account_payment_method_check').id\
-                and vals.get('check_manual_sequencing'):
-            sequence = self.env['account.journal'].browse(vals['journal_id']).check_sequence_id
-            vals.update({'check_number': sequence.next_by_id()})
-        return super(AccountPayment, self).create(vals)
+    @api.multi
+    def post(self):
+        res = super(AccountPayment, self).post()
+        payment_method_check = self.env.ref('account_check_printing.account_payment_method_check')
+        for payment in self.filtered(lambda p: p.payment_method_id == payment_method_check and p.check_manual_sequencing):
+            sequence = payment.journal_id.check_sequence_id
+            payment.check_number = sequence.next_by_id()
+        return res
 
     @api.multi
     def print_checks(self):
diff --git a/addons/account_check_printing/views/account_payment_views.xml b/addons/account_check_printing/views/account_payment_views.xml
index f3836a44099..1c5516f98b6 100644
--- a/addons/account_check_printing/views/account_payment_views.xml
+++ b/addons/account_check_printing/views/account_payment_views.xml
@@ -27,10 +27,6 @@
                 <xpath expr="//div[@name='amount_div']" position="after">
                     <field name="check_amount_in_words" attrs="{'invisible': [('payment_method_code', '!=', 'check_printing')]}" groups="base.group_no_one"/>
                 </xpath>
-                <xpath expr="//field[@name='communication']" position="after">
-                    <field name="check_manual_sequencing" invisible="1" readonly="1"/>
-                    <field name="check_number" attrs="{'invisible': ['|', ('payment_method_code', '!=', 'check_printing'), ('check_manual_sequencing', '=', False)]}"/>
-                </xpath>
             </field>
         </record>