Catch edge case for merge_stock_items: (#7373) (#7374)

* Catch edge case for merge_stock_items:

- Use current location as backup
- Handle null location

* Fix deltas

(cherry picked from commit 9fa2735f7a)

Co-authored-by: Oliver <oliver.henry.walters@gmail.com>
This commit is contained in:
github-actions[bot] 2024-05-30 20:13:28 +10:00 committed by GitHub
parent 1f6e52138a
commit dfdaddbc7e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1678,6 +1678,9 @@ class StockItem(
- Tracking history for the *other* item is deleted
- Any allocations (build order, sales order) are moved to this StockItem
"""
if isinstance(other_items, StockItem):
other_items = [other_items]
if len(other_items) == 0:
return
@ -1685,7 +1688,7 @@ class StockItem(
tree_ids = {self.tree_id}
user = kwargs.get('user', None)
location = kwargs.get('location', None)
location = kwargs.get('location', self.location)
notes = kwargs.get('notes', None)
parent_id = self.parent.pk if self.parent else None
@ -1693,6 +1696,9 @@ class StockItem(
for other in other_items:
# If the stock item cannot be merged, return
if not self.can_merge(other, raise_error=raise_error, **kwargs):
logger.warning(
'Stock item <%s> could not be merge into <%s>', other.pk, self.pk
)
return
tree_ids.add(other.tree_id)
@ -1722,7 +1728,7 @@ class StockItem(
user,
quantity=self.quantity,
notes=notes,
deltas={'location': location.pk},
deltas={'location': location.pk if location else None},
)
self.location = location