diff --git a/kfet/forms.py b/kfet/forms.py index 317effb3..2b59e1b3 100644 --- a/kfet/forms.py +++ b/kfet/forms.py @@ -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) diff --git a/kfet/static/kfet/css/index.css b/kfet/static/kfet/css/index.css index 2d18e2de..63f93b06 100644 --- a/kfet/static/kfet/css/index.css +++ b/kfet/static/kfet/css/index.css @@ -213,6 +213,24 @@ textarea { font-size:25px; } +/* + * Pages tableaux seuls + */ + +.content-center > div { + background:#fff; +} + +.content-center tbody tr:not(.section) td { + padding:0px 5px !important; +} + +.content-center .table .form-control { + padding: 1px 12px ; + height:28px; + margin:3px 0px; +} + /* * Pages formulaires seuls */ @@ -365,6 +383,11 @@ textarea { margin:15px 0; } +/* Tooltips */ +thead .tooltip { + font-size:13px; +} + /* * Statistiques */ diff --git a/kfet/templates/kfet/order_create.html b/kfet/templates/kfet/order_create.html index efd316a6..cbd84ba8 100644 --- a/kfet/templates/kfet/order_create.html +++ b/kfet/templates/kfet/order_create.html @@ -5,19 +5,31 @@ {% block content %} +
+
{% csrf_token %} - +
- - - - + + + + - - + + @@ -30,8 +42,9 @@ {% for form in formset %} {% ifchanged form.category %} - - + + + {% endifchanged %} @@ -56,7 +69,15 @@ {% endif %} {{ formset.management_form }} - + + + + + {% endblock %} diff --git a/kfet/templates/kfet/order_to_inventory.html b/kfet/templates/kfet/order_to_inventory.html index 4345cf2b..ab107065 100644 --- a/kfet/templates/kfet/order_to_inventory.html +++ b/kfet/templates/kfet/order_to_inventory.html @@ -7,24 +7,27 @@ {% include 'kfet/base_messages.html' %} +
+
{% csrf_token %} -
ArticleVentesV. moy.E.T.Prév.Ventes + + V. moy. + + E.T. + + Prév. + + StockRec.Com.Rec. + + Commande
S1
{{ form.category_name }}
{{ form.category_name }}
+
- - + + - + {% for form in formset %} {% ifchanged form.category %} - - + + + {% endifchanged %} @@ -42,7 +45,9 @@ {% endif %} {{ formset.management_form }} - + + + {% endblock %}
ArticleHTArticlePrix HT TVA DroitsCom.Commandé Reçu
{{ form.category_name }}
{{ form.category_name }}