diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2022-07-07 11:56:40 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2022-07-08 09:59:31 +0200 |
commit | 632f8e2ea107324838845df2b51d084759923c56 (patch) | |
tree | 9907ca50998ac262431617260d07b4fac3ce36ff /archaeological_files/views.py | |
parent | 98e33994e42a0d5ee7cd1142922265589a6cb519 (diff) | |
download | Ishtar-632f8e2ea107324838845df2b51d084759923c56.tar.bz2 Ishtar-632f8e2ea107324838845df2b51d084759923c56.zip |
Preventive file form: fix JS - fix default cost add with price agreement
Diffstat (limited to 'archaeological_files/views.py')
-rw-r--r-- | archaeological_files/views.py | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/archaeological_files/views.py b/archaeological_files/views.py index d91688ac4..eaeccd1ad 100644 --- a/archaeological_files/views.py +++ b/archaeological_files/views.py @@ -546,8 +546,13 @@ def file_edit_preventive_add_default(request, pk, current_right=None): ("default_daily_need_on_ground", models.PreventiveFileGroundJob), ("default_daily_need", models.PreventiveFileJob), ) + price_agreement_id = None + q = models.File.objects.filter(pk=pk).values("price_agreement_id") + if q.count(): + price_agreement_id = q.all()[0]["price_agreement_id"] for attr, job_model in job_attrs: - jobs = models.Job.objects.exclude(**{attr: 0}) + jobs = models.Job.objects.exclude(**{attr: 0}).filter( + price_agreement_id=price_agreement_id) for job in jobs: q = job_model.objects.filter(job=job, file_id=pk) if not q.count(): @@ -558,7 +563,11 @@ def file_edit_preventive_add_default(request, pk, current_right=None): "man_by_day_planned": getattr(job, attr), } job_model.objects.create(**dct) - q = models.EquipmentServiceCost.objects.exclude(default_quantity_by_day=0) + q = models.EquipmentServiceCost.objects.exclude( + default_quantity_by_day=0 + ).filter( + price_agreement_id=price_agreement_id + ) for cost in list(q.all()): q = models.PreventiveFileEquipmentServiceCost.objects.filter( equipment_service_cost=cost, file_id=pk |