Merge pull request #840 from SchrodingersGat/bom-queryset

Allow template parts to be specified for the BOM item
This commit is contained in:
Oliver 2020-05-27 10:47:46 +10:00 committed by GitHub
commit f8e36c5468
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 2 deletions

View File

@ -7,6 +7,7 @@ from __future__ import unicode_literals
from InvenTree.forms import HelperForm from InvenTree.forms import HelperForm
from InvenTree.helpers import GetExportFormats from InvenTree.helpers import GetExportFormats
from InvenTree.fields import RoundingDecimalFormField
from mptt.fields import TreeNodeChoiceField from mptt.fields import TreeNodeChoiceField
from django import forms from django import forms
@ -194,6 +195,8 @@ class EditCategoryForm(HelperForm):
class EditBomItemForm(HelperForm): class EditBomItemForm(HelperForm):
""" Form for editing a BomItem object """ """ Form for editing a BomItem object """
quantity = RoundingDecimalFormField(max_digits=10, decimal_places=5)
class Meta: class Meta:
model = BomItem model = BomItem
fields = [ fields = [

View File

@ -0,0 +1,24 @@
# Generated by Django 3.0.5 on 2020-05-27 00:05
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('part', '0042_auto_20200518_0900'),
]
operations = [
migrations.AlterField(
model_name='bomitem',
name='part',
field=models.ForeignKey(help_text='Select parent part', limit_choices_to={'assembly': True}, on_delete=django.db.models.deletion.CASCADE, related_name='bom_items', to='part.Part'),
),
migrations.AlterField(
model_name='bomitem',
name='sub_part',
field=models.ForeignKey(help_text='Select part to be used in BOM', limit_choices_to={'component': True}, on_delete=django.db.models.deletion.CASCADE, related_name='used_in', to='part.Part'),
),
]

View File

@ -1364,7 +1364,6 @@ class BomItem(models.Model):
help_text=_('Select parent part'), help_text=_('Select parent part'),
limit_choices_to={ limit_choices_to={
'assembly': True, 'assembly': True,
'is_template': False,
}) })
# A link to the child item (sub-part) # A link to the child item (sub-part)
@ -1373,7 +1372,6 @@ class BomItem(models.Model):
help_text=_('Select part to be used in BOM'), help_text=_('Select part to be used in BOM'),
limit_choices_to={ limit_choices_to={
'component': True, 'component': True,
'is_template': False,
}) })
# Quantity required # Quantity required