inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-04-29 20:16:44 +00:00
Code

Add option to disable stock item grouping

Browse Source
This commit is contained in:
Oliver Walters 2021-02-19 11:31:38 +11:00
parent e8bacbe45f
commit 098b494047
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
InvenTree/common/models.py
View File

@ -242,6 +242,13 @@ class InvenTreeSetting(models.Model):
'validator': bool, 'validator': bool,
}, },
'STOCK_GROUP_BY_PART': {
'name': _('Group by Part'),
'description': _('Group stock items by part reference in table views'),
'default': True,
'validator': bool,
},
'BUILDORDER_REFERENCE_PREFIX': { 'BUILDORDER_REFERENCE_PREFIX': {
'name': _('Build Order Reference Prefix'), 'name': _('Build Order Reference Prefix'),
'description': _('Prefix value for build order reference'), 'description': _('Prefix value for build order reference'),

11
InvenTree/templates/InvenTree/settings/stock.html
View File

@ -15,11 +15,12 @@
<table class='table table-striped table-condensed'> <table class='table table-striped table-condensed'>
{% include "InvenTree/settings/header.html" %} {% include "InvenTree/settings/header.html" %}
<tbody> <tbody>
{% include "InvenTree/settings/setting.html" with key="STOCK_ENABLE_EXPIRY" %} {% include "InvenTree/settings/setting.html" with key="STOCK_GROUP_BY_PART" icon="fa-layer-group" %}
{% include "InvenTree/settings/setting.html" with key="STOCK_STALE_DAYS" %} {% include "InvenTree/settings/setting.html" with key="STOCK_ENABLE_EXPIRY" icon="fa-stopwatch" %}
{% include "InvenTree/settings/setting.html" with key="STOCK_ALLOW_EXPIRED_SALE" %} {% include "InvenTree/settings/setting.html" with key="STOCK_STALE_DAYS" icon="fa-calendar" %}
{% include "InvenTree/settings/setting.html" with key="STOCK_ALLOW_EXPIRED_BUILD" %} {% include "InvenTree/settings/setting.html" with key="STOCK_ALLOW_EXPIRED_SALE" icon="fa-truck" %}
{% include "InvenTree/settings/setting.html" with key="STOCK_OWNERSHIP_CONTROL" %} {% include "InvenTree/settings/setting.html" with key="STOCK_ALLOW_EXPIRED_BUILD" icon="fa-tools" %}
{% include "InvenTree/settings/setting.html" with key="STOCK_OWNERSHIP_CONTROL" icon="fa-users" %}
</tbody> </tbody>
</table> </table>
{% endblock %} {% endblock %}

9
InvenTree/templates/js/stock.js
View File

@ -327,11 +327,13 @@ function loadStockTable(table, options) {
url: options.url || "{% url 'api-stock-list' %}", url: options.url || "{% url 'api-stock-list' %}",
queryParams: filters, queryParams: filters,
customSort: customGroupSorter, customSort: customGroupSorter,
groupBy: true,
name: 'stock', name: 'stock',
original: original, original: original,
showColumns: true, showColumns: true,
{% settings_value 'STOCK_GROUP_BY_PART' as group_by_part %}
{% if group_by_part %}
groupByField: options.groupByField || 'part', groupByField: options.groupByField || 'part',
groupBy: true,
groupByFormatter: function(field, id, data) { groupByFormatter: function(field, id, data) {
var row = data[0]; var row = data[0];
@ -363,9 +365,9 @@ function loadStockTable(table, options) {
var packaging = []; var packaging = [];
data.forEach(function(item) { data.forEach(function(item) {
var pkg = String(item.packaging); var pkg = item.packaging;
if (!pkg || pkg == '') { if (!pkg) {
pkg = '-'; pkg = '-';
} }
@ -491,6 +493,7 @@ function loadStockTable(table, options) {
return ''; return '';
} }
}, },
{% endif %}
columns: [ columns: [
{ {
checkbox: true, checkbox: true,