Commit 28896518 authored by Gladys Forte's avatar Gladys Forte

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

* commit 'dadde7d9':
  rejected requestor
parents 042d8457 dadde7d9
...@@ -641,7 +641,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet): ...@@ -641,7 +641,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
) )
change_request.cr_routing_actions(new_instance, current_user) change_request.cr_routing_actions(new_instance, current_user)
# if action.lower() == 'approved': # if action.lower() == 'approved':
# the_next_vendor = models.ChangeRequestFormApprovers.objects.filter( # the_next_vendor = models.ChangeRequestFormApprovers.objects.filter(
......
...@@ -574,7 +574,7 @@ def cr_routing_actions(approver_instance, current_user): ...@@ -574,7 +574,7 @@ def cr_routing_actions(approver_instance, current_user):
remarks, level remarks, level
) )
prev_level = int(level) + 1 prev_level = int(level) - 1
# reset last vendor details # reset last vendor details
models.ChangeRequestFormApprovers.objects.filter( models.ChangeRequestFormApprovers.objects.filter(
Q(form_code=form_code) & Q(form_code=form_code) &
...@@ -710,7 +710,7 @@ def cr_routing_actions(approver_instance, current_user): ...@@ -710,7 +710,7 @@ def cr_routing_actions(approver_instance, current_user):
requestor_notification_msg, action, requestor_notification_msg, action,
remarks, level remarks, level
) )
date_now = datetime.now() date_now = datetime.now()
# update current approver details # update current approver details
update_form_approver(form_code, level, 'current', date_now) update_form_approver(form_code, level, 'current', date_now)
......
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