inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-05-23 09:35:30 +00:00
Code Activity

Merge branch 'master' of https://github.com/inventree/InvenTree into sn-append

Browse Source
This commit is contained in:
Matthias
2021-12-29 23:45:19 +01:00
parent f2c1fe1f95 724dd2a9c8
commit 95ee4f908f
63 changed files with 20963 additions and 16113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
InvenTree/stock/api.py
+15
View File
@@ -180,6 +180,20 @@ class StockAssign(generics.CreateAPIView):
return ctx
class StockMerge(generics.CreateAPIView):
"""
API endpoint for merging multiple stock items
"""
queryset = StockItem.objects.none()
serializer_class = StockSerializers.StockMergeSerializer
def get_serializer_context(self):
ctx = super().get_serializer_context()
ctx['request'] = self.request
return ctx
class StockLocationList(generics.ListCreateAPIView):
"""
API endpoint for list view of StockLocation objects:
@@ -1214,6 +1228,7 @@ stock_api_urls = [
url(r'^remove/', StockRemove.as_view(), name='api-stock-remove'),
url(r'^transfer/', StockTransfer.as_view(), name='api-stock-transfer'),
url(r'^assign/', StockAssign.as_view(), name='api-stock-assign'),
url(r'^merge/', StockMerge.as_view(), name='api-stock-merge'),
# StockItemAttachment API endpoints
url(r'^attachment/', include([