inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-18 21:15:41 +00:00
Code Activity

Merge branch 'inventree:master' into matmair/issue2385

Browse Source
This commit is contained in:
Matthias Mair
2022-04-30 19:53:32 +02:00
committed by GitHub
parent 37e74074dd d7e9e15c21
commit c18579088a
24 changed files with 762 additions and 492 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
InvenTree/part/api.py
View File

@ -383,7 +383,7 @@ class PartTestTemplateList(generics.ListCreateAPIView):
required = params.get('required', None)
if required is not None:
queryset = queryset.filter(required=required)
queryset = queryset.filter(required=str2bool(required))
return queryset

4
InvenTree/part/models.py
View File

@ -2740,8 +2740,8 @@ class BomItem(models.Model, DataImportMixin):
if not p.active:
continue
# Trackable parts cannot be 'auto allocated'
if p.trackable:
# Trackable status must be the same as the sub_part
if p.trackable != self.sub_part.trackable:
continue
valid_parts.append(p)

7
InvenTree/part/templatetags/inventree_extras.py
View File

@ -160,13 +160,6 @@ def inventree_in_debug_mode(*args, **kwargs):
return djangosettings.DEBUG
@register.simple_tag()
def inventree_demo_mode(*args, **kwargs):
""" Return True if the server is running in DEMO mode """
return djangosettings.DEMO_MODE
@register.simple_tag()
def inventree_show_about(user, *args, **kwargs):
""" Return True if the about modal should be shown """