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

Better error reporting for quantity

Browse Source
This commit is contained in:
Oliver Walters 2019-06-02 11:00:28 +10:00
parent c228a4998c
commit 20963f83d9
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
InvenTree/stock/forms.py
View File

@ -67,7 +67,7 @@ class MoveMultipleStockItemsForm(forms.ModelForm):
return choices
location = forms.ChoiceField(label='Destination', required=True, help_text='Destination stock location')
destination = forms.ChoiceField(label='Destination', required=True, help_text='Destination stock location')
note = forms.CharField(label='Notes', required=True, help_text='Add note (required)')
# transaction = forms.BooleanField(required=False, initial=False, label='Create Transaction', help_text='Create a stock transaction for these parts')
confirm = forms.BooleanField(required=False, initial=False, label='Confirm Stock Movement', help_text='Confirm movement of stock items')
@ -75,13 +75,13 @@ class MoveMultipleStockItemsForm(forms.ModelForm):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self.fields['location'].choices = self.get_location_choices()
self.fields['destination'].choices = self.get_location_choices()
class Meta:
model = StockItem
fields = [
'location',
'destination',
'note',
# 'transaction',
'confirm',

3
InvenTree/stock/templates/stock/stock_move.html
View File

@ -20,6 +20,9 @@
<td>{{ item.location.pathstring }}</td>
<td>
<input class='numberinput' min='0' max='{{ item.quantity }}' value='{{ item.new_quantity }}' type='number' name='stock-id-{{ item.id }}' id='stock-id-{{ item.id }}'/>
{% if item.error %}
<br><span class='help-inline'>{{ item.error }}</span>
{% endif %}
</td>
<td><button class='btn btn-default btn-remove' id='del-{{ item.id }}' title='Remove item' type='button'><span row='stock-row-{{ item.id }}' onclick='removeStockRow()' class='glyphicon glyphicon-small glyphicon-remove'></span></button></td>
</tr>

16
InvenTree/stock/views.py
View File

@ -10,6 +10,8 @@ from django.views.generic import DetailView, ListView
from django.forms.models import model_to_dict
from django.forms import HiddenInput
from django.utils.translation import ugettext as _
from InvenTree.views import AjaxView
from InvenTree.views import AjaxUpdateView, AjaxDeleteView, AjaxCreateView
from InvenTree.views import QRCodeView
@ -229,7 +231,17 @@ class StockItemMoveMultiple(AjaxView, FormMixin):
try:
q = int(item.new_quantity)
except ValueError:
item.error = 'Must enter integer value'
item.error = _('Must enter integer value')
valid = False
continue
if q < 0:
item.error = _('Quantity must be positive')
valid = False
continue
if q > item.quantity:
item.error = _('Quantity must not exceed {x}'.format(x=item.quantity))
valid = False
continue
@ -237,7 +249,7 @@ class StockItemMoveMultiple(AjaxView, FormMixin):
if not confirmed:
valid = False
form.errors['confirm'] = ['Confirm stock adjustment']
form.errors['confirm'] = [_('Confirm stock adjustment')]
data = {
'form_valid': False,