Commit Graph

312 Commits

Author SHA1 Message Date
e64089f06f Added the default_spec() method to Period, and applied it to the views in the accounting application. 2020-07-29 19:08:10 +08:00
依瑪貓
79337272ec Revised the imports in the views of the accounting application. 2020-07-29 15:07:47 +08:00
依瑪貓
d6428a002e Renamed the parameter type to txn_type in the transaction views in the accounting application. 2020-07-29 15:06:23 +08:00
依瑪貓
63d83e0e4d Revised the transaction_store() view to validate the POSTed form in the accounting application. 2020-07-29 15:04:31 +08:00
依瑪貓
5c2f5a0407 Revised the fill_transaction_from_form() utility to store the account code instead of the account primary key in the accounting application. 2020-07-29 14:47:49 +08:00
依瑪貓
aa35e45426 Renamed the variables in the sort_form_transaction_records() utility in the accounting application. 2020-07-29 09:40:51 +08:00
依瑪貓
758af556fc Simplified the code in the sort_form_transaction_records() utility in the accounting application. 2020-07-29 09:38:34 +08:00
依瑪貓
7ec25d89a8 Refined the sort_form_transaction_records() utility in the accounting application. 2020-07-29 09:37:15 +08:00
依瑪貓
0b0624b709 Simplified the code in the sort_form_transaction_records() utility in the accounting application. 2020-07-29 09:27:52 +08:00
依瑪貓
3873f131ef Revised the redundant part in the fill_transaction_from_form() utility in the accounting application. 2020-07-29 09:22:56 +08:00
de7abdfc7e Added the fill_transaction_from_form() utility and moved most of the code in fill_transaction_from_previous_form() to there, added the sort_form_transaction_records() utility, and applied the two utilities in the transaction_store() view in the accounting application. 2020-07-29 00:02:34 +08:00
ec51884414 Revised the fill_transaction_from_previous_form() utility in the accounting application. 2020-07-28 22:59:29 +08:00
4c3f3465d5 Added the fill_transaction_from_previous_form() utility to load the transaction data from the stored status, and applied it to the transaction_edit() view in the accounting application. 2020-07-28 22:48:42 +08:00
9ab325a1c7 Added the dict template filter to obtain a value from a dictionary in the Mia core application, and applied it in the templates of the forms of the transactions in the acccounting application. 2020-07-28 22:11:54 +08:00
e90defd25d Added the stored status and a dummy transaction_store() view to the accounting application. 2020-07-28 08:22:42 +08:00
e31119a19d Fixed the action URL for existing transactions in the transfer transaction form in the accounting application. 2020-07-28 03:25:05 +08:00
22f3cad8b1 Fixed the documentation of the view transaction_edit() in the accounting application. 2020-07-28 03:12:16 +08:00
9aa85b6ae8 Renamed the transaction_create() view to transaction_edit() in the accounting application. 2020-07-28 03:10:45 +08:00
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