Merge pull request #60 from tosccolors/16.0-377.9_1st-cancel-draft-unlink

[RFR] #377.9(1st) cascade draft, cancel and unlink actions to wip moves

Author: Stephanvandenberg

ps_timesheet_invoicing/models/account_move.py

@@ -211,19 +211,32 @@ def action_wip_move_create(self):
 
     def button_draft(self):
         res = super().button_draft()
+
         wip_moves = self.mapped("wip_move_id")
+        if wip_moves:
+            wip_moves += self.search([("reversed_entry_id", "in", wip_moves.ids)])
+            wip_moves.button_draft()
 
-        # First, set the invoices as cancelled and detach the move ids
-        self.write({"wip_move_id": False})
-        # second, invalidate the move(s)
+        return res
+
+    def button_cancel(self):
+        result = super().button_cancel()
+
+        wip_moves = self.mapped("wip_move_id")
         if wip_moves:
             wip_moves += self.search([("reversed_entry_id", "in", wip_moves.ids)])
             wip_moves.button_cancel()
-            # delete the move this invoice was pointing to
-            # Note that the corresponding move_lines and move_reconciles
-            # will be automatically deleted too
+
+        return result
+
+    def unlink(self):
+        wip_moves = self.mapped("wip_move_id")
+        self.write({"wip_move_id": False})
+        if wip_moves:
+            wip_moves += self.search([("reversed_entry_id", "in", wip_moves.ids)])
             wip_moves.with_context(force_delete=True).unlink()
-        return res
+
+        return super().unlink()
 
     def wip_move_create(self, wip_journal, name, ar_account_id, ref=None):
         self.ensure_one()

ps_timesheet_invoicing/tests/test_ps_invoice.py

@@ -67,6 +67,7 @@ def test_01_invoicing(self):
         self.assertEqual(ps_invoice.state, "invoiced")
         self.assertEqual(set(self.ps_line.mapped("state")), {"invoiced"})
         self.assertTrue(ps_invoice.invoice_id.wip_move_id)
+        self.assertTrue(ps_invoice.invoice_id.wip_move_id.reversal_move_id)
         return ps_invoice
 
     def test_02_delete_invoice(self):
@@ -82,8 +83,20 @@ def test_02_delete_invoice(self):
             ps_invoice.user_total_ids.detail_ids + ps_invoice.mileage_line_ids,
             self.ps_line,
         )
+        wip_move = ps_invoice.invoice_id.wip_move_id
+        wip_reversal = ps_invoice.invoice_id.wip_move_id.reversal_move_id
+        invoice = ps_invoice.invoice_id
         ps_invoice.unlink()
         self.assertEqual(set(self.ps_line.mapped("state")), {"invoiceable"})
+        invoice.button_draft()
+        self.assertEqual(wip_move.state, "draft")
+        self.assertEqual(wip_reversal.state, "draft")
+        invoice.button_cancel()
+        self.assertEqual(wip_move.state, "cancel")
+        self.assertEqual(wip_reversal.state, "cancel")
+        invoice.unlink()
+        self.assertFalse(wip_move.exists())
+        self.assertFalse(wip_reversal.exists())
 
     def test_03_amend_invoice(self):
         ps_line1, mileage_line = self.ps_line