Merge branch '225-voucher-number' into 'master'

Resolve "voucher number"

Closes #225

See merge request NCER-PD/scheduling-system!149

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()