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

* commit 'c4cc53ff':
  revised fix

app/businesslayer/changerequest/change_request.py

@@ -595,16 +595,6 @@ def cr_routing_actions(approver_instance, current_user):
             
             if prev_vendor.count() > 0:
                 
-                # EMAIL CODE FOR REQUESTOR
-                # requestor_notification_msg = REQUESTOR_REJECT_MESSAGE.split(';')[0]
-                
-                # SEND EMAIL AND NOTIF TO REQUESTOR
-                # send_mail_requestor(
-                #     current_user, form_code, delegation,
-                #     requestor_notification_msg, action,
-                #     remarks, level
-                # )
-
                 notification_msg = REVISED_MESSAGE.split(';')[0]
                 
                 send_mail_vendor(
@@ -627,7 +617,7 @@ def cr_routing_actions(approver_instance, current_user):
                 level = last_action_vendor.level
 
         models.ChangeRequestFormApprovers.objects.filter(
-            Q(form_code=form_code) & Q(level__gt=int(level))
+            Q(form_code=form_code) & Q(level__gte=int(level))
             ).update(
                 is_action=False,
                 action=None,
@@ -636,46 +626,8 @@ def cr_routing_actions(approver_instance, current_user):
                 date_sent=None
         )
             
-        # else:
-
-        #     update_form_header_status(form_code, 'Rejected')
-
-        #     # EMAIL CODE FOR REQUESTOR
-        #     requestor_notification_msg = REQUESTOR_REJECT_MESSAGE.split(';')[0]
-            
-        #     # SEND EMAIL AND NOTIF TO REQUESTOR
-        #     send_mail_requestor(
-        #         current_user, form_code, delegation,
-        #         requestor_notification_msg, action,
-        #         remarks, level
-        #     )
-
     elif approver_instance['action'].lower() == 'rejected':
         
-        # send email to vendor
-        # if delegation.lower() == 'requestor':
-        #     notification_msg = VENDOR_REJECT_MESSAGE.split(';')[0]
-
-        #     # send reject email to vendor
-        #     send_mail_vendor(
-        #         current_user, form_code, delegation,
-        #         notification_msg, action,
-        #         remarks, level
-        #     )
-
-        #     prev_level = int(level) - 1
-        #     # reset last vendor details
-        #     models.ChangeRequestFormApprovers.objects.filter(
-        #         Q(form_code=form_code) &
-        #         Q(level=int(prev_level))
-        #         ).update(
-        #             is_action=True,
-        #             action='Acknowledged',
-        #             action_date=datetime.now(),
-        #             date_sent=datetime.now()
-        #     )
-
-        # else:
         update_form_header_status(form_code, 'Rejected')
 
         # EMAIL CODE FOR REQUESTOR
@@ -769,7 +721,7 @@ def cr_routing_actions(approver_instance, current_user):
         
         
         reset_autoemail_tables(form_code)
-
+        
     return True