Merge pull request #335 from fasrc/development

Clear out ProductUsageProcessing when recalculating billing records

coldfront/plugins/ifx/calculator.py

@@ -111,7 +111,6 @@ def generate_billing_records_for_organization(self, year, month, organization, r
         '''
         successes = []
         errors = []
-
         if organization.org_tree == 'Harvard':
             projects = [po.project for po in organization.projectorganization_set.all()]
             if not projects:

coldfront/plugins/ifx/views.py

@@ -113,6 +113,7 @@ def calculate_billing_month(request, year, month):
     try:
         if recalculate:
             ifxbilling_models.BillingRecord.objects.filter(year=year, month=month).delete()
+            ifxbilling_models.ProductUsageProcessing.objects.filter(product_usage__year=year, product_usage__month=month).delete()
         calculator = NewColdfrontBillingCalculator()
         calculator.calculate_billing_month(year, month, recalculate=recalculate)
         return Response('OK', status=status.HTTP_200_OK)