diff --git a/counter/migrations/0021_rename_check_cashregistersummaryitem_is_checked.py b/counter/migrations/0021_rename_check_cashregistersummaryitem_is_checked.py new file mode 100644 index 00000000..3ccc2744 --- /dev/null +++ b/counter/migrations/0021_rename_check_cashregistersummaryitem_is_checked.py @@ -0,0 +1,24 @@ +# Generated by Django 4.2 on 2024-06-26 09:26 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + dependencies = [("counter", "0020_auto_20221215_1709")] + + operations = [ + migrations.RenameField( + model_name="cashregistersummaryitem", + old_name="check", + new_name="is_check", + ), + migrations.AlterField( + model_name="cashregistersummaryitem", + name="is_check", + field=models.BooleanField( + default=False, + help_text="True if this is a bank check, else False", + verbose_name="check", + ), + ), + ] diff --git a/counter/models.py b/counter/models.py index c9972f10..6c6dd27c 100644 --- a/counter/models.py +++ b/counter/models.py @@ -927,25 +927,25 @@ class CashRegisterSummary(models.Model): if name[:5] == "check": checks = self.items.filter(check=True).order_by("value").all() if name == "ten_cents": - return self.items.filter(value=0.1, check=False).first() + return self.items.filter(value=0.1, is_check=False).first() elif name == "twenty_cents": - return self.items.filter(value=0.2, check=False).first() + return self.items.filter(value=0.2, is_check=False).first() elif name == "fifty_cents": - return self.items.filter(value=0.5, check=False).first() + return self.items.filter(value=0.5, is_check=False).first() elif name == "one_euro": - return self.items.filter(value=1, check=False).first() + return self.items.filter(value=1, is_check=False).first() elif name == "two_euros": - return self.items.filter(value=2, check=False).first() + return self.items.filter(value=2, is_check=False).first() elif name == "five_euros": - return self.items.filter(value=5, check=False).first() + return self.items.filter(value=5, is_check=False).first() elif name == "ten_euros": - return self.items.filter(value=10, check=False).first() + return self.items.filter(value=10, is_check=False).first() elif name == "twenty_euros": - return self.items.filter(value=20, check=False).first() + return self.items.filter(value=20, is_check=False).first() elif name == "fifty_euros": - return self.items.filter(value=50, check=False).first() + return self.items.filter(value=50, is_check=False).first() elif name == "hundred_euros": - return self.items.filter(value=100, check=False).first() + return self.items.filter(value=100, is_check=False).first() elif name == "check_1": return checks[0] if 0 < len(checks) else None elif name == "check_2": @@ -993,7 +993,11 @@ class CashRegisterSummaryItem(models.Model): ) value = CurrencyField(_("value")) quantity = models.IntegerField(_("quantity"), default=0) - check = models.BooleanField(_("check"), default=False) + is_check = models.BooleanField( + _("check"), + default=False, + help_text=_("True if this is a bank check, else False"), + ) class Meta: verbose_name = _("cash register summary item") diff --git a/counter/views.py b/counter/views.py index fe10d0a1..e27547d2 100644 --- a/counter/views.py +++ b/counter/views.py @@ -1204,35 +1204,35 @@ class CashRegisterSummaryForm(forms.Form): cash_summary=summary, value=cd["check_1_value"], quantity=cd["check_1_quantity"], - check=True, + is_check=True, ).save() if cd["check_2_quantity"]: CashRegisterSummaryItem( cash_summary=summary, value=cd["check_2_value"], quantity=cd["check_2_quantity"], - check=True, + is_check=True, ).save() if cd["check_3_quantity"]: CashRegisterSummaryItem( cash_summary=summary, value=cd["check_3_value"], quantity=cd["check_3_quantity"], - check=True, + is_check=True, ).save() if cd["check_4_quantity"]: CashRegisterSummaryItem( cash_summary=summary, value=cd["check_4_value"], quantity=cd["check_4_quantity"], - check=True, + is_check=True, ).save() if cd["check_5_quantity"]: CashRegisterSummaryItem( cash_summary=summary, value=cd["check_5_value"], quantity=cd["check_5_quantity"], - check=True, + is_check=True, ).save() if summary.items.count() < 1: summary.delete()