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 2020-06-09 16:28:59 +10:00
commit f40a9d1dad
6 changed files with 3121 additions and 1748 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

3
InvenTree/part/templates/part/variants.html
View File

@ -1,5 +1,6 @@
{% extends "part/part_base.html" %}
{% load static %}
{% load inventree_extras %}
{% block details %}
{% include "part/tabs.html" with tab='variants' %}
@ -40,7 +41,7 @@
{% endif %}
</td>
<td>{{ variant.description }}</td>
<td>{{ variant.total_stock }}</td>
<td>{% decimal variant.total_stock %}</td>
</tr>
{% endfor %}
</tbody>

2
InvenTree/stock/templates/stock/item_base.html
View File

@ -112,7 +112,7 @@ InvenTree | {% trans "Stock Item" %} - {{ item }}
<span class='fas fa-edit icon-blue'/>
</button>
{% if item.can_delete %}
<button type='button' class='btn btn-default' id='stock-delete' title='{% trans "Edit stock item" %}'>
<button type='button' class='btn btn-default' id='stock-delete' title='{% trans "Delete stock item" %}'>
<span class='fas fa-trash-alt icon-red'/>
</button>
{% endif %}