inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-18 13:05:42 +00:00
Code Activity

Merge branch 'master' of https://github.com/inventree/InvenTree into one-pricing-view

Browse Source
This commit is contained in:
Matthias
2021-07-02 16:44:43 +02:00
parent 628e365c6a ded0fb5353
commit f8e2d53ad4
45 changed files with 6912 additions and 5754 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
InvenTree/templates/InvenTree/settings/currencies.html
View File

@ -12,6 +12,13 @@
{% block settings %}
<table class='table table-striped table-condensed'>
{% include "InvenTree/settings/header.html" %}
<tbody>
{% include "InvenTree/settings/setting.html" with key="INVENTREE_DEFAULT_CURRENCY" icon="fa-globe" %}
</tbody>
</table>
<table class='table table-striped table-condensed'>
<tbody>
<tr>

1
InvenTree/templates/InvenTree/settings/part.html
View File

@ -21,6 +21,7 @@
{% include "InvenTree/settings/setting.html" with key="PART_ALLOW_EDIT_IPN" %}
{% include "InvenTree/settings/setting.html" with key="PART_SHOW_QUANTITY_IN_FORMS" icon="fa-hashtag" %}
{% include "InvenTree/settings/setting.html" with key="PART_SHOW_PRICE_IN_FORMS" icon="fa-dollar-sign" %}
{% include "InvenTree/settings/setting.html" with key="PART_SHOW_RELATED" icon="fa-random" %}
{% include "InvenTree/settings/setting.html" with key="PART_RECENT_COUNT" icon="fa-clock" %}
<tr><td colspan='5 '></td></tr>
{% include "InvenTree/settings/setting.html" with key="PART_TEMPLATE" icon="fa-clone" %}

11
InvenTree/templates/js/bom.js
View File

@ -259,26 +259,19 @@ function loadBomTable(table, options) {
sortable: true,
});
/*
// TODO - Re-introduce the pricing column at a later stage,
// once the pricing has been "fixed"
// O.W. 2020-11-24
cols.push(
{
field: 'price_range',
title: '{% trans "Price" %}',
title: '{% trans "Buy Price" %}',
sortable: true,
formatter: function(value, row, index, field) {
if (value) {
return value;
} else {
return "<span class='warning-msg'>{% trans "No pricing available" %}</span>";
return "<span class='warning-msg'>{% trans 'No pricing available' %}</span>";
}
}
});
*/
cols.push({
field: 'optional',

1
InvenTree/templates/js/build.js
View File

@ -231,6 +231,7 @@ function loadBuildOrderAllocationTable(table, options={}) {
{
field: 'quantity',
title: '{% trans "Quantity" %}',
sortable: true,
}
]
});

1
InvenTree/templates/js/order.js
View File

@ -391,6 +391,7 @@ function loadSalesOrderAllocationTable(table, options={}) {
{
field: 'quantity',
title: '{% trans "Quantity" %}',
sortable: true,
}
]
});