2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-04-28 19:46:46 +00:00

Fix for issue 6442 (#6443) (#6444)

- Add null option to status field for stock adjustment
- Prevent stock adjustments from setting status to OK

(cherry picked from commit edd6f254111ee05a199923ce28cc24cce6b6b3e4)

Co-authored-by: Oliver <oliver.henry.walters@gmail.com>
This commit is contained in:
github-actions[bot] 2024-02-07 22:08:32 +11:00 committed by GitHub
parent 0782d86d12
commit d7f05cdcb7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1237,6 +1237,14 @@ class StockMergeSerializer(serializers.Serializer):
) )
def stock_item_adjust_status_options():
"""Return a custom set of options for the StockItem status adjustment field.
In particular, include a Null option for the status field.
"""
return [(None, _('No Change'))] + InvenTree.status_codes.StockStatus.items()
class StockAdjustmentItemSerializer(serializers.Serializer): class StockAdjustmentItemSerializer(serializers.Serializer):
"""Serializer for a single StockItem within a stock adjument request. """Serializer for a single StockItem within a stock adjument request.
@ -1284,8 +1292,8 @@ class StockAdjustmentItemSerializer(serializers.Serializer):
) )
status = serializers.ChoiceField( status = serializers.ChoiceField(
choices=InvenTree.status_codes.StockStatus.items(), choices=stock_item_adjust_status_options(),
default=InvenTree.status_codes.StockStatus.OK.value, default=None,
label=_('Status'), label=_('Status'),
help_text=_('Stock item status code'), help_text=_('Stock item status code'),
required=False, allow_blank=True, required=False, allow_blank=True,
@ -1443,8 +1451,8 @@ class StockTransferSerializer(StockAdjustmentSerializer):
kwargs = {} kwargs = {}
for field_name in StockItem.optional_transfer_fields(): for field_name in StockItem.optional_transfer_fields():
if field_name in item: if field_value := item.get(field_name, None):
kwargs[field_name] = item[field_name] kwargs[field_name] = field_value
stock_item.move( stock_item.move(
location, location,