Renamed the "is_pay_off_needed" column of the Account data model to "is_offset_needed", and the "pay_off_target_id" column of the JournalEntry data model to "original_id".
This commit is contained in:
		| @@ -30,7 +30,7 @@ from accounting.utils.user import has_user, get_user_pk | ||||
|  | ||||
| AccountData = tuple[int, str, int, str, str, str, bool] | ||||
| """The format of the account data, as a list of (ID, base account code, number, | ||||
| English, Traditional Chinese, Simplified Chinese, is-pay-off-needed) tuples.""" | ||||
| English, Traditional Chinese, Simplified Chinese, is-offset-needed) tuples.""" | ||||
|  | ||||
|  | ||||
| def __validate_username(ctx: click.core.Context, param: click.core.Option, | ||||
| @@ -93,10 +93,10 @@ def init_accounts_command(username: str) -> None: | ||||
|     data: list[AccountData] = [] | ||||
|     for base in bases_to_add: | ||||
|         l10n: dict[str, str] = {x.locale: x.title for x in base.l10n} | ||||
|         is_pay_off_needed: bool = True if re.match("^[12]1[34]", base.code) \ | ||||
|         is_offset_needed: bool = True if re.match("^[12]1[34]", base.code) \ | ||||
|             else False | ||||
|         data.append((get_new_id(), base.code, 1, base.title_l10n, | ||||
|                      l10n["zh_Hant"], l10n["zh_Hans"], is_pay_off_needed)) | ||||
|                      l10n["zh_Hant"], l10n["zh_Hans"], is_offset_needed)) | ||||
|     __add_accounting_accounts(data, creator_pk) | ||||
|     click.echo(F"{len(data)} added.  Accounting accounts initialized.") | ||||
|  | ||||
| @@ -113,7 +113,7 @@ def __add_accounting_accounts(data: list[AccountData], creator_pk: int)\ | ||||
|                                        base_code=x[1], | ||||
|                                        no=x[2], | ||||
|                                        title_l10n=x[3], | ||||
|                                        is_pay_off_needed=x[6], | ||||
|                                        is_offset_needed=x[6], | ||||
|                                        created_by_id=creator_pk, | ||||
|                                        updated_by_id=creator_pk) | ||||
|                                for x in data] | ||||
|   | ||||
| @@ -66,8 +66,8 @@ class AccountForm(FlaskForm): | ||||
|         filters=[strip_text], | ||||
|         validators=[DataRequired(lazy_gettext("Please fill in the title"))]) | ||||
|     """The title.""" | ||||
|     is_pay_off_needed = BooleanField() | ||||
|     """Whether the the entries of this account need pay-off.""" | ||||
|     is_offset_needed = BooleanField() | ||||
|     """Whether the the entries of this account need offset.""" | ||||
|  | ||||
|     def populate_obj(self, obj: Account) -> None: | ||||
|         """Populates the form data into an account object. | ||||
| @@ -87,7 +87,7 @@ class AccountForm(FlaskForm): | ||||
|             obj.base_code = self.base_code.data | ||||
|             obj.no = count + 1 | ||||
|         obj.title = self.title.data | ||||
|         obj.is_pay_off_needed = self.is_pay_off_needed.data | ||||
|         obj.is_offset_needed = self.is_offset_needed.data | ||||
|         if is_new: | ||||
|             current_user_pk: int = get_current_user_pk() | ||||
|             obj.created_by_id = current_user_pk | ||||
|   | ||||
| @@ -47,8 +47,8 @@ def get_account_query() -> list[Account]: | ||||
|                Account.title_l10n.contains(k), | ||||
|                code.contains(k), | ||||
|                Account.id.in_(l10n_matches)] | ||||
|         if k in gettext("Pay-off needed"): | ||||
|             sub_conditions.append(Account.is_pay_off_needed) | ||||
|         if k in gettext("Need offset"): | ||||
|             sub_conditions.append(Account.is_offset_needed) | ||||
|         conditions.append(sa.or_(*sub_conditions)) | ||||
|  | ||||
|     return Account.query.filter(*conditions)\ | ||||
|   | ||||
		Reference in New Issue
	
	Block a user