pull update from gladys branch

app/applicationlayer/master/company/views.py

@@ -15,6 +15,7 @@ class AdminCompanyViewSet(viewsets.ModelViewSet):
     queryset = Company.objects.all()
     serializer_class = AdminCompanySerializer
     pagination_class = CustomPagination
+    lookup_field = 'code'
     filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter)
     filterset_class = CompanyFilterSet
     ordering_fields = '__all__'

app/applicationlayer/master/department/views.py

@@ -18,6 +18,7 @@ class AdminDepartmentViewSet(viewsets.ModelViewSet):
     queryset = Department.objects.all()
     serializer_class = serializer.AdminDepartmentSerializer
     pagination_class = CustomPagination
+    lookup_field = 'code'
     filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter)
     filterset_class = DepartmentFilterSet
     ordering_fields = '__all__'

app/entities/migrations/0013_auto_20190917_1620.py

-# Generated by Django 2.2 on 2019-09-17 16:20
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('entities', '0012_auto_20190913_1704'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='changerequesthistory',
-            name='action',
-            field=models.CharField(max_length=50),
-        ),
-        migrations.AlterField(
-            model_name='changerequesthistory',
-            name='entity',
-            field=models.CharField(max_length=50),
-        ),
-        migrations.AlterField(
-            model_name='notification',
-            name='account_no',
-            field=models.CharField(blank=True, max_length=255, null=True),
-        ),
-        migrations.AlterField(
-            model_name='notification',
-            name='app',
-            field=models.CharField(blank=True, max_length=255, null=True),
-        ),
-        migrations.AlterField(
-            model_name='notification',
-            name='form_code',
-            field=models.CharField(blank=True, max_length=255, null=True),
-        ),
-        migrations.AlterField(
-            model_name='notification',
-            name='sender_account_no',
-            field=models.CharField(blank=True, max_length=255, null=True),
-        ),
-    ]