inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-04-30 20:46:47 +00:00
Code

Merge remote-tracking branch 'inventree/master'

Browse Source
This commit is contained in:
Oliver Walters 2020-08-03 20:49:33 +10:00
commit d65d76653c
8 changed files with 1042 additions and 677 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.

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

@ -115,7 +115,7 @@ InvenTree | {% trans "Stock Item" %} - {{ item }}
{% endif %} {% endif %}
<li><a href='#' id='stock-duplicate' title='{% trans "Duplicate stock item" %}'><span class='fas fa-copy'></span> {% trans "Duplicate stock item" %}</a></li> <li><a href='#' id='stock-duplicate' title='{% trans "Duplicate stock item" %}'><span class='fas fa-copy'></span> {% trans "Duplicate stock item" %}</a></li>
<li><a href='#' id='stock-edit' title='{% trans "Edit stock item" %}'><span class='fas fa-edit icon-blue'></span> {% trans "Edit stock item" %}</a></li> <li><a href='#' id='stock-edit' title='{% trans "Edit stock item" %}'><span class='fas fa-edit icon-blue'></span> {% trans "Edit stock item" %}</a></li>
{% if item.can_delete %} {% if item.can_delete or user.is_staff %}
<li><a href='#' id='stock-delete' title='{% trans "Delete stock item" %}'><span class='fas fa-trash-alt icon-red'></span> {% trans "Delete stock item" %}</a></li> <li><a href='#' id='stock-delete' title='{% trans "Delete stock item" %}'><span class='fas fa-trash-alt icon-red'></span> {% trans "Delete stock item" %}</a></li>
{% endif %} {% endif %}
</ul> </ul>

7
InvenTree/stock/templates/stock/item_delete.html
View File

@ -1,11 +1,14 @@
{% extends "modal_delete_form.html" %} {% extends "modal_delete_form.html" %}
{% load i18n %}
{% load inventree_extras %}
{% block pre_form_content %} {% block pre_form_content %}
<div class='alert alert-danger alert-block'> <div class='alert alert-danger alert-block'>
Are you sure you want to delete this stock item? {% trans "Are you sure you want to delete this stock item?" %}
<br> <br>
This will remove <b>{{ item.quantity }}</b> units of <b>{{ item.part.full_name }}</b> from stock. This will remove <b>{% decimal item.quantity %}</b> units of <b>{{ item.part.full_name }}</b> from stock.
</div> </div>
{% endblock %} {% endblock %}

4
InvenTree/stock/views.py
View File

@ -1239,8 +1239,8 @@ class StockItemCreate(AjaxCreateView):
valid = False valid = False
form.errors['quantity'] = [_('Invalid quantity')] form.errors['quantity'] = [_('Invalid quantity')]
if quantity <= 0: if quantity < 0:
form.errors['quantity'] = [_('Quantity must be greater than zero')] form.errors['quantity'] = [_('Quantity cannot be less than zero')]
valid = False valid = False
if part is None: if part is None:

2
requirements.txt
View File

@ -1,6 +1,6 @@
wheel>=0.34.2 # Wheel wheel>=0.34.2 # Wheel
Django==3.0.7 # Django package Django==3.0.7 # Django package
pillow==6.2.2 # Image manipulation pillow==7.1.0 # Image manipulation
djangorestframework==3.10.3 # DRF framework djangorestframework==3.10.3 # DRF framework
django-dbbackup==3.3.0 # Database backup / restore functionality django-dbbackup==3.3.0 # Database backup / restore functionality
django-cors-headers==3.2.0 # CORS headers extension for DRF django-cors-headers==3.2.0 # CORS headers extension for DRF