From 4a0be0dfb848363dca084672730acb9687f5c792 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Tue, 17 Sep 2019 20:15:50 +1000 Subject: [PATCH] Simplify --- InvenTree/stock/forms.py | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/InvenTree/stock/forms.py b/InvenTree/stock/forms.py index 3a34e0416d..1cacd6648b 100644 --- a/InvenTree/stock/forms.py +++ b/InvenTree/stock/forms.py @@ -9,6 +9,8 @@ from django import forms from django.forms.utils import ErrorDict from django.utils.translation import ugettext as _ +from mptt.fields import TreeNodeChoiceField + from InvenTree.helpers import GetExportFormats from InvenTree.forms import HelperForm from .models import StockLocation, StockItem, StockItemTracking @@ -135,28 +137,16 @@ class AdjustStockForm(forms.ModelForm): This form is used for managing stock adjuments for single or multiple stock items. """ - def get_location_choices(self): - locs = StockLocation.objects.all() - - choices = [(None, '---------')] - - for loc in locs: - choices.append((loc.pk, loc.pathstring + ' - ' + loc.description)) - - return choices - - destination = forms.ChoiceField(label='Destination', required=True, help_text=_('Destination stock location')) + destination = TreeNodeChoiceField(queryset=StockLocation.objects.all(), 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 adjustment', help_text=_('Confirm movement of stock items')) set_loc = forms.BooleanField(required=False, initial=False, label='Set Default Location', help_text=_('Set the destination as the default location for selected parts')) - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - self.fields['destination'].choices = self.get_location_choices() - class Meta: model = StockItem