Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop

hb_server/apps/inm/views.py

@@ -67,7 +67,7 @@ class FIFODetailViewSet(ListModelMixin, GenericViewSet):
     perms_map = {'*': '*'}
     queryset = FIFODetail.objects.select_related('material', 'fifo').all()
     serializer_class = FIFODetailSerializer
-    filterset_fields = ['material', 'fifo']
+    filterset_fields = ['material', 'fifo', 'warehouse']
     search_fields = []
     ordering_fields = ['create_time']
     ordering = ['-create_time']