0c647d8f21
Moved the "accounting.reports.period" and "accounting.reports.income_expense_account" utility modules into the "accounting.reports.utils" module.
依瑪貓2023-03-09 18:13:18 +08:00
5d1f87582e
Moved the "accounting.report.reports.utils" module to "accounting.report.utils". It does not make sense to have a wierd and long module name just to make the import pretty.
依瑪貓2023-03-09 18:09:08 +08:00
ef086b3f81
Revised to simplify the YearPeriod period.
依瑪貓2023-03-09 18:03:02 +08:00
b4be1db712
Revised the imports in the "accounting.report.reports.utils.period_chooser" module.
依瑪貓2023-03-09 18:00:38 +08:00
5d44ebdfd8
Revised the properties of the Today, Yesterday, and AllTime periods.
依瑪貓2023-03-09 17:58:49 +08:00
9859604c81
Revised the documentation of the _set_properties method of the Period utility.
依瑪貓2023-03-09 17:56:27 +08:00
d31e495f6b
Added the AllTime class as a named period.
依瑪貓2023-03-09 17:49:55 +08:00
7c4102be44
Fixed the documentation of the "ReportType.SEARCH" enum item.
依瑪貓2023-03-09 17:44:39 +08:00
1fd50e23d9
Changed the PeriodChooser utility from abstract to real, and replaced the various trivial subclasses with the get_url callable as the parameter.
依瑪貓2023-03-09 17:43:21 +08:00
9635448f18
Added the missing documentation to the sections property of the PageParams data model in the income statement report.
依瑪貓2023-03-09 17:36:33 +08:00
e7f1ca332e
Revised the imports in the modules of ledger, income and expenses log, trial balance, and income statement.
依瑪貓2023-03-09 17:32:22 +08:00
3d2e40865e
Revised the PeriodChooser utility to find the start of the data by itself. It can do that. It's child classes are all doing the same thing. There is no need to do that in its child classes.
依瑪貓2023-03-09 17:20:52 +08:00
5132141c68
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".
依瑪貓2023-03-09 17:16:05 +08:00
e37f6792c9
Replaced aria-label with aria-labelled-by in the search modal of the report, for simplicity.
依瑪貓2023-03-09 16:42:13 +08:00
e6b1136a14
Fixed so that the brought-forward row is not added for norminal accounts in the ledger.
依瑪貓2023-03-09 16:25:59 +08:00
d7bc01ccb4
Updated the Sphinx documentation.
依瑪貓2023-03-09 14:38:45 +08:00
27beff3f8f
Renamed the accounting-search and accounting-search-label HTML ID to accounting-toolbar-search and accounting-toolbar-search-label, respectively.
依瑪貓2023-03-09 14:32:05 +08:00
c6c545b99f
Removed the unused accounting-search-form, accounting-search-desktop-form, accounting-search-input, and accounting-search-label classes.
依瑪貓2023-03-09 14:28:30 +08:00
6d5a2fae6a
Applied the accounting-toolbar class to the base account list, account list, and currency list.
依瑪貓2023-03-09 14:24:49 +08:00
8819eabcd0
Replaced the separated toolbar for the desktop and mobile screen with the accounting-toolbar class that acts differently on different screen sizes.
依瑪貓2023-03-09 14:14:47 +08:00
3582d960ca
Replaced the toolbar button group with individual buttons on the reports.
依瑪貓2023-03-09 12:52:55 +08:00
02e10a301a
Removed the unused custom "btn-actions" class from the templates.
依瑪貓2023-03-09 12:22:53 +08:00
f0187434d2
Fixed the error from the month chooser in the period chooser when the current period has no start as the default month.
依瑪貓2023-03-09 12:15:37 +08:00
34af52e3c3
Revised the __add_owner_s_equity method of the AccountCollector of the balance sheet to receive the period instead of the URL, and does its job when there is an amount, so that the URL is build only when there is an amount.
依瑪貓2023-03-09 12:00:56 +08:00
965df82c1c
Fixed the logic in the __add_owner_s_equity method of the AccountCollector of the balance sheet, that when there is an existing balance, only set the URL when there's amount to be added.
依瑪貓2023-03-09 11:55:12 +08:00
df53f06094
Renamed the "accounting.report.reports.utils.get_url" module to "accounting.report.reports.utils.urls", and shortened the names of the utilities, for readability.
依瑪貓2023-03-09 11:50:02 +08:00
140d3c6010
Added the get_balance_sheet_url utility to replace the common codes to retrieve the URL of an income statement.
依瑪貓2023-03-09 11:37:06 +08:00
a65dccac92
Added the get_journal_url utility to replace the common codes to retrieve the URL of an income statement.
依瑪貓2023-03-09 11:34:29 +08:00
740e1cfac1
Added the get_trial_balance_url utility to replace the common codes to retrieve the URL of an income statement.
依瑪貓2023-03-09 11:31:23 +08:00
b62f31d385
Added the get_income_statement_url utility to replace the common codes to retrieve the URL of an income statement.
依瑪貓2023-03-09 11:26:35 +08:00
1c740b9bbc
Added the get_income_expenses_url utility to replace the common codes to retrieve the URL of an income and expenses log.
依瑪貓2023-03-09 11:14:58 +08:00
380256eda7
Revised the imports in the reports.
依瑪貓2023-03-09 11:04:12 +08:00
74b695c089
Added the get_ledger_url utility to replace the common codes to retrieve the URL of a ledger.
依瑪貓2023-03-09 11:18:36 +08:00
6d1e705e4b
Revised the documentation of the "accounting.report.reports.utils.csv_export" module.
依瑪貓2023-03-09 10:49:42 +08:00
8abe20dba5
Revised the __set_data method of the trial balance and the __query_balances of the income statement for consistency.
依瑪貓2023-03-09 10:49:11 +08:00
ed7a8ac0fd
Added the __query_balance method to the AccountCollector of balance sheet to simplify the queris in the __query_accumulated and __query_currency_period methods.
依瑪貓2023-03-09 10:34:23 +08:00
74eee034d0
Replaced the "transaction" property with the "url" property in the ReportEntry model of the income and expenses log, so that the report entry does not need to keep the transaction object.
依瑪貓2023-03-09 09:01:15 +08:00
d19d23fe37
Replaced the "transaction" property with the "url" property in the ReportEntry model of ledger, so that the report entry does not need to keep the transaction object.
依瑪貓2023-03-09 08:59:48 +08:00
4ce577d7d8
Removed the unused entry property from the ReportEntry model of the income and expenses log.
依瑪貓2023-03-09 08:22:09 +08:00
a340fad109
Removed the unused entry and account properties from the ReportEntry model of the ledger.
依瑪貓2023-03-09 08:21:35 +08:00
555ad388bc
Added the debit and credit pseudo properties to the JournalEntry data model, and retired the redundant ReportEntry model from the "accounting.report.reports.journal" module.
依瑪貓2023-03-09 07:55:36 +08:00
2f27ad5bef
Replaced querying the transactions later with the "selectinload" query option in the ledger. Retired the unused populate_entries function from the "accounting.report.reports.ledger" module.
依瑪貓2023-03-09 07:52:01 +08:00
c6487bf9d4
Replaced querying the transactions later with the "selectinload" query option in the income and expenses log. Retired the unused populate_entries function from the "accounting.report.reports.income_expenses" module.
依瑪貓2023-03-09 07:47:54 +08:00
ff3dd28cd7
Replaced querying the transactions later with the "selectinload" query option in the journal and search reports. Retired the unused populate_entries function from the "accounting.report.reports.journal" module.
依瑪貓2023-03-09 07:43:25 +08:00
a14ffa93ed
Replaced querying the currencies later with the "selectinload" query option in the journal and search reports.
依瑪貓2023-03-09 07:39:07 +08:00
672fcbcbdf
Replaced querying the accounts later with the "selectinload" query option in the income and expenses log.
依瑪貓2023-03-09 07:35:18 +08:00
cb4258dd6d
Removed the unused "is_total" property from the ReportEntry class of the journal.
依瑪貓2023-03-09 07:31:06 +08:00
6fc21f82af
Changed the entry parameter of the ReportEntry class in journal to be non-optional. There is no optional entry in its actual use.
依瑪貓2023-03-09 07:30:04 +08:00
13e3ef5875
Replaced querying the accounts later with the "selectinload" query option in the journal and search reports, and restored the lazy setting in the account relationship of the JournalEntry data model.
依瑪貓2023-03-09 07:21:01 +08:00
21b3320e66
Revised the add-txn-material-fab.html template to simplify the code to include it.
依瑪貓2023-03-09 06:59:32 +08:00
5c47e63ae3
Moved the add-txn-material-fab.html template from the accounting/include directory to the accounting/report/include directory, because it is only used in the reports now.
依瑪貓2023-03-09 06:58:45 +08:00
f59378002e
Removed the list_transactions view that is not used now.
依瑪貓2023-03-09 06:56:04 +08:00
531e90e8ad
Revised the imports in the "accounting.transaction.view" module.
依瑪貓2023-03-09 06:52:34 +08:00
8fc33131dd
Changed the transaction operation to return to the default journal instead of the transaction list. The transaction list is to be removed. There is no link to the transaction list at all, and it's layout is undecided.
依瑪貓2023-03-09 06:51:14 +08:00
62716eb545
Fixed the report chooser to set the current report when the current report is the search page.
依瑪貓2023-03-08 22:59:09 +08:00
14d5d1e8d6
Renamed the action-buttons.html template to toolbar-buttons.html.
依瑪貓2023-03-08 22:55:56 +08:00
4306ed739f
Added the is_search property to the report chooser to highlight the search when it is on the search page.
依瑪貓2023-03-08 22:44:12 +08:00
1f87bc00e8
Removed the excess "with_type" from the success redirection of the update_transaction view.
依瑪貓2023-03-08 22:10:21 +08:00
ff9ff4bdcf
Removed the excess "with_type" from the success redirection of the delete_transaction view.
依瑪貓2023-03-08 22:07:00 +08:00
578233d66d
Renamed the sort_accounts view to sort_transactions in the "accounting.transaction.views" module, and fixed its url endpoints on success.
依瑪貓2023-03-08 22:04:26 +08:00
5e7f790f87
Moved the __get_csv_rows method of the Journal report to the get_csv_rows function, and revised the Search report to use it, because both of their __get_csv_rows methods are identical.
依瑪貓2023-03-08 21:54:42 +08:00
d64f354ee0
Added the DATE_SPEC_RE constant to simplify the regular expression matching in the _parse_period_spec function.
依瑪貓2023-03-08 21:42:47 +08:00
ba3d8c6d4e
Removed a redundant test in the _parse_period_spec function in the "accounting.report.period" module.
依瑪貓2023-03-08 21:37:26 +08:00
4f7f87b10d
Removed an unused import from the "accounting.report.reports.utils" module.
依瑪貓2023-03-08 21:34:00 +08:00
4273f99644
Fixed the regular expression to match the extra note in the summary for security, as suggested by SonarQube.
依瑪貓2023-03-08 21:28:10 +08:00
ffe834bedd
Added the DATE_REQUIRED constant to the "accounting.transaction.forms" module as the common date field validator.
依瑪貓2023-03-08 19:34:23 +08:00
e448e009c9
Simplified the declaration of the "available_years" property in the PeriodChooser utility.
依瑪貓2023-03-08 19:30:10 +08:00
b6802c51bb
Removed an excess blank line in the __get_since_desc method of the PeriodDescription utility.
依瑪貓2023-03-08 19:27:17 +08:00
2515c1ea1f
Added the __get_since_spec and __get_until_spec methods to simplify the __get_spec method in the PeriodSpecification utility.
依瑪貓2023-03-08 19:26:49 +08:00
0ef6409f75
Revised the documentation of the PeriodDescription utility.
依瑪貓2023-03-08 19:20:19 +08:00
ed18b81ad8
Moved the code to compose the period specification from the Period utility to the PeriodSpecification utility, to simplify the code.
依瑪貓2023-03-08 19:18:43 +08:00
b46cec6fab
Updated the translation.
依瑪貓2023-03-08 19:11:46 +08:00
6c122666a0
Revised to simplify the PeriodDescription utility.
依瑪貓2023-03-08 19:09:12 +08:00
7ddc9ececf
Added the __format_day method to the PeriodDescription utility to simplify the code.
依瑪貓2023-03-08 19:00:59 +08:00
4eebbd9692
Moved the code to compose the period description from the Period utility to the PeriodDescription utility, to simplify the code.
依瑪貓2023-03-08 18:58:24 +08:00
338b49c965
Added the __get_since_desc and __get_until_desc methods to simplify the __get_desc method in the Period utility.
依瑪貓2023-03-08 18:50:54 +08:00
f438f97571
Revised the styles of the f-strings in the Period utility.
依瑪貓2023-03-08 18:37:11 +08:00
9b273115a0
Removed the empty _set_properties method override from the YearPeriod period.
依瑪貓2023-03-08 18:35:27 +08:00
58d1add810
Added type hints to the CASH_CODE, ACCUMULATED_CHANGE_CODE, and NET_CHANGE_CODE constants.
依瑪貓2023-03-08 18:32:27 +08:00
c189615ca4
Renamed the CASH, ACCUMULATED_CHANGE, and NET_CHANGE constants to CASH_CODE, ACCUMULATED_CHANGE_CODE, and NET_CHANGE_CODE, respectively, to avoid confusion.
依瑪貓2023-03-08 18:31:35 +08:00
5687852dfb
Added the _get_currency_options method to the BasePageParams class, and applied it to the currency_options pseudo property of the PageParams classes of the ledger, income and expenses log, trial balance, income statement, and balance sheet reports.
依瑪貓2023-03-08 18:23:49 +08:00
d74c62dbb7
Removed excess property documentation from the Journal and Search classes.
依瑪貓2023-03-08 18:07:16 +08:00
987e98ebc0
Moved the code to collect the report entries to the EntryCollector class in the Search report.
依瑪貓2023-03-08 18:06:14 +08:00
7083f22577
Revised the documentation in the page parameters and the report in the ledger and income and expenses log.
依瑪貓2023-03-08 18:01:07 +08:00
7b10eb68bc
Revised the documentation of the EntryCollector class in the ledger and income and expenses log.
依瑪貓2023-03-08 17:59:56 +08:00
f277010991
Renamed the TrialBalanceTotal class to Total, to be short and clear.
依瑪貓2023-03-08 17:56:57 +08:00
729a7fd107
Renamed the TrialBalanceAccount, IncomeStatementAccount, and BalanceSheetAccount classes to ReportAccount, to be short and clear.
依瑪貓2023-03-08 17:55:34 +08:00
c8230c949d
Renamed the Entry class to ReportEntry in the journal, ledger, income and expenses log, and search result, to be clear without confusion.
依瑪貓2023-03-08 17:52:29 +08:00
3c98960efe
Replaced the Entry CSVRow, and populate_entries in the "accounting.report.reports.search" module with those in the journal module, because their contents are identical.
依瑪貓2023-03-08 17:49:54 +08:00
c5d0d91a7d
Renamed the _populate_entries functions to populate_entries in journal, ledger, income and expenses log, and search result, changing them from protected to public so that they can be reused.
依瑪貓2023-03-08 17:47:30 +08:00
fb06e9db44
Shortened the names of the BalanceSheetSubsection and BalanceSheetSubsection classes to Section and Subsection, respectively.
依瑪貓2023-03-08 17:41:07 +08:00
d47e2e231b
Shortened the names of the IncomeStatementSection, IncomeStatementSubsection, and IncomeStatementAccumulatedTotal classes to Section, Subsection, and AccumulatedTotal, respectively.
依瑪貓2023-03-08 17:40:08 +08:00
cb89f34455
Renamed the "PageParams" class to "BasePageParams", and renamed its module from "accounting.report.reports.utils.page_params" to "accounting.report.reports.utils.base_page_params". Renamed all its subclasses to PageParams, to shorten their names and make code more readable.
依瑪貓2023-03-08 17:27:19 +08:00
11ab4a4ba6
Revised the documentation of the CSV rows for the reports.
依瑪貓2023-03-08 17:21:14 +08:00
5dc8387ad9
Fixed the incorrect account in the __add_current_period method of the AccountCollector class in the "accounting.report.reports.balance_sheet" module.
依瑪貓2023-03-08 14:48:51 +08:00
26b70bb625
Fixed the logic for all-time in the period_spec function in the "accounting.report.reports.utils.csv_export" module.
依瑪貓2023-03-08 14:44:18 +08:00
f30a96d7e9
Simplified the logic in the period_spec method in the "accounting.report.reports.utils.csv_export" module.
依瑪貓2023-03-08 14:42:39 +08:00
a1627b7fbf
Revised to use a simpler way to run the class methods in the __get_desc method of the Period utility, to prevent confusion with SonarQube.
依瑪貓2023-03-08 14:31:36 +08:00
7c3b8c8f44
Revised to store the newly-constructed period chooser and month chooser in variables to prevent SonarQube from complaining.
依瑪貓2023-03-08 14:22:29 +08:00
b19f4fa939
Added "use strict"; to all the JavaScript files.
依瑪貓2023-03-08 14:08:40 +08:00
依瑪貓