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. 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/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, + ), + ), + ] 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 %} +