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

Better rendering of aggregated stock count in stock table

Browse Source 
https://stackoverflow.com/questions/11832914/round-to-at-most-2-decimal-places-only-if-necessary#12830454
This commit is contained in:
Oliver Walters 2019-11-19 10:36:01 +11:00
parent 64db28be67
commit 8b2f1b9313
4 changed files with 50 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
InvenTree/InvenTree/static/script/inventree/stock.js
View File

@ -80,6 +80,8 @@ function loadStockTable(table, options) {
items += 1; items += 1;
}); });
stock = +stock.toFixed(5);
return stock + " (" + items + " items)"; return stock + " (" + items + " items)";
} else if (field == 'batch') { } else if (field == 'batch') {
var batches = []; var batches = [];

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

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-11-18 23:29+0000\n" "POT-Creation-Date: 2019-11-18 23:32+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -18,7 +18,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: InvenTree/helpers.py:175 order/models.py:158 order/models.py:203 #: InvenTree/helpers.py:175 order/models.py:159 order/models.py:204
msgid "Invalid quantity provided" msgid "Invalid quantity provided"
msgstr "" msgstr ""
@ -305,60 +305,60 @@ msgstr ""
msgid "Receive parts to this location" msgid "Receive parts to this location"
msgstr "" msgstr ""
#: order/models.py:62 #: order/models.py:63
msgid "Order reference" msgid "Order reference"
msgstr "" msgstr ""
#: order/models.py:64 #: order/models.py:65
msgid "Order description" msgid "Order description"
msgstr "" msgstr ""
#: order/models.py:66 #: order/models.py:67
msgid "Link to external page" msgid "Link to external page"
msgstr "" msgstr ""
#: order/models.py:83 #: order/models.py:84
msgid "Order notes" msgid "Order notes"
msgstr "" msgstr ""
#: order/models.py:125 #: order/models.py:126
msgid "Company" msgid "Company"
msgstr "" msgstr ""
#: order/models.py:156 order/models.py:201 part/views.py:1032 #: order/models.py:157 order/models.py:202 part/views.py:1032
#: stock/models.py:438 #: stock/models.py:438
msgid "Quantity must be greater than zero" msgid "Quantity must be greater than zero"
msgstr "" msgstr ""
#: order/models.py:161 #: order/models.py:162
msgid "Part supplier must match PO supplier" msgid "Part supplier must match PO supplier"
msgstr "" msgstr ""
#: order/models.py:196 #: order/models.py:197
msgid "Lines can only be received against an order marked as 'Placed'" msgid "Lines can only be received against an order marked as 'Placed'"
msgstr "" msgstr ""
#: order/models.py:245 #: order/models.py:246
msgid "Item quantity" msgid "Item quantity"
msgstr "" msgstr ""
#: order/models.py:247 #: order/models.py:248
msgid "Line item reference" msgid "Line item reference"
msgstr "" msgstr ""
#: order/models.py:249 #: order/models.py:250
msgid "Line item notes" msgid "Line item notes"
msgstr "" msgstr ""
#: order/models.py:275 stock/templates/stock/item.html:107 #: order/models.py:276 stock/templates/stock/item.html:107
msgid "Purchase Order" msgid "Purchase Order"
msgstr "" msgstr ""
#: order/models.py:284 #: order/models.py:285
msgid "Supplier part" msgid "Supplier part"
msgstr "" msgstr ""
#: order/models.py:287 #: order/models.py:288
msgid "Number of items received" msgid "Number of items received"
msgstr "" msgstr ""

32
InvenTree/locale/en/LC_MESSAGES/django.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-11-18 23:29+0000\n" "POT-Creation-Date: 2019-11-18 23:32+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -18,7 +18,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: InvenTree/helpers.py:175 order/models.py:158 order/models.py:203 #: InvenTree/helpers.py:175 order/models.py:159 order/models.py:204
msgid "Invalid quantity provided" msgid "Invalid quantity provided"
msgstr "" msgstr ""
@ -305,60 +305,60 @@ msgstr ""
msgid "Receive parts to this location" msgid "Receive parts to this location"
msgstr "" msgstr ""
#: order/models.py:62 #: order/models.py:63
msgid "Order reference" msgid "Order reference"
msgstr "" msgstr ""
#: order/models.py:64 #: order/models.py:65
msgid "Order description" msgid "Order description"
msgstr "" msgstr ""
#: order/models.py:66 #: order/models.py:67
msgid "Link to external page" msgid "Link to external page"
msgstr "" msgstr ""
#: order/models.py:83 #: order/models.py:84
msgid "Order notes" msgid "Order notes"
msgstr "" msgstr ""
#: order/models.py:125 #: order/models.py:126
msgid "Company" msgid "Company"
msgstr "" msgstr ""
#: order/models.py:156 order/models.py:201 part/views.py:1032 #: order/models.py:157 order/models.py:202 part/views.py:1032
#: stock/models.py:438 #: stock/models.py:438
msgid "Quantity must be greater than zero" msgid "Quantity must be greater than zero"
msgstr "" msgstr ""
#: order/models.py:161 #: order/models.py:162
msgid "Part supplier must match PO supplier" msgid "Part supplier must match PO supplier"
msgstr "" msgstr ""
#: order/models.py:196 #: order/models.py:197
msgid "Lines can only be received against an order marked as 'Placed'" msgid "Lines can only be received against an order marked as 'Placed'"
msgstr "" msgstr ""
#: order/models.py:245 #: order/models.py:246
msgid "Item quantity" msgid "Item quantity"
msgstr "" msgstr ""
#: order/models.py:247 #: order/models.py:248
msgid "Line item reference" msgid "Line item reference"
msgstr "" msgstr ""
#: order/models.py:249 #: order/models.py:250
msgid "Line item notes" msgid "Line item notes"
msgstr "" msgstr ""
#: order/models.py:275 stock/templates/stock/item.html:107 #: order/models.py:276 stock/templates/stock/item.html:107
msgid "Purchase Order" msgid "Purchase Order"
msgstr "" msgstr ""
#: order/models.py:284 #: order/models.py:285
msgid "Supplier part" msgid "Supplier part"
msgstr "" msgstr ""
#: order/models.py:287 #: order/models.py:288
msgid "Number of items received" msgid "Number of items received"
msgstr "" msgstr ""

32
InvenTree/locale/es/LC_MESSAGES/django.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-11-18 23:29+0000\n" "POT-Creation-Date: 2019-11-18 23:32+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -18,7 +18,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: InvenTree/helpers.py:175 order/models.py:158 order/models.py:203 #: InvenTree/helpers.py:175 order/models.py:159 order/models.py:204
msgid "Invalid quantity provided" msgid "Invalid quantity provided"
msgstr "" msgstr ""
@ -305,60 +305,60 @@ msgstr ""
msgid "Receive parts to this location" msgid "Receive parts to this location"
msgstr "" msgstr ""
#: order/models.py:62 #: order/models.py:63
msgid "Order reference" msgid "Order reference"
msgstr "" msgstr ""
#: order/models.py:64 #: order/models.py:65
msgid "Order description" msgid "Order description"
msgstr "" msgstr ""
#: order/models.py:66 #: order/models.py:67
msgid "Link to external page" msgid "Link to external page"
msgstr "" msgstr ""
#: order/models.py:83 #: order/models.py:84
msgid "Order notes" msgid "Order notes"
msgstr "" msgstr ""
#: order/models.py:125 #: order/models.py:126
msgid "Company" msgid "Company"
msgstr "" msgstr ""
#: order/models.py:156 order/models.py:201 part/views.py:1032 #: order/models.py:157 order/models.py:202 part/views.py:1032
#: stock/models.py:438 #: stock/models.py:438
msgid "Quantity must be greater than zero" msgid "Quantity must be greater than zero"
msgstr "" msgstr ""
#: order/models.py:161 #: order/models.py:162
msgid "Part supplier must match PO supplier" msgid "Part supplier must match PO supplier"
msgstr "" msgstr ""
#: order/models.py:196 #: order/models.py:197
msgid "Lines can only be received against an order marked as 'Placed'" msgid "Lines can only be received against an order marked as 'Placed'"
msgstr "" msgstr ""
#: order/models.py:245 #: order/models.py:246
msgid "Item quantity" msgid "Item quantity"
msgstr "" msgstr ""
#: order/models.py:247 #: order/models.py:248
msgid "Line item reference" msgid "Line item reference"
msgstr "" msgstr ""
#: order/models.py:249 #: order/models.py:250
msgid "Line item notes" msgid "Line item notes"
msgstr "" msgstr ""
#: order/models.py:275 stock/templates/stock/item.html:107 #: order/models.py:276 stock/templates/stock/item.html:107
msgid "Purchase Order" msgid "Purchase Order"
msgstr "" msgstr ""
#: order/models.py:284 #: order/models.py:285
msgid "Supplier part" msgid "Supplier part"
msgstr "" msgstr ""
#: order/models.py:287 #: order/models.py:288
msgid "Number of items received" msgid "Number of items received"
msgstr "" msgstr ""