Merge branch 'feature/RMS.v2.1-AMS' into 'product-dev'

Feature/rms.v2.1 ams See merge request rms/Backend/api-main-service!980

Merge branch 'feature/RMS.v2.1-AMS' into 'product-dev'
Feature/rms.v2.1 ams See merge request rms/Backend/api-main-service!980
9d90f9e1 · Gladys Forte · b3dc489e · 951ae477 · 9d90f9e1 · 9d90f9e1
Commit 9d90f9e1 authored Mar 17, 2020 by Gladys Forte
6 changed files
--- a/app/applicationlayer/ams/asset/serializers.py
+++ b/app/applicationlayer/ams/asset/serializers.py
--- a/app/applicationlayer/ams/asset/table_filters.py
+++ b/app/applicationlayer/ams/asset/table_filters.py
--- a/app/applicationlayer/ams/asset/views.py
+++ b/app/applicationlayer/ams/asset/views.py
--- a/app/applicationlayer/ams/asset_stock/serializers.py
+++ b/app/applicationlayer/ams/asset_stock/serializers.py
--- a/app/applicationlayer/ams/asset_stock/table_filters.py
+++ b/app/applicationlayer/ams/asset_stock/table_filters.py
--- a/app/applicationlayer/ams/asset_stock/views.py
+++ b/app/applicationlayer/ams/asset_stock/views.py