Merge branch 'red-develop' into 'feature/RMS.v2.1-AMS'

Red develop

See merge request rms/Backend/api-main-service!990

app/applicationlayer/ams/asset/serializers.py

@@ -10,9 +10,11 @@ class AMSAssetSerializer(serializers.ModelSerializer):
         ret['in_qty'] = instance.ams_asset_to_assetdetail.filter(status='In-Store').count()
         ret['out_qty'] = instance.ams_asset_to_assetdetail.filter(status='Deployed').count()
         ret['unavailable'] = instance.ams_asset_to_assetdetail.filter(status='Faulty').count()
+        ret['created_by'] = instance.created_by.name,
         return ret
 
 
     class Meta:
         model = AMSAsset
         fields = '__all__'
+        read_only_fields = ('created_by',)

app/applicationlayer/ams/asset_stock/serializers.py

@@ -9,6 +9,12 @@ class AMSAssetStockSerializer(serializers.ModelSerializer):
         ret['asset_group'] = instance.asset_group.name
         ret['asset'] = instance.asset.name
         ret['asset_type'] = instance.asset.asset_type.name
+        ret['manager'] = instance.manager.name
+        ret['user_client'] = instance.user_client.name
+        # ret['created_by'] = {
+        #     "name": instance.created_by.name,
+        #     "code": instance.created_by.code
+        # }
         return ret