mirror of
				https://github.com/inventree/InvenTree.git
				synced 2025-10-30 20:55:42 +00:00 
			
		
		
		
	| @@ -109,7 +109,7 @@ class BuildOutputCreate(AjaxUpdateView): | ||||
|         # Check that the serial numbers are valid | ||||
|         if serials: | ||||
|             try: | ||||
|                 extracted = extract_serial_numbers(serials, quantity) | ||||
|                 extracted = extract_serial_numbers(serials, quantity, build.part.getLatestSerialNumberInt()) | ||||
|  | ||||
|                 if extracted: | ||||
|                     # Check for conflicting serial numbers | ||||
| @@ -143,7 +143,7 @@ class BuildOutputCreate(AjaxUpdateView): | ||||
|         serials = data.get('serial_numbers', None) | ||||
|  | ||||
|         if serials: | ||||
|             serial_numbers = extract_serial_numbers(serials, quantity) | ||||
|             serial_numbers = extract_serial_numbers(serials, quantity, build.part.getLatestSerialNumberInt()) | ||||
|         else: | ||||
|             serial_numbers = None | ||||
|  | ||||
|   | ||||
| @@ -861,7 +861,7 @@ class SOSerialAllocationSerializer(serializers.Serializer): | ||||
|         part = line_item.part | ||||
|  | ||||
|         try: | ||||
|             data['serials'] = extract_serial_numbers(serial_numbers, quantity) | ||||
|             data['serials'] = extract_serial_numbers(serial_numbers, quantity, part.getLatestSerialNumberInt()) | ||||
|         except DjangoValidationError as e: | ||||
|             raise ValidationError({ | ||||
|                 'serial_numbers': e.messages, | ||||
|   | ||||
| @@ -466,18 +466,6 @@ class StockList(generics.ListCreateAPIView): | ||||
|  | ||||
|         notes = data.get('notes', '') | ||||
|  | ||||
|         serials = None | ||||
|  | ||||
|         if serial_numbers: | ||||
|             # If serial numbers are specified, check that they match! | ||||
|             try: | ||||
|                 serials = extract_serial_numbers(serial_numbers, quantity) | ||||
|             except DjangoValidationError as e: | ||||
|                 raise ValidationError({ | ||||
|                     'quantity': e.messages, | ||||
|                     'serial_numbers': e.messages, | ||||
|                 }) | ||||
|  | ||||
|         with transaction.atomic(): | ||||
|  | ||||
|             # Create an initial stock item | ||||
| @@ -493,6 +481,19 @@ class StockList(generics.ListCreateAPIView): | ||||
|                 if item.part.default_expiry > 0: | ||||
|                     item.expiry_date = datetime.now().date() + timedelta(days=item.part.default_expiry) | ||||
|  | ||||
|             # fetch serial numbers | ||||
|             serials = None | ||||
|  | ||||
|             if serial_numbers: | ||||
|                 # If serial numbers are specified, check that they match! | ||||
|                 try: | ||||
|                     serials = extract_serial_numbers(serial_numbers, quantity, item.part.getLatestSerialNumberInt()) | ||||
|                 except DjangoValidationError as e: | ||||
|                     raise ValidationError({ | ||||
|                         'quantity': e.messages, | ||||
|                         'serial_numbers': e.messages, | ||||
|                     }) | ||||
|  | ||||
|             # Finally, save the item (with user information) | ||||
|             item.save(user=user) | ||||
|  | ||||
|   | ||||
| @@ -350,7 +350,7 @@ class SerializeStockItemSerializer(serializers.Serializer): | ||||
|         serial_numbers = data['serial_numbers'] | ||||
|  | ||||
|         try: | ||||
|             serials = InvenTree.helpers.extract_serial_numbers(serial_numbers, quantity) | ||||
|             serials = InvenTree.helpers.extract_serial_numbers(serial_numbers, quantity, item.part.getLatestSerialNumberInt()) | ||||
|         except DjangoValidationError as e: | ||||
|             raise ValidationError({ | ||||
|                 'serial_numbers': e.messages, | ||||
| @@ -379,6 +379,7 @@ class SerializeStockItemSerializer(serializers.Serializer): | ||||
|         serials = InvenTree.helpers.extract_serial_numbers( | ||||
|             data['serial_numbers'], | ||||
|             data['quantity'], | ||||
|             item.part.getLatestSerialNumberInt() | ||||
|         ) | ||||
|  | ||||
|         item.serializeStock( | ||||
|   | ||||
| @@ -1241,7 +1241,7 @@ class StockItemCreate(AjaxCreateView): | ||||
|  | ||||
|             if len(sn) > 0: | ||||
|                 try: | ||||
|                     serials = extract_serial_numbers(sn, quantity) | ||||
|                     serials = extract_serial_numbers(sn, quantity, part.getLatestSerialNumberInt()) | ||||
|                 except ValidationError as e: | ||||
|                     serials = None | ||||
|                     form.add_error('serial_numbers', e.messages) | ||||
| @@ -1283,7 +1283,7 @@ class StockItemCreate(AjaxCreateView): | ||||
|  | ||||
|             # Create a single stock item for each provided serial number | ||||
|             if len(sn) > 0: | ||||
|                 serials = extract_serial_numbers(sn, quantity) | ||||
|                 serials = extract_serial_numbers(sn, quantity, part.getLatestSerialNumberInt()) | ||||
|  | ||||
|                 for serial in serials: | ||||
|                     item = StockItem( | ||||
|   | ||||
		Reference in New Issue
	
	Block a user