Commit Graph

375 Commits

Author SHA1 Message Date
b2ce0eff54 Applied the summary helper and JavaScripts to the transaction form, so that the transaction form works in the accounting application. 2020-08-05 07:48:50 +08:00
2c6256b497 Fixed to return as JSON in the get_summary_categories() utility in the accounting application. 2020-08-05 00:28:50 +08:00
4f7c338dfd Added transactions.css to the views of the transactions in the accounting application. 2020-08-04 23:59:15 +08:00
66c08fd413 Rewrote the get_summary_categories() utility to only query once in the accounting application. 2020-08-04 23:26:30 +08:00
依瑪貓
8f90912146 Fixed to resort the order when the date is changed in a transaction form in the accounting application. 2020-08-04 14:02:52 +08:00
依瑪貓
3680d550c7 Added a movie to the accounting_sample command in the accounting application. 2020-08-04 09:56:02 +08:00
依瑪貓
245e4c6573 Added the get_summary_categories() utility and put the categories in the transaction forms in the accounting application. 2020-08-04 09:55:27 +08:00
依瑪貓
12d4af06a0 Added TODO to the views to-do in the accounting application. 2020-08-04 09:18:28 +08:00
44e22d711f Renamed the sn column to id in the accounting application. 2020-08-04 01:59:51 +08:00
733335c715 Replaced the set() method with the kwargs-based query() method in UrlBuilder in the Mia core application. 2020-08-03 23:12:04 +08:00
b749581162 Moved the data preparation out of the transaction in the txn_store() view in the accounting application. 2020-08-03 22:55:18 +08:00
1d7acef3e1 Renamed RecordSummary to MonthlySummary, changed it from a Django data model to a simple data class, and moved it from accounting.models to accounting.utils in the accounting application. 2020-08-03 22:48:43 +08:00
66f57b7b0d Added the title_case filter and replaced the title filter with the title_case filter to display titles in American English. 2020-08-03 22:31:13 +08:00
3babe8bc1f Added the prep_desc property to Period to return the text descriptions with prepositions, to be easier to embed it in a text message in the Mia core application, and applied it in the accounting reports in the accounting application. 2020-08-03 22:20:20 +08:00
95e0173126 Replaced the invalid_period() method in Period.Parser with ValueError in the Mia core application. 2020-08-03 21:42:51 +08:00
18161c3fb2 Changed the cumulative_balance property in RecordSummary from a decorated @property to a simple property in the accounting application. 2020-08-03 20:01:36 +08:00
a9a47f8526 Fixed the error not setting the label correctly in the cash account summary and ledger summary in the accounting application. 2020-08-03 19:32:41 +08:00
841fbc1223 Added the add_css and add_js template tags to add local CSS and JavaScript files to the base template in the Mia core application, and applied them in the templates of the accounting application. 2020-08-03 00:20:26 +08:00
cbac2ba61e Added the account_options() view to return the account options in the accounting application. 2020-08-03 00:02:51 +08:00
ce1d640866 Added the test case for the sort_post_txn_records() utility in the accounting application. 2020-08-02 23:08:53 +08:00
14c6d2e4bf Revised the sort_post_txn_records() utility to fill in the new order as strings instead of integers in the accounting applications. 2020-08-02 23:08:13 +08:00
2c3bd43345 Fixed the URL of the 3351 brought-forward subject in the balance sheet to the income statement before the current period in the accounting application. 2020-08-02 22:38:16 +08:00
b652d090d3 Added the mount, debit_amount, and credit_amount properties to replace the run-time balance, total, debit, and credit properties in the Account data model in the accounting application. 2020-08-02 19:42:48 +08:00
bcc394128e Applied the title filter to the account titles in the trial balance in the accounting application. 2020-08-02 18:47:16 +08:00
65a950a28a Changed the safe-guard condition of the accounting_sample command in the accounting application. 2020-08-02 18:29:10 +08:00
2ae1e825f6 Revised the accounting_sample command to supply the account code as numbers instead of strings in the accounting application. 2020-08-02 18:26:01 +08:00
6cbef81088 Wrapped the accounting_sample command in a transaction in the accounting application. 2020-08-02 18:23:01 +08:00
2b9034cfe8 Moved the hard-coded account code 3351 and 3353 to constants in the Account data model in the accounting application. 2020-08-02 18:20:36 +08:00
da3e7912de Moved the account code of cash from hard-coded in the codes to a class constant in the Account data model in the accounting application. 2020-08-02 18:13:04 +08:00
377b25f669 Changed the decorated @property balance to a real property in the Record data model in the accounting application, for simplicity. 2020-08-02 18:00:06 +08:00
f3e2280041 Revised the debit_amount and credit_amount pseudo property in the Record data model in the accounting application. 2020-08-02 17:57:16 +08:00
fe22f64b64 Fixed the cash account and ledger and restored the balance value of the pseudo records in the accounting application. 2020-08-02 17:55:07 +08:00
6f444442b1 Fixed the txn_edit() and txn_store() views to work with cash income and cash expense transactions in the accounting application. 2020-08-02 14:29:45 +08:00
a78cbb2ad8 Revised the records property of the record data model so that the returned records are sorted by their types and their orders in the accounting application. 2020-08-02 14:08:38 +08:00
7acef78d5d Replaced the record order value with forloop.counter, so that the form does not have to have the order field. 2020-08-02 14:03:33 +08:00
62978474c8 Renamed the variable rec_type as record_type in the fill_txn_from_post() and make_txn_form_from_post() utilities in the accounting application. 2020-08-02 12:07:45 +08:00
8d9e4cdf93 Fixed the fill_txn_from_post() utility to fill the optional fields as None when they are empty in the accounting application. 2020-08-02 12:06:19 +08:00
70bc4e9662 Added to validate if an existing accounting record is a correct debit or credit record in the transaction forms in the accounting application. 2020-08-02 12:01:20 +08:00
3224a1d111 Added to store the transaction 2020-08-02 11:01:36 +08:00
478d0ca035 Removed unnecessary @property decorations from the transaction data model in the accounting application. 2020-08-02 10:39:07 +08:00
c4ffe5da34 Reordered the members in the transaction data model in the accounting application. 2020-08-02 10:35:35 +08:00
4561fa4b39 dded to return as "not modified" when the transaction was not modified in the accounting application. 2020-08-02 10:01:17 +08:00
688e350017 Adapted dirtyfields in the data models. 2020-08-02 09:53:26 +08:00
330b43c71b Fixed the fill_txn_from_post() utility when constructing the records in the accounting application. 2020-08-02 09:51:17 +08:00
0f8f2b7838 Removed the unused debug logging in the record form validation in the accounting application. 2020-08-02 03:27:41 +08:00
f7c62fcc66 Renamed the views transaction_show() to txn_show(), transaction_edit() to txn_edit(), and transaction_store() to txn_store() in the accounting application. 2020-08-02 03:08:26 +08:00
96eb033fb4 Renamed utility methods *transaction* to *txn*, and the corresponding parameters and variables, to avoid name conflict in the accounting application. 2020-08-02 03:06:31 +08:00
7be26e7447 Renamed the parameter transaction to txn in the transaction_show(), transaction_edit() and transaction_store() views, to avoid name conflict in the accounting application. 2020-08-02 03:00:23 +08:00
066fd1cb3f Renamed a variable to prevent shadowing the outer variables in the sort_form_transaction_records() utility in the accounting application. 2020-08-02 02:40:00 +08:00
73c961cfee Moved the common codes in the make_transaction_form_from_post() and fill_transaction_from_post() utilities to the new _find_max_record_no() utility, to avoid duplicated codes in the accounting application. 2020-08-02 02:37:18 +08:00
413c0fe112 Renamed the fill_transaction_from_form() to fill_transaction_from_post(), and the parameter form to post in the accounting application. 2020-08-02 02:32:10 +08:00
1b89fef01c Fixed and replaced the incorrect class property declaration with the instance property declaration, and replaced unnecessary pseudo properties with instance properties. 2020-08-02 01:04:47 +08:00
fda8a2c523 Fixed the ledger URL parameter in the template of the trial balance in the accounting application. 2020-08-02 00:32:46 +08:00
da80816b37 Revised the coding style according to PEP8. 2020-08-02 00:08:53 +08:00
9d988f17ca Added forms and validators, and applied them to the transaction form in the accounting application. 2020-08-01 23:56:41 +08:00
54939d3050 Fixed the error in the view of the cash account when there is no data in the current period in the accounting application. 2020-08-01 07:49:56 +08:00
aec234fc01 Renamed the add_param() method to add(), the del_param() method to remove(), and the set_param() method to set() in UrlBuilder in the Mia core application. 2020-07-31 21:16:03 +08:00
1a27d87400 Added the strip_form() utility to the Mia core application, and apply it to the transaction_store() view of the accounting application. 2020-07-31 00:14:12 +08:00
69e8eed33f Moved the account validation rule to from the transaction_store() view to the validate_account_code() utility function in the accounting application. 2020-07-30 08:04:18 +08:00
6e08093464 Revised the form of the transactions to supply the account code instead of the account primary key in the accounting application. 2020-07-30 07:37:27 +08:00
2252e4cb98 Revised the code in the transaction_sotre() view in the accounting application. 2020-07-30 07:35:30 +08:00
a30c937a4b Renamed the digest_login_required() decorator to login_required(), for consistency. 2020-07-30 00:12:13 +08:00
a8058209bd Replaced the views of the default accounting reports with class-based redirect views in the accounting application. 2020-07-30 00:10:11 +08:00
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