[IMP] subscription_oca: recurrent payment

Author: adasatorres

subscription_oca/models/sale_subscription.py

@@ -328,7 +328,12 @@ def create_sale_order(self):
     def generate_invoice(self):
         invoice_number = ""
         msg_static = _("Created invoice with reference")
-        if self.template_id.invoicing_mode in ["draft", "invoice", "invoice_send"]:
+        if self.template_id.invoicing_mode in [
+            "draft",
+            "invoice",
+            "invoice_send",
+            "invoice_and_payment",
+        ]:
             invoice = self.create_invoice()
             if self.template_id.invoicing_mode != "draft":
                 invoice.action_post()
@@ -340,6 +345,8 @@ def generate_invoice(self):
                         email_layout_xmlid="mail.mail_notification_paynow",
                     )
                     invoice.write({"is_move_sent": True})
+                if self.template_id.invoicing_mode == "invoice_and_payment":
+                    self.create_payment(invoice)
                 invoice_number = invoice.name
                 message_body = (
                     "<b>%s</b> <a href=# data-oe-model=account.move data-oe-id=%d>%s</a>"
@@ -363,6 +370,50 @@ def generate_invoice(self):
         self.calculate_recurring_next_date(self.recurring_next_date)
         self.message_post(body=message_body)
 
+    def create_payment(self, invoice):
+        invoice.ensure_one()
+        payment_token = self.env["payment.token"].search(
+            [("partner_id", "=", invoice.partner_id.id)],
+            order="create_date desc",
+            limit=1,
+        )
+        if not payment_token:
+            self.message_post(
+                body=_(
+                    "No payment token found for partner %s" % invoice.partner_id.name
+                )
+            )
+            return
+        provider = payment_token.provider_id
+        method_line = self.env["account.payment.method.line"].search(
+            [
+                ("payment_method_id.code", "=", provider.code),
+                ("company_id", "=", invoice.company_id.id),
+            ],
+            limit=1,
+        )
+        payment_register = self.env["account.payment.register"]
+        payment_vals = {
+            "currency_id": invoice.currency_id.id,
+            "journal_id": provider.journal_id.id,
+            "company_id": invoice.company_id.id,
+            "partner_id": invoice.partner_id.id,
+            "communication": invoice.name,
+            "payment_type": "inbound",
+            "partner_type": "customer",
+            "payment_difference_handling": "open",
+            "writeoff_label": "Write-Off",
+            "payment_date": fields.Date.today(),
+            "amount": invoice.amount_total,
+            "payment_method_line_id": method_line.id,
+            "payment_token_id": payment_token.id,
+        }
+        payment_register.with_context(
+            active_model="account.move",
+            active_ids=invoice.ids,
+            active_id=invoice.id,
+        ).create(payment_vals).action_create_payments()
+
     def manual_invoice(self):
         invoice_id = self.create_invoice()
         self.calculate_recurring_next_date(self.recurring_next_date)

subscription_oca/models/sale_subscription_template.py

@@ -35,6 +35,7 @@ class SaleSubscriptionTemplate(models.Model):
             ("invoice", "Invoice"),
             ("invoice_send", "Invoice & send"),
             ("sale_and_invoice", "Sale order & Invoice"),
+            ("invoice_and_payment", "Invoice & Recurring Payment"),
         ],
     )
     code = fields.Char()

subscription_oca/tests/test_subscription_oca.py

@@ -38,6 +38,14 @@ def setUpClass(cls):
                 ("company_id", "=", cls.env.ref("base.main_company").id),
             ]
         )[0]
+
+        cls.bank_journal = cls.env["account.journal"].search(
+            [
+                ("type", "=", "bank"),
+                ("company_id", "=", cls.env.ref("base.main_company").id),
+            ]
+        )[0]
+
         cls.pricelist1 = cls.env["product.pricelist"].create(
             {
                 "name": "pricelist for contract test",
@@ -116,6 +124,14 @@ def setUpClass(cls):
             }
         )
 
+        cls.tmpl6 = cls.create_sub_template(
+            {
+                "recurring_rule_boundary": "unlimited",
+                "invoicing_mode": "invoice_and_payment",
+                "recurring_rule_type": "years",
+            }
+        )
+
         cls.stage = cls.env["sale.subscription.stage"].create(
             {
                 "name": "Test Sub Stage",
@@ -193,6 +209,14 @@ def setUpClass(cls):
             }
         )
 
+        cls.sub10 = cls.create_sub(
+            {
+                "template_id": cls.tmpl6.id,
+                "recurring_rule_boundary": False,
+                "date_start": fields.Date.today(),
+            }
+        )
+
         cls.sub_line = cls.create_sub_line(cls.sub1)
         cls.sub_line2 = cls.env["sale.subscription.line"].create(
             {
@@ -210,6 +234,7 @@ def setUpClass(cls):
         cls.sub_line52 = cls.create_sub_line(cls.sub5, cls.product_2.id)
         cls.sub_line71 = cls.create_sub_line(cls.sub7)
         cls.sub_line72 = cls.create_sub_line(cls.sub7, cls.product_2.id)
+        cls.sub_line102 = cls.create_sub_line(cls.sub10, cls.product_2.id)
 
         cls.close_reason = cls.env["sale.subscription.close.reason"].create(
             {
@@ -541,7 +566,7 @@ def test_subscription_oca_sub_stage(self):
 
     def test_x_subscription_oca_pricelist_related(self):
         res = self.partner.read(["subscription_count", "subscription_ids"])
-        self.assertEqual(res[0]["subscription_count"], 9)
+        self.assertEqual(res[0]["subscription_count"], 10)
         res = self.partner.action_view_subscription_ids()
         self.assertIsInstance(res, dict)
         sale_order = self.sub1.create_sale_order()
@@ -692,3 +717,9 @@ def _collect_all_sub_test_results(self, subscription):
         )
         test_res.append(group_stage_ids)
         return test_res
+
+    def test_subscription_invoice_and_payment(self):
+        subscription = self.sub10
+        subscription.generate_invoice()
+        self.assertEqual(len(subscription.invoice_ids), 1)
+        self.assertEqual(subscription.invoice_ids.state, "posted")