From 9d2c13e67c9bf5708b0a9afe95804a07e2c28a7d Mon Sep 17 00:00:00 2001 From: Quentin VERMANDE Date: Wed, 9 Dec 2020 22:03:54 +0100 Subject: [PATCH 1/4] kfetTriArticles --- kfet/forms.py | 2 + kfet/templates/kfet/inventory_create.html | 6 +++ kfet/templates/kfet/order_create.html | 54 +++++++++++++---------- kfet/views.py | 6 ++- 4 files changed, 43 insertions(+), 25 deletions(-) diff --git a/kfet/forms.py b/kfet/forms.py index a7637551..bc98a8ce 100644 --- a/kfet/forms.py +++ b/kfet/forms.py @@ -558,6 +558,7 @@ class InventoryArticleForm(forms.Form): self.category = kwargs["initial"]["category"] self.category_name = kwargs["initial"]["category__name"] self.box_capacity = kwargs["initial"]["box_capacity"] + self.is_sold = kwargs["initial"]["is_sold"] # ----- @@ -584,6 +585,7 @@ class OrderArticleForm(forms.Form): self.v_et = kwargs["initial"]["v_et"] self.v_prev = kwargs["initial"]["v_prev"] self.c_rec = kwargs["initial"]["c_rec"] + self.is_sold = kwargs["initial"]["is_sold"] class OrderArticleToInventoryForm(forms.Form): diff --git a/kfet/templates/kfet/inventory_create.html b/kfet/templates/kfet/inventory_create.html index c3084e71..45bd48ed 100644 --- a/kfet/templates/kfet/inventory_create.html +++ b/kfet/templates/kfet/inventory_create.html @@ -26,6 +26,12 @@ {% for form in formset %} + {% ifchanged form.is_sold %} + + {% if form.is_sold %} Vendu {% else %} Non vendu {% endif %} + + + {% endifchanged %} {% ifchanged form.category %} {{ form.category_name }} diff --git a/kfet/templates/kfet/order_create.html b/kfet/templates/kfet/order_create.html index 7cb4d1cb..20ae7b69 100644 --- a/kfet/templates/kfet/order_create.html +++ b/kfet/templates/kfet/order_create.html @@ -58,31 +58,39 @@ {% endfor %} - {% regroup formset by category_name as category_list %} - {% for category in category_list %} - - - {{ category.grouper }} + {% regroup formset by is_sold as is_sold_list %} + {% for condition in is_sold_list %} + + + {% if condition.grouper %} Vendu {% else %} Non vendu {% endif %} - - {% for form in category.list %} - - {{ form.article }} - {{ form.name }} - {% for v_chunk in form.v_all %} - {{ v_chunk }} - {% endfor %} - {{ form.v_moy }} - {{ form.v_et }} - {{ form.v_prev }} - {{ form.stock }} - {{ form.box_capacity|default:"" }} - {{ form.c_rec }} - {{ form.quantity_ordered|add_class:"form-control" }} - - {% endfor %} - + {% regroup condition.list by category_name as category_list %} + {% for category in category_list %} + + + {{ category.grouper }} + + + + {% for form in category.list %} + + {{ form.article }} + {{ form.name }} + {% for v_chunk in form.v_all %} + {{ v_chunk }} + {% endfor %} + {{ form.v_moy }} + {{ form.v_et }} + {{ form.v_prev }} + {{ form.stock }} + {{ form.box_capacity|default:"" }} + {{ form.c_rec }} + {{ form.quantity_ordered|add_class:"form-control" }} + + {% endfor %} + + {% endfor %} {% endfor %} diff --git a/kfet/views.py b/kfet/views.py index d42c6338..136d7bd0 100644 --- a/kfet/views.py +++ b/kfet/views.py @@ -1835,12 +1835,13 @@ class InventoryList(ListView): def inventory_create(request): articles = Article.objects.select_related("category").order_by( - "category__name", "name" + "-is_sold", "category__name", "name" ) initial = [] for article in articles: initial.append( { + "is_sold": article.is_sold, "article": article.pk, "stock_old": article.stock, "name": article.name, @@ -1960,7 +1961,7 @@ def order_create(request, pk): Article.objects.filter(suppliers=supplier.pk) .distinct() .select_related("category") - .order_by("category__name", "name") + .order_by("-is_sold", "category__name", "name") ) # Force hit to cache @@ -2017,6 +2018,7 @@ def order_create(request, pk): "v_et": round(v_et), "v_prev": round(v_prev), "c_rec": article.box_capacity and c_rec or round(c_rec_tot), + "is_sold": article.is_sold } ) From 035bbe68a5335609359d1663c52f738163370acd Mon Sep 17 00:00:00 2001 From: Quentin VERMANDE Date: Wed, 9 Dec 2020 22:22:12 +0100 Subject: [PATCH 2/4] make black happy --- kfet/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kfet/views.py b/kfet/views.py index 136d7bd0..3a497111 100644 --- a/kfet/views.py +++ b/kfet/views.py @@ -2018,7 +2018,7 @@ def order_create(request, pk): "v_et": round(v_et), "v_prev": round(v_prev), "c_rec": article.box_capacity and c_rec or round(c_rec_tot), - "is_sold": article.is_sold + "is_sold": article.is_sold, } ) From 681507f21147711b550987b68b5ef76aba67c712 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20P=C3=A9pin?= Date: Wed, 6 Jan 2021 21:31:47 +0100 Subject: [PATCH 3/4] Happy new year! --- kfet/migrations/0073_2021.py | 66 ++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 kfet/migrations/0073_2021.py diff --git a/kfet/migrations/0073_2021.py b/kfet/migrations/0073_2021.py new file mode 100644 index 00000000..4470b4fb --- /dev/null +++ b/kfet/migrations/0073_2021.py @@ -0,0 +1,66 @@ +# Generated by Django 2.2.17 on 2021-01-06 20:26 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("kfet", "0072_auto_20200901_1526"), + ] + + operations = [ + migrations.AlterField( + model_name="account", + name="promo", + field=models.IntegerField( + blank=True, + choices=[ + (1980, 1980), + (1981, 1981), + (1982, 1982), + (1983, 1983), + (1984, 1984), + (1985, 1985), + (1986, 1986), + (1987, 1987), + (1988, 1988), + (1989, 1989), + (1990, 1990), + (1991, 1991), + (1992, 1992), + (1993, 1993), + (1994, 1994), + (1995, 1995), + (1996, 1996), + (1997, 1997), + (1998, 1998), + (1999, 1999), + (2000, 2000), + (2001, 2001), + (2002, 2002), + (2003, 2003), + (2004, 2004), + (2005, 2005), + (2006, 2006), + (2007, 2007), + (2008, 2008), + (2009, 2009), + (2010, 2010), + (2011, 2011), + (2012, 2012), + (2013, 2013), + (2014, 2014), + (2015, 2015), + (2016, 2016), + (2017, 2017), + (2018, 2018), + (2019, 2019), + (2020, 2020), + (2021, 2021), + ], + default=2020, + null=True, + ), + ), + ] From 40391d88142abc1f1c164775b81f04f00dd89016 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20P=C3=A9pin?= Date: Wed, 6 Jan 2021 21:32:41 +0100 Subject: [PATCH 4/4] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 84614959..6b75b07a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,8 @@ adhérents ni des cotisations. ### K-Fêt +- On affiche les articles actuellement en vente en premier lors des inventaires + et des commandes. - On peut supprimer un inventaire. Seuls les articles dont c'est le dernier inventaire sont affectés.