align from demo to product-dev

app/applicationlayer/master/Account/views.py

@@ -31,7 +31,7 @@ class AdminAccountViewSet(viewsets.ModelViewSet):
     # @rms.department_list
     def list(self, request, *args, **kwargs):
         try:
-
+            
             queryset = self.filter_queryset(self.get_queryset())
             if len(self.request.query_params) > 0:
                 dept = self.request.query_params['department_code']

app/entities/models.py

@@ -1272,4 +1272,4 @@ class ChangeRequestSettings(models.Model):
         if self.code == '':
             self.code = code
             self.created = datetime.now()
-            self.save()
\ No newline at end of file
+            self.save()

config/settings/base.py

@@ -165,7 +165,24 @@ REST_FRAMEWORK = {
     'PAGE_SIZE': 10
 }
 
+<<<<<<< HEAD
+=======
+# EMAIL_TEMPLATES_ROOT = os.path.join(BASE_DIR, "app/helper/email_service/templates")
+# EMAIL_HOST = 'email-smtp.us-west-2.amazonaws.com'
+# EMAIL_PORT = 587
+# EMAIL_HOST_USER = 'AKIAIPRWQKYV6N5SMLUA'
+# EMAIL_HOST_PASSWORD = 'ApK1dtH2qpT/oMl9MEauFvyN9XZDQ1fjzd8TumIs71NG'
+# EMAIL_USE_SSL = False
+# EMAIL_USE_TLS = True
+# EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
+# EMAIL_DEFAULT_SENDER = 'rms.noreply@oneberrysystem.com'
+
+# EMAIL_TEMPLATES_ROOT = os.path.join(BASE_DIR, "app/helper/email_service/templates")
+
+
+>>>>>>> 585ee9ce5bff84b4f108c6f5928f939b1f3b733d
 EMAIL_TEMPLATES_ROOT = os.path.join(BASE_DIR, "app/helper/email_service/templates")
+
 EMAIL_HOST = 'email-smtp.us-west-2.amazonaws.com'
 EMAIL_PORT = 587
 EMAIL_HOST_USER = 'AKIAIPRWQKYV6N5SMLUA'