CM-342: filter only not assigned bills (#15)

* CM-342: filter only not assigned bills

* CM-342: provide more strict filtering

* CM-342: add translations

---------

Co-authored-by: Jan <[email protected]>

Author: Jan

locale/en/LC_MESSAGES/django.po

@@ -0,0 +1,11 @@
+msgid "payroll.validation.payroll.bill_already_assigned"
+msgstr "Bills %(bill_ids) already assigned to payroll."
+
+msgid "payroll.validation.payroll.no_bills_for_filter_criteria"
+msgstr "Bills not found for given search criteria."
+
+msgid "payroll.validation.payroll.name_exists"
+msgstr "Name %(name) already exists."
+
+msgid "payroll.validation.field_empty"
+msgstr "Field %(field) can not be empty."

payroll/services.py

@@ -128,7 +128,11 @@ def _get_bills_queryset(self, obj_data, included_unpaid):
             date_bill__range=(date_from, date_to),
             subject_type=ContentType.objects.get_for_model(Beneficiary),
             subject_id__in=beneficiary_ids,
-            status__in=[Bill.Status.VALIDATED]
+            status__in=[Bill.Status.VALIDATED],
+        )
+
+        bills_queryset = bills_queryset.filter(
+            Q(payrollbill__isnull=True) | Q(payrollbill__is_deleted=True)
         )
 
         if included_unpaid:

payroll/validation.py

@@ -50,7 +50,7 @@ def are_bills_in_data(data):
 
 def validate_one_payroll_per_bill(data):
     bills = data.get('bills', [])
-    query = PayrollBill.objects.filter(bill__in=bills)
+    query = PayrollBill.objects.filter(bill__in=bills, is_deleted=False)
     if query.exists():
         payroll_bill_ids = list(query.values_list('id', flat=True))
         return [{"message": _("payroll.validation.payroll.bill_already_assigned") % {