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

* commit 'c96429d9':
  model to dict serialier
  model dict
  comment
  is active

app/applicationlayer/cms/form/header/views.py

@@ -590,7 +590,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
                                         pk=instance.id)
 
         new_instance = model_to_dict(form_header)
-
+        
         # save history in form header
         crhistory_save(
             batchno,

app/applicationlayer/cms/template/header/serializers.py

@@ -44,7 +44,7 @@ class ChangeRequestTemplatesSerializer(
             ret['requested_to_company'] = model_to_dict(instance.requested_to_company)
             ret['requested_to_department'] = model_to_dict(instance.requested_to_department)
             ret['requested_to_user'] = requested_to_user_object
-            
+
             ret['company'] = instance.requested_to_company.name
             ret['department'] = instance.requested_to_department.name
             ret['point_of_contact'] = instance.requested_to_user.name

app/applicationlayer/cms/template/header/views.py

@@ -257,7 +257,7 @@ class ChangeRequestTemplatesViewset(viewsets.ModelViewSet):
             "Unable to edit due to existing transaction",
                 status=status.HTTP_400_BAD_REQUEST
         )
-#try 1
+
 
 class ChangeRequestTemplatePost(APIView):
 

app/businesslayer/changerequest/change_request.py

@@ -59,7 +59,6 @@ def list_by_user_archived(user_id_number):
         ).values('group_pivots')
         
         return_queryset = models.ChangeRequestFormHeader.objects.filter(
-            Q(is_active=False) |
             Q(frm_approvers__user__code=user_id_number) |
             Q(frm_stakes__user__code=user_id_number) |
             Q(requested_by_user=user_id_number) |
@@ -303,10 +302,9 @@ def form_add_edit_delete(form_request_body,
 
             serializer.is_valid(raise_exception=True)
             old_instance = model_to_dict(frm_instance)
-            
             self.perform_update(serializer)
             new_instance = serializer.data
-            
+            # comment
             crhistory_save(
                 batch_no,
                 main_action,