Commit Graph

394 Commits

Author SHA1 Message Date
78cac61cd5 Renamed the templates edit.html to form.html, and show.html to view.html in the accounting application. 2020-07-28 03:09:53 +08:00
b11348b276 Applied the form to existing transactions in the accounting application. 2020-07-28 03:07:37 +08:00
95ffeff8cb Removed the default value of the accounting record order in the accounting application. 2020-07-28 00:33:02 +08:00
760c739864 Removed the transaction type from the template variables of the transactions, because they are not necessary at all in the accounting application. 2020-07-28 00:23:13 +08:00
99fb99b160 Added the view and the templates for the forms of the transactions in the accounting application. 2020-07-27 22:36:28 +08:00
c8eb31ce82 Removed unused debug logging in the views of the accounting application. 2020-07-25 14:26:35 +08:00
dc4d301891 Added the records property to Transaction to manage the records temporarily instead of record_set that requires the records to be saved first in the accounting application. 2020-07-24 19:42:48 +08:00
75b5e53900 Fixed the transaction views so that it works without the return parameter in the accounting application. 2020-07-24 07:26:47 +08:00
20369e42cc Fixed so that the URL in the transaction views uses the current transaction type specified in the URL rather than the type of the transaction itself in the accounting application. 2020-07-23 23:35:43 +08:00
6e49443b88 Renamed the new_id() utility to new_pk() in the Mia core application. 2020-07-23 23:24:42 +08:00
aefb5cc091 Changed the use of the sn field with pk. 2020-07-23 23:20:10 +08:00
1dcbd37fbd Replaced the use of the sn field with pk, for compatibility in the future. 2020-07-23 23:15:33 +08:00
e04736b90d Renamed the new_sn() utility to new_id() in the Mia core application. 2020-07-23 23:04:18 +08:00
ff8c92a711 Added the action buttons to the transaction views in the accounting application. 2020-07-23 23:01:19 +08:00
43d51a5519 Revised the code in the transaction model in the accounting application. 2020-07-23 22:33:33 +08:00
6453cd4b8e Added the edit button to the transaction views in the accounting application. 2020-07-23 22:32:34 +08:00
0a29ffaa12 Moved the url_with_return template tag from the accounting application to the Mia core application. 2020-07-23 22:23:40 +08:00
cafa927c07 Added the back button to the transaction views in the accounting application. 2020-07-23 22:22:04 +08:00
25383a3ae6 Employed a regular expression pattern in the PeriodConverter to check the period format first. 2020-07-23 22:13:17 +08:00
2db3899dea Added the transaction views in the accounting application. 2020-07-23 22:02:26 +08:00
41737c250e Fixed the accounting_sample command for the cash-expense transactions in the accounting application. 2020-07-23 21:00:51 +08:00
1e2d57805c Fixed the documentation in accounting.converters in the accounting application. 2020-07-23 18:37:29 +08:00
依瑪貓
0ff6076b36 Revised the imports in accounting.views and accounting.converters in the accounting application. 2020-07-23 14:26:05 +08:00
依瑪貓
6691e3db2b Moved the views back to accounting.views in the accounting application. 2020-07-23 14:17:05 +08:00
依瑪貓
79442085b6 Moved the get_cash_accounts(), get_ledger_accounts(), find_imbalanced(), and find_order_holes() utilities from accounting.views.reports to accounting.utils in the accounting application. 2020-07-23 09:57:29 +08:00
依瑪貓
9602ba56c7 Moved the Polulator from accounting.populate to accounting.utils in the accounting application. 2020-07-23 09:40:21 +08:00
依瑪貓
a089e2c235 Renamed the template variable current_account to account in the accounting application, for simplicity. 2020-07-23 09:37:29 +08:00
8890e60fbb Added CashAccountConverter and LedgerAccountConverter and applied them in the URL patterns of the accounting application. 2020-07-23 08:33:53 +08:00
6ae25ddca7 Moved the path converters from accounting.urls to accounting.converters in the accounting application. 2020-07-23 01:22:11 +08:00
5c10b30c24 Added confirmation to the accounting_sample command in the accounting application. 2020-07-23 01:15:46 +08:00
554a195b5a Added Populator to the quickly populates the accounting data, and applied it in the accounting_sample command in the accounting application. 2020-07-22 21:02:04 +08:00
依瑪貓
9d188ff96b Fixed the journal to display the brought-forward records with balance larger than zero in the accounting application. 2020-07-22 10:36:39 +08:00
依瑪貓
2335a4b4a8 ixed the report URL in the search result in the accounting application. 2020-07-22 10:27:20 +08:00
依瑪貓
968516c472 Fixed the sign of the liabilities and owner's equity in the balance sheet in the accounting application. 2020-07-22 10:26:04 +08:00
依瑪貓
c7ab277698 Added the payable to the accounting_sample command in the accounting application. 2020-07-22 10:22:26 +08:00
依瑪貓
17be43cbd9 Added the income to the accounting_sample command in the accounting application. 2020-07-22 09:55:04 +08:00
c7a17cf0f2 Added the order of the transaction in a day to the order of the records in the views of the accounting application. 2020-07-22 08:25:43 +08:00
21350127a1 eplaced localdate() and timedelta() with timezone.localdate() and timezone.timedelta() in the accounting_sample command in the accounting application. 2020-07-22 08:22:01 +08:00
0fb7cafbcd Applied random amounts to the accounting_sample command in the accounting application. 2020-07-22 08:17:44 +08:00
4ef0dbf839 Removed the debug output from the accounting_sample command in the accounting application. 2020-07-22 07:46:55 +08:00
cef592ac99 Added the user creation to the accounting_sample command in the accounting application. 2020-07-22 07:46:00 +08:00
aba808a53a Added the accounting_sample command in the accounting application. 2020-07-22 00:15:26 +08:00
f9a9a99246 Added PeriodConverter to convert a period specification to a period, and applied it in the URL patterns. 2020-07-21 22:05:39 +08:00
ebb7c06f91 Applied the set_multi_lingual_attr() utility function to the titles of the accounts and the names of the countries. 2020-07-21 21:23:54 +08:00
248ebe8774 Revised the codes of the views of the accounting application according to the inspection results by PyCharm. 2020-07-21 21:18:12 +08:00
7a6879951a Revised the code of the views of the account application with PEP8. 2020-07-21 20:57:59 +08:00
b353a3fba8 Replaced filter().first() with get() when finding the account #3351 in the accounting application. 2020-07-21 19:45:14 +08:00
e207efc285 Revised the indents in the views of the accounting application. 2020-07-21 19:41:53 +08:00
5a48e07ef6 Moved the order from the data models to the reports in the accounting application. 2020-07-21 19:38:01 +08:00
090f3dc3a5 Fixed the _find_order_holes() utility to include the check for the minimal order in the accounting application. 2020-07-21 18:57:34 +08:00
e0e2815c34 Fixed the _find_order_holes() utility in the accounting application. 2020-07-21 18:55:04 +08:00
依瑪貓
bbfe9e7892 Changed the URL of the accounts in the balance sheet so that the net income in the current period links to the income statement in the accounting application. 2020-07-21 13:38:18 +08:00
依瑪貓
3c294ffcb8 Updated the template variables in the balance sheet in the accounting application. 2020-07-21 11:58:50 +08:00
依瑪貓
6f47c08c80 Added a unique constraint to the account code in the accounting application. 2020-07-21 10:59:48 +08:00
依瑪貓
bace7bb93b Renamed "subject" to "account" in the models of the accounting application. 2020-07-21 10:43:05 +08:00
依瑪貓
076a68c028 Renamed "subject" to "account" in the accounting application. 2020-07-21 10:38:47 +08:00
依瑪貓
28e84702e7 Fixed the title of the journal in the accounting application. 2020-07-21 10:26:40 +08:00
依瑪貓
c6a62d92d5 Added the search page in the accounting application. 2020-07-21 10:04:29 +08:00
f114f84c85 Reordered the codes in accounting.views.reports. 2020-07-21 08:26:23 +08:00
951a29feeb Moved the views of the accounting reports from accounting.views to accounting.views.reports in the accounting application. 2020-07-21 08:20:57 +08:00
083163347f Revised the documentation of the views and renamed the *_home() view functions to *_default() in the accounting application. 2020-07-21 07:54:23 +08:00
7657d5f823 Added the default page of the cash summary, ledger, ledger summary, journal, trial balance, income statement, balance sheet in the accounting application. 2020-07-21 07:40:38 +08:00
6c58b04617 Added a TODO note in the template of the balance sheet in the accounting application. 2020-07-21 00:33:31 +08:00
a18df0e928 Added the balance sheet in the accounting application. 2020-07-21 00:31:31 +08:00
c2c8ee66ab Fixed the stylesheet of the income statement in the accounting application. 2020-07-20 23:46:57 +08:00
bd826b7738 Removed the excess escape from the template of the income statement in the accounting application. 2020-07-20 23:43:40 +08:00
59820f65ca Revised the template of the income statement and removed the case when there is no data, because there is always data in the accounting application. 2020-07-20 23:40:12 +08:00
bbe4b39fde Renamed the classes used in the income statement in the accounting application. 2020-07-20 22:48:16 +08:00
4087cebf87 Revised the documentation in the templates of the accounting application. 2020-07-20 22:43:03 +08:00
d2ea9ff279 Revised the income statement for the small screens on mobile devices. 2020-07-20 22:36:14 +08:00
434b109a75 evised the income statement. 2020-07-20 22:23:19 +08:00
175e28f862 Added the income statement in the accounting application. 2020-07-20 20:58:07 +08:00
6a9eb5ed0e Removed the unused logging from the accounting_amount template filter in the accounting application. 2020-07-20 20:20:05 +08:00
f90b764770 Fixed the current report name in the report chooser in the trial balance in the accounting application. 2020-07-19 21:40:10 +08:00
1ec1bba364 Added a TODO note to the _ledger_subjects() utility method in the accounting application. 2020-07-19 21:20:11 +08:00
469f32b1ec Replaced the SQL in the _find_order_holes() utility function in the accounting application. 2020-07-19 21:19:10 +08:00
b8b5546b9f Renamed the variables. 2020-07-19 21:08:10 +08:00
a62d5df9a3 Renamed records to item_list, and record to item in the report templates in the accounting application. 2020-07-19 20:27:00 +08:00
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
fbce3ab9ef Revised the documentation. 2020-07-02 00:50:27 +08:00
4537681bb5 Added the documentation to the invalid page number in Pagination. 2020-07-02 00:45:53 +08:00
3abce4498f Revised the pagination to redirect to the URL without the page number if the specific page number is exactly the default page number. That is, the page number is totally unnecessary. 2020-07-02 00:42:34 +08:00
789bdca699 Added simple localization. 2020-07-02 00:34:43 +08:00
1ddfc96621 Revised to redirect on invalid page size and page number on pagination. 2020-07-01 23:39:32 +08:00
8cab91dcd2 Added the side-wide base template, and apply it in the accounting cash report. 2020-07-01 23:38:36 +08:00
eb07cc30ba Removed the unused imports from the views of the accounting application. 2020-07-01 00:54:41 +08:00
51ec6f7eed Revised the documentation of the get_query_number() function. 2020-07-01 00:54:15 +08:00
37cddf478c Changed the get_number_query() method to the get_query_number() function, so that it is shared by different view classes. 2020-07-01 00:52:38 +08:00
967c51075c Removed an unused variable from the views. 2020-07-01 00:45:33 +08:00
a48a885ed6 Added the get_absolute_url() method to the accounting transactions. 2020-07-01 00:43:46 +08:00
42fe685d53 Added a simple pagination filter and refined the cash report. 2020-06-30 23:49:21 +08:00
06b8d470fb Added simple views for the accounting cash report. 2020-06-30 20:59:24 +08:00
cde10aed91 Added the accounting models to the administration. 2020-06-30 05:41:41 +08:00
48d9d742ec Added the data models of the accounting application. 2020-06-30 05:41:36 +08:00
fb95c0e073 Added the accounting application. 2020-06-29 19:41:52 +08:00