Commit Graph

166 Commits

Author SHA1 Message Date
65afcd08d3 Added report.css to the cash account, cash summary, ledger, ledger summary and journal reports in the accounting application. 2020-07-19 19:52:00 +08:00
dc17058d31 Replaced the SQL statement in the _find_imbalanced() utility function in the accounting application. 2020-07-19 19:07:51 +08:00
1e742dc375 Added the _get_period() utility function to obtain the period helper for the accounting application. 2020-07-19 18:58:24 +08:00
119349868d Revised the indent in the views of the accounting application. 2020-07-19 18:54:44 +08:00
36c9aaa975 Renamed the template cash_summary.html to cash-summary.html, and ledger_summary.html to ledger-summary.html in the accounting application. 2020-07-19 18:52:16 +08:00
3cc7c5458b Added thje trial balance in the accounting application. 2020-07-19 18:50:56 +08:00
36389623ef Added the brought-forward records to the journal in the accounting application. 2020-07-19 00:26:54 +08:00
1cd64955a3 Removed the now-unused SqlQuery from the Mia core application. 2020-07-18 23:43:31 +08:00
b8eb78cc9f Replaced the SQL query in the cash account summary with the Django model query in the accounting application. 2020-07-18 23:42:15 +08:00
b20b82698b Replced the SQL query with the Django model query when finding the cash account subjects in the accounting module. 2020-07-18 11:31:37 +08:00
a03c701a31 Fixed the model query so that the brought-forward balance in the ledger will not be None in the accounting application. 2020-07-18 11:24:33 +08:00
ed0c29f360 Replaced the SQL query in the cash account with the Django model query in the accounting application. 2020-07-18 10:32:15 +08:00
c21f079321 Fixed the date of the brought-forward record in the accounting application. 2020-07-18 08:46:30 +08:00
85b8515a0a Simplified the query to get the brought-forward balance in the ledger in the accounting transaction. 2020-07-18 08:45:41 +08:00
dae002387f Fixed the report URL parameter used in the ledger summary in the accounting application. 2020-07-18 08:20:43 +08:00
393535b6bd Revised the accounting_amount filter to return "-" on 0 in the accounting application. 2020-07-18 08:17:19 +08:00
cb0d42ddd8 Simplified the query in the ledger summary in the accounting application. 2020-07-18 08:15:54 +08:00
753e69d4e9 Renamed the credit_amount attribute to credit and debit_summary to debit in RecordSummary in the accounting application. 2020-07-18 07:52:16 +08:00
a15a359ca7 Revised the view of the ledger summary and replaced the raw SQL query with the Django model query in the accounting transaction. 2020-07-18 07:46:01 +08:00
ff9146c8b1 Revised the view of the ledger and replaced the raw SQL query with the Django model query in the accounting transaction. 2020-07-18 00:08:53 +08:00
39428d1d35 Fixed the ledger when there is no brought-forward records in the accounting application. 2020-07-17 23:34:00 +08:00
4c821a73ea Added the accounting journal in the accounting application. 2020-07-17 23:27:49 +08:00
f33a1631fa Revised the comments in the view of the accounting application. 2020-07-17 07:18:58 +08:00
7f7e2c7100 Revised the code in the views of the accounting application. 2020-07-17 00:19:41 +08:00
5855c1dd2b Added the balance value to the total record in the cash account summary and ledger summary in the accounting application. 2020-07-17 00:17:18 +08:00
44a778f4f5 Fixed the subject URL in the ledger summary in the accounting application. 2020-07-17 00:15:32 +08:00
3156bc97c0 Revised the cash account summary in the accounting application. 2020-07-17 00:13:52 +08:00
70c3f01368 Added the ledger summary in the accounting application. 2020-07-17 00:12:30 +08:00
d9ccefa27c Revised the template of the cash summary in the accounting transaction. 2020-07-16 23:59:07 +08:00
c189c78f4c Removed an excess blank line in the template of the cash summary in the accounting application. 2020-07-16 23:51:49 +08:00
229e01a3d9 Revised the template of the cash summary for long lines in the accounting application. 2020-07-16 23:50:32 +08:00
d47010e51a Fixed the cash summary to indicate the current subject in the subject selection in the accounting application. 2020-07-16 23:48:34 +08:00
a9c7a8328e Fixed the documentation of the templates of the cash account and ledger in the accounting application. 2020-07-16 23:45:43 +08:00
4fec46413f Simplified the code in the cash_summary() and ledger() views in the accounting application. 2020-07-16 23:40:35 +08:00
ba119c4ed0 Applied f-string to compose the SQL statements in the views of the accounting application. 2020-07-16 23:35:10 +08:00
1f80f8a4d6 Revised the codes in the views of the accounting application to avoid long lines. 2020-07-16 23:25:10 +08:00
fb37da4ac0 Fixed a typo in the cash account in the accounting application. 2020-07-16 23:19:23 +08:00
418dcd9803 Renamed the get_multi_language_attr() method to get_multi_lingual_attr(), and renamed the multi-lingual model fields from _zhtw to _zh_hant, and _zhcn to _zh_hans. 2020-07-16 23:13:15 +08:00
a58f6d6d11 Moved the core custom template filters and tags to the template tag library in the Mia core application. 2020-07-16 23:03:37 +08:00
5b9ac93ee5 Revised the import of django.utils.timezone.localdate. 2020-07-16 22:22:35 +08:00
27f762a1c0 Removed unused imports 2020-07-16 22:19:05 +08:00
847f8dc402 Added the ledger in the accounting application. 2020-07-16 22:12:59 +08:00
9c053148d4 Revised the subject selector in the template of the cash account in the accounting application. 2020-07-16 20:55:08 +08:00
861b1eeda2 Revised the template of the cash account for readibility in the accounting application 2020-07-16 20:47:40 +08:00
b589539af3 Fixed the cash account report to indicate the current subject in the subject selection in the accounting application. 2020-07-16 20:44:25 +08:00
5c976226ff Revised the documentation of the templates in the accounting application. 2020-07-16 07:47:41 +08:00
df2c324ce0 Added _find_imbalanced() and _find_order_holes() methods as shortcuts to tag the accounting records with problems. 2020-07-16 07:45:16 +08:00
983c2a5533 Added the cash summary report in the accounting application. 2020-07-16 00:28:50 +08:00
77da7862c6 Removed an unnecessary if-condition in the template of the cash account. 2020-07-15 19:07:22 +08:00
14ed892534 Revised the cash account view in the accounting application. 2020-07-14 22:16:13 +08:00
e895de3abc Changed Period to use the current language instead of expecting the language passed by the caller. 2020-07-14 22:10:27 +08:00
fa034b9a6a Added the get_multi_language_attr() function to the Mia core application, to deal with the multi-lingual attributes, and applied it in the data models. 2020-07-14 22:01:32 +08:00
a8d18ddd1e Removed the debugging content from the cash account in the accounting application. 2020-07-14 21:28:28 +08:00
e00cf7656b Added the subject selector for the cash account in the accounting application. 2020-07-14 21:27:30 +08:00
依瑪貓
c42120d1a7 Removed the debug logging in the accounting_amount filter. 2020-07-14 10:52:49 +08:00
依瑪貓
cafbeffa28 Applied text color to negative values in the cash account. 2020-07-14 10:52:08 +08:00
依瑪貓
46b20ab500 Added the accounting_amount template filter and applied it in the cash account. 2020-07-14 10:48:10 +08:00
依瑪貓
9cab1c2194 Added documentation to the accounting utilities. 2020-07-14 10:02:16 +08:00
069cd9ca74 Revised the parameters of Period. 2020-07-14 07:43:47 +08:00
ea354ae101 Added ReportUrl to help building the report chooser in the accounting application. 2020-07-14 07:41:19 +08:00
39c75f772a Added the balance-before record and the sum record to the cash account report. Moved the SqlQuery utility from the accounting application to the Mia core application. 2020-07-13 19:54:27 +08:00
fa7416d0f3 Replaced the CashReportView list view with the cash view function, to simplify. Moved the pagination query parameter parser from the view to Pagination. 2020-07-11 17:23:38 +08:00
2f53bcfd43 Moved accounting/views.py to accounting/views/_init__.py. 2020-07-11 10:12:23 +08:00
d7f04dbb39 Added the pagination navigation bar and the action buttons to the cash account in the accounting application. 2020-07-11 07:12:53 +08:00
03d293d545 Added all the URL of the accounting application, using the dummy TODO view. Also applied the dummy TODO view to the URL that are not implemented yet. 2020-07-09 23:19:48 +08:00
依瑪貓
e59d8738fa Renamed the routes of the transactions. 2020-07-09 10:46:32 +08:00
d96a606e3a Removed the debug code in the cash account report. 2020-07-09 08:16:14 +08:00
faddceb074 Simplified the title in the cash account report. 2020-07-09 08:15:55 +08:00
6bdcdd0d78 Renamed the format template tag to str_format, and simplify it. 2020-07-09 01:29:51 +08:00
e5d0feadbc Added the page size options to the pagination navigation bar. 2020-07-08 23:40:36 +08:00
依瑪貓
fc2e89ca1a Added the currently-specified subject to the template variables, and use it in the template. 2020-07-08 11:07:00 +08:00
依瑪貓
149aa8391a Revised the view of the cash account to use the first and last day of the data from the data source. 2020-07-08 11:00:14 +08:00
依瑪貓
dde75b9805 Added Period as the template period helper, and changed PeriodParser to the inner class Period.Parser. 2020-07-08 10:52:03 +08:00
ad0eb6e73e Renamed the template variable from period_parser to period. 2020-07-08 07:40:50 +08:00
6da65f00ba Moved the period parser from the accounting application to the Mia core application. 2020-07-08 07:20:38 +08:00
d047be7ba9 Added the format template tag that does sprintf-like string format in the templates. 2020-07-08 00:58:25 +08:00
db860619f1 Added the period parser to the base report view and the template variables 2020-07-08 00:29:41 +08:00
097e699ccf Replaced now() with localdate() when finding the default period in the view of the cash reports. 2020-07-08 00:14:36 +08:00
e48460b9bb Implemented the period parser. 2020-07-08 00:12:48 +08:00
92867c3e97 Changed the pagination template variable to pagination_links. 2020-07-07 22:50:57 +08:00
e9509c9bac Changed the links attribute of Pagination to a pseudo attribute that is calculated on request. 2020-07-07 22:49:37 +08:00
19ac9d3200 Added the navigation links for pagination. 2020-07-07 22:18:40 +08:00
897f82bd26 Moved part of the pagination logic from the view to Pagination. 2020-07-07 21:04:07 +08:00
df0380362b Renamed PageNoOutOfRangeError to PageNoOutOfRangeException. 2020-07-07 20:56:01 +08:00
d48d1b017a Moved the pagination and the page number out of range error from the accounting application to the Mia core application. 2020-07-07 20:54:35 +08:00
a26247f752 Revised the has_order_hole attribute of the accounting transaction data model. 2020-07-07 19:33:34 +08:00
83f97a6467 Restored the missing _has_order_hole attribute to the accounting transaction model. 2020-07-07 19:32:19 +08:00
bf20fc8a72 Added the has_many_same_day property to the accounting transactions. 2020-07-07 07:12:26 +08:00
e6401e75ae Implemented has_order_hole in Transaction, and added the caches and setters to the pseudo properties is_balanced and has_order_hole. 2020-07-07 07:10:24 +08:00
37e793f340 Revised the cash report template. 2020-07-06 23:58:47 +08:00
405ae2307e Added the digest_login_required decorator. 2020-07-06 22:26:29 +08:00
68cf985671 Changed the decorator from @require_http_methods to @require_GET in the accounting module 2020-07-06 21:36:31 +08:00
62f960c081 Addded a simple authentication request to the cash report view. 2020-07-06 00:10:38 +08:00
714086e8e2 Applied the User model to the data models in the accounting application. Changed the primary keys of the accounting application to positive integers. 2020-07-06 00:09:26 +08:00
依瑪貓
9690256edc Fixed the template of the accounting cash report. 2020-07-02 09:53:15 +08:00
依瑪貓
0243289946 Revised the code according to the PyCharm and PEP8 inspection. 2020-07-02 09:45:11 +08:00
dc14f2e27a Renamed the human_date filter to smart_date. 2020-07-02 07:40:45 +08:00
bc0c1d9803 Fixed the layout of the cash report. 2020-07-02 02:10:44 +08:00
a3c0f3fb82 Added the template helper to display the date in a human-friendly format. 2020-07-02 02:04:35 +08:00
d19b12509f Removed an unused import from the views of the accounting application. 2020-07-02 02:04:16 +08:00