From 2c6ed1b8b1079f01d0302515f7a3bead9b7ec2d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BE=9D=E7=91=AA=E8=B2=93?= Date: Wed, 12 Aug 2020 23:13:35 +0800 Subject: [PATCH] Added labels to the record forms in the accounting application. --- .../locale/zh_Hant/LC_MESSAGES/django.po | 808 +++++++++--------- .../static/accounting/css/transactions.css | 4 + .../include/record_form-non-transfer.html | 3 + .../include/record_form-transfer.html | 3 + 4 files changed, 422 insertions(+), 396 deletions(-) diff --git a/accounting/locale/zh_Hant/LC_MESSAGES/django.po b/accounting/locale/zh_Hant/LC_MESSAGES/django.po index ed76933..559f627 100644 --- a/accounting/locale/zh_Hant/LC_MESSAGES/django.po +++ b/accounting/locale/zh_Hant/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: mia-accounting 3.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-08-10 02:42+0800\n" -"PO-Revision-Date: 2020-08-11 10:14+0800\n" +"POT-Creation-Date: 2020-08-12 23:02+0800\n" +"PO-Revision-Date: 2020-08-12 23:03+0800\n" "Last-Translator: imacat \n" "Language-Team: Traditional Chinese \n" "Language: Traditional Chinese\n" @@ -17,7 +17,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: accounting/converters.py:157 accounting/utils.py:243 +#: accounting/converters.py:157 accounting/utils.py:246 accounting/utils.py:266 +#: accounting/utils.py:275 msgid "current assets and liabilities" msgstr "流動資產與負債" @@ -37,7 +38,7 @@ msgstr "摘要太長了（最長128個字）。" msgid "Please fill in the amount." msgstr "請填寫金額。" -#: accounting/forms.py:61 accounting/forms.py:314 +#: accounting/forms.py:61 accounting/forms.py:349 msgid "Please fill in a number." msgstr "請填寫數字。" @@ -77,65 +78,65 @@ msgstr "請依正確日期格式填寫日期。" msgid "These notes are too long (max. 128 characters)." msgstr "註記太長了（最長128個字）。" -#: accounting/forms.py:230 +#: accounting/forms.py:265 msgid "Please fill in debit accounting records." msgstr "請填寫借方會計分錄。" -#: accounting/forms.py:233 accounting/forms.py:251 +#: accounting/forms.py:268 accounting/forms.py:286 msgid "Please fill in accounting records." msgstr "請填寫會計分錄。" -#: accounting/forms.py:248 +#: accounting/forms.py:283 msgid "Please fill in credit accounting records." msgstr "請填寫貸方會計分錄。" -#: accounting/forms.py:266 +#: accounting/forms.py:301 msgid "The total of the debit and credit amounts are inconsistent." msgstr "借方和貸方合計不符。" -#: accounting/forms.py:313 +#: accounting/forms.py:348 msgid "Please fill in the code." msgstr "請填寫代碼。" -#: accounting/forms.py:315 accounting/forms.py:316 +#: accounting/forms.py:350 accounting/forms.py:351 msgid "This code is too long (max. 5)." msgstr "代碼太長了（最長5位數字）。" -#: accounting/forms.py:320 +#: accounting/forms.py:355 msgid "You can only use numbers 1-9 in the code." msgstr "代碼限填數字1-9。" -#: accounting/forms.py:325 +#: accounting/forms.py:360 msgid "Please fill in the title." msgstr "請填寫標題。" -#: accounting/forms.py:326 +#: accounting/forms.py:361 msgid "This title is too long (max. 128)." msgstr "標題太長了（最長128個字）。" -#: accounting/forms.py:374 +#: accounting/forms.py:409 msgid "You cannot set the code under itself." msgstr "代碼不可設在自己之下。" -#: accounting/forms.py:395 +#: accounting/forms.py:430 msgid "This code is already in use." msgstr "代碼和其他會計科目重複。" -#: accounting/forms.py:414 +#: accounting/forms.py:449 msgid "The parent account of this code does not exist." msgstr "找不到上層會計科目。" -#: accounting/forms.py:441 +#: accounting/forms.py:476 msgid "The descendant account codes will be too long (max. 5)." msgstr "子科目的代碼會太長（最長5位數字）。" #: accounting/templates/accounting/account_detail.html:37 -#: accounting/templates/accounting/transaction_detail-expense.html:38 -#: accounting/templates/accounting/transaction_detail-income.html:38 -#: accounting/templates/accounting/transaction_detail-transfer.html:38 -#: accounting/templates/accounting/transaction_form-expense.html:44 -#: accounting/templates/accounting/transaction_form-income.html:44 -#: accounting/templates/accounting/transaction_form-transfer.html:44 +#: accounting/templates/accounting/transaction_detail-expense.html:39 +#: accounting/templates/accounting/transaction_detail-income.html:39 +#: accounting/templates/accounting/transaction_detail-transfer.html:39 +#: accounting/templates/accounting/transaction_form-expense.html:45 +#: accounting/templates/accounting/transaction_form-income.html:45 +#: accounting/templates/accounting/transaction_form-transfer.html:45 msgid "Error:" msgstr "錯誤：" @@ -154,29 +155,29 @@ msgstr "您真的要刪掉這個會計科目嗎？" #: accounting/templates/accounting/account_detail.html:60 #: accounting/templates/accounting/include/summary-helper.html:158 -#: accounting/templates/accounting/transaction_detail-expense.html:61 -#: accounting/templates/accounting/transaction_detail-income.html:61 -#: accounting/templates/accounting/transaction_detail-transfer.html:61 +#: accounting/templates/accounting/transaction_detail-expense.html:62 +#: accounting/templates/accounting/transaction_detail-income.html:62 +#: accounting/templates/accounting/transaction_detail-transfer.html:62 msgid "Confirm" msgstr "確定" #: accounting/templates/accounting/account_detail.html:61 #: accounting/templates/accounting/include/summary-helper.html:159 -#: accounting/templates/accounting/transaction_detail-expense.html:62 -#: accounting/templates/accounting/transaction_detail-income.html:62 -#: accounting/templates/accounting/transaction_detail-transfer.html:62 +#: accounting/templates/accounting/transaction_detail-expense.html:63 +#: accounting/templates/accounting/transaction_detail-income.html:63 +#: accounting/templates/accounting/transaction_detail-transfer.html:63 msgid "Cancel" msgstr "取消" #: accounting/templates/accounting/account_detail.html:71 #: accounting/templates/accounting/account_form.html:42 #: accounting/templates/accounting/transaction-sort.html:43 -#: accounting/templates/accounting/transaction_detail-expense.html:72 -#: accounting/templates/accounting/transaction_detail-income.html:72 -#: accounting/templates/accounting/transaction_detail-transfer.html:72 -#: accounting/templates/accounting/transaction_form-expense.html:51 -#: accounting/templates/accounting/transaction_form-income.html:51 -#: accounting/templates/accounting/transaction_form-transfer.html:51 +#: accounting/templates/accounting/transaction_detail-expense.html:73 +#: accounting/templates/accounting/transaction_detail-income.html:73 +#: accounting/templates/accounting/transaction_detail-transfer.html:73 +#: accounting/templates/accounting/transaction_form-expense.html:52 +#: accounting/templates/accounting/transaction_form-income.html:52 +#: accounting/templates/accounting/transaction_form-transfer.html:52 msgid "Back" msgstr "回上頁" @@ -194,20 +195,20 @@ msgstr "這個科目沒有用在會計分錄中。" #: accounting/templates/accounting/account_detail.html:96 #: accounting/templates/accounting/account_detail.html:101 #: accounting/templates/accounting/include/report-chooser.html:77 -#: accounting/templates/accounting/ledger.html:56 +#: accounting/templates/accounting/report-ledger.html:56 msgid "Ledger" msgstr "分類帳" #: accounting/templates/accounting/account_detail.html:107 -#: accounting/views.py:1106 +#: accounting/views.py:1054 msgid "This account is in use." msgstr "會計科目使用中。" #: accounting/templates/accounting/account_detail.html:109 #: accounting/templates/accounting/account_detail.html:114 -#: accounting/templates/accounting/transaction_detail-expense.html:117 -#: accounting/templates/accounting/transaction_detail-income.html:117 -#: accounting/templates/accounting/transaction_detail-transfer.html:109 +#: accounting/templates/accounting/transaction_detail-expense.html:118 +#: accounting/templates/accounting/transaction_detail-income.html:118 +#: accounting/templates/accounting/transaction_detail-transfer.html:110 msgid "Delete" msgstr "刪除" @@ -240,30 +241,30 @@ msgid "This account is an end-point account." msgstr "這個會計科目是最下層科目。" #: accounting/templates/accounting/account_detail.html:154 -#: accounting/templates/accounting/transaction_detail-expense.html:177 -#: accounting/templates/accounting/transaction_detail-income.html:177 -#: accounting/templates/accounting/transaction_detail-transfer.html:223 +#: accounting/templates/accounting/transaction_detail-expense.html:178 +#: accounting/templates/accounting/transaction_detail-income.html:178 +#: accounting/templates/accounting/transaction_detail-transfer.html:224 msgid "Created at:" msgstr "建檔時間：" #: accounting/templates/accounting/account_detail.html:159 -#: accounting/templates/accounting/transaction_detail-expense.html:182 -#: accounting/templates/accounting/transaction_detail-income.html:182 -#: accounting/templates/accounting/transaction_detail-transfer.html:228 +#: accounting/templates/accounting/transaction_detail-expense.html:183 +#: accounting/templates/accounting/transaction_detail-income.html:183 +#: accounting/templates/accounting/transaction_detail-transfer.html:229 msgid "Created by:" msgstr "建檔人：" #: accounting/templates/accounting/account_detail.html:164 -#: accounting/templates/accounting/transaction_detail-expense.html:187 -#: accounting/templates/accounting/transaction_detail-income.html:187 -#: accounting/templates/accounting/transaction_detail-transfer.html:233 +#: accounting/templates/accounting/transaction_detail-expense.html:188 +#: accounting/templates/accounting/transaction_detail-income.html:188 +#: accounting/templates/accounting/transaction_detail-transfer.html:234 msgid "Updated at:" msgstr "更新時間：" #: accounting/templates/accounting/account_detail.html:169 -#: accounting/templates/accounting/transaction_detail-expense.html:192 -#: accounting/templates/accounting/transaction_detail-income.html:192 -#: accounting/templates/accounting/transaction_detail-transfer.html:238 +#: accounting/templates/accounting/transaction_detail-expense.html:193 +#: accounting/templates/accounting/transaction_detail-income.html:193 +#: accounting/templates/accounting/transaction_detail-transfer.html:239 msgid "Updated by:" msgstr "更新人：" @@ -273,9 +274,9 @@ msgstr "建新會計科目" #: accounting/templates/accounting/account_form.html:81 #: accounting/templates/accounting/transaction-sort.html:137 -#: accounting/templates/accounting/transaction_form-expense.html:109 -#: accounting/templates/accounting/transaction_form-income.html:109 -#: accounting/templates/accounting/transaction_form-transfer.html:138 +#: accounting/templates/accounting/transaction_form-expense.html:115 +#: accounting/templates/accounting/transaction_form-income.html:114 +#: accounting/templates/accounting/transaction_form-transfer.html:147 msgid "Save" msgstr "儲存" @@ -300,24 +301,24 @@ msgstr "標題" #: accounting/templates/accounting/account_list.html:54 #: accounting/templates/accounting/account_list.html:72 -#: accounting/templates/accounting/balance-sheet.html:98 -#: accounting/templates/accounting/balance-sheet.html:129 -#: accounting/templates/accounting/balance-sheet.html:166 -#: accounting/templates/accounting/cash-summary.html:92 -#: accounting/templates/accounting/cash-summary.html:107 -#: accounting/templates/accounting/cash.html:103 -#: accounting/templates/accounting/cash.html:127 -#: accounting/templates/accounting/income-statement.html:110 -#: accounting/templates/accounting/journal.html:83 -#: accounting/templates/accounting/journal.html:107 -#: accounting/templates/accounting/ledger-summary.html:85 -#: accounting/templates/accounting/ledger-summary.html:100 -#: accounting/templates/accounting/ledger.html:96 -#: accounting/templates/accounting/ledger.html:128 +#: accounting/templates/accounting/report-balance-sheet.html:98 +#: accounting/templates/accounting/report-balance-sheet.html:129 +#: accounting/templates/accounting/report-balance-sheet.html:166 +#: accounting/templates/accounting/report-cash-summary.html:92 +#: accounting/templates/accounting/report-cash-summary.html:107 +#: accounting/templates/accounting/report-cash.html:103 +#: accounting/templates/accounting/report-cash.html:127 +#: accounting/templates/accounting/report-income-statement.html:110 +#: accounting/templates/accounting/report-journal.html:83 +#: accounting/templates/accounting/report-journal.html:107 +#: accounting/templates/accounting/report-ledger-summary.html:85 +#: accounting/templates/accounting/report-ledger-summary.html:100 +#: accounting/templates/accounting/report-ledger.html:96 +#: accounting/templates/accounting/report-ledger.html:128 +#: accounting/templates/accounting/report-trial-balance.html:87 +#: accounting/templates/accounting/report-trial-balance.html:99 #: accounting/templates/accounting/search.html:82 #: accounting/templates/accounting/search.html:105 -#: accounting/templates/accounting/trial-balance.html:87 -#: accounting/templates/accounting/trial-balance.html:99 msgid "View" msgstr "查閱" @@ -326,233 +327,30 @@ msgid "Parent Account In Use" msgstr "使用中的上層科目" #: accounting/templates/accounting/account_list.html:80 -#: accounting/templates/accounting/cash-summary.html:161 -#: accounting/templates/accounting/cash.html:203 -#: accounting/templates/accounting/journal.html:190 -#: accounting/templates/accounting/ledger-summary.html:160 -#: accounting/templates/accounting/ledger.html:216 +#: accounting/templates/accounting/report-cash-summary.html:161 +#: accounting/templates/accounting/report-cash.html:203 +#: accounting/templates/accounting/report-journal.html:190 +#: accounting/templates/accounting/report-ledger-summary.html:160 +#: accounting/templates/accounting/report-ledger.html:216 +#: accounting/templates/accounting/report-trial-balance.html:162 #: accounting/templates/accounting/search.html:156 -#: accounting/templates/accounting/trial-balance.html:162 msgid "There is currently no data." msgstr "目前沒有資料。" -#: accounting/templates/accounting/balance-sheet.html:30 -#, python-format -msgid "Balance Sheet %(prep_period)s" -msgstr "%(prep_period)s的資產負債表" +#: accounting/templates/accounting/include/record_form-non-transfer.html:32 +#: accounting/templates/accounting/include/record_form-transfer.html:33 +msgid "Account:" +msgstr "科目：" -#: accounting/templates/accounting/balance-sheet.html:42 -#: accounting/templates/accounting/cash-summary.html:41 -#: accounting/templates/accounting/cash.html:42 -#: accounting/templates/accounting/income-statement.html:42 -#: accounting/templates/accounting/journal.html:42 -#: accounting/templates/accounting/ledger-summary.html:41 -#: accounting/templates/accounting/ledger.html:42 -#: accounting/templates/accounting/search.html:41 -#: accounting/templates/accounting/trial-balance.html:42 -msgctxt "Accounting" -msgid "New" -msgstr "記帳" +#: accounting/templates/accounting/include/record_form-non-transfer.html:46 +#: accounting/templates/accounting/include/record_form-transfer.html:47 +msgid "Summary:" +msgstr "摘要：" -#: accounting/templates/accounting/balance-sheet.html:46 -#: accounting/templates/accounting/cash-summary.html:45 -#: accounting/templates/accounting/cash.html:46 -#: accounting/templates/accounting/income-statement.html:46 -#: accounting/templates/accounting/journal.html:46 -#: accounting/templates/accounting/ledger-summary.html:45 -#: accounting/templates/accounting/ledger.html:46 -#: accounting/templates/accounting/search.html:45 -#: accounting/templates/accounting/transaction-sort.html:85 -#: accounting/templates/accounting/trial-balance.html:46 -msgid "Cash Expense" -msgstr "現金支出" - -#: accounting/templates/accounting/balance-sheet.html:49 -#: accounting/templates/accounting/cash-summary.html:48 -#: accounting/templates/accounting/cash.html:49 -#: accounting/templates/accounting/income-statement.html:49 -#: accounting/templates/accounting/journal.html:49 -#: accounting/templates/accounting/ledger-summary.html:48 -#: accounting/templates/accounting/ledger.html:49 -#: accounting/templates/accounting/search.html:48 -#: accounting/templates/accounting/transaction-sort.html:87 -#: accounting/templates/accounting/trial-balance.html:49 -msgid "Cash Income" -msgstr "現金收入" - -#: accounting/templates/accounting/balance-sheet.html:52 -#: accounting/templates/accounting/cash-summary.html:51 -#: accounting/templates/accounting/cash.html:52 -#: accounting/templates/accounting/income-statement.html:52 -#: accounting/templates/accounting/journal.html:52 -#: accounting/templates/accounting/ledger-summary.html:51 -#: accounting/templates/accounting/ledger.html:52 -#: accounting/templates/accounting/search.html:51 -#: accounting/templates/accounting/transaction-sort.html:89 -#: accounting/templates/accounting/trial-balance.html:52 -msgid "Transfer" -msgstr "轉帳" - -#: accounting/templates/accounting/balance-sheet.html:56 -#: accounting/templates/accounting/include/report-chooser.html:97 -msgid "Balance Sheet" -msgstr "資產負債表" - -#: accounting/templates/accounting/balance-sheet.html:62 -#: accounting/templates/accounting/cash.html:82 -#: accounting/templates/accounting/income-statement.html:62 -#: accounting/templates/accounting/journal.html:62 -#: accounting/templates/accounting/ledger.html:75 -#: accounting/templates/accounting/trial-balance.html:62 -msgid "Period" -msgstr "期間" - -#: accounting/templates/accounting/balance-sheet.html:138 -#: accounting/templates/accounting/balance-sheet.html:175 -#: accounting/templates/accounting/balance-sheet.html:190 -#: accounting/templates/accounting/balance-sheet.html:203 -#: accounting/templates/accounting/balance-sheet.html:244 -#: accounting/templates/accounting/balance-sheet.html:275 -#: accounting/templates/accounting/balance-sheet.html:304 -#: accounting/templates/accounting/balance-sheet.html:313 -#: accounting/templates/accounting/income-statement.html:116 -#: accounting/templates/accounting/income-statement.html:124 -#: accounting/templates/accounting/income-statement.html:179 -#: accounting/templates/accounting/income-statement.html:189 -#: accounting/templates/accounting/transaction_detail-expense.html:145 -#: accounting/templates/accounting/transaction_detail-expense.html:163 -#: accounting/templates/accounting/transaction_detail-income.html:145 -#: accounting/templates/accounting/transaction_detail-income.html:163 -#: accounting/templates/accounting/transaction_detail-transfer.html:141 -#: accounting/templates/accounting/transaction_detail-transfer.html:159 -#: accounting/templates/accounting/transaction_detail-transfer.html:188 -#: accounting/templates/accounting/transaction_detail-transfer.html:207 -#: accounting/templates/accounting/transaction_form-expense.html:87 -#: accounting/templates/accounting/transaction_form-income.html:87 -#: accounting/templates/accounting/transaction_form-transfer.html:89 -#: accounting/templates/accounting/transaction_form-transfer.html:115 -#: accounting/templates/accounting/trial-balance.html:107 -#: accounting/templates/accounting/trial-balance.html:147 -#: accounting/views.py:139 accounting/views.py:251 accounting/views.py:396 -#: accounting/views.py:587 -msgid "Total" -msgstr "合計" - -#: accounting/templates/accounting/cash-summary.html:30 -#, python-format -msgid "Cash Summary for %(account)s" -msgstr "%(account)s的現金帳摘要" - -#: accounting/templates/accounting/cash-summary.html:55 -#: accounting/templates/accounting/include/report-chooser.html:73 -msgid "Cash Summary" -msgstr "現金帳摘要" - -#: accounting/templates/accounting/cash-summary.html:61 -#: accounting/templates/accounting/cash.html:62 -#: accounting/templates/accounting/cash.html:98 -#: accounting/templates/accounting/journal.html:78 -#: accounting/templates/accounting/ledger-summary.html:61 -#: accounting/templates/accounting/ledger.html:62 -#: accounting/templates/accounting/ledger.html:91 -#: accounting/templates/accounting/search.html:77 -#: accounting/templates/accounting/transaction_detail-expense.html:129 -#: accounting/templates/accounting/transaction_detail-income.html:129 -#: accounting/templates/accounting/transaction_detail-transfer.html:125 -#: accounting/templates/accounting/transaction_detail-transfer.html:172 -#: accounting/templates/accounting/trial-balance.html:84 -msgid "Account" -msgstr "科目" - -#: accounting/templates/accounting/cash-summary.html:64 -#: accounting/templates/accounting/cash.html:65 -msgid "Shortcuts" -msgstr "常用" - -#: accounting/templates/accounting/cash-summary.html:70 -#: accounting/templates/accounting/cash.html:71 -msgid "All" -msgstr "全部" - -#: accounting/templates/accounting/cash-summary.html:87 -#: accounting/templates/accounting/ledger-summary.html:80 -msgid "Month" -msgstr "月份" - -#: accounting/templates/accounting/cash-summary.html:88 -#: accounting/templates/accounting/cash.html:100 -msgid "Income" -msgstr "收入" - -#: accounting/templates/accounting/cash-summary.html:89 -#: accounting/templates/accounting/cash.html:101 -msgid "Expense" -msgstr "支出" - -#: accounting/templates/accounting/cash-summary.html:90 -#: accounting/templates/accounting/cash.html:102 -#: accounting/templates/accounting/ledger-summary.html:83 -#: accounting/templates/accounting/ledger.html:95 -msgid "Balance" -msgstr "餘額" - -#: accounting/templates/accounting/cash-summary.html:91 -#: accounting/templates/accounting/ledger-summary.html:84 -msgid "Cumulative Balance" -msgstr "累計餘額" - -#: accounting/templates/accounting/cash.html:30 -#, python-format -msgid "Cash Account for %(account)s %(prep_period)s" -msgstr "%(prep_period)s%(account)s的現金帳" - -#: accounting/templates/accounting/cash.html:56 -#: accounting/templates/accounting/include/report-chooser.html:69 -msgid "Cash Account" -msgstr "現金帳" - -#: accounting/templates/accounting/cash.html:97 -#: accounting/templates/accounting/journal.html:77 -#: accounting/templates/accounting/ledger.html:90 -#: accounting/templates/accounting/search.html:76 -msgid "Date" -msgstr "日期" - -#: accounting/templates/accounting/cash.html:99 -#: accounting/templates/accounting/include/summary-helper.html:37 -#: accounting/templates/accounting/journal.html:79 -#: accounting/templates/accounting/ledger.html:92 -#: accounting/templates/accounting/search.html:78 -#: accounting/templates/accounting/transaction_detail-expense.html:130 -#: accounting/templates/accounting/transaction_detail-income.html:130 -#: accounting/templates/accounting/transaction_detail-transfer.html:126 -#: accounting/templates/accounting/transaction_detail-transfer.html:173 -msgid "Summary" -msgstr "摘要" - -#: accounting/templates/accounting/cash.html:113 -#: accounting/templates/accounting/cash.html:150 -#: accounting/templates/accounting/journal.html:93 -#: accounting/templates/accounting/journal.html:131 -#: accounting/templates/accounting/journal.html:166 -#: accounting/templates/accounting/ledger.html:106 -#: accounting/templates/accounting/ledger.html:151 -#: accounting/templates/accounting/search.html:92 -#: accounting/templates/accounting/search.html:127 -#: accounting/templates/accounting/transaction-sort.html:120 -msgid "Unbalanced" -msgstr "借貸不平衡" - -#: accounting/templates/accounting/cash.html:117 -#: accounting/templates/accounting/cash.html:155 -#: accounting/templates/accounting/journal.html:97 -#: accounting/templates/accounting/journal.html:136 -#: accounting/templates/accounting/ledger.html:110 -#: accounting/templates/accounting/ledger.html:156 -#: accounting/templates/accounting/search.html:96 -#: accounting/templates/accounting/search.html:132 -msgid "Need Reorder" -msgstr "需排序" +#: accounting/templates/accounting/include/record_form-non-transfer.html:51 +#: accounting/templates/accounting/include/record_form-transfer.html:52 +msgid "Amount:" +msgstr "金額：" #: accounting/templates/accounting/include/report-chooser.html:34 msgid "Search Accounting Records" @@ -577,26 +375,53 @@ msgstr "搜尋" msgid "Book" msgstr "帳簿" +#: accounting/templates/accounting/include/report-chooser.html:69 +#: accounting/templates/accounting/report-cash.html:56 +msgid "Cash Account" +msgstr "現金帳" + +#: accounting/templates/accounting/include/report-chooser.html:73 +#: accounting/templates/accounting/report-cash-summary.html:55 +msgid "Cash Summary" +msgstr "現金帳摘要" + #: accounting/templates/accounting/include/report-chooser.html:81 -#: accounting/templates/accounting/ledger-summary.html:55 +#: accounting/templates/accounting/report-ledger-summary.html:55 msgid "Ledger Summary" msgstr "分類帳摘要" #: accounting/templates/accounting/include/report-chooser.html:85 -#: accounting/templates/accounting/journal.html:56 +#: accounting/templates/accounting/report-journal.html:56 msgid "Journal" msgstr "日記簿" #: accounting/templates/accounting/include/report-chooser.html:89 -#: accounting/templates/accounting/trial-balance.html:56 +#: accounting/templates/accounting/report-trial-balance.html:56 msgid "Trial Balance" msgstr "試算表" #: accounting/templates/accounting/include/report-chooser.html:93 -#: accounting/templates/accounting/income-statement.html:56 +#: accounting/templates/accounting/report-income-statement.html:56 msgid "Income Statement" msgstr "損益表" +#: accounting/templates/accounting/include/report-chooser.html:97 +#: accounting/templates/accounting/report-balance-sheet.html:56 +msgid "Balance Sheet" +msgstr "資產負債表" + +#: accounting/templates/accounting/include/summary-helper.html:37 +#: accounting/templates/accounting/report-cash.html:99 +#: accounting/templates/accounting/report-journal.html:79 +#: accounting/templates/accounting/report-ledger.html:92 +#: accounting/templates/accounting/search.html:78 +#: accounting/templates/accounting/transaction_detail-expense.html:131 +#: accounting/templates/accounting/transaction_detail-income.html:131 +#: accounting/templates/accounting/transaction_detail-transfer.html:127 +#: accounting/templates/accounting/transaction_detail-transfer.html:174 +msgid "Summary" +msgstr "摘要" + #: accounting/templates/accounting/include/summary-helper.html:50 msgid "General" msgstr "一般" @@ -645,67 +470,263 @@ msgstr "路線：" msgid "Count:" msgstr "數量：" -#: accounting/templates/accounting/income-statement.html:30 +#: accounting/templates/accounting/report-balance-sheet.html:30 +#, python-format +msgid "Balance Sheet %(prep_period)s" +msgstr "%(prep_period)s的資產負債表" + +#: accounting/templates/accounting/report-balance-sheet.html:42 +#: accounting/templates/accounting/report-cash-summary.html:41 +#: accounting/templates/accounting/report-cash.html:42 +#: accounting/templates/accounting/report-income-statement.html:42 +#: accounting/templates/accounting/report-journal.html:42 +#: accounting/templates/accounting/report-ledger-summary.html:41 +#: accounting/templates/accounting/report-ledger.html:42 +#: accounting/templates/accounting/report-trial-balance.html:42 +#: accounting/templates/accounting/search.html:41 +msgctxt "Accounting" +msgid "New" +msgstr "記帳" + +#: accounting/templates/accounting/report-balance-sheet.html:46 +#: accounting/templates/accounting/report-cash-summary.html:45 +#: accounting/templates/accounting/report-cash.html:46 +#: accounting/templates/accounting/report-income-statement.html:46 +#: accounting/templates/accounting/report-journal.html:46 +#: accounting/templates/accounting/report-ledger-summary.html:45 +#: accounting/templates/accounting/report-ledger.html:46 +#: accounting/templates/accounting/report-trial-balance.html:46 +#: accounting/templates/accounting/search.html:45 +#: accounting/templates/accounting/transaction-sort.html:85 +msgid "Cash Expense" +msgstr "現金支出" + +#: accounting/templates/accounting/report-balance-sheet.html:49 +#: accounting/templates/accounting/report-cash-summary.html:48 +#: accounting/templates/accounting/report-cash.html:49 +#: accounting/templates/accounting/report-income-statement.html:49 +#: accounting/templates/accounting/report-journal.html:49 +#: accounting/templates/accounting/report-ledger-summary.html:48 +#: accounting/templates/accounting/report-ledger.html:49 +#: accounting/templates/accounting/report-trial-balance.html:49 +#: accounting/templates/accounting/search.html:48 +#: accounting/templates/accounting/transaction-sort.html:87 +msgid "Cash Income" +msgstr "現金收入" + +#: accounting/templates/accounting/report-balance-sheet.html:52 +#: accounting/templates/accounting/report-cash-summary.html:51 +#: accounting/templates/accounting/report-cash.html:52 +#: accounting/templates/accounting/report-income-statement.html:52 +#: accounting/templates/accounting/report-journal.html:52 +#: accounting/templates/accounting/report-ledger-summary.html:51 +#: accounting/templates/accounting/report-ledger.html:52 +#: accounting/templates/accounting/report-trial-balance.html:52 +#: accounting/templates/accounting/search.html:51 +#: accounting/templates/accounting/transaction-sort.html:89 +msgid "Transfer" +msgstr "轉帳" + +#: accounting/templates/accounting/report-balance-sheet.html:62 +#: accounting/templates/accounting/report-cash.html:82 +#: accounting/templates/accounting/report-income-statement.html:62 +#: accounting/templates/accounting/report-journal.html:62 +#: accounting/templates/accounting/report-ledger.html:75 +#: accounting/templates/accounting/report-trial-balance.html:62 +msgid "Period" +msgstr "期間" + +#: accounting/templates/accounting/report-balance-sheet.html:138 +#: accounting/templates/accounting/report-balance-sheet.html:175 +#: accounting/templates/accounting/report-balance-sheet.html:190 +#: accounting/templates/accounting/report-balance-sheet.html:203 +#: accounting/templates/accounting/report-balance-sheet.html:244 +#: accounting/templates/accounting/report-balance-sheet.html:275 +#: accounting/templates/accounting/report-balance-sheet.html:304 +#: accounting/templates/accounting/report-balance-sheet.html:313 +#: accounting/templates/accounting/report-income-statement.html:116 +#: accounting/templates/accounting/report-income-statement.html:124 +#: accounting/templates/accounting/report-income-statement.html:179 +#: accounting/templates/accounting/report-income-statement.html:189 +#: accounting/templates/accounting/report-trial-balance.html:107 +#: accounting/templates/accounting/report-trial-balance.html:147 +#: accounting/templates/accounting/transaction_detail-expense.html:146 +#: accounting/templates/accounting/transaction_detail-expense.html:164 +#: accounting/templates/accounting/transaction_detail-income.html:146 +#: accounting/templates/accounting/transaction_detail-income.html:164 +#: accounting/templates/accounting/transaction_detail-transfer.html:142 +#: accounting/templates/accounting/transaction_detail-transfer.html:160 +#: accounting/templates/accounting/transaction_detail-transfer.html:189 +#: accounting/templates/accounting/transaction_detail-transfer.html:208 +#: accounting/templates/accounting/transaction_form-expense.html:93 +#: accounting/templates/accounting/transaction_form-income.html:92 +#: accounting/templates/accounting/transaction_form-transfer.html:94 +#: accounting/templates/accounting/transaction_form-transfer.html:124 +#: accounting/views.py:134 accounting/views.py:245 accounting/views.py:388 +#: accounting/views.py:579 +msgid "Total" +msgstr "合計" + +#: accounting/templates/accounting/report-cash-summary.html:30 +#, python-format +msgid "Cash Summary for %(account)s" +msgstr "%(account)s的現金帳摘要" + +#: accounting/templates/accounting/report-cash-summary.html:61 +#: accounting/templates/accounting/report-cash.html:62 +#: accounting/templates/accounting/report-cash.html:98 +#: accounting/templates/accounting/report-journal.html:78 +#: accounting/templates/accounting/report-ledger-summary.html:61 +#: accounting/templates/accounting/report-ledger.html:62 +#: accounting/templates/accounting/report-ledger.html:91 +#: accounting/templates/accounting/report-trial-balance.html:84 +#: accounting/templates/accounting/search.html:77 +#: accounting/templates/accounting/transaction_detail-expense.html:130 +#: accounting/templates/accounting/transaction_detail-income.html:130 +#: accounting/templates/accounting/transaction_detail-transfer.html:126 +#: accounting/templates/accounting/transaction_detail-transfer.html:173 +msgid "Account" +msgstr "科目" + +#: accounting/templates/accounting/report-cash-summary.html:64 +#: accounting/templates/accounting/report-cash.html:65 +msgid "Shortcuts" +msgstr "常用" + +#: accounting/templates/accounting/report-cash-summary.html:70 +#: accounting/templates/accounting/report-cash.html:71 +msgid "All" +msgstr "全部" + +#: accounting/templates/accounting/report-cash-summary.html:87 +#: accounting/templates/accounting/report-ledger-summary.html:80 +msgid "Month" +msgstr "月份" + +#: accounting/templates/accounting/report-cash-summary.html:88 +#: accounting/templates/accounting/report-cash.html:100 +msgid "Income" +msgstr "收入" + +#: accounting/templates/accounting/report-cash-summary.html:89 +#: accounting/templates/accounting/report-cash.html:101 +msgid "Expense" +msgstr "支出" + +#: accounting/templates/accounting/report-cash-summary.html:90 +#: accounting/templates/accounting/report-cash.html:102 +#: accounting/templates/accounting/report-ledger-summary.html:83 +#: accounting/templates/accounting/report-ledger.html:95 +msgid "Balance" +msgstr "餘額" + +#: accounting/templates/accounting/report-cash-summary.html:91 +#: accounting/templates/accounting/report-ledger-summary.html:84 +msgid "Cumulative Balance" +msgstr "累計餘額" + +#: accounting/templates/accounting/report-cash.html:30 +#, python-format +msgid "Cash Account for %(account)s %(prep_period)s" +msgstr "%(prep_period)s%(account)s的現金帳" + +#: accounting/templates/accounting/report-cash.html:97 +#: accounting/templates/accounting/report-journal.html:77 +#: accounting/templates/accounting/report-ledger.html:90 +#: accounting/templates/accounting/search.html:76 +msgid "Date" +msgstr "日期" + +#: accounting/templates/accounting/report-cash.html:113 +#: accounting/templates/accounting/report-cash.html:150 +#: accounting/templates/accounting/report-journal.html:93 +#: accounting/templates/accounting/report-journal.html:131 +#: accounting/templates/accounting/report-journal.html:166 +#: accounting/templates/accounting/report-ledger.html:106 +#: accounting/templates/accounting/report-ledger.html:151 +#: accounting/templates/accounting/search.html:92 +#: accounting/templates/accounting/search.html:127 +#: accounting/templates/accounting/transaction-sort.html:120 +msgid "Unbalanced" +msgstr "借貸不平衡" + +#: accounting/templates/accounting/report-cash.html:117 +#: accounting/templates/accounting/report-cash.html:155 +#: accounting/templates/accounting/report-journal.html:97 +#: accounting/templates/accounting/report-journal.html:136 +#: accounting/templates/accounting/report-ledger.html:110 +#: accounting/templates/accounting/report-ledger.html:156 +#: accounting/templates/accounting/search.html:96 +#: accounting/templates/accounting/search.html:132 +msgid "Need Reorder" +msgstr "需排序" + +#: accounting/templates/accounting/report-income-statement.html:30 #, python-format msgid "Income Statement %(prep_period)s" msgstr "%(prep_period)s的損益表" -#: accounting/templates/accounting/income-statement.html:82 +#: accounting/templates/accounting/report-income-statement.html:82 #: accounting/templates/accounting/transaction-sort.html:66 msgid "Amount" msgstr "金額" -#: accounting/templates/accounting/journal.html:30 +#: accounting/templates/accounting/report-journal.html:30 #, python-format msgid "Journal %(prep_period)s" msgstr "%(prep_period)s的日記簿" -#: accounting/templates/accounting/journal.html:80 -#: accounting/templates/accounting/ledger-summary.html:81 -#: accounting/templates/accounting/ledger.html:93 +#: accounting/templates/accounting/report-journal.html:80 +#: accounting/templates/accounting/report-ledger-summary.html:81 +#: accounting/templates/accounting/report-ledger.html:93 +#: accounting/templates/accounting/report-trial-balance.html:85 #: accounting/templates/accounting/search.html:79 -#: accounting/templates/accounting/transaction_detail-transfer.html:120 -#: accounting/templates/accounting/transaction_form-transfer.html:72 -#: accounting/templates/accounting/trial-balance.html:85 +#: accounting/templates/accounting/transaction_detail-transfer.html:121 +#: accounting/templates/accounting/transaction_form-transfer.html:73 msgid "Debit" msgstr "借方" -#: accounting/templates/accounting/journal.html:81 -#: accounting/templates/accounting/ledger-summary.html:82 -#: accounting/templates/accounting/ledger.html:94 +#: accounting/templates/accounting/report-journal.html:81 +#: accounting/templates/accounting/report-ledger-summary.html:82 +#: accounting/templates/accounting/report-ledger.html:94 +#: accounting/templates/accounting/report-trial-balance.html:86 #: accounting/templates/accounting/search.html:80 -#: accounting/templates/accounting/transaction_detail-transfer.html:167 -#: accounting/templates/accounting/transaction_form-transfer.html:98 -#: accounting/templates/accounting/trial-balance.html:86 +#: accounting/templates/accounting/transaction_detail-transfer.html:168 +#: accounting/templates/accounting/transaction_form-transfer.html:103 msgid "Credit" msgstr "貸方" -#: accounting/templates/accounting/journal.html:82 +#: accounting/templates/accounting/report-journal.html:82 #: accounting/templates/accounting/search.html:81 #: accounting/templates/accounting/transaction-sort.html:67 msgid "Notes" msgstr "註記" -#: accounting/templates/accounting/ledger-summary.html:30 +#: accounting/templates/accounting/report-ledger-summary.html:30 #, python-format msgid "Ledger Summary for %(account)s" msgstr "%(account)s的分類帳摘要" -#: accounting/templates/accounting/ledger.html:30 +#: accounting/templates/accounting/report-ledger.html:30 #, python-format msgid "Ledger for %(account)s %(prep_period)s" msgstr "%(prep_period)s%(account)s的分類帳" -#: accounting/templates/accounting/ledger.html:114 -#: accounting/templates/accounting/ledger.html:161 +#: accounting/templates/accounting/report-ledger.html:114 +#: accounting/templates/accounting/report-ledger.html:161 msgid "Payable" msgstr "未付款" -#: accounting/templates/accounting/ledger.html:118 -#: accounting/templates/accounting/ledger.html:166 +#: accounting/templates/accounting/report-ledger.html:118 +#: accounting/templates/accounting/report-ledger.html:166 msgid "Existing" msgstr "尚存" +#: accounting/templates/accounting/report-trial-balance.html:30 +#, python-format +msgid "Trial Balance %(prep_period)s" +msgstr "%(prep_period)s的試算表" + #: accounting/templates/accounting/search.html:30 #, python-format msgid "Search Result for “%(query)s”" @@ -717,12 +738,12 @@ msgid "Reorder the Transactions in %(date)s" msgstr "%(date)s的傳票排序" #: accounting/templates/accounting/transaction-sort.html:49 -#: accounting/templates/accounting/transaction_detail-expense.html:122 -#: accounting/templates/accounting/transaction_detail-income.html:122 -#: accounting/templates/accounting/transaction_detail-transfer.html:114 -#: accounting/templates/accounting/transaction_form-expense.html:62 -#: accounting/templates/accounting/transaction_form-income.html:62 -#: accounting/templates/accounting/transaction_form-transfer.html:62 +#: accounting/templates/accounting/transaction_detail-expense.html:123 +#: accounting/templates/accounting/transaction_detail-income.html:123 +#: accounting/templates/accounting/transaction_detail-transfer.html:115 +#: accounting/templates/accounting/transaction_form-expense.html:63 +#: accounting/templates/accounting/transaction_form-income.html:63 +#: accounting/templates/accounting/transaction_form-transfer.html:63 msgid "Date:" msgstr "日期：" @@ -734,110 +755,105 @@ msgstr "類型" msgid "Content" msgstr "內容" -#: accounting/templates/accounting/transaction_detail-expense.html:29 -#: accounting/templates/accounting/transaction_form-expense.html:28 +#: accounting/templates/accounting/transaction_detail-expense.html:30 +#: accounting/templates/accounting/transaction_form-expense.html:29 msgid "Cash Expense Transaction" msgstr "現金支出傳票" -#: accounting/templates/accounting/transaction_detail-expense.html:38 -#: accounting/templates/accounting/transaction_detail-income.html:38 -#: accounting/templates/accounting/transaction_detail-transfer.html:38 +#: accounting/templates/accounting/transaction_detail-expense.html:39 +#: accounting/templates/accounting/transaction_detail-income.html:39 +#: accounting/templates/accounting/transaction_detail-transfer.html:39 msgid "" "The transactions on this day are not well-ordered. Please reorder them." msgstr "這一天的傳票次序不齊，請重新排序。" -#: accounting/templates/accounting/transaction_detail-expense.html:52 +#: accounting/templates/accounting/transaction_detail-expense.html:53 msgid "Cash Expense Transaction Deletion Confirmation" msgstr "現金支出傳票刪除確認" -#: accounting/templates/accounting/transaction_detail-expense.html:57 +#: accounting/templates/accounting/transaction_detail-expense.html:58 msgid "Do you really want to delete this cash expense transaction?" msgstr "您真的要刪掉這張現金支出傳票嗎？" -#: accounting/templates/accounting/transaction_detail-expense.html:76 -#: accounting/templates/accounting/transaction_detail-income.html:76 -#: accounting/templates/accounting/transaction_detail-transfer.html:76 +#: accounting/templates/accounting/transaction_detail-expense.html:77 +#: accounting/templates/accounting/transaction_detail-income.html:77 +#: accounting/templates/accounting/transaction_detail-transfer.html:77 msgid "Edit" msgstr "編輯" -#: accounting/templates/accounting/transaction_detail-expense.html:79 -#: accounting/templates/accounting/transaction_detail-expense.html:99 -#: accounting/templates/accounting/transaction_detail-income.html:79 -#: accounting/templates/accounting/transaction_detail-income.html:99 -#: accounting/templates/accounting/transaction_detail-transfer.html:79 -#: accounting/templates/accounting/transaction_detail-transfer.html:95 +#: accounting/templates/accounting/transaction_detail-expense.html:80 +#: accounting/templates/accounting/transaction_detail-expense.html:100 +#: accounting/templates/accounting/transaction_detail-income.html:80 +#: accounting/templates/accounting/transaction_detail-income.html:100 +#: accounting/templates/accounting/transaction_detail-transfer.html:80 +#: accounting/templates/accounting/transaction_detail-transfer.html:96 msgid "There is no other transaction at the same day." msgstr "當天沒有其他會計傳票。" -#: accounting/templates/accounting/transaction_detail-expense.html:81 -#: accounting/templates/accounting/transaction_detail-expense.html:86 -#: accounting/templates/accounting/transaction_detail-expense.html:101 -#: accounting/templates/accounting/transaction_detail-expense.html:106 -#: accounting/templates/accounting/transaction_detail-income.html:81 -#: accounting/templates/accounting/transaction_detail-income.html:86 -#: accounting/templates/accounting/transaction_detail-income.html:101 -#: accounting/templates/accounting/transaction_detail-income.html:106 -#: accounting/templates/accounting/transaction_detail-transfer.html:81 -#: accounting/templates/accounting/transaction_detail-transfer.html:86 -#: accounting/templates/accounting/transaction_detail-transfer.html:97 -#: accounting/templates/accounting/transaction_detail-transfer.html:102 +#: accounting/templates/accounting/transaction_detail-expense.html:82 +#: accounting/templates/accounting/transaction_detail-expense.html:87 +#: accounting/templates/accounting/transaction_detail-expense.html:102 +#: accounting/templates/accounting/transaction_detail-expense.html:107 +#: accounting/templates/accounting/transaction_detail-income.html:82 +#: accounting/templates/accounting/transaction_detail-income.html:87 +#: accounting/templates/accounting/transaction_detail-income.html:102 +#: accounting/templates/accounting/transaction_detail-income.html:107 +#: accounting/templates/accounting/transaction_detail-transfer.html:82 +#: accounting/templates/accounting/transaction_detail-transfer.html:87 +#: accounting/templates/accounting/transaction_detail-transfer.html:98 +#: accounting/templates/accounting/transaction_detail-transfer.html:103 msgid "Sort" msgstr "排序" -#: accounting/templates/accounting/transaction_detail-expense.html:91 -#: accounting/templates/accounting/transaction_detail-expense.html:111 -#: accounting/templates/accounting/transaction_detail-income.html:91 -#: accounting/templates/accounting/transaction_detail-income.html:111 +#: accounting/templates/accounting/transaction_detail-expense.html:92 +#: accounting/templates/accounting/transaction_detail-expense.html:112 +#: accounting/templates/accounting/transaction_detail-income.html:92 +#: accounting/templates/accounting/transaction_detail-income.html:112 msgid "To Transfer" msgstr "改轉帳" -#: accounting/templates/accounting/transaction_detail-expense.html:131 -#: accounting/templates/accounting/transaction_detail-income.html:131 -#: accounting/templates/accounting/transaction_detail-transfer.html:127 -#: accounting/templates/accounting/transaction_detail-transfer.html:174 +#: accounting/templates/accounting/transaction_detail-expense.html:132 +#: accounting/templates/accounting/transaction_detail-income.html:132 +#: accounting/templates/accounting/transaction_detail-transfer.html:128 +#: accounting/templates/accounting/transaction_detail-transfer.html:175 msgid "$" msgstr "$" -#: accounting/templates/accounting/transaction_detail-expense.html:171 -#: accounting/templates/accounting/transaction_detail-income.html:171 -#: accounting/templates/accounting/transaction_detail-transfer.html:217 -#: accounting/templates/accounting/transaction_form-expense.html:97 -#: accounting/templates/accounting/transaction_form-income.html:97 -#: accounting/templates/accounting/transaction_form-transfer.html:126 +#: accounting/templates/accounting/transaction_detail-expense.html:172 +#: accounting/templates/accounting/transaction_detail-income.html:172 +#: accounting/templates/accounting/transaction_detail-transfer.html:218 +#: accounting/templates/accounting/transaction_form-expense.html:103 +#: accounting/templates/accounting/transaction_form-income.html:102 +#: accounting/templates/accounting/transaction_form-transfer.html:135 msgid "Notes:" msgstr "註記：" -#: accounting/templates/accounting/transaction_detail-income.html:29 -#: accounting/templates/accounting/transaction_form-income.html:28 +#: accounting/templates/accounting/transaction_detail-income.html:30 +#: accounting/templates/accounting/transaction_form-income.html:29 msgid "Cash Income Transaction" msgstr "現金收入傳票" -#: accounting/templates/accounting/transaction_detail-income.html:52 +#: accounting/templates/accounting/transaction_detail-income.html:53 msgid "Cash Income Transaction Deletion Confirmation" msgstr "現金收入傳票刪除確認" -#: accounting/templates/accounting/transaction_detail-income.html:57 +#: accounting/templates/accounting/transaction_detail-income.html:58 msgid "Do you really want to delete this cash income transaction?" msgstr "您真的要刪掉這張現金收入傳票嗎？" -#: accounting/templates/accounting/transaction_detail-transfer.html:29 -#: accounting/templates/accounting/transaction_form-transfer.html:28 +#: accounting/templates/accounting/transaction_detail-transfer.html:30 +#: accounting/templates/accounting/transaction_form-transfer.html:29 msgid "Transfer Transaction" msgstr "轉帳傳票" -#: accounting/templates/accounting/transaction_detail-transfer.html:52 +#: accounting/templates/accounting/transaction_detail-transfer.html:53 msgid "Transfer Transaction Deletion Confirmation" msgstr "轉帳傳票刪除確認" -#: accounting/templates/accounting/transaction_detail-transfer.html:57 +#: accounting/templates/accounting/transaction_detail-transfer.html:58 msgid "Do you really want to delete this transfer transaction?" msgstr "您真的要刪掉這張轉帳傳票嗎？" -#: accounting/templates/accounting/trial-balance.html:30 -#, python-format -msgid "Trial Balance %(prep_period)s" -msgstr "%(prep_period)s的試算表" - #: accounting/validators.py:40 msgid "This accounting record does not exists." msgstr "沒有這筆會計分錄。" @@ -850,70 +866,70 @@ msgstr "沒有這個會計科目。" msgid "You cannot select a parent account." msgstr "請勿選擇上層會計科目。" -#: accounting/views.py:320 +#: accounting/views.py:313 msgid "Brought Forward" msgstr "上期結轉" -#: accounting/views.py:643 +#: accounting/views.py:635 msgid "Gross Income" msgstr "營業毛利" -#: accounting/views.py:644 +#: accounting/views.py:636 msgid "Operating Income" msgstr "營業淨利" -#: accounting/views.py:645 +#: accounting/views.py:637 msgid "Before Tax Income" msgstr "稅前淨利" -#: accounting/views.py:646 +#: accounting/views.py:638 msgid "After Tax Income" msgstr "稅後淨利" -#: accounting/views.py:893 +#: accounting/views.py:879 msgid "This transaction was not modified." msgstr "會計傳票未異動。" -#: accounting/views.py:939 +#: accounting/views.py:882 msgid "This transaction was saved successfully." msgstr "會計傳票已存檔。" -#: accounting/views.py:949 +#: accounting/views.py:893 msgid "This transaction was deleted successfully." msgstr "會計傳票已刪除。" -#: accounting/views.py:986 +#: accounting/views.py:930 msgid "Invalid arguments." msgstr "參數無效。" -#: accounting/views.py:988 +#: accounting/views.py:932 msgid "Invalid order." msgstr "次序格式錯誤。" -#: accounting/views.py:1004 +#: accounting/views.py:946 msgid "The transaction orders were not modified." msgstr "會計傳票次序未異動。" -#: accounting/views.py:1011 +#: accounting/views.py:952 msgid "The transaction orders were saved successfully." msgstr "會計傳票次序已儲存。" -#: accounting/views.py:1085 +#: accounting/views.py:1033 msgid "This account was not modified." msgstr "會計科目未異動。" -#: accounting/views.py:1088 +#: accounting/views.py:1036 msgid "This account was saved successfully." msgstr "會計科目已存檔。" -#: accounting/views.py:1110 +#: accounting/views.py:1058 msgid "This account was deleted successfully." msgstr "會計科目已刪除。" -#: accounting/views.py:1152 +#: accounting/views.py:1101 msgid "---Accounts In Use---" msgstr "-----使用中科目-----" -#: accounting/views.py:1157 +#: accounting/views.py:1106 msgid "---Accounts Not In Use---" msgstr "-----未使用科目-----" diff --git a/accounting/static/accounting/css/transactions.css b/accounting/static/accounting/css/transactions.css index c8f6aaa..7f9bc76 100644 --- a/accounting/static/accounting/css/transactions.css +++ b/accounting/static/accounting/css/transactions.css @@ -34,3 +34,7 @@ .balance-row { border-color: transparent; } +.record-label { + margin-top: 0.25rem; + margin-bottom: 0.1rem; +} diff --git a/accounting/templates/accounting/include/record_form-non-transfer.html b/accounting/templates/accounting/include/record_form-non-transfer.html index 0c6cec4..73e9974 100644 --- a/accounting/templates/accounting/include/record_form-non-transfer.html +++ b/accounting/templates/accounting/include/record_form-non-transfer.html @@ -29,6 +29,7 @@ First written: 2020/8/5 {% endif %} +
{{ record.summary.errors.0|default:"" }}
+
{{ record.amount.errors.0|default:"" }}
diff --git a/accounting/templates/accounting/include/record_form-transfer.html b/accounting/templates/accounting/include/record_form-transfer.html index c315883..f156e56 100644 --- a/accounting/templates/accounting/include/record_form-transfer.html +++ b/accounting/templates/accounting/include/record_form-transfer.html @@ -30,6 +30,7 @@ First written: 2020/8/5 {% endif %} +
{{ record.summary.errors.0|default:"" }}
+
{{ record.amount.errors.0|default:"" }}