[FIX] cancellation on voucher and bank receopt

Author: kittiu

account_bank_receipt/models/account.py

@@ -14,6 +14,13 @@ class AccountJournal(models.Model):
     )
 
 
+class AccountMoveLine(models.Model):
+    _inherit = "account.move.line"
+
+    bank_receipt_id = fields.Many2one(
+        'account.bank.receipt', string='Bank Receipt', copy=False)
+
+
 class AccountMove(models.Model):
     _inherit = 'account.move'
 
@@ -29,10 +36,12 @@ class AccountMove(models.Model):
     @api.depends('line_id.bank_receipt_id')
     def _compute_bank_receipt(self):
         for move in self:
-            bank_receipt_line = move.line_id.filtered('bank_receipt_id')
-            move.bank_receipt_id = bank_receipt_line.bank_receipt_id
-            if move.bank_receipt_id:
+            if move.bank_receipt_id:  # Not yet assigned
                 break
+            move_lines = move.line_id.filtered('bank_receipt_id')
+            bank_receipts = move_lines.mapped('bank_receipt_id')
+            if bank_receipts:
+                move.bank_receipt_id = bank_receipts[0]
 
     @api.multi
     def create_bank_receipt(self, receipt_date):

account_bank_receipt/models/account_bank_receipt.py

@@ -16,6 +16,7 @@ class AccountBankReceipt(models.Model):
         size=64,
         readonly=True,
         default='/',
+        copy=False,
     )
     bank_intransit_ids = fields.One2many(
         'account.move.line',
@@ -349,10 +350,3 @@ def onchange_journal_id(self):
                 self.currency_id = self.journal_id.currency
             else:
                 self.currency_id = self.journal_id.company_id.currency_id
-
-
-class AccountMoveLine(models.Model):
-    _inherit = "account.move.line"
-
-    bank_receipt_id = fields.Many2one(
-        'account.bank.receipt', string='Bank Receipt', copy=False)

account_bank_receipt/views/account_bank_receipt_view.xml

@@ -16,6 +16,7 @@
                     <field name="account_id" readonly="1"/>
                     <field name="debit" sum="Total Debit" readonly="1"/>
                     <field name="credit" sum="Total Credit" readonly="1"/>
+                    <field name="reconcile_id" readonly="1"/>
                 </tree>
             </field>
         </record>

account_bank_receipt/wizard/voucher_create_bank_receipt_wizard.py

@@ -17,5 +17,8 @@ def voucher_create_bank_receipt(self):
         active_model = self._context.get('active_model')
         active_ids = self._context.get('active_ids')
         moves = self.env[active_model].browse(active_ids).mapped('move_id')
-        moves.create_bank_receipt(self.receipt_date)
-        return
+        bank_receipt_id = moves.create_bank_receipt(self.receipt_date)
+        action = self.env.ref('account_bank_receipt.action_bank_receipt_tree')
+        result = action.read()[0]
+        result['domain'] = [('id', '=', bank_receipt_id)]
+        return result

account_bank_receipt_cancel_reason/wizard/cancel_reason.py

@@ -22,7 +22,6 @@ def confirm_cancel(self):
         assert len(bank_receipt_ids) == 1, "Only 1 sale ID expected"
         BankReceipt = self.env['account.bank.receipt']
         bank_receipt = BankReceipt.browse(bank_receipt_ids[0])
-        bank_receipt.write({'cancel_reason_txt': self.cancel_reason_txt,
-                            'state': 'cancel',
-                            })
+        bank_receipt.write({'cancel_reason_txt': self.cancel_reason_txt})
+        bank_receipt.cancel_bank_receipt()
         return act_close

account_bank_receipt_deduction/models/account_bank_receipt.py

@@ -67,6 +67,7 @@ class AccountBankReceipt(models.Model):
     manual_total_amount = fields.Float(
         string="Total Amount",
         readonly=True,
+        default=0.0,
         states={'draft': [('readonly', False)]},
         required=True,
     )

account_cancel_reversal/models/account_bank_receipt.py

@@ -24,7 +24,7 @@ def _cancel_move(self):
                               'ref': move.ref})
         rev_move._switch_dr_cr()
         self.cancel_move_id = rev_move
-        # As accounto n both DR and CR are balance sheet item, do one by one
+        # As account both DR and CR are balance sheet item, do one by one
         accounts = move.line_id.mapped('account_id')
         for account in accounts:
             self.env['account.move'].\

account_cancel_reversal/models/account_voucher.py

@@ -21,8 +21,16 @@ def voucher_move_cancel_hook(self, voucher):
                               'ref': move.ref})
         rev_move._switch_dr_cr()
         voucher.cancel_move_id = rev_move
-        self.env['account.move'].\
-            _reconcile_voided_entry([move.id, rev_move.id])
+        # Delete reconcile, and receconcile with reverse entry
+        move.line_id.filtered('reconcile_id').reconcile_id.unlink()
+        accounts = move.line_id.mapped('account_id')
+        for account in accounts:
+            self.env['account.move'].\
+                _reconcile_voided_entry_by_account([move.id, rev_move.id],
+                                                   account.id)
+
+        # self.env['account.move'].\
+        #     _reconcile_voided_entry([move.id, rev_move.id])
         return
 
     @api.model