Merge branch 'current_branch' into 'dev'

Current branch

See merge request !245

finance/views.py

@@ -63,9 +63,17 @@ class BillListView(APIView):
                 for i in children:
                     status = get_real_name(elem=i['status'], array=Invoice.BILL_STATUSES)
                     try:
-                        invoice = Invoice.objects.get(id=i['id'])
-                        if invoice.status == "P" or invoice.status == status:
-                            continue
+                        invoice_id = i['id']
+                    except KeyError:
+                        invoice_id = None
+
+                    try:
+                        if not invoice_id is None:
+                            invoice = Invoice.objects.get(id=i['id'])
+                            if invoice.status == "P" or invoice.status == status:
+                                continue
+                        else:
+                            raise Invoice.DoesNotExist
 
                     except Invoice.DoesNotExist:
                         i['method'] = get_real_name(elem=i['method'], array=Invoice.BILL_METHOD)