Merge branch 'k-fet' into qwann/k-fet/home

This commit is contained in:
Qwann 2017-03-10 16:58:10 +01:00
commit 5ddcd2f1ff
4 changed files with 81 additions and 24 deletions

View file

@ -471,12 +471,16 @@ class InventoryArticleForm(forms.Form):
# Order forms
# -----
class OrderArticleForm(forms.Form):
article = forms.ModelChoiceField(
queryset = Article.objects.all(),
widget = forms.HiddenInput(),
queryset=Article.objects.all(),
widget=forms.HiddenInput(),
)
quantity_ordered = forms.IntegerField(required = False)
quantity_ordered = forms.IntegerField(
required=False,
widget=forms.NumberInput(attrs={'class': 'form-control'}))
def __init__(self, *args, **kwargs):
super(OrderArticleForm, self).__init__(*args, **kwargs)
@ -503,14 +507,18 @@ class OrderArticleToInventoryForm(forms.Form):
)
price_HT = forms.DecimalField(
max_digits = 7, decimal_places = 4,
required = False)
required = False,
widget=forms.NumberInput(attrs={'class': 'form-control'}))
TVA = forms.DecimalField(
max_digits = 7, decimal_places = 2,
required = False)
required = False,
widget=forms.NumberInput(attrs={'class': 'form-control'}))
rights = forms.DecimalField(
max_digits = 7, decimal_places = 4,
required = False)
quantity_received = forms.IntegerField()
required = False,
widget=forms.NumberInput(attrs={'class': 'form-control'}))
quantity_received = forms.IntegerField(
widget=forms.NumberInput(attrs={'class': 'form-control'}))
def __init__(self, *args, **kwargs):
super(OrderArticleToInventoryForm, self).__init__(*args, **kwargs)