bkinnightskytw
/
InvenTree
mirror of https://github.com/inventree/InvenTree.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert 'min_digits' to 'leading'

This commit is contained in:
Oliver Walters 2026-06-19 23:07:51 +00:00
parent e4775c6733
commit 65f3f75f5c
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/backend/InvenTree/report/templatetags/report.py
View File

@ -895,7 +895,7 @@ def format_number(
multiplier: Optional[int | float | Decimal] = None,
integer: bool = False,
separator: bool = False,
min_digits: Optional[int] = None,
leading: Optional[int] = None,
decimal_places: Optional[int] = None,
max_decimal_places: Optional[int] = None,
fmt: Optional[str] = None,
@ -908,7 +908,7 @@ def format_number(
multiplier: Optional multiplier to apply to the number before formatting
integer: Boolean, whether to render the number as an integer
separator: Boolean, whether to include a thousands separator
min_digits: Minimum number of digits to render (default = 1)
leading: Minimum number of leading digits to render (default = 1)
decimal_places: Number of decimal places to render (default = 0)
max_decimal_places: Maximum number of decimal places to render (default = 0)
separator:
@ -936,15 +936,15 @@ def format_number(
if not fmt:
fmt = '###,###,###,###,##0' # Default format string - this will be modified based on the provided options
# The 'min_digits' option specifies the minimum number of digits to render (not including decimal places)
if min_digits is not None:
# The 'leading' option specifies the minimum number of leading digits to render (not including decimal places)
if leading is not None:
try:
min_digits = int(min_digits) or 0
leading = int(leading) or 0
except (ValueError, TypeError):
min_digits = 0
leading = 0
if min_digits > 1:
fmt = fmt[::-1].replace('#', '0', (min_digits - 1))[::-1]
if leading > 1:
fmt = fmt[::-1].replace('#', '0', (leading - 1))[::-1]
if not bool(separator):
fmt = fmt.replace(',', '')

10
src/backend/InvenTree/report/test_tags.py
View File

@ -379,10 +379,10 @@ class ReportTagTest(PartImageTestMixin, InvenTreeTestCase):
'9.988.776.655',
)
# Test with 'min_digits' option
self.assertEqual(fn(5, min_digits=3), '005')
self.assertEqual(fn(123, min_digits=5), '00123')
self.assertEqual(fn(1234, min_digits=2, decimal_places=4), '1234.0000')
# Test with 'leading' option
self.assertEqual(fn(5, leading=3), '005')
self.assertEqual(fn(123, leading=5), '00123')
self.assertEqual(fn(1234, leading=2, decimal_places=4), '1234.0000')
# Test with custom 'fmt' format string (takes priority over decimal_places / separator)
self.assertEqual(fn(1234.5678, fmt='0.00'), '1234.57')
@ -409,7 +409,7 @@ class ReportTagTest(PartImageTestMixin, InvenTreeTestCase):
self.assertEqual(
fn(1234.456, decimal_places='a', separator=True, locale='en-au'), '1,234'
)
self.assertEqual(fn(1234.456, min_digits='a'), '1234.456')
self.assertEqual(fn(1234.456, leading='a'), '1234.456')
@override_settings(TIME_ZONE='America/New_York')
def test_datetime_tags(self):