From 0c6d66e7ced5f1c7843eba4221b08db79e56a021 Mon Sep 17 00:00:00 2001 From: Filipp Lepalaan Date: Thu, 1 Oct 2015 00:31:02 +0300 Subject: Inventory bug fixes and performance enhancements --- servo/forms/product.py | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'servo/forms/product.py') diff --git a/servo/forms/product.py b/servo/forms/product.py index a70d69f..61969f1 100644 --- a/servo/forms/product.py +++ b/servo/forms/product.py @@ -7,7 +7,7 @@ from django.core.exceptions import ValidationError from servo.models import Location, User, TaggedItem from servo.models.purchases import PurchaseOrderItem -from servo.models.product import Product, ProductCategory +from servo.models.product import Product, ProductCategory, Inventory from servo.forms.base import BaseModelForm, DatepickerInput, TextInput @@ -114,7 +114,8 @@ class ProductForm(forms.ModelForm): def clean_code(self): code = self.cleaned_data.get('code') if not re.match(r'^[\w\-/]+$', code): - raise ValidationError(_('Product code %s contains invalid characters') % code) + msg = _('Product code %s contains invalid characters') % code + raise ValidationError(msg) return code @@ -207,3 +208,18 @@ class IncomingSearchForm(forms.Form): label=_('Service order is') ) + +class ReserveProductForm(forms.Form): + """ + Form for reserving products for a given SO + """ + inventory = forms.ModelChoiceField( + queryset=Inventory.objects.none(), + label=_('Inventory') + ) + + def __init__(self, order, *args, **kwargs): + super(ReserveProductForm, self).__init__(*args, **kwargs) + inventory = Inventory.objects.filter(location=order.location, + product__in=order.products.all()) + self.fields['inventory'].queryset = inventory -- cgit v1.2.3