[IMP] subscription_oca: more invoicing modes

subscription_oca/models/sale_subscription.py

@@ -321,35 +321,52 @@ def generate_invoice(self):
             if self.template_id.invoicing_mode != "draft":
                 invoice.action_post()
                 if self.template_id.invoicing_mode == "invoice_send":
-                    mail_template = self.template_id.invoice_mail_template_id
-                    invoice.with_context(force_send=True).message_post_with_template(
-                        mail_template.id,
-                        composition_mode="comment",
-                        email_layout_xmlid="mail.mail_notification_paynow",
-                    )
+                    self.send_invoice(invoice)
                 invoice_number = invoice.name
                 message_body = (
                     "<b>%s</b> <a href=# data-oe-model=account.move data-oe-id=%d>%s</a>"
                     % (msg_static, invoice.id, invoice_number)
                 )
 
-        if self.template_id.invoicing_mode == "sale_and_invoice":
+        elif self.template_id.invoicing_mode in ["sale_draft"]:
+            self.create_sale_order()
+
+        elif self.template_id.invoicing_mode in ["sale_confirmed"]:
+            order_id = self.create_sale_order()
+            order_id.action_confirm()
+
+        elif self.template_id.invoicing_mode in [
+            "sale_and_invoice",
+            "sale_and_invoice_draft",
+            "sale_and_invoice_send",
+        ]:
             order_id = self.create_sale_order()
             order_id.action_done()
             new_invoice = order_id._create_invoices()
-            new_invoice.action_post()
+            if self.template_id.invoicing_mode == "sale_and_invoice":
+                new_invoice.action_post()
             new_invoice.invoice_origin = order_id.name + ", " + self.name
             invoice_number = new_invoice.name
             message_body = (
                 "<b>%s</b> <a href=# data-oe-model=account.move data-oe-id=%d>%s</a>"
                 % (msg_static, new_invoice.id, invoice_number)
             )
+            if self.template_id.invoicing_mode == "sale_and_invoice_send":
+                self.send_invoice(new_invoice)
         if not invoice_number:
             invoice_number = _("To validate")
             message_body = "<b>%s</b> %s" % (msg_static, invoice_number)
         self.calculate_recurring_next_date(self.recurring_next_date)
         self.message_post(body=message_body)
 
+    def send_invoice(self, invoice):
+        mail_template = self.template_id.invoice_mail_template_id
+        invoice.with_context(force_send=True).message_post_with_template(
+            mail_template.id,
+            composition_mode="comment",
+            email_layout_xmlid="mail.mail_notification_paynow",
+        )
+
     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,10 @@ class SaleSubscriptionTemplate(models.Model):
             ("invoice", "Invoice"),
             ("invoice_send", "Invoice & send"),
             ("sale_and_invoice", "Sale order & Invoice"),
+            ("sale_and_invoice_draft", "Sale order & Invoice Draft"),
+            ("sale_and_invoice_send", "Sale Order & Invoice Send"),
+            ("sale_draft", "Sale Order Draft"),
+            ("sale_confirmed", "Sale Order Confirmed"),
         ],
     )
     code = fields.Char()