Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix location priority when receiving items (#5661)

Browse Source 
* Fix location priority when receiving items

Fixes POReceiveBarcodeHandler

* Unit test adjustment
This commit is contained in:
Oliver 2023-10-05 00:31:50 +11:00 committed by GitHub
parent 9b4e1743c7
commit 4b13f3b0de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
InvenTree/order/serializers.py
View File

@ -674,8 +674,8 @@ class PurchaseOrderReceiveSerializer(serializers.Serializer):
with transaction.atomic(): with transaction.atomic():
for item in items: for item in items:
# Select location # Select location (in descending order of priority)
loc = item.get('location', None) or item['line_item'].get_destination() or location loc = location or item.get('location', None) or item['line_item'].get_destination()
try: try:
order.receive_line_item( order.receive_line_item(
@ -880,7 +880,7 @@ class SalesOrderLineItemSerializer(InvenTreeModelSerializer):
] ]
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
"""Initializion routine for the serializer: """Initialization routine for the serializer:
- Add extra related serializer information if required - Add extra related serializer information if required
""" """

12
InvenTree/order/test_api.py
View File

@ -982,9 +982,9 @@ class PurchaseOrderReceiveTest(OrderTest):
self.assertEqual(stock_1.count(), 1) self.assertEqual(stock_1.count(), 1)
self.assertEqual(stock_2.count(), 1) self.assertEqual(stock_2.count(), 1)
# Different location for each received item # Same location for each received item, as overall 'location' field is provided
self.assertEqual(stock_1.last().location.pk, 1) self.assertEqual(stock_1.last().location.pk, 1)
self.assertEqual(stock_2.last().location.pk, 2) self.assertEqual(stock_2.last().location.pk, 1)
# Barcodes should have been assigned to the stock items # Barcodes should have been assigned to the stock items
self.assertTrue(StockItem.objects.filter(barcode_data='MY-UNIQUE-BARCODE-123').exists()) self.assertTrue(StockItem.objects.filter(barcode_data='MY-UNIQUE-BARCODE-123').exists())
@ -1562,7 +1562,7 @@ class SalesOrderDownloadTest(OrderTest):
self.assertTrue(isinstance(file, io.BytesIO)) self.assertTrue(isinstance(file, io.BytesIO))
def test_download_csv(self): def test_download_csv(self):
"""Tesst that the list of sales orders can be downloaded as a .csv file""" """Test that the list of sales orders can be downloaded as a .csv file"""
url = reverse('api-so-list') url = reverse('api-so-list')
required_cols = [ required_cols = [
@ -1846,7 +1846,7 @@ class SalesOrderAllocateTest(OrderTest):
self.assertEqual(self.shipment.delivery_date, datetime(2023, 12, 5).date()) self.assertEqual(self.shipment.delivery_date, datetime(2023, 12, 5).date())
self.assertTrue(self.shipment.is_delivered()) self.assertTrue(self.shipment.is_delivered())
def test_shipment_deliverydate(self): def test_shipment_delivery_date(self):
"""Test delivery date functions via API.""" """Test delivery date functions via API."""
url = reverse('api-so-shipment-detail', kwargs={'pk': self.shipment.pk}) url = reverse('api-so-shipment-detail', kwargs={'pk': self.shipment.pk})
@ -1891,7 +1891,7 @@ class SalesOrderAllocateTest(OrderTest):
url = reverse('api-so-shipment-list') url = reverse('api-so-shipment-list')
# Count before creation # Count before creation
countbefore = models.SalesOrderShipment.objects.count() count_before = models.SalesOrderShipment.objects.count()
# Create some new shipments via the API # Create some new shipments via the API
for order in models.SalesOrder.objects.all(): for order in models.SalesOrder.objects.all():
@ -1922,7 +1922,7 @@ class SalesOrderAllocateTest(OrderTest):
# List *all* shipments # List *all* shipments
response = self.get(url, expected_code=200) response = self.get(url, expected_code=200)
self.assertEqual(len(response.data), countbefore + 3 * models.SalesOrder.objects.count()) self.assertEqual(len(response.data), count_before + 3 * models.SalesOrder.objects.count())
class ReturnOrderTests(InvenTreeAPITestCase): class ReturnOrderTests(InvenTreeAPITestCase):