-
Notifications
You must be signed in to change notification settings - Fork 105
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
2085: refactor: Posting Journal and Associated Tools r=mbayopanda a=jniles This Pull Request finalizes the refactor of the Posting Journal and associated modules. The commit history contains a full list of changes. In brief: 1. Editing has been moved out into a modal. By breaking out the editing code, the complexity of the Posting Journal is reduced. It also enforces editing a single transaction at a time. 2. The Trial Balance has moved into Stored Procedures. This separates the JS code from the SQL code and speeds up the execution of the Trail Balance slightly. 3. The Trial Balance no longer reloads data between `$state` changes. The modal is much more snappy than previous. 4. Links to the receipts/documents/patients associated with each transaction are embedded in the Posting Journal. This makes it easy to find the details associated with a given transaction. 5. The Posting Journal is able to load "posted" transactions. To accommodate this, the Posting Journal footer has been improved to show the number of unposted or posted transactions. Additionally, the "Posted Journal" module has been removed. There have been a number of miscellaneous bug fixes addressed as well. As with any change, this may introduce new bugs specific to the changes listed above. Partially addresses #1432. Closes #1034. Closes #1163. Closes #1402. Closes #1500. Closes #1640. Closes #1659. Closes #1716. Closes #1717. Closes #1724. Closes #1832. Closes #1839. Closes #1921. Closes #1928. Closes #1934. Closes #1943. Closes #1944. Closes #1948. Closes #1950. Closes #1961. Closes #2031. Closes #2041. --- ### TODO Before Merge - [x] Ensure all keys are translated into both French and English - [x] Ensure tests pass - [x] Make sure all filters/links work on Posting Journal page. - [x] Make sure all filters/links work on the Trial Balance - [x] Ensure all editors work as expected. - [x] Ensure that new code passes lint checks.
- Loading branch information
Showing
95 changed files
with
3,176 additions
and
3,575 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,68 +1,65 @@ | ||
| {"POSTING_JOURNAL":{"ABOLISH_GROUPS":"Abolishing Group", | ||
| "ACCOUNT":"Account", | ||
| "ADD_ROW":"Add Row", | ||
| "REMOVE_ROW":"Remove Row(s)", | ||
| "ADD_TRANSACTION":"Add Transaction", | ||
| "CONFIGURE":"Configure", | ||
| "CREDIT":"Credit", | ||
| "ROW":"Row", | ||
| "ROWS":"Row(s)", | ||
| "CREDIT_LETTER":"C", | ||
| "DEBIT_LETTER":"D", | ||
| "DEBIT":"Debit", | ||
| "TOTAL_ROWS":"Rows", | ||
| "DEB_CRED":"Deb Cred", | ||
| "DELETE_TRANSACTION":"Delete Transaction", | ||
| "EDIT":"Edit", | ||
| "EDIT_TRANSACTION":"Edit transaction", | ||
| "ENTERPRISE":"Enterprise", | ||
| "ENTERPRISE_MANAGEMENT":"Enterprise Management", | ||
| "FISCAL_YEAR":"Fiscal Year", | ||
| "GENERAL_LEDGER":"General Ledger", | ||
| "GROUP_BY":"Group By", | ||
| "IN_PROGRESS":"In progress", | ||
| "JUSTIFICATION":"Justification", | ||
| "LINES":"Lines", | ||
| "LIVE_TRANSACTION":"Live Transaction", | ||
| "RECORDS":"records", | ||
| "REFRESH":"Refresh", | ||
| "SAVE_TRANSACTION":"Save Transaction", | ||
| "SINGLE_EDIT_ONLY":"Single Edit Only", | ||
| "SPLIT":"Split", | ||
| "SPLIT_TRANSACTION":"Split transaction", | ||
| "TRANSACTION":"Transaction", | ||
| "TRANSACTION_DATE":"Transaction Date", | ||
| "SAVE_TRANSACTION_SUCCESS":"Transaction record was updated successfully.", | ||
| "TRANSACTION_NUMBER":"Transaction Number", | ||
| "TRANSACTION_SUCCESS":"Transaction success", | ||
| "UNKNOWN_ACCOUNT":"Unknown Account", | ||
| "VERIFY_TRANSACTION":"Verify Transaction", | ||
| "CONFIGURATION":{"TITLE":"Columns configuration", | ||
| "COLUMNS":"Columns"}, | ||
| "ERRORS":{"DATE_IN_WRONG_PERIOD":"Dates in wrong period", | ||
| "MISSING_DESCRIPTION":"Descriptions omitted", | ||
| "VARIOUS_TRANSACTION_TYPE":"Various transaction type for a transaction", | ||
| "LOCKED_ACCOUNT":"Locked account(s)", | ||
| "TRANSACTION_DIFF_DATES" : "Transactions with different dates", | ||
| "UNBALANCED_TRANSACTIONS":"Unbalanced Transaction(s)", | ||
| "MISSING_ACCOUNTS":"Accounts omitted", | ||
| "MISSING_DATES":"Missing Dates", | ||
| "DEB_CRED_NOT_NULL" : "Debit and Credit should not be Zero", | ||
| "CREDITED_DEBITED" : "On the same transaction line an account can not be debited and credited at the same time", | ||
| "MISSING_DOCUMENT_ID":"Records without document ID", | ||
| "MISSING_ENTITY":"Record without entity ID", | ||
| "MISSING_FISCAL_OR_PERIOD":"Fiscal year or period omitted", | ||
| "MULTIPLE_CANCELLING":"Multiple Cancelling. This transaction has been already cancelled", | ||
| "SINGLE_LINE_TRANSACTION":"Transaction with a single line", | ||
| "EDIT_INVALID_ACCOUNT":"Transaction contains invalid account(s)", | ||
| "EDIT_INVALID_ENTITY":"Transaction contains an invalid entity", | ||
| "EDIT_INVALID_REFERENCE":"Transaction contains an invlid reference"}, | ||
| "WARNINGS":{"MISSING_ENTITY":"Record without entity type and entity ID", | ||
| "NO_TRANSACTIONS_SELECTED":"No transactions selected. You must be in Transaction view to use this tool."}, | ||
| "ERROR_REPORT":{"TITLE":"Error Report"}, | ||
| "TRIAL_BALANCE":{"TITLE":"Trial Balance", | ||
| "MAIN":"Main", | ||
| "DETAIL":"Detail", | ||
| "ERROR_LIST":"Error List"}, | ||
| "TITLE":"Posting Journal", | ||
| "EDIT_MODE":"Edit Mode"}} | ||
| { | ||
| "POSTING_JOURNAL": { | ||
| "ADD_ROW" : "Add Row", | ||
| "REMOVE_ROW" : "Remove Row(s)", | ||
| "ROWS" : "Row(s)", | ||
| "EDITING" : "Editing", | ||
| "NO_TRANSACTION_TYPE" : "No assigned transaction type", | ||
| "JUSTIFICATION" : "Justification", | ||
| "REFRESH" : "Refresh", | ||
| "SAVE_TRANSACTION" : "Save Transaction", | ||
| "SAVE_TRANSACTION_SUCCESS" : "Transaction record was updated successfully.", | ||
| "TRANSACTION" : "Transaction", | ||
| "VIEWING" : "Viewing", | ||
| "OUTDATED_DATA_MESSAGE_1" : "The data displayed may have changed since it was loaded.", | ||
| "OUTDATED_DATA_MESSAGE_2" : "the latest data.", | ||
| "CLICK_HERE_TO_RELOAD" : "Click here to reload", | ||
| "CONFIGURATION": { | ||
| "TITLE" : "Columns configuration", | ||
| "COLUMNS" : "Columns" | ||
| }, | ||
| "ERRORS": { | ||
| "DATE_IN_WRONG_PERIOD" : "Dates in wrong period", | ||
| "MISSING_DESCRIPTION" : "Descriptions omitted", | ||
| "NO_FISCAL_FOR_DATE" : "There is no fiscal year for this Date", | ||
| "CLOSED_FISCAL_YEAR" : "The fiscal year for this date has already been closed", | ||
| "VARIOUS_TRANSACTION_TYPE" : "Various transaction type for a transaction", | ||
| "LOCKED_ACCOUNT" : "An accountant has locked one or more accounts used in a transaction. To correct this error, update the transaction or unlock the periods.", | ||
| "TRANSACTION_DIFF_DATES" : "A transaction must have identical dates, yet some transaction contains different dates. Correct this by updating the dates of the affected transactions.", | ||
| "UNBALANCED_TRANSACTIONS" : "Unbalanced Transaction(s)", | ||
| "MISSING_TRANSACTIONS" : "No transactions have been submitted.", | ||
| "MISSING_ACCOUNTS" : "Accounts omitted", | ||
| "MISSING_DATES" : "Missing Dates", | ||
| "DEB_CRED_NOT_NULL" : "The debits and credits should not be zero", | ||
| "CREDITED_DEBITED" : "On the same transaction line an account can not be debited and credited at the same time", | ||
| "MISSING_DOCUMENT_ID" : "Records without document ID", | ||
| "MISSING_ENTITY" : "Record without entity ID", | ||
| "MISSING_FISCAL_OR_PERIOD" : "Fiscal year or period omitted", | ||
| "MULTIPLE_CANCELLING" : "Multiple Cancelling. This transaction has been already cancelled", | ||
| "SINGLE_LINE_TRANSACTION" : "A transaction must have two or more lines. To correct this, locate the transaction and add the balancing line.", | ||
| "EDIT_INVALID_ACCOUNT" : "Transaction contains invalid account(s)", | ||
| "EDIT_INVALID_ENTITY" : "Transaction contains an invalid entity", | ||
| "EDIT_INVALID_REFERENCE" : "Transaction contains an invalid reference", | ||
| "TRANSACTION_ALREADY_POSTED" : "Transaction has already been posted and cannot be edited", | ||
| "USER_CANNOT_EDIT_POSTED_TRANSACTION" : "User cannot edit this transaction as it has already been posted", | ||
| "TRANSACTION_MUST_CONTAIN_ROWS" : "Existing transactions must contain rows" | ||
| }, | ||
| "WARNINGS": { | ||
| "MISSING_ENTITY" : "Record without entity type and entity ID", | ||
| "NO_TRANSACTIONS_SELECTED" : "No transactions selected. You must be in Transaction view to use this tool.", | ||
| "MULTIPLE_TRANSACTION_EDIT_DISABLED" : "You have multiple transactions selected. Multiple transaction editing is currently disabled.", | ||
| "TRIAL_BALANCE_HAS_POSTED_RECORDS" : "You have selected posted records! The Trial Balance can only show results of unposted records." | ||
| }, | ||
| "TRIAL_BALANCE" : { | ||
| "TITLE" : "Trial Balance", | ||
| "OVERVIEW" : "Overview", | ||
| "HAS_ERRORS" : "Attention! {{ numErrors }} Errors Detected.", | ||
| "EXPORT" : "Export the Trial Balance", | ||
| "SHOW_ERRORS" : "Switch to Error View", | ||
| "RETURN_TO_OVERVIEW" : "Return to Summary View", | ||
| "IS_BALANCED" : "Balanced", | ||
| "POSTED_TRANSACTIONS" : "Success! Posted {{ numRecords }} Transactions to the General Ledger." | ||
| }, | ||
| "TITLE" : "Journal" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,11 @@ | ||
| {"TRANSACTIONS":{"SINGLE_ACCOUNT_TRANSACTION":"This transaction only concerns a single account. Please select multiple accounts to complete the transaction.", | ||
| "MISSING_TRANSACTION_TYPE":"Transactions involving cash accounts (banks or cashboxes) must have a transaction type specified to differentiate them in the cashflow report. Please select a transaction type.", | ||
| "IMBALANCED_TRANSACTION":"This transaction's debits and credits must balance. Please correct the imbalances before submitting.", | ||
| "SINGLE_ROW_TRANSACTION":"This transaction only has a single row, but two rows are required. Please add one or more lines."}} | ||
| { | ||
| "TRANSACTIONS":{ | ||
| "VERIFIED_TRANSACTIONS": "Verified Transactions", | ||
| "INCLUDE_POSTED_TRANSACTIONS_DETAIL": "Include posted transactions in search", | ||
| "INCLUDE_POSTED_TRANSACTIONS_SHORT": "Posted Transactions", | ||
| "SINGLE_ACCOUNT_TRANSACTION":"This transaction only concerns a single account. Please select multiple accounts to complete the transaction.", | ||
| "MISSING_TRANSACTION_TYPE":"Transactions involving cash accounts (banks or cashboxes) must have a transaction type specified to differentiate them in the cashflow report. Please select a transaction type.", | ||
| "IMBALANCED_TRANSACTION":"This transaction's debits and credits must balance. Please correct the imbalances before submitting.", | ||
| "SINGLE_ROW_TRANSACTION":"This transaction only has a single row, but two rows are required. Please add one or more lines." | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.