From a042a82bed73041d68e347b236e2dadd9f56a596 Mon Sep 17 00:00:00 2001 From: Piotr Gawron <piotr.gawron@uni.lu> Date: Tue, 17 Jul 2018 14:44:32 +0200 Subject: [PATCH] voucher partner code comes befor voucher type code in the voucher number --- smash/web/forms/voucher_forms.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/smash/web/forms/voucher_forms.py b/smash/web/forms/voucher_forms.py index 12aaa876..6e2e9478 100644 --- a/smash/web/forms/voucher_forms.py +++ b/smash/web/forms/voucher_forms.py @@ -71,11 +71,11 @@ class VoucherForm(ModelForm): max_id = str(1).zfill(5) if Voucher.objects.all().count() > 0: max_id = str(Voucher.objects.latest('id').id + 1).zfill(4) - # number in format {ND_NUMBER}-{DATE}-{VOUCHER_TYPE_CODE}-{VOUCHER_TYPE}-{SEQ_NUMBER}{CHECKSUM} + # number in format {ND_NUMBER}-{DATE}-{VOUCHER_PARTNER_CODE}-{VOUCHER_TYPE}-{SEQ_NUMBER}{CHECKSUM} instance.number = instance.study_subject.nd_number + "-" + \ datetime.datetime.now().strftime("%Y%m%d") + "-" + \ - instance.voucher_type.code + "-" + \ instance.usage_partner.voucher_partner_code + "-" + \ + instance.voucher_type.code + "-" + \ max_id + VerhoeffAlgorithm.calculate_verhoeff_check_sum(max_id) if commit: instance.save() -- GitLab