Commit Graph

465 Commits

Author SHA1 Message Date
e86c150707 Removed an unused import from the URL patterns in the accounting application. 2020-08-09 17:44:24 +08:00
fdbc27ba57 Added the account deletion in the accounting application. 2020-08-09 17:25:51 +08:00
50eb3f080c Fixed the summary helper when starting a summary helper from a newly-added record in the transaction form in the accounting application. 2020-08-09 17:11:20 +08:00
7aa2146902 Revised the translation. 2020-08-09 17:07:05 +08:00
2e7b103e8d Revised the text on new transaction creation in the accounting application. 2020-08-09 17:03:41 +08:00
88e3637663 Revised the save() method so that it works both with the current user from the its parameter or from the parameter from the constructor. 2020-08-09 16:59:12 +08:00
bbd3d0e470 Revised and simplify the data model definition. 2020-08-09 16:34:47 +08:00
00ee0cc3bb dded the account_store() view in the accounting application. 2020-08-09 16:22:51 +08:00
7c218cbc76 Removed the strip_form() utility to strip_post() in the Mia core application. 2020-08-09 14:23:43 +08:00
375f0db9e0 Revised the names of the API views in the accounting application. 2020-08-09 14:20:59 +08:00
5c7636d37e Added my own DeleteView in the Mia core application, and applied it in the accounting application. 2020-08-09 14:20:38 +08:00
7a91a1fc1f Cleaned-up the documentation of the ReportUrl utility of the accounting appication. 2020-08-09 13:55:20 +08:00
19ea58e7a3 Revised the import usage of mia_core.stored_post. 2020-08-09 13:51:56 +08:00
0ee5eeaacf Renamed mia_core.status to mia_core.stored_post, and changed the stored status to stored POST data in the Mia core application. 2020-08-09 13:48:00 +08:00
755695be38 Replaced retrieve_status() with get_previous_post() in the make_txn_form_from_status() utility in the accounting application. 2020-08-09 13:27:00 +08:00
fc2cd3e3cc Removed unused imports from the template tags of the Mia core application and the forms of the accounting application. 2020-08-09 13:25:02 +08:00
836151d9d5 Replaced the function-based txn_delete() view with the class-based TransactionDeleteView view in the accounting application. 2020-08-09 13:19:20 +08:00
b84c9306cb Renamed the template form-record-transfer to record_form-transfer, and form-record-non-transfer to record_form-non-transfer in the accounting application. 2020-08-09 12:25:14 +08:00
19c1e8b586 Renamed the variable txn to form in the transaction forms in the accounting application. 2020-08-09 12:21:01 +08:00
1a6f36af0b Renamed the view txn_edit() to txn_form() in the accounting application. 2020-08-09 12:19:11 +08:00
06631d2df1 Revised the text messages in the account form in the accounting application. 2020-08-09 12:17:07 +08:00
724ba44a71 Added the account form in the accounting application. 2020-08-09 11:52:12 +08:00
008def227d Removed unused imports from the models of the accounting application. 2020-08-08 17:10:48 +08:00
340ba6f855 Renamed the view accounts.show to accounts.detail in the accounting application. 2020-08-08 17:05:24 +08:00
9961a34e84 Renamed the templates of the transactions to better-follow the Django conventions in the accounting application. 2020-08-08 16:34:45 +08:00
3662d154bd Revised the text translation in the accounting application. 2020-08-08 16:26:08 +08:00
e20b6376c9 Revised the template of the account detail in the accounting application. 2020-08-08 16:18:47 +08:00
cbd32bf66f Removed the unnecessary context_object_name setting from AccountListView in the accounting application. 2020-08-08 16:12:18 +08:00
f29e939de3 Replaced the function-based txn_detail() view with the class-based TransactionView view in the accounting application. 2020-08-08 16:08:15 +08:00
908fbedf0d Renamed the URL transactions.show to transactions.detail, teh templates show.html to detail.html, and the view txn_show() to txn_detail, to follow the naming convention of Django in the accounting application. 2020-08-08 15:43:21 +08:00
ece7dbe62f Removed a TODO from the url patterns in the accounting application. 2020-08-08 15:19:21 +08:00
734cd2320b Added the view of the account details in the accounting applications. 2020-08-08 15:18:39 +08:00
fd397a6692 Revised the documentation of the account list template in the accounting application. 2020-08-08 14:40:37 +08:00
9686196b91 Renamed the template variables in the account list to be more meaningful in the accounting application. 2020-08-08 14:09:02 +08:00
651f527c86 Renamed the template variables in the transaction views and forms and sorting form to be more meaningful in the accounting application. 2020-08-08 14:05:29 +08:00
fe1e4a40be Renamed the template variables in the accounting reports to be more meaningful in the accounting application. 2020-08-08 13:53:48 +08:00
c7e1fd323d Replaced the account and period template variables with the resolver matches from the request, reducing the variables passed from the view to the templates in the accounting application. 2020-08-08 13:43:11 +08:00
d23d7a9c60 Removed period chooser from the template of the search result. 2020-08-08 13:28:14 +08:00
a1d359570f Replaced the incorrect column name note with notes in the search page in the accounting application. 2020-08-08 13:27:17 +08:00
590f4aa46d Added the non_field_errors to the templates of the accounting forms in the accounting application. 2020-08-08 11:55:56 +08:00
06ab17c3a4 Added the validation whether there is any accounting records in the transaction form in the accounting application. 2020-08-08 11:55:25 +08:00
c6ccb6e0ae Added to validate the balance after deleting a record in the JavaScript of the transaction form in the accounting application. 2020-08-08 11:27:22 +08:00
61da336188 Added the validateRecord() validation in the JavaScript of the transaction form, so that users have to explicitly delete the invalid records before submitting the form in the accounting application. 2020-08-08 11:26:42 +08:00
1f0ec979ae Revised the record form template to display the whole-record errors. 2020-08-08 11:08:56 +08:00
5833af83a9 Stopped merging non-field errors into the ID errors, and joined ID errors into the non-field errors in the record form in the accounting application. 2020-08-08 10:57:32 +08:00
8793e8bc79 Replaced the use of success_redirect with django.contrib.messages in the views of the Mia core application. 2020-08-08 10:16:30 +08:00
26fceca653 Removed an unused import from the views in the accounting application. 2020-08-08 10:01:34 +08:00
7ed08b4c2f Revised the get_summary_categories() utility to look for bi-directional travel summary text in the accounting application. 2020-08-07 22:34:24 +08:00
9771cfd55a Fixed the direction text in the summary helper template in the accounting application. 2020-08-07 22:32:54 +08:00
09c1f453f4 Replaced parsing the HTML element ID with the HTML custom data attributes in the JavaScripts. 2020-08-07 22:31:08 +08:00
d6e68717fd Moved the JavaScript on the account list template to a separated JavaScript file in the accounting application. 2020-08-07 21:35:03 +08:00
1d9a8a0401 Moved the template accounting/accounts/index.html to accounting/account_list.html to follow the default template name in the accounting application. 2020-08-07 21:28:28 +08:00
依瑪貓
4342f1e34e Revised the translation. 2020-08-07 10:40:57 +08:00
依瑪貓
8cc40e1f68 Simplified the code in the account_options view in the accounting application. 2020-08-07 10:36:14 +08:00
依瑪貓
4f02dd88da Moved getting the ReportUrl utility from the views to the report chooser template, to simplify the view in the accounting application. 2020-08-07 10:25:29 +08:00
依瑪貓
45ed53b085 Added the account list view in the accounting application. 2020-08-07 10:11:09 +08:00
依瑪貓
1a2bada988 Added AccountConverter and apply it to the URL patterns in the accounting application. 2020-08-07 10:10:33 +08:00
依瑪貓
3b522af41b Added the is_parent_and_in_use decorated @property to the Account data model in the accounting application. 2020-08-07 10:09:41 +08:00
依瑪貓
4eb2391fd8 Added force_escape to the current report title in the report chooser template in the accounting application. 2020-08-07 09:46:37 +08:00
依瑪貓
2805eb0774 Added the report_url template tag in the accounting application. 2020-08-07 09:42:22 +08:00
依瑪貓
23f7564e87 Revised the constructor of the ReportUrl utility to better deal with the keyword arguments in the accounting application. 2020-08-07 09:42:07 +08:00
ceb6a3454b Revised the code in the txn_store() view in the accounting application. 2020-08-07 07:58:19 +08:00
35e6b533cf Implemented the find_existing_equipments() utility, and applied it in the ledger in the accounting application. 2020-08-07 01:06:57 +08:00
c78d0f613d Added the equipment account to the accounting_sample command in the accounting application. 2020-08-07 01:02:21 +08:00
eac77c725a Renamed the is_credit_card_paid() utility to is_payable(), and implemented it in the accounting application. 2020-08-07 00:58:33 +08:00
75cc6b2d00 Removed the context from the translatable text messages, because that is not necessary anymore. 2020-08-07 00:05:05 +08:00
f6c6ee7fe4 Applied the force_escape filter to the gettext shortcut _("...") in the templates, because it returns SafeString instead of str. 2020-08-06 23:55:24 +08:00
f970974e71 Added the transaction sorting in the accounting application. 2020-08-06 23:51:20 +08:00
9d49815462 Moved the form-record-transfer.html and form-record-non-transfer.html templates from accounting/transactions to accounting/include in the accounting application. 2020-08-06 22:05:15 +08:00
依瑪貓
4a63a01e11 Removed the now-unused l10n_messages hidden variable and the corresponding TODO from the transaction forms in the accounting application. 2020-08-06 16:02:18 +08:00
依瑪貓
ede94eb68e Added the should_validate template variable to the transaction forms to prevent initial errors with newly-created empty forms in the accounting application. 2020-08-06 15:48:26 +08:00
依瑪貓
9a9f715349 Fixed and set the txn_type to the form in the make_txn_form_from_model() utility in the accounting application. 2020-08-06 15:46:43 +08:00
1d79e970c4 Revised the error messages and their translations both in Python and for the JavaScript. 2020-08-06 01:47:01 +08:00
b45c06ac36 Added the JavaScript text message translation. 2020-08-06 01:39:51 +08:00
372e55b028 Revised the translation. 2020-08-06 01:14:51 +08:00
86dfe993a4 Removed the context from the translatable text messages in the accounting application, because it is not needed now. 2020-08-06 00:41:29 +08:00
518b49ee65 Split the translations into their corresponding applications. 2020-08-06 00:01:01 +08:00
c7bb3504e9 Replaced the records in the transaction form with external templates, so that these templates can also be used to add new records and replace the complex jQuery operation in the accounting application. 2020-08-05 23:24:52 +08:00
8294f2af36 Fixed the documentation in the templates of the transactions in the accounting application. 2020-08-05 22:10:51 +08:00
依瑪貓
4f8ed8dc85 Added the missing handlers for the PaginationException to the views in the accounting application. 2020-08-05 13:38:12 +08:00
依瑪貓
184e94e2c6 Revised the codes in the views with PEP8 and PyCharms inspection for the accounting application. 2020-08-05 13:35:09 +08:00
依瑪貓
4f837f942f Revised the get_summary_categories() utility to sort the returned categories by their frequencies in the accounting application. 2020-08-05 11:33:15 +08:00
依瑪貓
97b9190b32 Fixed to deal with PaginationException. 2020-08-05 10:04:44 +08:00
依瑪貓
b6111f0707 Fixed the find_order_holes() utility so that pseudo records does not count in the accounting application. 2020-08-05 09:36:09 +08:00
依瑪貓
dd8b192913 Revised and simplified the code for the URL on txn_delete() in the accounting application. 2020-08-05 09:30:10 +08:00
依瑪貓
34fb682de1 Added an addition blank line before the account_options() view in the accounting application. 2020-08-05 09:20:13 +08:00
c765d8ec86 Revised the algorithm to find the transactions to reorder when the date of an existing transaction is changed in a transaction form in the accounting application. 2020-08-05 08:29:30 +08:00
97825dfe8d Added the account deletion. 2020-08-05 08:23:20 +08:00
b6f5bbaf9e Fixed the fill_txn_from_post() utility so that it works on new transactions without any record in the accounting application. 2020-08-05 08:04:40 +08:00
65bfdf3a88 Renamed the class subject-line to account-line in the accounting application. 2020-08-05 07:51:35 +08:00
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