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 2022-11-29 20:16:40 +11:00
commit 7a9abdf6a4
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
InvenTree/templates/js/translated/bom.js
View File

@ -1086,7 +1086,8 @@ function loadBomTable(table, options={}) {
} }
if (any_pricing) { if (any_pricing) {
var html = formatCurrency(min_price) + ' - ' + formatCurrency(max_price);
var html = formatPriceRange(min_price, max_price);
if (complete_pricing) { if (complete_pricing) {
html += makeIconBadge( html += makeIconBadge(

4
InvenTree/templates/js/translated/part.js
View File

@ -710,6 +710,7 @@ function loadPartVariantTable(table, partId, options={}) {
field: 'name', field: 'name',
title: '{% trans "Name" %}', title: '{% trans "Name" %}',
switchable: false, switchable: false,
sortable: true,
formatter: function(value, row) { formatter: function(value, row) {
var html = ''; var html = '';
@ -760,10 +761,12 @@ function loadPartVariantTable(table, partId, options={}) {
{ {
field: 'IPN', field: 'IPN',
title: '{% trans "IPN" %}', title: '{% trans "IPN" %}',
sortable: true,
}, },
{ {
field: 'revision', field: 'revision',
title: '{% trans "Revision" %}', title: '{% trans "Revision" %}',
sortable: true,
}, },
{ {
field: 'description', field: 'description',
@ -772,6 +775,7 @@ function loadPartVariantTable(table, partId, options={}) {
{ {
field: 'in_stock', field: 'in_stock',
title: '{% trans "Stock" %}', title: '{% trans "Stock" %}',
sortable: true,
formatter: function(value, row) { formatter: function(value, row) {
var base_stock = row.in_stock; var base_stock = row.in_stock;