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

Merge remote-tracking branch 'inventree/master'

Browse Source
This commit is contained in:
Oliver Walters 2020-01-02 21:08:56 +11:00
commit 881931c6b1
4 changed files with 334 additions and 295 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
InvenTree/InvenTree/helpers.py
View File

@ -65,8 +65,19 @@ def decimal2string(d):
A string representation of the input number A string representation of the input number
""" """
try:
# Ensure that the provided string can actually be converted to a float
float(d)
except ValueError:
# Not a number
return str(d)
s = str(d) s = str(d)
# Return entire number if there is no decimal place
if '.' not in s:
return s
return s.rstrip("0").rstrip(".") return s.rstrip("0").rstrip(".")

BIN
InvenTree/locale/de/LC_MESSAGES/django.mo
View File

Binary file not shown.

614
InvenTree/locale/de/LC_MESSAGES/django.po
View File

File diff suppressed because it is too large Load Diff

4
README.md
View File

@ -20,3 +20,7 @@ For site administrator and project code documentation, refer to the [developer d
## Getting Started ## Getting Started
Refer to the [getting started guide](https://inventree.readthedocs.io/en/latest/start.html) for installation and setup instructions. Refer to the [getting started guide](https://inventree.readthedocs.io/en/latest/start.html) for installation and setup instructions.
### Third Party
[InvenTree Docker](https://github.com/Zeigren/inventree-docker) - A docker build for InvenTree by [Zeigren](https://github.com/Zeigren)