diff --git a/erpnext/locale/zh.po b/erpnext/locale/zh.po
index 101ed8ef3e8..41ebea5f9c2 100644
--- a/erpnext/locale/zh.po
+++ b/erpnext/locale/zh.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: frappe\n"
"Report-Msgid-Bugs-To: info@erpnext.com\n"
-"POT-Creation-Date: 2024-10-20 09:35+0000\n"
-"PO-Revision-Date: 2024-10-21 02:26\n"
+"POT-Creation-Date: 2024-10-27 09:35+0000\n"
+"PO-Revision-Date: 2024-10-28 02:57\n"
"Last-Translator: info@erpnext.com\n"
"Language-Team: Chinese Simplified\n"
"MIME-Version: 1.0\n"
@@ -211,7 +211,7 @@ msgstr "% 针对该销售订单开票的物料"
msgid "% of materials delivered against this Sales Order"
msgstr "% 针对该销售订单交付的物料"
-#: erpnext/controllers/accounts_controller.py:2028
+#: erpnext/controllers/accounts_controller.py:2031
msgid "'Account' in the Accounting section of Customer {0}"
msgstr "客户 {0} 的会计部分中的“账目”"
@@ -231,7 +231,7 @@ msgstr "“日期”为必填项"
msgid "'Days Since Last Order' must be greater than or equal to zero"
msgstr "“自上次订单以来的天数”必须大于等于零"
-#: erpnext/controllers/accounts_controller.py:2033
+#: erpnext/controllers/accounts_controller.py:2036
msgid "'Default {0} Account' in Company {1}"
msgstr "公司 {1} 的“默认 {0} 账目”"
@@ -272,7 +272,7 @@ msgstr "“结束包装编号”不能小于“起始包装编号”"
msgid "'Update Stock' can not be checked because items are not delivered via {0}"
msgstr "无法勾选“更新库存”,因为物料未通过 {0} 交付"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:362
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:365
msgid "'Update Stock' cannot be checked for fixed asset sale"
msgstr "销售固定资产无法勾选“更新库存”"
@@ -280,10 +280,6 @@ msgstr "销售固定资产无法勾选“更新库存”"
msgid "'{0}' account is already used by {1}. Use another account."
msgstr ""
-#: erpnext/controllers/accounts_controller.py:402
-msgid "'{0}' account: '{1}' should match the Return Against Invoice"
-msgstr ""
-
#: erpnext/setup/doctype/company/company.py:205
#: erpnext/setup/doctype/company/company.py:216
msgid "'{0}' should be in company currency {1}."
@@ -377,10 +373,6 @@ msgstr ""
msgid "* Will be calculated in the transaction."
msgstr ""
-#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:144
-msgid ", with the inventory {0}: {1}"
-msgstr ""
-
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:95
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:347
msgid "0 - 30 Days"
@@ -1159,15 +1151,15 @@ msgstr ""
#: erpnext/accounts/report/budget_variance_report/budget_variance_report.py:83
#: erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py:286
#: erpnext/accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.py:201
-#: erpnext/accounts/report/financial_statements.py:620
+#: erpnext/accounts/report/financial_statements.py:623
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:30
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:190
#: erpnext/accounts/report/general_ledger/general_ledger.js:38
-#: erpnext/accounts/report/general_ledger/general_ledger.py:598
+#: erpnext/accounts/report/general_ledger/general_ledger.py:604
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.js:30
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:30
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:146
-#: erpnext/accounts/report/trial_balance/trial_balance.py:409
+#: erpnext/accounts/report/trial_balance/trial_balance.py:403
#: erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js:70
#: erpnext/regional/doctype/uae_vat_account/uae_vat_account.json
#: erpnext/stock/doctype/warehouse/warehouse.json
@@ -1245,9 +1237,12 @@ msgstr ""
#. Label of the account_details_section (Section Break) field in DocType 'Bank
#. Account'
+#. Label of the account_details_section (Section Break) field in DocType 'GL
+#. Entry'
#. Label of the section_break_7 (Section Break) field in DocType 'Tax
#. Withholding Category'
#: erpnext/accounts/doctype/bank_account/bank_account.json
+#: erpnext/accounts/doctype/gl_entry/gl_entry.json
#: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
msgid "Account Details"
msgstr ""
@@ -1272,8 +1267,8 @@ msgstr ""
msgid "Account Manager"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:865
-#: erpnext/controllers/accounts_controller.py:2037
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:868
+#: erpnext/controllers/accounts_controller.py:2040
msgid "Account Missing"
msgstr "帐户遗失"
@@ -1448,7 +1443,7 @@ msgstr "子公司{1}中添加了帐户{0}"
msgid "Account {0} is frozen"
msgstr "科目{0}已冻结"
-#: erpnext/controllers/accounts_controller.py:1130
+#: erpnext/controllers/accounts_controller.py:1133
msgid "Account {0} is invalid. Account Currency must be {1}"
msgstr "科目{0}状态为非激活。科目货币必须是{1}"
@@ -1476,11 +1471,11 @@ msgstr "帐户: {0}是资金正在进行中,日记帐分录无法更
msgid "Account: {0} can only be updated via Stock Transactions"
msgstr "科目{0}只能通过库存处理更新"
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2617
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2619
msgid "Account: {0} is not permitted under Payment Entry"
msgstr "帐户:付款条目下不允许{0}"
-#: erpnext/controllers/accounts_controller.py:2723
+#: erpnext/controllers/accounts_controller.py:2726
msgid "Account: {0} with currency: {1} can not be selected"
msgstr "帐号:{0}币种:{1}不能选择"
@@ -1779,7 +1774,7 @@ msgstr "库存的会计分录"
msgid "Accounting Entry for {0}"
msgstr ""
-#: erpnext/controllers/accounts_controller.py:2078
+#: erpnext/controllers/accounts_controller.py:2081
msgid "Accounting Entry for {0}: {1} can only be made in currency: {2}"
msgstr "会计分录为{0}:{1}只能在货币做:{2}"
@@ -2286,12 +2281,12 @@ msgstr ""
#: erpnext/manufacturing/doctype/bom/bom.js:140
#: erpnext/manufacturing/doctype/bom/bom.js:151
#: erpnext/manufacturing/doctype/bom/bom.js:162
-#: erpnext/projects/doctype/project/project.js:86
-#: erpnext/projects/doctype/project/project.js:94
-#: erpnext/projects/doctype/project/project.js:168
+#: erpnext/projects/doctype/project/project.js:87
+#: erpnext/projects/doctype/project/project.js:95
+#: erpnext/projects/doctype/project/project.js:169
#: erpnext/public/js/bank_reconciliation_tool/data_table_manager.js:88
#: erpnext/public/js/bank_reconciliation_tool/data_table_manager.js:121
-#: erpnext/public/js/utils/unreconcile.js:28
+#: erpnext/public/js/utils/unreconcile.js:29
#: erpnext/quality_management/doctype/quality_feedback/quality_feedback.json
#: erpnext/quality_management/doctype/quality_procedure/quality_procedure.json
#: erpnext/selling/doctype/customer/customer.js:184
@@ -2461,7 +2456,7 @@ msgstr ""
msgid "Actual Operation Time"
msgstr ""
-#: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py:397
+#: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py:400
msgid "Actual Posting"
msgstr ""
@@ -2731,7 +2726,7 @@ msgstr ""
msgid "Add Sub Assembly"
msgstr ""
-#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:472
+#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:473
#: erpnext/public/js/event.js:32
msgid "Add Suppliers"
msgstr "添加供应商"
@@ -3413,7 +3408,7 @@ msgstr ""
#: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
#: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:39
#: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:91
-#: erpnext/accounts/report/general_ledger/general_ledger.py:664
+#: erpnext/accounts/report/general_ledger/general_ledger.py:670
msgid "Against Account"
msgstr "针对的科目"
@@ -3428,7 +3423,7 @@ msgstr "针对的科目"
msgid "Against Blanket Order"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:958
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:961
#: erpnext/patches/v15_0/update_invoice_remarks.py:22
msgid "Against Customer Order {0}"
msgstr ""
@@ -3527,7 +3522,7 @@ msgstr ""
#. Label of the against_voucher (Dynamic Link) field in DocType 'GL Entry'
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:683
+#: erpnext/accounts/report/general_ledger/general_ledger.py:689
msgid "Against Voucher"
msgstr "针对的凭证"
@@ -3545,7 +3540,7 @@ msgstr ""
#. Entry'
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:681
+#: erpnext/accounts/report/general_ledger/general_ledger.py:687
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:177
msgid "Against Voucher Type"
msgstr "针对的凭证类型"
@@ -3559,7 +3554,7 @@ msgstr "账龄"
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:152
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:133
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1068
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1087
msgid "Age (Days)"
msgstr "时间(天)"
@@ -3843,7 +3838,7 @@ msgstr "包括及以上的所有通信均应移至新发行中"
msgid "All items have already been Invoiced/Returned"
msgstr "所有商品均已开票/退货"
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:1296
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:1297
msgid "All items have already been received"
msgstr ""
@@ -3931,7 +3926,7 @@ msgstr ""
#: erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json
#: erpnext/accounts/doctype/unreconcile_payment_entries/unreconcile_payment_entries.json
#: erpnext/accounts/report/gross_profit/gross_profit.py:331
-#: erpnext/public/js/utils/unreconcile.js:86
+#: erpnext/public/js/utils/unreconcile.js:87
msgid "Allocated Amount"
msgstr "已核销金额"
@@ -3972,7 +3967,7 @@ msgstr "分配"
#. Label of the allocations (Table) field in DocType 'Unreconcile Payment'
#: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json
#: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json
-#: erpnext/public/js/utils/unreconcile.js:97
+#: erpnext/public/js/utils/unreconcile.js:98
msgid "Allocations"
msgstr ""
@@ -4802,6 +4797,11 @@ msgstr "金额{0} {1}从转移{2}到{3}"
msgid "Amount {0} {1} {2} {3}"
msgstr "金额{0} {1} {2} {3}"
+#. Label of the amounts_section (Section Break) field in DocType 'GL Entry'
+#: erpnext/accounts/doctype/gl_entry/gl_entry.json
+msgid "Amounts"
+msgstr ""
+
#. Name of a UOM
#: erpnext/setup/setup_wizard/data/uom_data.json
msgid "Ampere"
@@ -4842,7 +4842,7 @@ msgid "An error has occurred during {0}. Check {1} for more details"
msgstr ""
#: erpnext/public/js/controllers/buying.js:292
-#: erpnext/public/js/utils/sales_common.js:429
+#: erpnext/public/js/utils/sales_common.js:430
msgid "An error occurred during the update process"
msgstr "更新过程中发生错误"
@@ -4897,10 +4897,6 @@ msgstr "对于财务年度{4},{1}'{2}'和帐户“{3}”已存在另
msgid "Another Cost Center Allocation record {0} applicable from {1}, hence this allocation will be applicable upto {2}"
msgstr ""
-#: erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py:124
-msgid "Another Period Closing Entry {0} has been made after {1}"
-msgstr "在{1}之后另一个期间结束分录{0}已经被录入"
-
#: erpnext/setup/doctype/sales_person/sales_person.py:100
msgid "Another Sales Person {0} exists with the same Employee id"
msgstr "另外销售人员{0}存在具有相同员工ID"
@@ -5798,7 +5794,7 @@ msgstr ""
msgid "Asset restored after Asset Capitalization {0} was cancelled"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1339
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1342
msgid "Asset returned"
msgstr ""
@@ -5810,7 +5806,7 @@ msgstr ""
msgid "Asset scrapped via Journal Entry {0}"
msgstr "通过资产手工凭证报废{0}"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1376
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1379
msgid "Asset sold"
msgstr ""
@@ -5968,7 +5964,7 @@ msgid "At least one item should be entered with negative quantity in return docu
msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:420
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:507
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:510
msgid "At least one mode of payment is required for POS invoice."
msgstr "需要为POS费用清单定义至少一种付款模式"
@@ -6331,7 +6327,7 @@ msgid "Auto re-order"
msgstr ""
#: erpnext/public/js/controllers/buying.js:290
-#: erpnext/public/js/utils/sales_common.js:424
+#: erpnext/public/js/utils/sales_common.js:425
msgid "Auto repeat document updated"
msgstr "自动重复文件更新"
@@ -6848,7 +6844,7 @@ msgstr "物料清单网站项目"
msgid "BOM Website Operation"
msgstr "物料清单网站运营"
-#: erpnext/stock/doctype/stock_entry/stock_entry.js:1174
+#: erpnext/stock/doctype/stock_entry/stock_entry.js:1183
msgid "BOM and Manufacturing Quantity are required"
msgstr "物料清单和生产量是必需的"
@@ -6965,7 +6961,7 @@ msgstr "余额"
msgid "Balance (Dr - Cr)"
msgstr "结余(Dr - Cr)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:617
+#: erpnext/accounts/report/general_ledger/general_ledger.py:623
msgid "Balance ({0})"
msgstr "余额({0})"
@@ -7766,7 +7762,7 @@ msgstr ""
#. Label of the bill_date (Date) field in DocType 'Journal Entry'
#. Label of the bill_date (Date) field in DocType 'Subcontracting Receipt'
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1053
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1072
#: erpnext/accounts/report/purchase_register/purchase_register.py:214
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
msgid "Bill Date"
@@ -7775,7 +7771,7 @@ msgstr "账单日期"
#. Label of the bill_no (Data) field in DocType 'Journal Entry'
#. Label of the bill_no (Data) field in DocType 'Subcontracting Receipt'
#: erpnext/accounts/doctype/journal_entry/journal_entry.json
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1052
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1071
#: erpnext/accounts/report/purchase_register/purchase_register.py:213
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
msgid "Bill No"
@@ -8947,12 +8943,12 @@ msgid "Can not filter based on Voucher No, if grouped by Voucher"
msgstr "按凭证分类后不能根据凭证编号过滤"
#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1289
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2775
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2777
msgid "Can only make payment against unbilled {0}"
msgstr "只能为未开票{0}付款"
#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1424
-#: erpnext/controllers/accounts_controller.py:2632
+#: erpnext/controllers/accounts_controller.py:2635
#: erpnext/public/js/controllers/accounts.js:90
msgid "Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'"
msgstr "收取类型类型必须是“基于上一行的金额”或者“前一行的总计”才能引用组"
@@ -9260,7 +9256,7 @@ msgstr "无法确保按序列号交货,因为添加和不保证按序列号交
msgid "Cannot find Item with this Barcode"
msgstr "用此条形码找不到物品"
-#: erpnext/controllers/accounts_controller.py:3150
+#: erpnext/controllers/accounts_controller.py:3153
msgid "Cannot find a default warehouse for item {0}. Please set one in the Item Master or in Stock Settings."
msgstr ""
@@ -9268,7 +9264,7 @@ msgstr ""
msgid "Cannot make any transactions until the deletion job is completed"
msgstr ""
-#: erpnext/controllers/accounts_controller.py:1902
+#: erpnext/controllers/accounts_controller.py:1905
msgid "Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings"
msgstr "第{1}行中的项目{0}的出价不能超过{2}。要允许超额计费,请在“帐户设置”中设置配额"
@@ -9289,7 +9285,7 @@ msgid "Cannot receive from customer against negative outstanding"
msgstr ""
#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1441
-#: erpnext/controllers/accounts_controller.py:2647
+#: erpnext/controllers/accounts_controller.py:2650
#: erpnext/public/js/controllers/accounts.js:100
msgid "Cannot refer row number greater than or equal to current row number for this Charge type"
msgstr "此收取类型不能引用大于或等于本行的数据。"
@@ -9305,7 +9301,7 @@ msgstr ""
#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1433
#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1612
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1723
-#: erpnext/controllers/accounts_controller.py:2637
+#: erpnext/controllers/accounts_controller.py:2640
#: erpnext/public/js/controllers/accounts.js:94
#: erpnext/public/js/controllers/taxes_and_totals.js:455
msgid "Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row"
@@ -9323,11 +9319,11 @@ msgstr "不能为{0}设置折扣授权"
msgid "Cannot set multiple Item Defaults for a company."
msgstr "无法为公司设置多个项目默认值。"
-#: erpnext/controllers/accounts_controller.py:3298
+#: erpnext/controllers/accounts_controller.py:3301
msgid "Cannot set quantity less than delivered quantity"
msgstr "无法设定数量小于交货数量"
-#: erpnext/controllers/accounts_controller.py:3301
+#: erpnext/controllers/accounts_controller.py:3304
msgid "Cannot set quantity less than received quantity"
msgstr "无法设置小于收货数量的数量"
@@ -9668,7 +9664,7 @@ msgstr "更改审批日期"
msgid "Change in Stock Value"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:884
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:887
msgid "Change the account type to Receivable or select a different account."
msgstr "将帐户类型更改为“应收帐款”或选择其他帐户。"
@@ -9703,7 +9699,7 @@ msgid "Channel Partner"
msgstr ""
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2152
-#: erpnext/controllers/accounts_controller.py:2700
+#: erpnext/controllers/accounts_controller.py:2703
msgid "Charge of type 'Actual' in row {0} cannot be included in Item Rate or Paid Amount"
msgstr ""
@@ -10178,17 +10174,17 @@ msgstr "关闭的定单不能被取消。 打开关闭再取消。"
msgid "Closing"
msgstr ""
-#: erpnext/accounts/report/trial_balance/trial_balance.py:458
+#: erpnext/accounts/report/trial_balance/trial_balance.py:452
#: erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py:213
msgid "Closing (Cr)"
msgstr "结算(信用)"
-#: erpnext/accounts/report/trial_balance/trial_balance.py:451
+#: erpnext/accounts/report/trial_balance/trial_balance.py:445
#: erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py:206
msgid "Closing (Dr)"
msgstr "结算(借记)"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:408
+#: erpnext/accounts/report/general_ledger/general_ledger.py:416
msgid "Closing (Opening + Total)"
msgstr "期末(期初+总计)"
@@ -10198,7 +10194,7 @@ msgstr "期末(期初+总计)"
msgid "Closing Account Head"
msgstr ""
-#: erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py:92
+#: erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py:122
msgid "Closing Account {0} must be of type Liability / Equity"
msgstr "关闭科目{0}的类型必须是负债/权益"
@@ -10230,11 +10226,6 @@ msgstr ""
msgid "Closing Date"
msgstr ""
-#. Label of the fiscal_year (Link) field in DocType 'Period Closing Voucher'
-#: erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.json
-msgid "Closing Fiscal Year"
-msgstr ""
-
#. Name of a DocType
#: erpnext/stock/doctype/closing_stock_balance/closing_stock_balance.json
msgid "Closing Stock Balance"
@@ -11003,7 +10994,7 @@ msgstr ""
msgid "Company and Posting Date is mandatory"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2204
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2207
msgid "Company currencies of both the companies should match for Inter Company Transactions."
msgstr "两家公司的公司货币应该符合Inter公司交易。"
@@ -11096,7 +11087,7 @@ msgstr ""
#. Label of the competitors (Table MultiSelect) field in DocType 'Opportunity'
#. Label of the competitors (Table MultiSelect) field in DocType 'Quotation'
#: erpnext/crm/doctype/opportunity/opportunity.json
-#: erpnext/public/js/utils/sales_common.js:497
+#: erpnext/public/js/utils/sales_common.js:498
#: erpnext/selling/doctype/quotation/quotation.json
msgid "Competitors"
msgstr ""
@@ -11493,7 +11484,7 @@ msgstr "合并财务报表"
#. Log'
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:520
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:523
msgid "Consolidated Sales Invoice"
msgstr ""
@@ -12025,7 +12016,7 @@ msgstr "行{0}中默认计量单位的转换系数必须是1"
msgid "Conversion factor for item {0} has been reset to 1.0 as the uom {1} is same as stock uom {2}."
msgstr ""
-#: erpnext/controllers/accounts_controller.py:2529
+#: erpnext/controllers/accounts_controller.py:2532
msgid "Conversion rate cannot be 0 or 1"
msgstr "汇率不能为0或1"
@@ -12237,12 +12228,12 @@ msgstr ""
#: erpnext/accounts/report/accounts_payable/accounts_payable.js:28
#: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:40
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:30
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1039
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1058
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:40
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js:42
#: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:195
#: erpnext/accounts/report/general_ledger/general_ledger.js:152
-#: erpnext/accounts/report/general_ledger/general_ledger.py:676
+#: erpnext/accounts/report/general_ledger/general_ledger.py:682
#: erpnext/accounts/report/gross_profit/gross_profit.js:68
#: erpnext/accounts/report/gross_profit/gross_profit.py:317
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:306
@@ -12302,7 +12293,7 @@ msgstr ""
msgid "Cost Center Allocation Percentages"
msgstr ""
-#: erpnext/public/js/utils/sales_common.js:456
+#: erpnext/public/js/utils/sales_common.js:457
msgid "Cost Center For Item with Item Code {0} has been Changed to {1}"
msgstr ""
@@ -12355,7 +12346,7 @@ msgstr ""
msgid "Cost Center {} is a group cost center and group cost centers cannot be used in transactions"
msgstr ""
-#: erpnext/accounts/report/financial_statements.py:611
+#: erpnext/accounts/report/financial_statements.py:614
msgid "Cost Center: {0} does not exist"
msgstr "成本中心:{0}不存在"
@@ -12503,7 +12494,7 @@ msgid "Could not find path for "
msgstr ""
#: erpnext/accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.py:124
-#: erpnext/accounts/report/financial_statements.py:234
+#: erpnext/accounts/report/financial_statements.py:235
msgid "Could not retrieve information for {0}."
msgstr "无法检索{0}的信息。"
@@ -12737,7 +12728,7 @@ msgstr "信用"
#: erpnext/stock/doctype/stock_entry/stock_entry.js:166
#: erpnext/stock/doctype/stock_entry/stock_entry.js:168
#: erpnext/stock/doctype/stock_entry/stock_entry.js:241
-#: erpnext/stock/doctype/stock_entry/stock_entry.js:1249
+#: erpnext/stock/doctype/stock_entry/stock_entry.js:1258
#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:199
#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:232
#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:242
@@ -13107,17 +13098,17 @@ msgstr ""
#: erpnext/accounts/report/general_ledger/general_ledger.html:31
#: erpnext/accounts/report/purchase_register/purchase_register.py:241
#: erpnext/accounts/report/sales_register/sales_register.py:277
-#: erpnext/accounts/report/trial_balance/trial_balance.py:444
+#: erpnext/accounts/report/trial_balance/trial_balance.py:438
#: erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py:199
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:34
msgid "Credit"
msgstr "贷方"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:634
+#: erpnext/accounts/report/general_ledger/general_ledger.py:640
msgid "Credit (Transaction)"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:611
+#: erpnext/accounts/report/general_ledger/general_ledger.py:617
msgid "Credit ({0})"
msgstr "信用({0})"
@@ -13233,7 +13224,7 @@ msgstr ""
#: erpnext/accounts/doctype/journal_entry_template/journal_entry_template.json
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:174
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:147
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1062
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1081
#: erpnext/controllers/sales_and_purchase_return.py:331
#: erpnext/setup/setup_wizard/operations/install_fixtures.py:288
#: erpnext/stock/doctype/delivery_note/delivery_note.js:89
@@ -13268,7 +13259,7 @@ msgstr "换货凭单{0}已自动创建"
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:367
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:375
-#: erpnext/controllers/accounts_controller.py:2017
+#: erpnext/controllers/accounts_controller.py:2020
msgid "Credit To"
msgstr ""
@@ -13453,7 +13444,7 @@ msgstr ""
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#: erpnext/accounts/doctype/subscription_plan/subscription_plan.json
#: erpnext/accounts/report/account_balance/account_balance.py:28
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1072
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1091
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:205
#: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:101
#: erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:118
@@ -13461,7 +13452,7 @@ msgstr ""
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:145
#: erpnext/accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.py:208
#: erpnext/accounts/report/financial_statements.html:29
-#: erpnext/accounts/report/financial_statements.py:630
+#: erpnext/accounts/report/financial_statements.py:633
#: erpnext/accounts/report/general_ledger/general_ledger.js:146
#: erpnext/accounts/report/gross_profit/gross_profit.py:380
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:690
@@ -13470,7 +13461,7 @@ msgstr ""
#: erpnext/accounts/report/purchase_register/purchase_register.py:229
#: erpnext/accounts/report/sales_register/sales_register.py:265
#: erpnext/accounts/report/trial_balance/trial_balance.js:76
-#: erpnext/accounts/report/trial_balance/trial_balance.py:416
+#: erpnext/accounts/report/trial_balance/trial_balance.py:410
#: erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py:220
#: erpnext/accounts/workspace/accounting/accounting.json
#: erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -13484,7 +13475,7 @@ msgstr ""
#: erpnext/manufacturing/doctype/bom_creator/bom_creator.json
#: erpnext/projects/doctype/timesheet/timesheet.json
#: erpnext/public/js/financial_statements.js:244
-#: erpnext/public/js/utils/unreconcile.js:93
+#: erpnext/public/js/utils/unreconcile.js:94
#: erpnext/selling/doctype/quotation/quotation.json
#: erpnext/selling/doctype/sales_order/sales_order.json
#: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:121
@@ -13563,11 +13554,11 @@ msgstr "货币不能使用其他货币进行输入后更改"
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1504
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1566
-#: erpnext/accounts/utils.py:2160
+#: erpnext/accounts/utils.py:2164
msgid "Currency for {0} must be {1}"
msgstr "货币{0}必须{1}"
-#: erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py:98
+#: erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py:129
msgid "Currency of the Closing Account must be {0}"
msgstr "在关闭科目的货币必须是{0}"
@@ -13979,7 +13970,7 @@ msgstr ""
#. Label of the customer_contact_display (Small Text) field in DocType
#. 'Purchase Order'
#. Label of the customer_contact (Small Text) field in DocType 'Delivery Stop'
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1033
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1052
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/stock/doctype/delivery_stop/delivery_stop.json
msgid "Customer Contact"
@@ -14075,7 +14066,7 @@ msgstr ""
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#: erpnext/accounts/doctype/tax_rule/tax_rule.json
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:99
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1090
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1109
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:80
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:185
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:55
@@ -14119,7 +14110,7 @@ msgstr ""
msgid "Customer Group Name"
msgstr ""
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1182
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1201
msgid "Customer Group: {0} does not exist"
msgstr ""
@@ -14138,7 +14129,7 @@ msgstr ""
msgid "Customer Items"
msgstr ""
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1081
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1100
msgid "Customer LPO"
msgstr "客户采购订单号"
@@ -14316,7 +14307,7 @@ msgstr ""
msgid "Customer required for 'Customerwise Discount'"
msgstr "”客户折扣“需要指定客户"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1001
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1004
#: erpnext/selling/doctype/sales_order/sales_order.py:347
#: erpnext/stock/doctype/delivery_note/delivery_note.py:407
msgid "Customer {0} does not belong to project {1}"
@@ -14393,7 +14384,7 @@ msgstr ""
msgid "Customers Without Any Sales Transactions"
msgstr "没有任何销售交易的客户"
-#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:96
+#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:97
msgid "Customers not selected."
msgstr "未选择客户。"
@@ -14674,6 +14665,11 @@ msgstr "交易日期"
msgid "Date: {0} to {1}"
msgstr ""
+#. Label of the dates_section (Section Break) field in DocType 'GL Entry'
+#: erpnext/accounts/doctype/gl_entry/gl_entry.json
+msgid "Dates"
+msgstr ""
+
#. Option for the 'Billing Interval' (Select) field in DocType 'Subscription
#. Plan'
#. Name of a UOM
@@ -14800,17 +14796,17 @@ msgstr "亲爱的系统管理经理,"
#: erpnext/accounts/report/general_ledger/general_ledger.html:30
#: erpnext/accounts/report/purchase_register/purchase_register.py:240
#: erpnext/accounts/report/sales_register/sales_register.py:276
-#: erpnext/accounts/report/trial_balance/trial_balance.py:437
+#: erpnext/accounts/report/trial_balance/trial_balance.py:431
#: erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py:192
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:27
msgid "Debit"
msgstr "借方"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:627
+#: erpnext/accounts/report/general_ledger/general_ledger.py:633
msgid "Debit (Transaction)"
msgstr ""
-#: erpnext/accounts/report/general_ledger/general_ledger.py:605
+#: erpnext/accounts/report/general_ledger/general_ledger.py:611
msgid "Debit ({0})"
msgstr "借记卡({0})"
@@ -14847,7 +14843,7 @@ msgstr ""
#: erpnext/accounts/doctype/journal_entry_template/journal_entry_template.json
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:176
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:147
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1065
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1084
#: erpnext/controllers/sales_and_purchase_return.py:335
#: erpnext/setup/setup_wizard/operations/install_fixtures.py:289
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:61
@@ -14874,13 +14870,13 @@ msgstr ""
#. Label of the debit_to (Link) field in DocType 'Sales Invoice'
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:869
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:880
-#: erpnext/controllers/accounts_controller.py:2017
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:872
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:883
+#: erpnext/controllers/accounts_controller.py:2020
msgid "Debit To"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:865
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:868
msgid "Debit To is required"
msgstr "借记是必需的"
@@ -14953,7 +14949,7 @@ msgstr ""
msgid "Decimeter"
msgstr ""
-#: erpnext/public/js/utils/sales_common.js:524
+#: erpnext/public/js/utils/sales_common.js:525
msgid "Declare Lost"
msgstr "宣布失去"
@@ -15055,7 +15051,7 @@ msgstr "该物料或其模板物料的默认物料清单状态必须是激活的
msgid "Default BOM for {0} not found"
msgstr "默认BOM {0}未找到"
-#: erpnext/controllers/accounts_controller.py:3339
+#: erpnext/controllers/accounts_controller.py:3342
msgid "Default BOM not found for FG Item {0}"
msgstr ""
@@ -15866,7 +15862,7 @@ msgstr ""
msgid "Delivery Note Trends"
msgstr "销售出货趋势"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1157
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1160
msgid "Delivery Note {0} is not submitted"
msgstr "销售出货单{0}未提交"
@@ -15874,7 +15870,7 @@ msgstr "销售出货单{0}未提交"
msgid "Delivery Note(s) created for the Pick List"
msgstr ""
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1085
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1104
#: erpnext/stock/doctype/delivery_trip/delivery_trip.js:73
msgid "Delivery Notes"
msgstr "送货单"
@@ -16499,7 +16495,7 @@ msgstr ""
#. Label of the order_lost_reason (Small Text) field in DocType 'Opportunity'
#. Label of the order_lost_reason (Small Text) field in DocType 'Quotation'
#: erpnext/crm/doctype/opportunity/opportunity.json
-#: erpnext/public/js/utils/sales_common.js:503
+#: erpnext/public/js/utils/sales_common.js:504
#: erpnext/selling/doctype/quotation/quotation.json
msgid "Detailed Reason"
msgstr "详细原因"
@@ -16675,6 +16671,11 @@ msgstr ""
msgid "Dimension-wise Accounts Balance Report"
msgstr ""
+#. Label of the dimensions_section (Section Break) field in DocType 'GL Entry'
+#: erpnext/accounts/doctype/gl_entry/gl_entry.json
+msgid "Dimensions"
+msgstr ""
+
#. Option for the 'Account Type' (Select) field in DocType 'Account'
#: erpnext/accounts/doctype/account/account.json
msgid "Direct Expense"
@@ -16826,11 +16827,11 @@ msgstr ""
msgid "Disabled Warehouse {0} cannot be used for this transaction."
msgstr ""
-#: erpnext/controllers/accounts_controller.py:610
+#: erpnext/controllers/accounts_controller.py:613
msgid "Disabled pricing rules since this {} is an internal transfer"
msgstr ""
-#: erpnext/controllers/accounts_controller.py:624
+#: erpnext/controllers/accounts_controller.py:627
msgid "Disabled tax included prices since this {} is an internal transfer"
msgstr ""
@@ -17030,7 +17031,7 @@ msgstr ""
msgid "Discount must be less than 100"
msgstr "折扣必须小于100"
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:3246
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:3248
msgid "Discount of {} applied as per Payment Term"
msgstr ""
@@ -17497,6 +17498,7 @@ msgstr ""
#: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:93
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:27
+#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:150
msgid "Download"
msgstr "下载"
@@ -17525,6 +17527,10 @@ msgstr ""
msgid "Download PDF"
msgstr "下载PDF"
+#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:149
+msgid "Download PDF for Supplier"
+msgstr ""
+
#. Label of the download_template (Button) field in DocType 'Bank Statement
#. Import'
#. Label of the download_template (Button) field in DocType 'Chart of Accounts
@@ -17751,7 +17757,7 @@ msgstr ""
msgid "Due Date cannot be before Posting / Supplier Invoice Date"
msgstr "截止日期不能在付帐前/供应商发票日期之前"
-#: erpnext/controllers/accounts_controller.py:646
+#: erpnext/controllers/accounts_controller.py:649
msgid "Due Date is mandatory"
msgstr "截止日期字段必填"
@@ -17837,7 +17843,7 @@ msgstr ""
msgid "Duplicate POS Invoices found"
msgstr ""
-#: erpnext/projects/doctype/project/project.js:82
+#: erpnext/projects/doctype/project/project.js:83
msgid "Duplicate Project with Tasks"
msgstr "带有任务的重复项目"
@@ -17853,7 +17859,7 @@ msgstr "项目代码{0}和制造商{1}的重复输入"
msgid "Duplicate item group found in the item group table"
msgstr "在物料组中有重复物料组"
-#: erpnext/projects/doctype/project/project.js:182
+#: erpnext/projects/doctype/project/project.js:183
msgid "Duplicate project has been created"
msgstr "复制项目已创建"
@@ -18684,7 +18690,7 @@ msgstr ""
msgid "End Year"
msgstr "结束年份"
-#: erpnext/accounts/report/financial_statements.py:125
+#: erpnext/accounts/report/financial_statements.py:126
msgid "End Year cannot be before Start Year"
msgstr "结束年份不能启动年前"
@@ -18896,7 +18902,7 @@ msgstr ""
#. Valuation'
#: erpnext/accounts/doctype/bank_statement_import/bank_statement_import.json
#: erpnext/accounts/doctype/ledger_merge/ledger_merge.json
-#: erpnext/accounts/doctype/payment_request/payment_request.py:433
+#: erpnext/accounts/doctype/payment_request/payment_request.py:442
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.json
#: erpnext/manufacturing/doctype/job_card/job_card.py:847
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
@@ -19082,8 +19088,8 @@ msgstr ""
msgid "Exchange Gain/Loss"
msgstr "汇兑损益"
-#: erpnext/controllers/accounts_controller.py:1421
-#: erpnext/controllers/accounts_controller.py:1506
+#: erpnext/controllers/accounts_controller.py:1424
+#: erpnext/controllers/accounts_controller.py:1509
msgid "Exchange Gain/Loss amount has been booked through {0}"
msgstr ""
@@ -19174,7 +19180,7 @@ msgstr "汇率必须一致{0} {1}({2})"
msgid "Excise Entry"
msgstr ""
-#: erpnext/stock/doctype/stock_entry/stock_entry.js:1242
+#: erpnext/stock/doctype/stock_entry/stock_entry.js:1251
msgid "Excise Invoice"
msgstr "消费费用清单"
@@ -19239,7 +19245,7 @@ msgstr ""
msgid "Expand All"
msgstr "展开全部"
-#: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py:411
+#: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py:414
msgid "Expected"
msgstr ""
@@ -20110,15 +20116,15 @@ msgstr ""
msgid "Finished Good Item Quantity"
msgstr ""
-#: erpnext/controllers/accounts_controller.py:3325
+#: erpnext/controllers/accounts_controller.py:3328
msgid "Finished Good Item is not specified for service item {0}"
msgstr ""
-#: erpnext/controllers/accounts_controller.py:3342
+#: erpnext/controllers/accounts_controller.py:3345
msgid "Finished Good Item {0} Qty can not be zero"
msgstr ""
-#: erpnext/controllers/accounts_controller.py:3336
+#: erpnext/controllers/accounts_controller.py:3339
msgid "Finished Good Item {0} must be a sub-contracted item"
msgstr ""
@@ -20277,6 +20283,7 @@ msgstr "财政制度是强制性的,请在公司{0}设定财政制度"
#. Name of a DocType
#. Label of the fiscal_year (Link) field in DocType 'GL Entry'
#. Label of the fiscal_year (Link) field in DocType 'Monthly Distribution'
+#. Label of the fiscal_year (Link) field in DocType 'Period Closing Voucher'
#. Label of a Link in the Accounting Workspace
#. Label of the fiscal_year (Link) field in DocType 'Lower Deduction
#. Certificate'
@@ -20286,6 +20293,7 @@ msgstr "财政制度是强制性的,请在公司{0}设定财政制度"
#: erpnext/accounts/doctype/fiscal_year/fiscal_year.json
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
#: erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json
+#: erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.json
#: erpnext/accounts/notification/notification_for_new_fiscal_year/notification_for_new_fiscal_year.html:1
#: erpnext/accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:16
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.js:38
@@ -20483,7 +20491,7 @@ msgstr ""
msgid "For"
msgstr "对于"
-#: erpnext/public/js/utils/sales_common.js:332
+#: erpnext/public/js/utils/sales_common.js:333
msgid "For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table."
msgstr "对于“产品包”的物料,仓库,序列号和批号将被从“装箱单”表考虑。如果仓库和批次号是相同的任何“产品包”项目的所有包装物料,这些值可以在主项表中输入,值将被复制到“装箱单”表。"
@@ -20541,7 +20549,7 @@ msgstr ""
msgid "For Quantity (Manufactured Qty) is mandatory"
msgstr "数量(制造数量)字段必填"
-#: erpnext/controllers/accounts_controller.py:1104
+#: erpnext/controllers/accounts_controller.py:1107
msgid "For Return Invoices with Stock effect, '0' qty Items are not allowed. Following rows are affected: {0}"
msgstr ""
@@ -20953,7 +20961,7 @@ msgstr "起始日期"
msgid "From Date and To Date are Mandatory"
msgstr "从日期到日期是强制性的"
-#: erpnext/accounts/report/financial_statements.py:130
+#: erpnext/accounts/report/financial_statements.py:131
msgid "From Date and To Date are mandatory"
msgstr ""
@@ -21349,14 +21357,14 @@ msgstr "只能在“组”节点下新建节点"
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:186
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:155
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1077
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1096
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:177
msgid "Future Payment Amount"
msgstr "未来付款金额"
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:185
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:154
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1076
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1095
msgid "Future Payment Ref"
msgstr "未来付款参考"
@@ -21381,7 +21389,7 @@ msgstr ""
#. Name of a DocType
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:590
+#: erpnext/accounts/report/general_ledger/general_ledger.py:596
msgid "GL Entry"
msgstr "总账分录"
@@ -21462,7 +21470,7 @@ msgstr ""
msgid "Gamma"
msgstr ""
-#: erpnext/projects/doctype/project/project.js:101
+#: erpnext/projects/doctype/project/project.js:102
msgid "Gantt Chart"
msgstr "甘特图"
@@ -21624,7 +21632,7 @@ msgid "Get Item Locations"
msgstr ""
#. Label of the get_items (Button) field in DocType 'Stock Entry'
-#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:377
+#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:378
#: erpnext/manufacturing/doctype/production_plan/production_plan.js:369
#: erpnext/stock/doctype/pick_list/pick_list.js:193
#: erpnext/stock/doctype/pick_list/pick_list.js:236
@@ -21641,9 +21649,9 @@ msgstr "获取物料"
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:319
#: erpnext/buying/doctype/purchase_order/purchase_order.js:567
#: erpnext/buying/doctype/purchase_order/purchase_order.js:587
-#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:335
-#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:357
-#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:402
+#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:336
+#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:358
+#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:403
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:53
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:86
#: erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js:80
@@ -21681,7 +21689,7 @@ msgstr ""
msgid "Get Items from BOM"
msgstr "从物料清单获取物料"
-#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:374
+#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:375
msgid "Get Items from Material Requests against this Supplier"
msgstr "从针对此供应商的物料请求中获取物料"
@@ -21778,12 +21786,12 @@ msgstr ""
msgid "Get Supplier Group Details"
msgstr ""
-#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:416
-#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:436
+#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:417
+#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:437
msgid "Get Suppliers"
msgstr "获取供应商"
-#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:440
+#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:441
msgid "Get Suppliers By"
msgstr "获得供应商"
@@ -23968,7 +23976,7 @@ msgstr ""
#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:105
#: erpnext/accounts/doctype/ledger_merge/ledger_merge.json
#: erpnext/accounts/doctype/process_deferred_accounting/process_deferred_accounting.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:379
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:382
#: erpnext/accounts/report/account_balance/account_balance.js:27
#: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:170
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:182
@@ -24102,7 +24110,7 @@ msgstr ""
msgid "Incorrect Warehouse"
msgstr "仓库不正确"
-#: erpnext/accounts/general_ledger.py:52
+#: erpnext/accounts/general_ledger.py:53
msgid "Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction."
msgstr "总帐分录发现错误数字,可能是选择了错误的科目。"
@@ -24357,8 +24365,8 @@ msgstr ""
msgid "Insufficient Capacity"
msgstr ""
-#: erpnext/controllers/accounts_controller.py:3257
-#: erpnext/controllers/accounts_controller.py:3281
+#: erpnext/controllers/accounts_controller.py:3260
+#: erpnext/controllers/accounts_controller.py:3284
msgid "Insufficient Permissions"
msgstr "权限不足"
@@ -24485,7 +24493,7 @@ msgstr ""
msgid "Interest"
msgstr ""
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2882
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2884
msgid "Interest and/or dunning fee"
msgstr ""
@@ -24510,11 +24518,11 @@ msgstr ""
msgid "Internal Customer for company {0} already exists"
msgstr ""
-#: erpnext/controllers/accounts_controller.py:593
+#: erpnext/controllers/accounts_controller.py:596
msgid "Internal Sale or Delivery Reference missing."
msgstr ""
-#: erpnext/controllers/accounts_controller.py:595
+#: erpnext/controllers/accounts_controller.py:598
msgid "Internal Sales Reference Missing"
msgstr ""
@@ -24545,7 +24553,7 @@ msgstr ""
msgid "Internal Transfer"
msgstr "内部转账"
-#: erpnext/controllers/accounts_controller.py:604
+#: erpnext/controllers/accounts_controller.py:607
msgid "Internal Transfer Reference Missing"
msgstr ""
@@ -24578,12 +24586,12 @@ msgstr ""
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:368
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:376
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:875
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:885
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:878
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:888
#: erpnext/assets/doctype/asset_category/asset_category.py:70
#: erpnext/assets/doctype/asset_category/asset_category.py:98
-#: erpnext/controllers/accounts_controller.py:2661
-#: erpnext/controllers/accounts_controller.py:2669
+#: erpnext/controllers/accounts_controller.py:2664
+#: erpnext/controllers/accounts_controller.py:2672
msgid "Invalid Account"
msgstr "无效账户"
@@ -24592,7 +24600,7 @@ msgstr "无效账户"
msgid "Invalid Allocated Amount"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:111
+#: erpnext/accounts/doctype/payment_request/payment_request.py:120
msgid "Invalid Amount"
msgstr ""
@@ -24600,7 +24608,7 @@ msgstr ""
msgid "Invalid Attribute"
msgstr "无效属性"
-#: erpnext/controllers/accounts_controller.py:430
+#: erpnext/controllers/accounts_controller.py:433
msgid "Invalid Auto Repeat Date"
msgstr ""
@@ -24616,13 +24624,13 @@ msgstr "无效框架订单对所选客户和物料无效"
msgid "Invalid Child Procedure"
msgstr "无效的子程序"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1983
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1986
msgid "Invalid Company for Inter Company Transaction."
msgstr "公司间交易的公司无效。"
#: erpnext/assets/doctype/asset/asset.py:249
#: erpnext/assets/doctype/asset/asset.py:256
-#: erpnext/controllers/accounts_controller.py:2684
+#: erpnext/controllers/accounts_controller.py:2687
msgid "Invalid Cost Center"
msgstr ""
@@ -24705,11 +24713,11 @@ msgstr ""
msgid "Invalid Purchase Invoice"
msgstr ""
-#: erpnext/controllers/accounts_controller.py:3294
+#: erpnext/controllers/accounts_controller.py:3297
msgid "Invalid Qty"
msgstr ""
-#: erpnext/controllers/accounts_controller.py:1119
+#: erpnext/controllers/accounts_controller.py:1122
msgid "Invalid Quantity"
msgstr "无效数量"
@@ -24772,7 +24780,7 @@ msgstr ""
msgid "Invalid {0}"
msgstr "无效的{0}"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1981
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1984
msgid "Invalid {0} for Inter Company Transaction."
msgstr "Inter Company Transaction无效{0}。"
@@ -24791,7 +24799,7 @@ msgstr ""
msgid "Inventory Dimension"
msgstr ""
-#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:161
+#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:160
msgid "Inventory Dimension Negative Stock"
msgstr ""
@@ -24843,7 +24851,7 @@ msgstr ""
msgid "Invoice Discounting"
msgstr "发票贴现"
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1057
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1076
msgid "Invoice Grand Total"
msgstr "发票总计"
@@ -24916,7 +24924,7 @@ msgstr "发票状态"
msgid "Invoice Type"
msgstr "费用清单类型"
-#: erpnext/projects/doctype/timesheet/timesheet.py:389
+#: erpnext/projects/doctype/timesheet/timesheet.py:429
msgid "Invoice already created for all billing hours"
msgstr "费用清单已在所有结算时间创建"
@@ -24926,13 +24934,13 @@ msgstr "费用清单已在所有结算时间创建"
msgid "Invoice and Billing"
msgstr ""
-#: erpnext/projects/doctype/timesheet/timesheet.py:386
+#: erpnext/projects/doctype/timesheet/timesheet.py:426
msgid "Invoice can't be made for zero billing hour"
msgstr "在零计费时间内无法开具费用清单"
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:169
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:144
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1059
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1078
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:164
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:102
msgid "Invoiced Amount"
@@ -24952,7 +24960,7 @@ msgstr ""
#: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
#: erpnext/accounts/doctype/pos_profile/pos_profile.json
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2032
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2035
#: erpnext/buying/doctype/supplier/supplier.json
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:62
msgid "Invoices"
@@ -26738,7 +26746,7 @@ msgstr "物料名称"
msgid "Item operation"
msgstr ""
-#: erpnext/controllers/accounts_controller.py:3317
+#: erpnext/controllers/accounts_controller.py:3320
msgid "Item qty can not be updated as raw materials are already processed."
msgstr ""
@@ -27006,7 +27014,7 @@ msgstr "待申请物料"
msgid "Items and Pricing"
msgstr "物料和定价"
-#: erpnext/controllers/accounts_controller.py:3536
+#: erpnext/controllers/accounts_controller.py:3539
msgid "Items cannot be updated as Subcontracting Order is created against the Purchase Order {0}."
msgstr ""
@@ -27333,7 +27341,7 @@ msgstr ""
msgid "Journals"
msgstr ""
-#: erpnext/projects/doctype/project/project.js:112
+#: erpnext/projects/doctype/project/project.js:113
msgid "Kanban Board"
msgstr "看板"
@@ -27818,7 +27826,7 @@ msgstr ""
#: erpnext/accounts/doctype/journal_entry/journal_entry.js:30
#: erpnext/accounts/doctype/payment_entry/payment_entry.js:388
-#: erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.js:25
+#: erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.js:43
msgid "Ledger"
msgstr "分类账"
@@ -28077,7 +28085,7 @@ msgstr ""
msgid "Link to Material Request"
msgstr "链接到材料请求"
-#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:407
+#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:408
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:58
msgid "Link to Material Requests"
msgstr "链接到物料请求"
@@ -28149,6 +28157,10 @@ msgstr ""
msgid "Load All Criteria"
msgstr ""
+#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.js:83
+msgid "Loading Invoices! Please Wait..."
+msgstr ""
+
#: erpnext/accounts/doctype/bank_statement_import/bank_statement_import.js:290
msgid "Loading import file..."
msgstr ""
@@ -28301,7 +28313,7 @@ msgstr "丢失的原因细节"
#. 'Quotation'
#: erpnext/crm/doctype/opportunity/opportunity.json
#: erpnext/crm/report/lost_opportunity/lost_opportunity.py:49
-#: erpnext/public/js/utils/sales_common.js:487
+#: erpnext/public/js/utils/sales_common.js:488
#: erpnext/selling/doctype/quotation/quotation.json
msgid "Lost Reasons"
msgstr "失去的原因"
@@ -28618,7 +28630,7 @@ msgstr "维护计划"
msgid "Maintenance Status"
msgstr ""
-#: erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py:58
+#: erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py:59
msgid "Maintenance Status has to be Cancelled or Completed to Submit"
msgstr "维护状态必须取消或完成提交"
@@ -28858,7 +28870,7 @@ msgstr ""
msgid "Mandatory Depends On"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1537
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1540
msgid "Mandatory Field"
msgstr ""
@@ -29378,7 +29390,7 @@ msgstr "材料收讫"
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:546
#: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
-#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:316
+#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:317
#: erpnext/buying/doctype/request_for_quotation_item/request_for_quotation_item.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:34
#: erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
@@ -29597,7 +29609,7 @@ msgstr ""
msgid "Material to Supplier"
msgstr "给供应商的材料"
-#: erpnext/controllers/subcontracting_controller.py:1289
+#: erpnext/controllers/subcontracting_controller.py:1295
msgid "Materials are already received against the {0} {1}"
msgstr ""
@@ -30188,13 +30200,13 @@ msgstr ""
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:69
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:168
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:586
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2048
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2606
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2051
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2609
#: erpnext/assets/doctype/asset_category/asset_category.py:117
msgid "Missing Account"
msgstr "帐户遗失"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1423
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1426
msgid "Missing Asset"
msgstr ""
@@ -30539,6 +30551,7 @@ msgstr "每月总工单"
msgid "Months"
msgstr ""
+#. Label of the more_info_section (Section Break) field in DocType 'GL Entry'
#. Label of the more_info_tab (Tab Break) field in DocType 'Purchase Invoice'
#. Label of the more_info_tab (Tab Break) field in DocType 'Sales Invoice'
#. Label of the more_info_tab (Tab Break) field in DocType 'Purchase Order'
@@ -30551,6 +30564,7 @@ msgstr ""
#. Label of the more_info_tab (Tab Break) field in DocType 'Delivery Note'
#. Label of the more_info_tab (Tab Break) field in DocType 'Material Request'
#. Label of the more_info_tab (Tab Break) field in DocType 'Purchase Receipt'
+#: erpnext/accounts/doctype/gl_entry/gl_entry.json
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#: erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -30691,7 +30705,7 @@ msgstr "多种变体"
msgid "Multiple Warehouse Accounts"
msgstr ""
-#: erpnext/controllers/accounts_controller.py:975
+#: erpnext/controllers/accounts_controller.py:978
msgid "Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year"
msgstr "多个会计年度的日期{0}存在。请设置公司财年"
@@ -30741,7 +30755,7 @@ msgstr ""
#: erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json
#: erpnext/accounts/doctype/payment_order_reference/payment_order_reference.json
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:84
-#: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py:355
+#: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py:358
#: erpnext/bulk_transaction/doctype/bulk_transaction_log_detail/bulk_transaction_log_detail.json
#: erpnext/crm/doctype/appointment/appointment.json
#: erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py:29
@@ -31143,7 +31157,7 @@ msgstr ""
msgid "Net Weight UOM"
msgstr ""
-#: erpnext/controllers/accounts_controller.py:1311
+#: erpnext/controllers/accounts_controller.py:1314
msgid "Net total calculation precision loss"
msgstr ""
@@ -31426,12 +31440,12 @@ msgstr "没有行动"
msgid "No Answer"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2150
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2153
msgid "No Customer found for Inter Company Transactions which represents company {0}"
msgstr "找不到代表公司{0}的公司间交易的客户"
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:115
-#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:352
+#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:354
msgid "No Customers found with selected options."
msgstr ""
@@ -31492,7 +31506,7 @@ msgid "No Records for these settings."
msgstr ""
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:332
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:963
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:966
msgid "No Remarks"
msgstr "暂无说明"
@@ -31508,7 +31522,7 @@ msgstr ""
msgid "No Summary"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2134
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2137
msgid "No Supplier found for Inter Company Transactions which represents company {0}"
msgstr "找不到代表公司{0}的公司间交易的供应商"
@@ -31545,7 +31559,7 @@ msgstr "找不到项目{0}的活动BOM。无法确保按序列号交货"
msgid "No additional fields available"
msgstr ""
-#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:417
+#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:419
msgid "No billing email found for customer: {0}"
msgstr ""
@@ -31687,7 +31701,7 @@ msgstr ""
msgid "No pending Material Requests found to link for the given items."
msgstr "找不到针对给定项目链接的待处理物料请求。"
-#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:424
+#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:426
msgid "No primary email found for customer: {0}"
msgstr ""
@@ -31728,7 +31742,7 @@ msgstr "没有价值"
msgid "No {0} Accounts found for this company."
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2198
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2201
msgid "No {0} found for Inter Company Transactions."
msgstr "Inter公司没有找到{0}。"
@@ -31782,7 +31796,7 @@ msgstr ""
#: erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py:66
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:260
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:523
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:526
#: erpnext/assets/doctype/asset/asset.js:618
#: erpnext/assets/doctype/asset/asset.js:635
#: erpnext/controllers/buying_controller.py:201
@@ -31821,7 +31835,7 @@ msgstr ""
#: erpnext/buying/doctype/purchase_order/purchase_order.py:763
#: erpnext/templates/pages/material_request_info.py:21
-#: erpnext/templates/pages/order.py:34 erpnext/templates/pages/rfq.py:46
+#: erpnext/templates/pages/order.py:37 erpnext/templates/pages/rfq.py:46
msgid "Not Permitted"
msgstr "不允许"
@@ -31931,7 +31945,7 @@ msgstr ""
msgid "Note: Item {0} added multiple times"
msgstr "注意:项目{0}被多次添加"
-#: erpnext/controllers/accounts_controller.py:504
+#: erpnext/controllers/accounts_controller.py:507
msgid "Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified"
msgstr "注意:“现金或银行科目”未指定,付款凭证不会创建"
@@ -32195,7 +32209,7 @@ msgstr "办公室租金"
msgid "Offsetting Account"
msgstr ""
-#: erpnext/accounts/general_ledger.py:82
+#: erpnext/accounts/general_ledger.py:83
msgid "Offsetting for Accounting Dimension"
msgstr ""
@@ -32577,7 +32591,7 @@ msgstr "打开工单"
msgid "Open a new ticket"
msgstr "打开一张新票"
-#: erpnext/accounts/report/general_ledger/general_ledger.py:406
+#: erpnext/accounts/report/general_ledger/general_ledger.py:414
#: erpnext/public/js/stock_analytics.js:97
msgid "Opening"
msgstr "开帐"
@@ -32587,12 +32601,12 @@ msgstr "开帐"
msgid "Opening & Closing"
msgstr ""
-#: erpnext/accounts/report/trial_balance/trial_balance.py:430
+#: erpnext/accounts/report/trial_balance/trial_balance.py:424
#: erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py:185
msgid "Opening (Cr)"
msgstr "期初(贷方 )"
-#: erpnext/accounts/report/trial_balance/trial_balance.py:423
+#: erpnext/accounts/report/trial_balance/trial_balance.py:417
#: erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py:178
msgid "Opening (Dr)"
msgstr "期初(借方)"
@@ -32677,7 +32691,7 @@ msgid "Opening Invoice Item"
msgstr "待处理费用清单项"
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1526
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1638
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1641
msgid "Opening Invoice has rounding adjustment of {0}.
'{1}' account is required to post these values. Please set it in Company: {2}.
Or, '{3}' can be enabled to not post any rounding adjustment."
msgstr ""
@@ -32975,7 +32989,7 @@ msgstr ""
#. Label of a Link in the CRM Workspace
#. Label of a shortcut in the CRM Workspace
#. Label of the opportunity (Link) field in DocType 'Quotation'
-#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:340
+#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:341
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
#: erpnext/crm/doctype/crm_settings/crm_settings.json
@@ -33439,7 +33453,7 @@ msgstr ""
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:149
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1066
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1085
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:167
#: erpnext/accounts/report/purchase_register/purchase_register.py:289
#: erpnext/accounts/report/sales_register/sales_register.py:319
@@ -33515,7 +33529,7 @@ msgstr ""
msgid "Overbilling of {0} {1} ignored for item {2} because you have {3} role."
msgstr ""
-#: erpnext/controllers/accounts_controller.py:1841
+#: erpnext/controllers/accounts_controller.py:1844
msgid "Overbilling of {} ignored because you have {} role."
msgstr ""
@@ -33787,7 +33801,7 @@ msgstr "POS配置文件用户"
msgid "POS Profile doesn't match {}"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1137
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1140
msgid "POS Profile required to make POS Entry"
msgstr "请创建POS配置记录"
@@ -33994,7 +34008,7 @@ msgstr "已付款"
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:146
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1060
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1079
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:165
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:109
#: erpnext/accounts/report/pos_register/pos_register.py:209
@@ -34046,7 +34060,7 @@ msgid "Paid To Account Type"
msgstr ""
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:322
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1009
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1012
msgid "Paid amount + Write Off Amount can not be greater than Grand Total"
msgstr "已支付的金额+销帐金额不能大于总金额"
@@ -34443,7 +34457,7 @@ msgstr ""
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:147
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:228
#: erpnext/accounts/report/general_ledger/general_ledger.js:74
-#: erpnext/accounts/report/general_ledger/general_ledger.py:666
+#: erpnext/accounts/report/general_ledger/general_ledger.py:672
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:51
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:155
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:46
@@ -34490,7 +34504,7 @@ msgstr ""
msgid "Party Account No. (Bank Statement)"
msgstr ""
-#: erpnext/controllers/accounts_controller.py:2109
+#: erpnext/controllers/accounts_controller.py:2112
msgid "Party Account {0} currency ({1}) and document currency ({2}) should be same"
msgstr ""
@@ -34598,7 +34612,7 @@ msgstr ""
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:141
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:219
#: erpnext/accounts/report/general_ledger/general_ledger.js:65
-#: erpnext/accounts/report/general_ledger/general_ledger.py:665
+#: erpnext/accounts/report/general_ledger/general_ledger.py:671
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:41
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:151
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:35
@@ -34872,7 +34886,7 @@ msgstr "输入付款扣除"
msgid "Payment Entry Reference"
msgstr "付款凭证参考"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:433
+#: erpnext/accounts/doctype/payment_request/payment_request.py:442
msgid "Payment Entry already exists"
msgstr "付款凭证已存在"
@@ -34880,13 +34894,13 @@ msgstr "付款凭证已存在"
msgid "Payment Entry has been modified after you pulled it. Please pull it again."
msgstr "获取付款凭证后有修改,请重新获取。"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:122
+#: erpnext/accounts/doctype/payment_request/payment_request.py:131
#: erpnext/accounts/doctype/payment_request/payment_request.py:544
#: erpnext/accounts/doctype/payment_request/payment_request.py:681
msgid "Payment Entry is already created"
msgstr "付款凭证已创建"
-#: erpnext/controllers/accounts_controller.py:1262
+#: erpnext/controllers/accounts_controller.py:1265
msgid "Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice."
msgstr ""
@@ -35129,7 +35143,7 @@ msgstr ""
msgid "Payment Request took too long to respond. Please try requesting for payment again."
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:537
+#: erpnext/accounts/doctype/payment_request/payment_request.py:536
msgid "Payment Requests cannot be created against: {0}"
msgstr ""
@@ -35164,7 +35178,7 @@ msgstr "付款工时单"
#: erpnext/accounts/doctype/payment_schedule/payment_schedule.json
#: erpnext/accounts/doctype/payment_term/payment_term.json
#: erpnext/accounts/doctype/payment_terms_template_detail/payment_terms_template_detail.json
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1056
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1075
#: erpnext/accounts/report/gross_profit/gross_profit.py:365
#: erpnext/accounts/workspace/accounting/accounting.json
#: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:30
@@ -35596,13 +35610,20 @@ msgstr "期末结帐凭证"
msgid "Period Details"
msgstr ""
+#. Label of the period_end_date (Date) field in DocType 'Period Closing
+#. Voucher'
#. Label of the period_end_date (Datetime) field in DocType 'POS Closing Entry'
#. Label of the period_end_date (Date) field in DocType 'POS Opening Entry'
+#: erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.json
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.json
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.json
msgid "Period End Date"
msgstr ""
+#: erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py:69
+msgid "Period End Date cannot be greater than Fiscal Year End Date"
+msgstr ""
+
#. Label of the period_name (Data) field in DocType 'Accounting Period'
#: erpnext/accounts/doctype/accounting_period/accounting_period.json
msgid "Period Name"
@@ -35623,15 +35644,26 @@ msgstr ""
msgid "Period Settings"
msgstr ""
+#. Label of the period_start_date (Date) field in DocType 'Period Closing
+#. Voucher'
#. Label of the period_start_date (Datetime) field in DocType 'POS Closing
#. Entry'
#. Label of the period_start_date (Datetime) field in DocType 'POS Opening
#. Entry'
+#: erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.json
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.json
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.json
msgid "Period Start Date"
msgstr ""
+#: erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py:66
+msgid "Period Start Date cannot be greater than Period End Date"
+msgstr ""
+
+#: erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py:63
+msgid "Period Start Date must be {0}"
+msgstr ""
+
#. Label of the period_to_date (Datetime) field in DocType 'Bisect Nodes'
#: erpnext/accounts/doctype/bisect_nodes/bisect_nodes.json
msgid "Period To Date"
@@ -36135,7 +36167,7 @@ msgstr ""
msgid "Please attach CSV file"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2741
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2744
msgid "Please cancel and amend the Payment Entry"
msgstr ""
@@ -36213,7 +36245,7 @@ msgstr ""
msgid "Please create a new Accounting Dimension if required."
msgstr ""
-#: erpnext/controllers/accounts_controller.py:594
+#: erpnext/controllers/accounts_controller.py:597
msgid "Please create purchase from internal sale or delivery document itself"
msgstr ""
@@ -36271,11 +36303,11 @@ msgstr ""
msgid "Please ensure that the {0} account {1} is a Payable account. You can change the account type to Payable or select a different account."
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:869
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:872
msgid "Please ensure {} account is a Balance Sheet account."
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:879
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:882
msgid "Please ensure {} account {} is a Receivable account."
msgstr ""
@@ -36284,7 +36316,7 @@ msgid "Please enter Difference Account or set default Stock Adjustment
msgstr "请输入差异帐户或为公司{0}设置默认的库存调整帐户"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:444
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1048
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1051
msgid "Please enter Account for Change Amount"
msgstr "请输入零钱科目"
@@ -36374,7 +36406,7 @@ msgid "Please enter Warehouse and Date"
msgstr "请输入仓库和日期"
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:651
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1044
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1047
msgid "Please enter Write Off Account"
msgstr "请输入销帐科目"
@@ -36386,7 +36418,7 @@ msgstr "请先输入公司"
msgid "Please enter company name first"
msgstr "请先输入公司名称"
-#: erpnext/controllers/accounts_controller.py:2523
+#: erpnext/controllers/accounts_controller.py:2526
msgid "Please enter default currency in Company Master"
msgstr "请在公司设置中维护默认货币"
@@ -36565,7 +36597,7 @@ msgstr "请选择公司和发布日期以获取条目"
msgid "Please select Company first"
msgstr "请首先选择公司"
-#: erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py:51
+#: erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py:52
msgid "Please select Completion Date for Completed Asset Maintenance Log"
msgstr "请选择已完成资产维护日志的完成日期"
@@ -36587,7 +36619,7 @@ msgstr ""
msgid "Please select Item Code first"
msgstr "请先选择商品代码"
-#: erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py:54
+#: erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py:55
msgid "Please select Maintenance Status as Completed or remove Completion Date"
msgstr "请选择维护状态为已完成或删除完成日期"
@@ -36631,7 +36663,7 @@ msgstr "请选择开始日期和结束日期的项目{0}"
msgid "Please select Subcontracting Order instead of Purchase Order {0}"
msgstr ""
-#: erpnext/controllers/accounts_controller.py:2419
+#: erpnext/controllers/accounts_controller.py:2422
msgid "Please select Unrealized Profit / Loss account or add default Unrealized Profit / Loss account account for company {0}"
msgstr ""
@@ -36822,7 +36854,7 @@ msgstr ""
msgid "Please set Account"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1537
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1540
msgid "Please set Account for Change Amount"
msgstr ""
@@ -36941,23 +36973,23 @@ msgstr "请为潜在客户{0}设置电子邮件ID"
msgid "Please set at least one row in the Taxes and Charges Table"
msgstr "请在“税费和收费表”中至少设置一行"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2045
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2048
msgid "Please set default Cash or Bank account in Mode of Payment {0}"
msgstr "请为付款方式{0}设置默认的现金或银行科目"
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:66
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:165
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2603
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2606
msgid "Please set default Cash or Bank account in Mode of Payment {}"
msgstr "请在付款方式{}中设置默认的现金或银行帐户"
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:68
#: erpnext/accounts/doctype/pos_profile/pos_profile.py:167
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2605
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2608
msgid "Please set default Cash or Bank account in Mode of Payments {}"
msgstr "请在付款方式{}中设置默认的现金或银行帐户"
-#: erpnext/accounts/utils.py:2155
+#: erpnext/accounts/utils.py:2159
msgid "Please set default Exchange Gain/Loss Account in Company {}"
msgstr ""
@@ -36991,7 +37023,7 @@ msgstr "根据项目或仓库请设置过滤器"
msgid "Please set filters"
msgstr ""
-#: erpnext/controllers/accounts_controller.py:2025
+#: erpnext/controllers/accounts_controller.py:2028
msgid "Please set one of the following:"
msgstr ""
@@ -37041,6 +37073,10 @@ msgstr "请为地址{1}设置{0}"
msgid "Please set {0} in BOM Creator {1}"
msgstr ""
+#: erpnext/controllers/accounts_controller.py:401
+msgid "Please set {0} to {1}, the same account that was used in the original invoice {2}."
+msgstr ""
+
#: erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.py:97
msgid "Please setup and enable a group account with the Account Type - {0} for the company {1}"
msgstr ""
@@ -37064,7 +37100,7 @@ msgid "Please specify Company to proceed"
msgstr "请注明公司进行"
#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1438
-#: erpnext/controllers/accounts_controller.py:2643
+#: erpnext/controllers/accounts_controller.py:2646
#: erpnext/public/js/controllers/accounts.js:97
msgid "Please specify a valid Row ID for row {0} in table {1}"
msgstr "请指定行{0}在表中的有效行ID {1}"
@@ -37147,7 +37183,7 @@ msgstr ""
msgid "Portrait"
msgstr "肖像"
-#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:362
+#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:363
msgid "Possible Supplier"
msgstr "可能的供应商"
@@ -37212,7 +37248,6 @@ msgstr "邮政费用"
#. Label of the posting_date (Date) field in DocType 'Payment Order'
#. Label of the posting_date (Date) field in DocType 'Payment Reconciliation
#. Payment'
-#. Label of the posting_date (Date) field in DocType 'Period Closing Voucher'
#. Label of the posting_date (Date) field in DocType 'POS Closing Entry'
#. Label of the posting_date (Date) field in DocType 'POS Invoice Merge Log'
#. Label of the posting_date (Date) field in DocType 'POS Opening Entry'
@@ -37248,8 +37283,6 @@ msgstr "邮政费用"
#: erpnext/accounts/doctype/payment_order/payment_order.json
#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js:290
#: erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json
-#: erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.json
-#: erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py:102
#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.json
#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.json
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.json
@@ -37266,7 +37299,7 @@ msgstr "邮政费用"
#: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:61
#: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:65
#: erpnext/accounts/report/cheques_and_deposits_incorrectly_cleared/cheques_and_deposits_incorrectly_cleared.py:151
-#: erpnext/accounts/report/general_ledger/general_ledger.py:596
+#: erpnext/accounts/report/general_ledger/general_ledger.py:602
#: erpnext/accounts/report/gross_profit/gross_profit.py:222
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:183
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:201
@@ -37521,7 +37554,7 @@ msgstr "上一财务年度未关闭"
msgid "Previous Work Experience"
msgstr ""
-#: erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py:154
+#: erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py:98
msgid "Previous Year is not closed, please close it first"
msgstr ""
@@ -38387,7 +38420,7 @@ msgstr "处理物品和UOM"
msgid "Processing Party Addresses"
msgstr "处理方地址"
-#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.js:122
+#: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.js:124
msgid "Processing Sales! Please Wait..."
msgstr ""
@@ -38777,7 +38810,7 @@ msgstr ""
#: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:73
#: erpnext/accounts/report/general_ledger/general_ledger.js:162
-#: erpnext/accounts/report/general_ledger/general_ledger.py:667
+#: erpnext/accounts/report/general_ledger/general_ledger.py:673
#: erpnext/accounts/report/gross_profit/gross_profit.js:78
#: erpnext/accounts/report/gross_profit/gross_profit.py:310
#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:225
@@ -39479,7 +39512,7 @@ msgstr "采购订单项"
msgid "Purchase Order Item Supplied"
msgstr "采购订单外发物料"
-#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:767
+#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:732
msgid "Purchase Order Item reference is missing in Subcontracting Receipt {0}"
msgstr ""
@@ -39545,7 +39578,7 @@ msgstr ""
msgid "Purchase Orders to Receive"
msgstr ""
-#: erpnext/controllers/accounts_controller.py:1661
+#: erpnext/controllers/accounts_controller.py:1664
msgid "Purchase Orders {0} are un-linked"
msgstr ""
@@ -39651,7 +39684,7 @@ msgstr "采购收货趋势"
msgid "Purchase Receipt doesn't have any Item for which Retain Sample is enabled."
msgstr "购买收据没有任何启用了保留样本的项目。"
-#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:785
+#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:802
msgid "Purchase Receipt {0} created."
msgstr ""
@@ -41406,7 +41439,7 @@ msgstr ""
msgid "Recalculate Incoming/Outgoing Rate"
msgstr ""
-#: erpnext/projects/doctype/project/project.js:136
+#: erpnext/projects/doctype/project/project.js:137
msgid "Recalculating Purchase Cost against this Project..."
msgstr ""
@@ -42329,7 +42362,7 @@ msgstr "剩余"
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:187
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:156
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1078
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1097
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:178
msgid "Remaining Balance"
msgstr "余额"
@@ -42382,10 +42415,10 @@ msgstr "备注"
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:159
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:198
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:269
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1110
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1129
#: erpnext/accounts/report/general_ledger/general_ledger.html:29
#: erpnext/accounts/report/general_ledger/general_ledger.html:52
-#: erpnext/accounts/report/general_ledger/general_ledger.py:694
+#: erpnext/accounts/report/general_ledger/general_ledger.py:700
#: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:112
#: erpnext/accounts/report/purchase_register/purchase_register.py:296
#: erpnext/accounts/report/sales_register/sales_register.py:335
@@ -43929,12 +43962,12 @@ msgid "Row # {0}: Returned Item {1} does not exist in {2} {3}"
msgstr "行号{0}:返回的项目{1}在{2} {3}中不存在"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:453
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1721
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1724
msgid "Row #{0} (Payment Table): Amount must be negative"
msgstr "行#{0}(付款表):金额必须为负数"
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:451
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1716
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1719
msgid "Row #{0} (Payment Table): Amount must be positive"
msgstr "行#{0}(付款表):金额必须为正值"
@@ -43963,7 +43996,7 @@ msgstr "第#0行:接受仓库和供应商仓库不能相同"
msgid "Row #{0}: Accepted Warehouse is mandatory for the accepted Item {1}"
msgstr ""
-#: erpnext/controllers/accounts_controller.py:963
+#: erpnext/controllers/accounts_controller.py:966
msgid "Row #{0}: Account {1} does not belong to company {2}"
msgstr "行#{0}:科目{1}不属于公司{2}"
@@ -43984,7 +44017,7 @@ msgstr ""
msgid "Row #{0}: Amount must be a positive number"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:368
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:371
msgid "Row #{0}: Asset {1} cannot be submitted, it is already {2}"
msgstr "行#{0}:资产{1}无法提交,这已经是{2}"
@@ -44000,23 +44033,23 @@ msgstr ""
msgid "Row #{0}: Cannot allocate more than {1} against payment term {2}"
msgstr ""
-#: erpnext/controllers/accounts_controller.py:3191
+#: erpnext/controllers/accounts_controller.py:3194
msgid "Row #{0}: Cannot delete item {1} which has already been billed."
msgstr "第#{0}行:无法删除已计费的项目{1}。"
-#: erpnext/controllers/accounts_controller.py:3165
+#: erpnext/controllers/accounts_controller.py:3168
msgid "Row #{0}: Cannot delete item {1} which has already been delivered"
msgstr "第{0}行:无法删除已交付的项目{1}"
-#: erpnext/controllers/accounts_controller.py:3184
+#: erpnext/controllers/accounts_controller.py:3187
msgid "Row #{0}: Cannot delete item {1} which has already been received"
msgstr "第#0行:无法删除已收到的项目{1}"
-#: erpnext/controllers/accounts_controller.py:3171
+#: erpnext/controllers/accounts_controller.py:3174
msgid "Row #{0}: Cannot delete item {1} which has work order assigned to it."
msgstr "第#{0}行:无法删除已为其分配了工作订单的项目{1}。"
-#: erpnext/controllers/accounts_controller.py:3177
+#: erpnext/controllers/accounts_controller.py:3180
msgid "Row #{0}: Cannot delete item {1} which is assigned to customer's purchase order."
msgstr "第#{0}行:无法删除分配给客户采购订单的项目{1}。"
@@ -44024,7 +44057,7 @@ msgstr "第#{0}行:无法删除分配给客户采购订单的项目{1}。"
msgid "Row #{0}: Cannot select Supplier Warehouse while suppling raw materials to subcontractor"
msgstr "第{0}行:在向分包商供应原材料时无法选择供应商仓库"
-#: erpnext/controllers/accounts_controller.py:3432
+#: erpnext/controllers/accounts_controller.py:3435
msgid "Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}."
msgstr "行#{0}:如果金额大于项目{1}的开帐单金额,则无法设置费率。"
@@ -44180,7 +44213,7 @@ msgstr ""
msgid "Row #{0}: Please set reorder quantity"
msgstr "行#{0}:请设置再订购数量"
-#: erpnext/controllers/accounts_controller.py:421
+#: erpnext/controllers/accounts_controller.py:424
msgid "Row #{0}: Please update deferred revenue/expense account in item row or default account in company master"
msgstr ""
@@ -44197,8 +44230,8 @@ msgstr ""
msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}."
msgstr ""
-#: erpnext/controllers/accounts_controller.py:1116
-#: erpnext/controllers/accounts_controller.py:3291
+#: erpnext/controllers/accounts_controller.py:1119
+#: erpnext/controllers/accounts_controller.py:3294
msgid "Row #{0}: Quantity for Item {1} cannot be zero."
msgstr "行 # {0}: 商品 {1} 的数量不能为零。"
@@ -44262,15 +44295,15 @@ msgstr ""
msgid "Row #{0}: Serial No {1} is already selected."
msgstr ""
-#: erpnext/controllers/accounts_controller.py:449
+#: erpnext/controllers/accounts_controller.py:452
msgid "Row #{0}: Service End Date cannot be before Invoice Posting Date"
msgstr "行#{0}:服务终止日期不能早于发票过帐日期"
-#: erpnext/controllers/accounts_controller.py:443
+#: erpnext/controllers/accounts_controller.py:446
msgid "Row #{0}: Service Start Date cannot be greater than Service End Date"
msgstr "行#{0}:服务开始日期不能大于服务结束日期"
-#: erpnext/controllers/accounts_controller.py:437
+#: erpnext/controllers/accounts_controller.py:440
msgid "Row #{0}: Service Start and End Date is required for deferred accounting"
msgstr "行#{0}:延期计费需要服务开始和结束日期"
@@ -44342,7 +44375,7 @@ msgstr "行#{0}:与排时序冲突{1}"
msgid "Row #{0}: You cannot use the inventory dimension '{1}' in Stock Reconciliation to modify the quantity or valuation rate. Stock reconciliation with inventory dimensions is intended solely for performing opening entries."
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1422
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1425
msgid "Row #{0}: You must select an Asset for Item {1}."
msgstr ""
@@ -44471,7 +44504,7 @@ msgstr ""
msgid "Row {0}: Account {1} and Party Type {2} have different account types"
msgstr ""
-#: erpnext/projects/doctype/timesheet/timesheet.py:118
+#: erpnext/projects/doctype/timesheet/timesheet.py:158
msgid "Row {0}: Activity Type is mandatory."
msgstr "行{0}:活动类型是强制性的。"
@@ -44508,7 +44541,7 @@ msgstr ""
msgid "Row {0}: Conversion Factor is mandatory"
msgstr "行{0}:转换系数必填"
-#: erpnext/controllers/accounts_controller.py:2681
+#: erpnext/controllers/accounts_controller.py:2684
msgid "Row {0}: Cost Center {1} does not belong to Company {2}"
msgstr ""
@@ -44536,7 +44569,7 @@ msgstr "第{0}行:交货仓库({1})和客户仓库({2})不能相同"
msgid "Row {0}: Depreciation Start Date is required"
msgstr "行{0}:折旧开始日期是必需的"
-#: erpnext/controllers/accounts_controller.py:2340
+#: erpnext/controllers/accounts_controller.py:2343
msgid "Row {0}: Due Date in the Payment Terms table cannot be before Posting Date"
msgstr "第{0}行:“付款条款”表中的到期日期不能早于过帐日期"
@@ -44573,12 +44606,12 @@ msgstr ""
msgid "Row {0}: For Supplier {1}, Email Address is Required to send an email"
msgstr "第{0}行:对于供应商{1},需要电子邮件地址才能发送电子邮件"
-#: erpnext/projects/doctype/timesheet/timesheet.py:115
+#: erpnext/projects/doctype/timesheet/timesheet.py:155
msgid "Row {0}: From Time and To Time is mandatory."
msgstr "行{0}:开始时间和结束时间必填。"
#: erpnext/manufacturing/doctype/job_card/job_card.py:259
-#: erpnext/projects/doctype/timesheet/timesheet.py:186
+#: erpnext/projects/doctype/timesheet/timesheet.py:226
msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}"
msgstr "行{0}:从时间和结束时间{1}是具有重叠{2}"
@@ -44590,7 +44623,7 @@ msgstr ""
msgid "Row {0}: From time must be less than to time"
msgstr "行{0}:从时间开始必须小于时间"
-#: erpnext/projects/doctype/timesheet/timesheet.py:121
+#: erpnext/projects/doctype/timesheet/timesheet.py:161
msgid "Row {0}: Hours value must be greater than zero."
msgstr "行{0}:小时值必须大于零。"
@@ -44671,7 +44704,7 @@ msgstr "行{0}:请在付款时间表中设置付款方式"
msgid "Row {0}: Please set the correct code on Mode of Payment {1}"
msgstr "行{0}:请在付款方式{1}上设置正确的代码"
-#: erpnext/projects/doctype/timesheet/timesheet.py:174
+#: erpnext/projects/doctype/timesheet/timesheet.py:214
msgid "Row {0}: Project must be same as the one set in the Timesheet: {1}."
msgstr ""
@@ -44711,7 +44744,7 @@ msgstr ""
msgid "Row {0}: The item {1}, quantity must be positive number"
msgstr "第{0}行:项目{1},数量必须为正数"
-#: erpnext/controllers/accounts_controller.py:2658
+#: erpnext/controllers/accounts_controller.py:2661
msgid "Row {0}: The {3} Account {1} does not belong to the company {2}"
msgstr ""
@@ -44727,7 +44760,7 @@ msgstr ""
msgid "Row {0}: UOM Conversion Factor is mandatory"
msgstr "行{0}:计量单位转换系数是必需的"
-#: erpnext/controllers/accounts_controller.py:864
+#: erpnext/controllers/accounts_controller.py:867
msgid "Row {0}: user has not applied the rule {1} on the item {2}"
msgstr "第{0}行:用户尚未在项目{2}上应用规则{1}"
@@ -44739,7 +44772,7 @@ msgstr ""
msgid "Row {0}: {1} must be greater than 0"
msgstr "行{0}:{1}必须大于0"
-#: erpnext/controllers/accounts_controller.py:571
+#: erpnext/controllers/accounts_controller.py:574
msgid "Row {0}: {1} {2} cannot be same as {3} (Party Account) {4}"
msgstr ""
@@ -44781,7 +44814,7 @@ msgstr "在{0}中删除的行"
msgid "Rows with Same Account heads will be merged on Ledger"
msgstr ""
-#: erpnext/controllers/accounts_controller.py:2350
+#: erpnext/controllers/accounts_controller.py:2353
msgid "Rows with duplicate due dates in other rows were found: {0}"
msgstr "发现其他行中具有重复截止日期的行:{0}"
@@ -45329,7 +45362,7 @@ msgstr "销售订单为物料{0}的必须项"
msgid "Sales Order {0} already exists against Customer's Purchase Order {1}. To allow multiple Sales Orders, Enable {2} in {3}"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1151
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1154
msgid "Sales Order {0} is not submitted"
msgstr "销售订单{0}未提交"
@@ -45388,7 +45421,7 @@ msgstr ""
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:114
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1099
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1118
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:98
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:194
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:73
@@ -45486,7 +45519,7 @@ msgstr "销售付款摘要"
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:156
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:137
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:120
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1096
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1115
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:104
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:191
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:79
@@ -46163,7 +46196,7 @@ msgstr ""
msgid "Secretary"
msgstr ""
-#: erpnext/accounts/report/financial_statements.py:620
+#: erpnext/accounts/report/financial_statements.py:623
msgid "Section"
msgstr ""
@@ -46233,7 +46266,7 @@ msgstr "选择BOM和数量生产"
msgid "Select BOM, Qty and For Warehouse"
msgstr "选择BOM,Qty和For Warehouse"
-#: erpnext/public/js/utils/sales_common.js:383
+#: erpnext/public/js/utils/sales_common.js:384
#: erpnext/selling/page/point_of_sale/pos_item_details.js:213
#: erpnext/stock/doctype/pick_list/pick_list.js:352
msgid "Select Batch No"
@@ -46333,7 +46366,7 @@ msgstr ""
msgid "Select Loyalty Program"
msgstr "选择忠诚度计划"
-#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:366
+#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:367
msgid "Select Possible Supplier"
msgstr "选择潜在供应商"
@@ -46342,13 +46375,13 @@ msgstr "选择潜在供应商"
msgid "Select Quantity"
msgstr "选择数量"
-#: erpnext/public/js/utils/sales_common.js:383
+#: erpnext/public/js/utils/sales_common.js:384
#: erpnext/selling/page/point_of_sale/pos_item_details.js:213
#: erpnext/stock/doctype/pick_list/pick_list.js:352
msgid "Select Serial No"
msgstr ""
-#: erpnext/public/js/utils/sales_common.js:386
+#: erpnext/public/js/utils/sales_common.js:387
#: erpnext/stock/doctype/pick_list/pick_list.js:355
msgid "Select Serial and Batch"
msgstr ""
@@ -46449,7 +46482,7 @@ msgstr "首先选择公司"
msgid "Select company name first."
msgstr ""
-#: erpnext/controllers/accounts_controller.py:2539
+#: erpnext/controllers/accounts_controller.py:2542
msgid "Select finance book for the item {0} at row {1}"
msgstr "为行{1}中的项{0}选择财务手册"
@@ -46522,7 +46555,7 @@ msgstr ""
msgid "Selected POS Opening Entry should be open."
msgstr "所选的POS入口条目应打开。"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2193
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2196
msgid "Selected Price List should have buying and selling fields checked."
msgstr "选定价格清单应该有买入和卖出的字段。"
@@ -47509,13 +47542,13 @@ msgstr ""
msgid "Set Process Loss Item Quantity"
msgstr ""
-#: erpnext/projects/doctype/project/project.js:148
-#: erpnext/projects/doctype/project/project.js:151
-#: erpnext/projects/doctype/project/project.js:165
+#: erpnext/projects/doctype/project/project.js:149
+#: erpnext/projects/doctype/project/project.js:152
+#: erpnext/projects/doctype/project/project.js:166
msgid "Set Project Status"
msgstr ""
-#: erpnext/projects/doctype/project/project.js:190
+#: erpnext/projects/doctype/project/project.js:191
msgid "Set Project and all Tasks to status {0}?"
msgstr "将项目和所有任务设置为状态{0}?"
@@ -47577,7 +47610,7 @@ msgstr "设置为关闭"
msgid "Set as Completed"
msgstr "设为已完成"
-#: erpnext/public/js/utils/sales_common.js:483
+#: erpnext/public/js/utils/sales_common.js:484
#: erpnext/selling/doctype/quotation/quotation.js:131
msgid "Set as Lost"
msgstr "设置为输"
@@ -48232,6 +48265,9 @@ msgstr ""
msgid "Show Preview"
msgstr ""
+#. Label of the show_remarks (Check) field in DocType 'Process Statement Of
+#. Accounts'
+#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
#: erpnext/accounts/report/accounts_payable/accounts_payable.js:120
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:157
#: erpnext/accounts/report/general_ledger/general_ledger.js:204
@@ -48512,15 +48548,15 @@ msgstr ""
msgid "Something went wrong please try again"
msgstr ""
-#: erpnext/accounts/doctype/pricing_rule/utils.py:738
+#: erpnext/accounts/doctype/pricing_rule/utils.py:736
msgid "Sorry, this coupon code is no longer valid"
msgstr "抱歉,此优惠券代码不再有效"
-#: erpnext/accounts/doctype/pricing_rule/utils.py:736
+#: erpnext/accounts/doctype/pricing_rule/utils.py:734
msgid "Sorry, this coupon code's validity has expired"
msgstr "抱歉,此优惠券代码的有效性已过期"
-#: erpnext/accounts/doctype/pricing_rule/utils.py:733
+#: erpnext/accounts/doctype/pricing_rule/utils.py:732
msgid "Sorry, this coupon code's validity has not started"
msgstr "抱歉,此优惠券代码的有效性尚未开始"
@@ -48957,7 +48993,7 @@ msgstr ""
msgid "Start Year"
msgstr "开始年份"
-#: erpnext/accounts/report/financial_statements.py:122
+#: erpnext/accounts/report/financial_statements.py:123
msgid "Start Year and End Year are mandatory"
msgstr "开始年和结束年是强制性的"
@@ -49922,11 +49958,11 @@ msgstr ""
msgid "Stock cannot be updated against Purchase Receipt {0}"
msgstr "库存不能对采购收货单进行更新{0}"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1030
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1033
msgid "Stock cannot be updated against the following Delivery Notes: {0}"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1057
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1060
msgid "Stock cannot be updated because the invoice contains a drop shipping item. Please disable 'Update Stock' or remove the drop shipping item."
msgstr ""
@@ -50275,7 +50311,7 @@ msgid "Submit"
msgstr "提交"
#: erpnext/buying/doctype/purchase_order/purchase_order.py:881
-#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:781
+#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:798
msgid "Submit Action Failed"
msgstr ""
@@ -50816,13 +50852,13 @@ msgstr ""
#: erpnext/accounts/doctype/tax_rule/tax_rule.json
#: erpnext/accounts/report/accounts_payable/accounts_payable.js:103
#: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:86
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1103
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1122
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:198
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:174
#: erpnext/accounts/report/purchase_register/purchase_register.js:27
#: erpnext/accounts/report/purchase_register/purchase_register.py:186
#: erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:55
-#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:458
+#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:459
#: erpnext/buying/doctype/supplier/supplier.json
#: erpnext/buying/report/item_wise_purchase_history/item_wise_purchase_history.py:105
#: erpnext/buying/workspace/buying/buying.json
@@ -50871,7 +50907,7 @@ msgstr "供应商费用清单的日期不能超过过帐日期更大"
#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:59
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#: erpnext/accounts/report/general_ledger/general_ledger.html:54
-#: erpnext/accounts/report/general_ledger/general_ledger.py:689
+#: erpnext/accounts/report/general_ledger/general_ledger.py:695
#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:210
msgid "Supplier Invoice No"
msgstr "供应商费用清单编号"
@@ -51374,7 +51410,7 @@ msgstr ""
msgid "System will fetch all the entries if limit value is zero."
msgstr ""
-#: erpnext/controllers/accounts_controller.py:1801
+#: erpnext/controllers/accounts_controller.py:1804
msgid "System will not check over billing since amount for Item {0} in {1} is zero"
msgstr ""
@@ -51421,7 +51457,7 @@ msgstr ""
msgid "Tablespoon (US)"
msgstr ""
-#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:466
+#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:467
msgid "Tag"
msgstr "标签"
@@ -51712,6 +51748,12 @@ msgstr ""
msgid "Task"
msgstr "任务"
+#. Label of the task_assignee_email (Data) field in DocType 'Asset Maintenance
+#. Log'
+#: erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json
+msgid "Task Assignee Email"
+msgstr ""
+
#. Option for the '% Complete Method' (Select) field in DocType 'Project'
#: erpnext/projects/doctype/project/project.json
msgid "Task Completion"
@@ -52520,7 +52562,7 @@ msgstr ""
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#: erpnext/accounts/doctype/territory_item/territory_item.json
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:126
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1087
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1106
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:92
#: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:182
#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:67
@@ -52636,12 +52678,12 @@ msgstr ""
msgid "The Document Type {0} must have a Status field to configure Service Level Agreement"
msgstr ""
-#: erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py:70
-msgid "The GL Entries will be cancelled in the background, it can take a few minutes."
+#: erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py:149
+msgid "The GL Entries and closing balances will be processed in the background, it can take a few minutes."
msgstr ""
-#: erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py:171
-msgid "The GL Entries will be processed in the background, it can take a few minutes."
+#: erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py:423
+msgid "The GL Entries will be cancelled in the background, it can take a few minutes."
msgstr ""
#: erpnext/accounts/doctype/loyalty_program/loyalty_program.py:169
@@ -52696,7 +52738,7 @@ msgstr ""
msgid "The allocated amount is greater than the outstanding amount of Payment Request {0}"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:158
+#: erpnext/accounts/doctype/payment_request/payment_request.py:167
msgid "The amount of {0} set in this payment request is different from the calculated amount of all payment plans: {1}. Make sure this is correct before submitting the document."
msgstr "此付款申请中设置的{0}金额与所有付款计划的计算金额不同:{1}。在提交文档之前确保这是正确的。"
@@ -52820,7 +52862,7 @@ msgstr ""
msgid "The parent account {0} does not exists in the uploaded template"
msgstr "上级模板中不存在上级帐户{0}"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:147
+#: erpnext/accounts/doctype/payment_request/payment_request.py:156
msgid "The payment gateway account in plan {0} is different from the payment gateway account in this payment request"
msgstr "计划{0}中的支付网关帐户与此付款请求中的支付网关帐户不同"
@@ -53141,6 +53183,10 @@ msgstr ""
msgid "This is a location where scraped materials are stored."
msgstr ""
+#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:275
+msgid "This is a preview of the email to be sent. A PDF of the document will automatically be attached with the email."
+msgstr ""
+
#: erpnext/accounts/doctype/account/account.js:35
msgid "This is a root account and cannot be edited."
msgstr "这是一个顶层(根)科目,不能被编辑。"
@@ -53225,7 +53271,7 @@ msgstr ""
msgid "This schedule was created when Asset {0} was restored."
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1346
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1349
msgid "This schedule was created when Asset {0} was returned through Sales Invoice {1}."
msgstr ""
@@ -53233,7 +53279,7 @@ msgstr ""
msgid "This schedule was created when Asset {0} was scrapped."
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1358
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1361
msgid "This schedule was created when Asset {0} was sold through Sales Invoice {1}."
msgstr ""
@@ -53487,14 +53533,14 @@ msgstr "时间表详细信息"
msgid "Timesheet for tasks."
msgstr "任务方面的时间表。"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:754
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:757
msgid "Timesheet {0} is already completed or cancelled"
msgstr "时间表{0}已完成或已取消"
#. Label of the timesheet_sb (Section Break) field in DocType 'Projects
#. Settings'
#: erpnext/projects/doctype/projects_settings/projects_settings.json
-#: erpnext/projects/doctype/timesheet/timesheet.py:530
+#: erpnext/projects/doctype/timesheet/timesheet.py:570
#: erpnext/templates/pages/projects.html:59
msgid "Timesheets"
msgstr "时间表"
@@ -53738,7 +53784,7 @@ msgstr ""
msgid "To Date"
msgstr "至今"
-#: erpnext/controllers/accounts_controller.py:430
+#: erpnext/controllers/accounts_controller.py:433
#: erpnext/setup/doctype/holiday_list/holiday_list.py:112
msgid "To Date cannot be before From Date"
msgstr "无效的主名称"
@@ -53749,7 +53795,7 @@ msgstr "无效的主名称"
msgid "To Date cannot be before From Date."
msgstr "截止日期不能早于截止日期。"
-#: erpnext/accounts/report/financial_statements.py:133
+#: erpnext/accounts/report/financial_statements.py:134
msgid "To Date cannot be less than From Date"
msgstr "迄今不能少于起始日期"
@@ -53975,15 +54021,15 @@ msgstr ""
msgid "To be Delivered to Customer"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:519
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:522
msgid "To cancel a {} you need to cancel the POS Closing Entry {}."
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:105
+#: erpnext/accounts/doctype/payment_request/payment_request.py:114
msgid "To create a Payment Request reference document is required"
msgstr "必须生成一个付款申请参考文档"
-#: erpnext/projects/doctype/timesheet/timesheet.py:146
+#: erpnext/projects/doctype/timesheet/timesheet.py:186
msgid "To date cannot be before from date"
msgstr "到日期不能早于日期"
@@ -53996,7 +54042,7 @@ msgid "To include non-stock items in the material request planning. i.e. Items f
msgstr ""
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2143
-#: erpnext/controllers/accounts_controller.py:2691
+#: erpnext/controllers/accounts_controller.py:2694
msgid "To include tax in row {0} in Item rate, taxes in rows {1} must also be included"
msgstr "要包括税款,行{0}项率,税收行{1}也必须包括在内"
@@ -54025,9 +54071,9 @@ msgstr ""
msgid "To use a different finance book, please uncheck 'Include Default FB Assets'"
msgstr ""
-#: erpnext/accounts/report/financial_statements.py:574
+#: erpnext/accounts/report/financial_statements.py:577
#: erpnext/accounts/report/general_ledger/general_ledger.py:289
-#: erpnext/accounts/report/trial_balance/trial_balance.py:272
+#: erpnext/accounts/report/trial_balance/trial_balance.py:266
msgid "To use a different finance book, please uncheck 'Include Default FB Entries'"
msgstr ""
@@ -54081,8 +54127,8 @@ msgstr ""
#: erpnext/buying/doctype/purchase_order/purchase_order.js:678
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:66
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:153
-#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:411
-#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:420
+#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:412
+#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:421
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:62
#: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:121
#: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
@@ -54126,13 +54172,13 @@ msgstr ""
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:235
#: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:273
#: erpnext/accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.py:229
-#: erpnext/accounts/report/financial_statements.py:651
-#: erpnext/accounts/report/general_ledger/general_ledger.py:407
+#: erpnext/accounts/report/financial_statements.py:654
+#: erpnext/accounts/report/general_ledger/general_ledger.py:415
#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:682
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:93
#: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:98
-#: erpnext/accounts/report/trial_balance/trial_balance.py:338
-#: erpnext/accounts/report/trial_balance/trial_balance.py:339
+#: erpnext/accounts/report/trial_balance/trial_balance.py:332
+#: erpnext/accounts/report/trial_balance/trial_balance.py:333
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
#: erpnext/crm/doctype/opportunity/opportunity.json
@@ -54627,11 +54673,11 @@ msgstr "总待处理金额"
msgid "Total Paid Amount"
msgstr "已支付总金额"
-#: erpnext/controllers/accounts_controller.py:2397
+#: erpnext/controllers/accounts_controller.py:2400
msgid "Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total"
msgstr "支付计划中的总付款金额必须等于总计/圆整的总计"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:126
+#: erpnext/accounts/doctype/payment_request/payment_request.py:135
msgid "Total Payment Request amount cannot be greater than {0} amount"
msgstr "总付款请求金额不能大于{0}金额"
@@ -54667,7 +54713,7 @@ msgstr ""
msgid "Total Purchase Cost (via Purchase Invoice)"
msgstr ""
-#: erpnext/projects/doctype/project/project.js:139
+#: erpnext/projects/doctype/project/project.js:140
msgid "Total Purchase Cost has been updated"
msgstr ""
@@ -54907,7 +54953,7 @@ msgstr ""
msgid "Total Working Hours"
msgstr ""
-#: erpnext/controllers/accounts_controller.py:1969
+#: erpnext/controllers/accounts_controller.py:1972
msgid "Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2})"
msgstr "对订单{1}的合计的预付款({0})不能大于总计({2})"
@@ -54924,7 +54970,7 @@ msgid "Total hours: {0}"
msgstr ""
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:459
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:503
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:506
msgid "Total payments amount can't be greater than {}"
msgstr "付款总额不得超过{}"
@@ -54934,8 +54980,8 @@ msgstr ""
#: erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py:745
#: erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py:746
-#: erpnext/accounts/report/financial_statements.py:336
#: erpnext/accounts/report/financial_statements.py:337
+#: erpnext/accounts/report/financial_statements.py:338
msgid "Total {0} ({1})"
msgstr "总{0}({1})"
@@ -55089,8 +55135,11 @@ msgstr ""
msgid "Transaction Deletion Record Item"
msgstr ""
+#. Label of the transaction_details_section (Section Break) field in DocType
+#. 'GL Entry'
#. Label of the transaction_details (Section Break) field in DocType 'Payment
#. Request'
+#: erpnext/accounts/doctype/gl_entry/gl_entry.json
#: erpnext/accounts/doctype/payment_request/payment_request.json
msgid "Transaction Details"
msgstr ""
@@ -55123,7 +55172,7 @@ msgstr ""
msgid "Transaction Type"
msgstr "交易类型"
-#: erpnext/accounts/doctype/payment_request/payment_request.py:136
+#: erpnext/accounts/doctype/payment_request/payment_request.py:145
msgid "Transaction currency must be same as Payment Gateway currency"
msgstr "交易货币必须与支付网关货币"
@@ -55692,7 +55741,7 @@ msgstr "网址只能是一个字符串"
msgid "UTM Source"
msgstr ""
-#: erpnext/public/js/utils/unreconcile.js:24
+#: erpnext/public/js/utils/unreconcile.js:25
msgid "UnReconcile"
msgstr ""
@@ -56175,7 +56224,7 @@ msgstr ""
msgid "Update Stock"
msgstr ""
-#: erpnext/projects/doctype/project/project.js:90
+#: erpnext/projects/doctype/project/project.js:91
msgid "Update Total Purchase Cost"
msgstr ""
@@ -56773,7 +56822,7 @@ msgid "Valuation rate for the item as per Sales Invoice (Only for Internal Trans
msgstr ""
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2167
-#: erpnext/controllers/accounts_controller.py:2715
+#: erpnext/controllers/accounts_controller.py:2718
msgid "Valuation type charges can not be marked as Inclusive"
msgstr "评估类型的费用不能标记为包含"
@@ -57051,8 +57100,8 @@ msgstr "影片设定"
#: erpnext/buying/doctype/supplier/supplier.js:93
#: erpnext/buying/doctype/supplier/supplier.js:104
#: erpnext/manufacturing/doctype/production_plan/production_plan.js:98
-#: erpnext/projects/doctype/project/project.js:108
-#: erpnext/projects/doctype/project/project.js:125
+#: erpnext/projects/doctype/project/project.js:109
+#: erpnext/projects/doctype/project/project.js:126
#: erpnext/public/js/controllers/stock_controller.js:76
#: erpnext/public/js/controllers/stock_controller.js:95
#: erpnext/public/js/utils.js:137
@@ -57219,17 +57268,17 @@ msgstr ""
#: erpnext/accounts/doctype/repost_accounting_ledger_items/repost_accounting_ledger_items.json
#: erpnext/accounts/doctype/repost_payment_ledger_items/repost_payment_ledger_items.json
#: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1042
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1061
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:42
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:209
#: erpnext/accounts/report/general_ledger/general_ledger.js:49
-#: erpnext/accounts/report/general_ledger/general_ledger.py:658
+#: erpnext/accounts/report/general_ledger/general_ledger.py:664
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.js:41
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:33
#: erpnext/accounts/report/payment_ledger/payment_ledger.js:64
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:168
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:19
-#: erpnext/public/js/utils/unreconcile.js:78
+#: erpnext/public/js/utils/unreconcile.js:79
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
@@ -57261,7 +57310,7 @@ msgstr ""
#. Label of the voucher_subtype (Small Text) field in DocType 'GL Entry'
#: erpnext/accounts/doctype/gl_entry/gl_entry.json
-#: erpnext/accounts/report/general_ledger/general_ledger.py:652
+#: erpnext/accounts/report/general_ledger/general_ledger.py:658
msgid "Voucher Subtype"
msgstr ""
@@ -57288,15 +57337,15 @@ msgstr ""
#: erpnext/accounts/doctype/repost_payment_ledger_items/repost_payment_ledger_items.json
#: erpnext/accounts/doctype/tax_withheld_vouchers/tax_withheld_vouchers.json
#: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1040
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1059
#: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:200
-#: erpnext/accounts/report/general_ledger/general_ledger.py:650
+#: erpnext/accounts/report/general_ledger/general_ledger.py:656
#: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31
#: erpnext/accounts/report/payment_ledger/payment_ledger.py:159
#: erpnext/accounts/report/purchase_register/purchase_register.py:158
#: erpnext/accounts/report/sales_register/sales_register.py:174
#: erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py:17
-#: erpnext/public/js/utils/unreconcile.js:70
+#: erpnext/public/js/utils/unreconcile.js:71
#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
@@ -57650,7 +57699,7 @@ msgstr "在帐户{0}中找不到仓库"
msgid "Warehouse not found in the system"
msgstr "仓库在系统中未找到"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1020
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1023
#: erpnext/stock/doctype/delivery_note/delivery_note.py:415
msgid "Warehouse required for stock Item {0}"
msgstr "物料{0}需要指定仓库"
@@ -57770,13 +57819,13 @@ msgid "Warn for new Request for Quotations"
msgstr ""
#: erpnext/accounts/doctype/payment_entry/payment_entry.py:724
-#: erpnext/controllers/accounts_controller.py:1804
+#: erpnext/controllers/accounts_controller.py:1807
#: erpnext/stock/doctype/delivery_trip/delivery_trip.js:145
#: erpnext/utilities/transaction_base.py:120
msgid "Warning"
msgstr "警告"
-#: erpnext/projects/doctype/timesheet/timesheet.py:77
+#: erpnext/projects/doctype/timesheet/timesheet.py:117
msgid "Warning - Row {0}: Billing Hours are more than Actual Hours"
msgstr ""
@@ -58660,10 +58709,7 @@ msgid "Year Name"
msgstr ""
#. Label of the year_start_date (Date) field in DocType 'Fiscal Year'
-#. Label of the year_start_date (Date) field in DocType 'Period Closing
-#. Voucher'
#: erpnext/accounts/doctype/fiscal_year/fiscal_year.json
-#: erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.json
msgid "Year Start Date"
msgstr ""
@@ -58755,7 +58801,7 @@ msgstr ""
msgid "Yes"
msgstr "是"
-#: erpnext/controllers/accounts_controller.py:3278
+#: erpnext/controllers/accounts_controller.py:3281
msgid "You are not allowed to update as per the conditions set in {} Workflow."
msgstr "您无法按照{}工作流程中设置的条件进行更新。"
@@ -58787,14 +58833,10 @@ msgstr "您也可以复制粘贴此链接到您的浏览器地址栏中"
msgid "You can also set default CWIP account in Company {}"
msgstr "您还可以在公司{}中设置默认的CWIP帐户"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:872
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:875
msgid "You can change the parent account to a Balance Sheet account or select a different account."
msgstr "您可以将父帐户更改为资产负债表帐户,也可以选择其他帐户。"
-#: erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py:82
-msgid "You can not cancel this Period Closing Voucher, please cancel the future Period Closing Vouchers first"
-msgstr ""
-
#: erpnext/accounts/doctype/journal_entry/journal_entry.py:647
msgid "You can not enter current voucher in 'Against Journal Entry' column"
msgstr "您不能在“对日记账分录”列中选择此凭证。"
@@ -58832,7 +58874,7 @@ msgstr ""
msgid "You cannot change the rate if BOM is mentioned against any Item."
msgstr ""
-#: erpnext/accounts/doctype/accounting_period/accounting_period.py:126
+#: erpnext/accounts/doctype/accounting_period/accounting_period.py:128
msgid "You cannot create a {0} within the closed Accounting Period {1}"
msgstr ""
@@ -58876,7 +58918,11 @@ msgstr "您不能提交空订单。"
msgid "You cannot submit the order without payment."
msgstr "您必须先付款才能提交订单。"
-#: erpnext/controllers/accounts_controller.py:3254
+#: erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py:105
+msgid "You cannot {0} this document because another Period Closing Entry {1} exists after {2}"
+msgstr ""
+
+#: erpnext/controllers/accounts_controller.py:3257
msgid "You do not have permissions to {} items in a {}."
msgstr "您无权访问{}中的{}个项目。"
@@ -58924,7 +58970,7 @@ msgstr "在添加项目之前,您必须选择一个客户。"
msgid "You need to cancel POS Closing Entry {} to be able to cancel this document."
msgstr ""
-#: erpnext/controllers/accounts_controller.py:2666
+#: erpnext/controllers/accounts_controller.py:2669
msgid "You selected the account group {1} as {2} Account in row {0}. Please select a single account."
msgstr ""
@@ -59028,12 +59074,12 @@ msgstr ""
msgid "based_on"
msgstr "基于"
-#: erpnext/public/js/utils/sales_common.js:279
+#: erpnext/public/js/utils/sales_common.js:280
msgid "cannot be greater than 100"
msgstr ""
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:329
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:960
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:963
msgid "dated {0}"
msgstr ""
@@ -59164,7 +59210,7 @@ msgstr ""
msgid "on"
msgstr ""
-#: erpnext/controllers/accounts_controller.py:1131
+#: erpnext/controllers/accounts_controller.py:1134
msgid "or"
msgstr "或"
@@ -59297,7 +59343,7 @@ msgstr ""
msgid "to"
msgstr "到"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2743
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2746
msgid "to unallocate the amount of this Return Invoice before cancelling it."
msgstr ""
@@ -59327,7 +59373,7 @@ msgstr "您必须在帐户表中选择正在进行的资本工程帐户"
msgid "{0}"
msgstr ""
-#: erpnext/controllers/accounts_controller.py:955
+#: erpnext/controllers/accounts_controller.py:958
msgid "{0} '{1}' is disabled"
msgstr "{0}“{1}”被禁用"
@@ -59343,7 +59389,7 @@ msgstr "{0}({1})不能大于工单{3}中的计划数量({2})"
msgid "{0} {1} has submitted Assets. Remove Item {2} from table to continue."
msgstr ""
-#: erpnext/controllers/accounts_controller.py:2024
+#: erpnext/controllers/accounts_controller.py:2027
msgid "{0} Account not found against Customer {1}."
msgstr ""
@@ -59355,7 +59401,7 @@ msgstr ""
msgid "{0} Budget for Account {1} against {2} {3} is {4}. It {5} exceed by {6}"
msgstr ""
-#: erpnext/accounts/doctype/pricing_rule/utils.py:753
+#: erpnext/accounts/doctype/pricing_rule/utils.py:751
msgid "{0} Coupon used are {1}. Allowed quantity is exhausted"
msgstr "{0}使用的优惠券是{1}。允许数量已耗尽"
@@ -59432,7 +59478,7 @@ msgstr "{0}不能为负"
msgid "{0} cannot be used as a Main Cost Center because it has been used as child in Cost Center Allocation {1}"
msgstr ""
-#: erpnext/accounts/doctype/payment_request/payment_request.py:110
+#: erpnext/accounts/doctype/payment_request/payment_request.py:119
msgid "{0} cannot be zero"
msgstr ""
@@ -59483,7 +59529,7 @@ msgstr "{0}已成功提交"
msgid "{0} hours"
msgstr ""
-#: erpnext/controllers/accounts_controller.py:2345
+#: erpnext/controllers/accounts_controller.py:2348
msgid "{0} in row {1}"
msgstr "{1}行中的{0}"
@@ -59512,7 +59558,7 @@ msgstr "{0}被阻止,所以此事务无法继续"
msgid "{0} is mandatory"
msgstr "{0}是必填项"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:989
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:992
msgid "{0} is mandatory for Item {1}"
msgstr "{0}是{1}的必填项"
@@ -59525,7 +59571,7 @@ msgstr ""
msgid "{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}"
msgstr "{0}是必需的。也许没有为{1}至{2}创建货币兑换记录"
-#: erpnext/controllers/accounts_controller.py:2623
+#: erpnext/controllers/accounts_controller.py:2626
msgid "{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}."
msgstr "{0}是必填项。{1}和{2}的货币转换记录可能还未生成。"
@@ -59561,7 +59607,7 @@ msgstr ""
msgid "{0} is not the default supplier for any items."
msgstr "{0}不是任何商品的默认供应商。"
-#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2844
+#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2846
msgid "{0} is on hold till {1}"
msgstr "{0}暂缓处理,直到{1}"
@@ -59584,7 +59630,7 @@ msgstr "{0}物料已生产"
msgid "{0} must be negative in return document"
msgstr "{0}在退货凭证中必须为负"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1994
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1997
msgid "{0} not allowed to transact with {1}. Please change the Company or add the Company in the 'Allowed To Transact With'-Section in the Customer record."
msgstr ""
@@ -59616,8 +59662,8 @@ msgstr ""
msgid "{0} units of Item {1} is picked in another Pick List."
msgstr ""
-#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:149
-msgid "{0} units of {1} are required in {2}{3}, on {4} {5} for {6} to complete the transaction."
+#: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:146
+msgid "{0} units of {1} are required in {2} with the inventory dimension: {3} ({4}) on {5} {6} for {7} to complete the transaction."
msgstr ""
#: erpnext/stock/stock_ledger.py:1472 erpnext/stock/stock_ledger.py:1963
@@ -59931,7 +59977,7 @@ msgstr ""
msgid "{} To Bill"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1780
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1783
msgid "{} can't be cancelled since the Loyalty Points earned has been redeemed. First cancel the {} No {}"
msgstr "由于所赚取的忠诚度积分已被兑换,因此无法取消{}。首先取消{}否{}"