Commit d921ca6a authored by John Red Medrano's avatar John Red Medrano

Merge branch 'RMSv2' of http://42.61.118.105:7990/scm/rms/api-main-service into red-develop

parents 20ecceee 071032cb
...@@ -794,10 +794,11 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet): ...@@ -794,10 +794,11 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
form_code=form_code, delegation='Vendor/Implementor' form_code=form_code, delegation='Vendor/Implementor'
).order_by('level').last() ).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( models.ChangeRequestFormHeader.objects.filter(
form_code=form_code form_code=form_code
).update(status='Completed') ).update(status='Completed')
else: else:
the_next_vendor = models.ChangeRequestFormApprovers.objects.filter( the_next_vendor = models.ChangeRequestFormApprovers.objects.filter(
form_code=form_code, level=int(next_level), form_code=form_code, level=int(next_level),
...@@ -822,7 +823,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet): ...@@ -822,7 +823,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
date_sent=datetime.now(), date_sent=datetime.now(),
is_action=True is_action=True
) )
# update current approver details # update current approver details
models.ChangeRequestFormApprovers.objects.filter( models.ChangeRequestFormApprovers.objects.filter(
Q(form_code=form_code) & Q(level=int(level)) 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