Merge pull request #12217 from dimagi/np/skip_invoice

add flag to skip invoicing if there are no feature charges

corehq/apps/accounting/invoicing.py

@@ -137,6 +137,16 @@ def _get_invoice_end(sub, date_end):
             )
             return
 
+        if (
+            subscription.skip_invoicing_if_no_feature_charges
+            and not subscription.plan_version.feature_charges_exist_for_domain(self.domain)
+        ):
+            log_accounting_info(
+                "Skipping invoicing for Subscription %s because there are no feature charges."
+                % subscription.pk
+            )
+            return
+
         invoice_start = _get_invoice_start(subscription, self.date_start)
         invoice_end = _get_invoice_end(subscription, self.date_end)
 

corehq/apps/accounting/migrations/0036_subscription_skip_invoicing_if_no_feature_charges.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounting', '0035_kill_date_received'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='subscription',
+            name='skip_invoicing_if_no_feature_charges',
+            field=models.BooleanField(default=False),
+            preserve_default=True,
+        ),
+    ]

corehq/apps/accounting/models.py

@@ -1006,6 +1006,7 @@ class Subscription(models.Model):
     do_not_email_reminder = models.BooleanField(default=False)
     auto_generate_credits = models.BooleanField(default=False)
     is_trial = models.BooleanField(default=False)
+    skip_invoicing_if_no_feature_charges = models.BooleanField(default=False)
     service_type = models.CharField(
         max_length=25,
         choices=SubscriptionType.CHOICES,