Renamed the new_sn() utility to new_id() in the Mia core application.
This commit is contained in:
		| @@ -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_sn | ||||
| from mia_core.utils import new_id | ||||
|  | ||||
|  | ||||
| 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(sn=new_sn(Account), parent=parent, code=code, | ||||
|             Account(sn=new_id(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(sn=new_sn(Transaction), date=date, ord=order, | ||||
|         transaction = Transaction(sn=new_id(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(sn=new_sn(Record), is_credit=False, | ||||
|             transaction.record_set.create(sn=new_id(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(sn=new_sn(Record), is_credit=True, | ||||
|             transaction.record_set.create(sn=new_id(Record), is_credit=True, | ||||
|                                           ord=order, account=account, | ||||
|                                           summary=data[1], amount=data[2], | ||||
|                                           created_by=self.user, | ||||
|   | ||||
| @@ -26,22 +26,21 @@ from django.db.models import Model, Q | ||||
| from django.utils.translation import pgettext, get_language | ||||
|  | ||||
|  | ||||
| def new_sn(cls): | ||||
|     """Finds a random serial number that does not conflict with | ||||
|     the existing data records. | ||||
| def new_id(cls): | ||||
|     """Finds a random ID that does not conflict with the existing data records. | ||||
|  | ||||
|     Args: | ||||
|         cls (class): The Django model class. | ||||
|  | ||||
|     Returns: | ||||
|          int: The new random serial number. | ||||
|          int: The new random ID. | ||||
|     """ | ||||
|     while True: | ||||
|         sn = random.randint(100000000, 999999999) | ||||
|         id = random.randint(100000000, 999999999) | ||||
|         try: | ||||
|             cls.objects.get(pk=sn) | ||||
|             cls.objects.get(pk=id) | ||||
|         except cls.DoesNotExist: | ||||
|             return sn | ||||
|             return id | ||||
|  | ||||
|  | ||||
| class Language: | ||||
|   | ||||
		Reference in New Issue
	
	Block a user