Commit 071032cb authored by Gladys Forte's avatar Gladys Forte

Merge pull request #324 in RMS/api-main-service from gladys-dev2 to RMSv2

* commit 'd5c9bd90':
  added condition on action completed
parents 33a8e90b d5c9bd90
......@@ -794,10 +794,11 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
form_code=form_code, delegation='Vendor/Implementor'
).order_by('level').last()
if current_user == the_last_vendor.user.code:
if (current_user == the_last_vendor.user.code and
level == the_last_vendor.level):
models.ChangeRequestFormHeader.objects.filter(
form_code=form_code
).update(status='Completed')
).update(status='Completed')
else:
the_next_vendor = models.ChangeRequestFormApprovers.objects.filter(
form_code=form_code, level=int(next_level),
......@@ -822,7 +823,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
date_sent=datetime.now(),
is_action=True
)
# update current approver details
models.ChangeRequestFormApprovers.objects.filter(
Q(form_code=form_code) & Q(level=int(level))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment