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 branch 'master' of github.com:inventree/InvenTree into ipn_edit_setting

Browse Source
This commit is contained in:
eeintech 2021-03-15 08:50:31 -04:00
commit 7b81a470b9
10 changed files with 783 additions and 1383 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
InvenTree/InvenTree/static/css/inventree.css
View File

@ -586,6 +586,8 @@
.breadcrump {
margin-bottom: 5px;
margin-left: 5px;
margin-right: 10px;
}
.inventree-body {

2
InvenTree/build/forms.py
View File

@ -95,7 +95,7 @@ class BuildOutputCreateForm(HelperForm):
confirm = forms.BooleanField(
required=True,
label=_('Confirm'),
help_text=_('Confirm creation of build outut'),
help_text=_('Confirm creation of build output'),
)
class Meta:

BIN
InvenTree/locale/de/LC_MESSAGES/django.mo
View File

Binary file not shown.

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

File diff suppressed because it is too large Load Diff

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

@ -350,7 +350,7 @@ msgid "Enter serial numbers for build outputs"
msgstr ""
#: build/forms.py:98
msgid "Confirm creation of build outut"
msgid "Confirm creation of build output"
msgstr ""
#: build/forms.py:118

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

@ -350,7 +350,7 @@ msgid "Enter serial numbers for build outputs"
msgstr ""
#: build/forms.py:98
msgid "Confirm creation of build outut"
msgid "Confirm creation of build output"
msgstr ""
#: build/forms.py:118

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

@ -241,6 +241,7 @@
"{% url 'part-pricing' part.id %}",
{
submit_text: 'Calculate',
hideErrorMessage: true,
}
);
});

7
InvenTree/stock/api.py
View File

@ -665,6 +665,13 @@ class StockList(generics.ListCreateAPIView):
active = str2bool(active)
queryset = queryset.filter(part__active=active)
# Do we wish to filter by "assembly parts"
assembly = params.get('assembly', None)
if assembly is not None:
assembly = str2bool(assembly)
queryset = queryset.filter(part__assembly=assembly)
# Filter by 'depleted' status
depleted = params.get('depleted', None)

7
InvenTree/templates/js/modals.js
View File

@ -739,9 +739,10 @@ function handleModalForm(url, options) {
// Form was returned, invalid!
else {
var warningDiv = $(modal).find('#form-validation-warning');
warningDiv.css('display', 'block');
if (!options.hideErrorMessage) {
var warningDiv = $(modal).find('#form-validation-warning');
warningDiv.css('display', 'block');
}
if (response.html_form) {
injectModalForm(modal, response.html_form);

7
InvenTree/templates/js/table_filters.js
View File

@ -96,10 +96,15 @@ function getAvailableTableFilters(tableKey) {
title: '{% trans "Active parts" %}',
description: '{% trans "Show stock for active parts" %}',
},
assembly: {
type: 'bool',
title: '{% trans "Assembly" %}',
description: '{% trans "Part is an assembly" %}',
},
allocated: {
type: 'bool',
title: '{% trans "Is allocated" %}',
description: '{% trans "Item has been alloacted" %}',
description: '{% trans "Item has been allocated" %}',
},
cascade: {
type: 'bool',