merge

app/applicationlayer/cms/utils_cr.py

@@ -695,9 +695,6 @@ def cancelled_user_trigger(form_code):
         # NOTIF MSG FOR NEXT APPROVER
         msg = CANCEL_MESSAGE.split(';')[0]
         
-        # if n_approver.delegation.name.lower() == 'vendor/implementor':
-        #     msg = VENDOR_ACKNOWLEDGE_MESSAGE.split(';')[0]
-
         # next approver details  --------------------------------------------------
         receiver_instance = get_account_details(n_approver.user.code)
         receiver_name = receiver_instance.values_list('name', flat=True)[0]

app/applicationlayer/management/batchupload/views.py

@@ -198,7 +198,7 @@ class BatchUploadViewSet(viewsets.ModelViewSet):
         )
         return Response(
             {"message": message},
-            status=status.HTTP_400_BAD_REQUEST
+            status=status.HTTP_200_OK
         )
 
     @transaction.atomic
@@ -256,13 +256,15 @@ class BatchUploadViewSet(viewsets.ModelViewSet):
                         raise ParseError(
                             department_error
                         )
+
+                # user type authorization and user type per user
                 else:
                     user_department = Department.objects.get(
                         name__icontains=keys['department']
                     )
                 
                 default_app = Application.objects.filter(
-                    excel_code=keys['default_app']
+                    excel_code=keys['Default_app']
                 ).first()
 
                 dept_code = Department.objects.get(

app/entities/models.py

@@ -130,7 +130,6 @@ class Company(AuditClass):
     def save(self, *args, **kwargs):
         super(Company, self).save(*args, **kwargs)
         if self.code == 'com':
-            print(self.code)
             code = enums.GenerateCode.APP.value
             code = number_generator(enums.GenerateCode.COMPANY.value, self.id)
             Company.objects.filter(id=self.id).update(code=code)