Merge pull request #2978 from SchrodingersGat/convert-to-variant-fix

Convert to variant fix
This commit is contained in:
Oliver 2022-05-12 15:42:22 +10:00 committed by GitHub
commit a68db90240
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions

View File

@ -2233,7 +2233,7 @@ class Part(MPTTModel):
for child in children:
parts.append(child)
# Immediate parent
# Immediate parent, and siblings
if self.variant_of:
parts.append(self.variant_of)

View File

@ -556,7 +556,14 @@ class StockItem(MPTTModel):
# If the item points to a build, check that the Part references match
if self.build:
if not self.part == self.build.part:
if self.part == self.build.part:
# Part references match exactly
pass
elif self.part in self.build.part.get_conversion_options():
# Part reference is one of the valid conversion options for the build output
pass
else:
raise ValidationError({
'build': _("Build reference does not point to the same part object")
})