Commit c961b6ee authored by John Red Medrano's avatar John Red Medrano

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

Red develop

See merge request rms/Backend/api-main-service!1009
parents e63c7383 920fa1a7
...@@ -9,7 +9,7 @@ class AMSAssetSerializer(serializers.ModelSerializer): ...@@ -9,7 +9,7 @@ class AMSAssetSerializer(serializers.ModelSerializer):
ret['asset_type'] = instance.asset_type.name ret['asset_type'] = instance.asset_type.name
ret['in_qty'] = instance.ams_asset_to_assetdetail.filter(status='In-Store').count() 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['out_qty'] = instance.ams_asset_to_assetdetail.filter(status='Deployed').count()
ret['unavailable'] = instance.ams_asset_to_assetgroup.filter( ret['unavailable'] = instance.ams_asset_to_assetdetail.filter(
status__in=['Faulty', 'Returned', 'Written Off'] status__in=['Faulty', 'Returned', 'Written Off']
).count() ).count()
ret['created_by'] = instance.created_by.name ret['created_by'] = instance.created_by.name
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment