Merge pull request #1036 from SchrodingersGat/bom-quantity-export

Normalize quantity field when exporting BOM
This commit is contained in:
Oliver 2020-10-08 14:21:50 +11:00 committed by GitHub
commit 26ee3032f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 0 deletions

View File

@ -15,6 +15,8 @@ from .models import PartParameterTemplate, PartParameter
from .models import PartTestTemplate from .models import PartTestTemplate
from .models import PartSellPriceBreak from .models import PartSellPriceBreak
from InvenTree.helpers import normalize
from stock.models import StockLocation from stock.models import StockLocation
from company.models import SupplierPart from company.models import SupplierPart
@ -165,6 +167,15 @@ class BomItemResource(ModelResource):
# Is the sub-part itself an assembly? # Is the sub-part itself an assembly?
sub_assembly = Field(attribute='sub_part__assembly', readonly=True) sub_assembly = Field(attribute='sub_part__assembly', readonly=True)
def dehydrate_quantity(self, item):
"""
Special consideration for the 'quantity' field on data export.
We do not want a spreadsheet full of "1.0000" (we'd rather "1")
Ref: https://django-import-export.readthedocs.io/en/latest/getting_started.html#advanced-data-manipulation-on-export
"""
return normalize(item.quantity)
def before_export(self, queryset, *args, **kwargs): def before_export(self, queryset, *args, **kwargs):
self.is_importing = kwargs.get('importing', False) self.is_importing = kwargs.get('importing', False)

View File

@ -0,0 +1,18 @@
{% extends "base.html" %}
{% load i18n %}
{% block page_title %}
InvenTree | {% trans "Page Not Found" %}
{% endblock %}
{% block content %}
<div class='container-fluid'>
<h3>{% trans "Page Not Found" %}</h3>
<div class='alert alert-danger alert-block'>
{% trans "The requested page does not exist" %}
</div>
</div>
{% endblock %}