|
|
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:49:05 +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 |
|
|
|
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 |
|
|
|
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 14:36:58 +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 14:36:57 +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 14:36:56 +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 14:36:55 +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 14:36:55 +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 14:36:54 +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 14:36:54 +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 14:36:53 +08:00 |
|
|
|
380256eda7
|
Revised the imports in the reports.
|
2023-03-09 14:36:52 +08:00 |
|
|
|
74b695c089
|
Added the get_ledger_url utility to replace the common codes to retrieve the URL of a ledger.
|
2023-03-09 14:36:50 +08:00 |
|
|
|
6d1e705e4b
|
Revised the documentation of the "accounting.report.reports.utils.csv_export" module.
|
2023-03-09 14:36:49 +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 14:36:48 +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 14:36:48 +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 14:36:47 +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 14:36:46 +08:00 |
|
|
|
4ce577d7d8
|
Removed the unused entry property from the ReportEntry model of the income and expenses log.
|
2023-03-09 14:36:45 +08:00 |
|
|
|
a340fad109
|
Removed the unused entry and account properties from the ReportEntry model of the ledger.
|
2023-03-09 14:36:45 +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 14:36:44 +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 14:36:43 +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 14:36:42 +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 14:36:42 +08:00 |
|
|
|
a14ffa93ed
|
Replaced querying the currencies later with the "selectinload" query option in the journal and search reports.
|
2023-03-09 14:36:41 +08:00 |
|
|
|
672fcbcbdf
|
Replaced querying the accounts later with the "selectinload" query option in the income and expenses log.
|
2023-03-09 14:36:41 +08:00 |
|
|
|
cb4258dd6d
|
Removed the unused "is_total" property from the ReportEntry class of the journal.
|
2023-03-09 14:36:40 +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 14:36:40 +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 14:36:40 +08:00 |
|
|
|
62716eb545
|
Fixed the report chooser to set the current report when the current report is the search page.
|
2023-03-09 14:36:36 +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-09 14:36:34 +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-09 14:36:32 +08:00 |
|
|
|
d64f354ee0
|
Added the DATE_SPEC_RE constant to simplify the regular expression matching in the _parse_period_spec function.
|
2023-03-09 14:36:32 +08:00 |
|
|
|
ba3d8c6d4e
|
Removed a redundant test in the _parse_period_spec function in the "accounting.report.period" module.
|
2023-03-09 14:36:31 +08:00 |
|
|
|
4f7f87b10d
|
Removed an unused import from the "accounting.report.reports.utils" module.
|
2023-03-09 14:36:30 +08:00 |
|
|
|
e448e009c9
|
Simplified the declaration of the "available_years" property in the PeriodChooser utility.
|
2023-03-09 14:36:29 +08:00 |
|
|
|
b6802c51bb
|
Removed an excess blank line in the __get_since_desc method of the PeriodDescription utility.
|
2023-03-09 14:36:29 +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-09 14:36:28 +08:00 |
|
|
|
0ef6409f75
|
Revised the documentation of the PeriodDescription utility.
|
2023-03-09 14:36:28 +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-09 14:36:27 +08:00 |
|
|
|
6c122666a0
|
Revised to simplify the PeriodDescription utility.
|
2023-03-09 14:36:27 +08:00 |
|
|
|
7ddc9ececf
|
Added the __format_day method to the PeriodDescription utility to simplify the code.
|
2023-03-09 14:36:26 +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-09 14:36:25 +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-09 14:36:25 +08:00 |
|
|
|
f438f97571
|
Revised the styles of the f-strings in the Period utility.
|
2023-03-09 14:36:24 +08:00 |
|
|
|
9b273115a0
|
Removed the empty _set_properties method override from the YearPeriod period.
|
2023-03-09 14:36:24 +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-09 14:36:23 +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-09 14:36:22 +08:00 |
|
|
|
d74c62dbb7
|
Removed excess property documentation from the Journal and Search classes.
|
2023-03-09 14:36:22 +08:00 |
|
|
|
987e98ebc0
|
Moved the code to collect the report entries to the EntryCollector class in the Search report.
|
2023-03-09 14:36:21 +08:00 |
|
|
|
7083f22577
|
Revised the documentation in the page parameters and the report in the ledger and income and expenses log.
|
2023-03-09 14:36:21 +08:00 |
|
|
|
7b10eb68bc
|
Revised the documentation of the EntryCollector class in the ledger and income and expenses log.
|
2023-03-09 14:36:20 +08:00 |
|
|
|
f277010991
|
Renamed the TrialBalanceTotal class to Total, to be short and clear.
|
2023-03-09 14:36:19 +08:00 |
|
|
|
729a7fd107
|
Renamed the TrialBalanceAccount, IncomeStatementAccount, and BalanceSheetAccount classes to ReportAccount, to be short and clear.
|
2023-03-09 14:36:19 +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-09 14:36:18 +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-09 14:36:18 +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-09 14:36:17 +08:00 |
|
|
|
fb06e9db44
|
Shortened the names of the BalanceSheetSubsection and BalanceSheetSubsection classes to Section and Subsection, respectively.
|
2023-03-09 14:36:17 +08:00 |
|
|
|
d47e2e231b
|
Shortened the names of the IncomeStatementSection, IncomeStatementSubsection, and IncomeStatementAccumulatedTotal classes to Section, Subsection, and AccumulatedTotal, respectively.
|
2023-03-09 14:36:17 +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-09 14:36:17 +08:00 |
|
|
|
11ab4a4ba6
|
Revised the documentation of the CSV rows for the reports.
|
2023-03-09 14:36:16 +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-09 14:36:16 +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-09 14:36:15 +08:00 |
|
|
|
f30a96d7e9
|
Simplified the logic in the period_spec method in the "accounting.report.reports.utils.csv_export" module.
|
2023-03-09 14:36:15 +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-09 14:36:14 +08:00 |
|
|
|
8a3df7a689
|
Revised the search report to match the amount when the query keyword is a number, instead of matching the amount as a text string. For example, "0150.00" matches 150, while "50" does not match 150.
|
2023-03-09 14:36:11 +08:00 |
|
|
|
196a115c99
|
Revised the coding style in the __get_transaction_condition method of the Search report.
|
2023-03-09 14:36:11 +08:00 |
|
|
|
005f9083aa
|
Revised the constructor of the IncomeExpensesAccount pseudo account.
|
2023-03-09 14:36:10 +08:00 |
|
|
|
617dd29f23
|
Added the period_spec function to be used to compose the download file name, to replace the spec property of the Period utility.
|
2023-03-09 14:36:08 +08:00 |
|
|
|
b0a4a735f3
|
Added the is_a_month property to the Period utility.
|
2023-03-09 14:36:08 +08:00 |
|
|
|
43fc4b9b8d
|
Renamed "total revenue" to "total operating revenue".
|
2023-03-09 14:36:07 +08:00 |
|
|
|
041a905fc0
|
Added font-awesome icons to the report chooser.
|
2023-03-09 14:36:05 +08:00 |
|
|
|
116d00a557
|
Replaced the hard-coded cash account codes with the ACCUMULATED_CHANGE and NET_CHANGE constants and the accumulated_change() method of the Account data model.
|
2023-03-09 14:36:01 +08:00 |
|
|
|
329e3d5362
|
Replaced the hard-coded cash account codes with the CASH constant and the cash() method of the Account data model.
|
2023-03-09 14:36:00 +08:00 |
|
|
|
e7c43ae390
|
Revised the documentation to use the term "income and expenses log" instead of "income and expenses", for consistency.
|
2023-03-09 14:36:00 +08:00 |
|
|
|
9993f65627
|
Added the search to the accounting data.
|
2023-03-09 06:37:31 +08:00 |
|
|
|
2f7b9932a0
|
Added the base report class to ensure that the reports can both be shown on the page and downloaded as CSV.
|
2023-03-09 06:37:28 +08:00 |
|
|
|
1eed16b732
|
Added the pseudo account for the income and expenses log to query the income and expenses log of the current assets and liabilities.
|
2023-03-09 06:37:28 +08:00 |
|
|
|
ede1160943
|
Fixed the ledger and the income and expenses log not to show the total entry when there is actually no data.
|
2023-03-09 06:37:27 +08:00 |
|
|
|
24315b8203
|
Fixed the styles of the negative numbers in the reports with red and braced absolute values.
|
2023-03-09 06:37:26 +08:00 |
|
|
|
3c200d0dc6
|
Fixed the sign of the amount in income statement.
|
2023-03-09 06:37:26 +08:00 |
|
|
|
9f1e724875
|
Added the "accounting.report.reports.csv_export" module to handle the CSV export in one place.
|
2023-03-09 06:37:26 +08:00 |
|
|
|
f838e7f893
|
Moved the utilities that are only for the report generators from the "accounting.report" module to the "accounting.report.reports.utils" module.
|
2023-03-09 06:37:25 +08:00 |
|
|
|
edb893ecd3
|
Replaced the report generators with a separated module for each report, to work with the diversity of the report formats without messing-up one another.
|
2023-03-09 06:37:23 +08:00 |
|
|
|
436a4c367f
|
Added the balance sheet.
|
2023-03-09 06:37:22 +08:00 |
|
|
|
1813ce0cfa
|
Removed the unused and empty __get_category method from the IncomeStatement report.
|
2023-03-09 06:37:22 +08:00 |
|
|
|
7683347997
|
Removed a non-existing parameter from the documentation of the constructor of the IncomeStatementParams class.
|
2023-03-09 06:37:22 +08:00 |
|
|
|
dffcf6d2ce
|
Removed the unused is_account pseudo property in the IncomeStatementRow row.
|
2023-03-09 06:37:19 +08:00 |
|
|
|
84d239e4b1
|
Added the income statement.
|
2023-03-09 06:37:19 +08:00 |
|
