Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for BOM pricing weirdness

Browse Source
This commit is contained in:
Oliver Walters 2020-02-12 10:06:17 +11:00
parent c287a0a0b9
commit 520b8d7b2b
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
InvenTree/part/models.py
View File

@ -35,6 +35,7 @@ from InvenTree import helpers
from InvenTree import validators from InvenTree import validators
from InvenTree.models import InvenTreeTree from InvenTree.models import InvenTreeTree
from InvenTree.fields import InvenTreeURLField from InvenTree.fields import InvenTreeURLField
from InvenTree.helpers import decimal2string
from InvenTree.status_codes import BuildStatus, StockStatus, OrderStatus from InvenTree.status_codes import BuildStatus, StockStatus, OrderStatus
@ -1249,4 +1250,8 @@ class BomItem(models.Model):
if pmin == pmax: if pmin == pmax:
return str(pmin) return str(pmin)
# Convert to better string representation
pmin = decimal2string(pmin)
pmax = decimal2string(pmax)
return "{pmin} to {pmax}".format(pmin=pmin, pmax=pmax) return "{pmin} to {pmax}".format(pmin=pmin, pmax=pmax)

3
InvenTree/part/test_part.py
View File

@ -1,6 +1,7 @@
# Tests for the Part model # Tests for the Part model
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import unicode_literals from __future__ import unicode_literals
from django.test import TestCase from django.test import TestCase
@ -16,7 +17,7 @@ class TemplateTagTest(TestCase):
""" Tests for the custom template tag code """ """ Tests for the custom template tag code """
def test_multiply(self): def test_multiply(self):
self.assertEqual(inventree_extras.multiply(3, 5), 15) self.assertEqual(int(inventree_extras.multiply(3, 5)), 15)
def test_version(self): def test_version(self):
self.assertEqual(type(inventree_extras.inventree_version()), str) self.assertEqual(type(inventree_extras.inventree_version()), str)