From 6e49443b8831a3479e733179615589d73f0da092 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BE=9D=E7=91=AA=E8=B2=93?= Date: Thu, 23 Jul 2020 23:24:42 +0800 Subject: [PATCH] Renamed the new_id() utility to new_pk() in the Mia core application. --- accounting/utils.py | 10 +++++----- mia_core/utils.py | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/accounting/utils.py b/accounting/utils.py index 594c31d..9da02d1 100644 --- a/accounting/utils.py +++ b/accounting/utils.py @@ -27,7 +27,7 @@ from django.utils.translation import pgettext from accounting.models import Account, Transaction, Record from mia_core.period import Period -from mia_core.utils import new_id +from mia_core.utils import new_pk class ReportUrl: @@ -134,7 +134,7 @@ class Populator: code = str(code) parent = None if len(code) == 1\ else Account.objects.get(code=code[:-1]) - Account(pk=new_id(Account), parent=parent, code=code, + Account(pk=new_pk(Account), parent=parent, code=code, title_zh_hant=data[1], title_en=data[2], title_zh_hans=data[3], created_by=self.user, updated_by=self.user).save() @@ -153,7 +153,7 @@ class Populator: if isinstance(date, int): date = timezone.localdate() + timezone.timedelta(days=date) order = Transaction.objects.filter(date=date).count() + 1 - transaction = Transaction(pk=new_id(Transaction), date=date, ord=order, + transaction = Transaction(pk=new_pk(Transaction), date=date, ord=order, created_by=self.user, updated_by=self.user) transaction.save() order = 1 @@ -163,7 +163,7 @@ class Populator: account = Account.objects.get(code=account) elif isinstance(account, int): account = Account.objects.get(code=str(account)) - transaction.record_set.create(pk=new_id(Record), is_credit=False, + transaction.record_set.create(pk=new_pk(Record), is_credit=False, ord=order, account=account, summary=data[1], amount=data[2], created_by=self.user, @@ -176,7 +176,7 @@ class Populator: account = Account.objects.get(code=account) elif isinstance(account, int): account = Account.objects.get(code=str(account)) - transaction.record_set.create(pk=new_id(Record), is_credit=True, + transaction.record_set.create(pk=new_pk(Record), is_credit=True, ord=order, account=account, summary=data[1], amount=data[2], created_by=self.user, diff --git a/mia_core/utils.py b/mia_core/utils.py index 8a79531..172d12c 100644 --- a/mia_core/utils.py +++ b/mia_core/utils.py @@ -26,7 +26,7 @@ from django.db.models import Model, Q from django.utils.translation import pgettext, get_language -def new_id(cls): +def new_pk(cls): """Finds a random ID that does not conflict with the existing data records. Args: