diff --git a/erpnext/locale/zh.po b/erpnext/locale/zh.po
index 0fecc275299..101ed8ef3e8 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-13 09:35+0000\n"
-"PO-Revision-Date: 2024-10-17 02:01\n"
+"POT-Creation-Date: 2024-10-20 09:35+0000\n"
+"PO-Revision-Date: 2024-10-21 02:26\n"
"Last-Translator: info@erpnext.com\n"
"Language-Team: Chinese Simplified\n"
"MIME-Version: 1.0\n"
@@ -994,7 +994,7 @@ msgstr "缩写已用于另一家公司"
msgid "Abbreviation is mandatory"
msgstr "缩写字段必填"
-#: erpnext/stock/doctype/item_attribute/item_attribute.py:102
+#: erpnext/stock/doctype/item_attribute/item_attribute.py:99
msgid "Abbreviation: {0} must appear only once"
msgstr ""
@@ -1766,8 +1766,8 @@ msgstr "服务会计分录"
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1183
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1381
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1399
-#: erpnext/controllers/stock_controller.py:514
-#: erpnext/controllers/stock_controller.py:531
+#: erpnext/controllers/stock_controller.py:529
+#: erpnext/controllers/stock_controller.py:546
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:821
#: erpnext/stock/doctype/stock_entry/stock_entry.py:1579
#: erpnext/stock/doctype/stock_entry/stock_entry.py:1593
@@ -3304,7 +3304,7 @@ msgstr "预付款总额"
msgid "Advance Paid"
msgstr ""
-#: erpnext/buying/doctype/purchase_order/purchase_order_list.js:65
+#: erpnext/buying/doctype/purchase_order/purchase_order_list.js:58
#: erpnext/selling/doctype/sales_order/sales_order_list.js:105
msgid "Advance Payment"
msgstr ""
@@ -4045,7 +4045,7 @@ msgstr ""
msgid "Allow Item To Be Added Multiple Times in a Transaction"
msgstr ""
-#: erpnext/controllers/selling_controller.py:697
+#: erpnext/controllers/selling_controller.py:707
msgid "Allow Item to Be Added Multiple Times in a Transaction"
msgstr ""
@@ -4897,7 +4897,7 @@ 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:132
+#: 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}已经被录入"
@@ -4934,7 +4934,7 @@ msgstr ""
#. 'Inventory Dimension'
#: erpnext/accounts/doctype/pricing_rule/pricing_rule.json
#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
-#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py:232
+#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py:262
#: erpnext/stock/doctype/inventory_dimension/inventory_dimension.json
msgid "Applicable For"
msgstr ""
@@ -5810,7 +5810,7 @@ msgstr ""
msgid "Asset scrapped via Journal Entry {0}"
msgstr "通过资产手工凭证报废{0}"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1375
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1376
msgid "Asset sold"
msgstr ""
@@ -6004,7 +6004,7 @@ msgstr ""
msgid "At row {0}: Serial No is mandatory for Item {1}"
msgstr ""
-#: erpnext/controllers/stock_controller.py:468
+#: erpnext/controllers/stock_controller.py:483
msgid "At row {0}: Serial and Batch Bundle {1} has already created. Please remove the values from the serial no or batch no fields."
msgstr ""
@@ -6078,7 +6078,7 @@ msgstr ""
msgid "Attribute table is mandatory"
msgstr "属性表中的信息必填"
-#: erpnext/stock/doctype/item_attribute/item_attribute.py:97
+#: erpnext/stock/doctype/item_attribute/item_attribute.py:94
msgid "Attribute value: {0} must appear only once"
msgstr ""
@@ -7708,7 +7708,7 @@ msgstr ""
msgid "Batch and Serial No"
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.py:513
+#: erpnext/manufacturing/doctype/work_order/work_order.py:522
msgid "Batch not created for item {} since it does not have a batch series."
msgstr ""
@@ -8918,7 +8918,7 @@ msgstr ""
msgid "Can be approved by {0}"
msgstr "可以被{0}的批准"
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1537
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1546
msgid "Can not close Work Order. Since {0} Job Cards are in Work In Progress state."
msgstr ""
@@ -9153,7 +9153,7 @@ msgstr "不能成为库存分类账创建的固定资产项目。"
msgid "Cannot cancel as processing of cancelled documents is pending."
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.py:686
+#: erpnext/manufacturing/doctype/work_order/work_order.py:695
msgid "Cannot cancel because submitted Stock Entry {0} exists"
msgstr "不能取消,因为提交的仓储记录{0}已经存在"
@@ -9217,7 +9217,7 @@ msgstr "不能转换到组,因为已选择账户类型。"
msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts."
msgstr ""
-#: erpnext/selling/doctype/sales_order/sales_order.py:1637
+#: erpnext/selling/doctype/sales_order/sales_order.py:1640
#: erpnext/stock/doctype/pick_list/pick_list.py:172
msgid "Cannot create a pick list for Sales Order {0} because it has reserved stock. Please unreserve the stock in order to create a pick list."
msgstr ""
@@ -9272,15 +9272,15 @@ msgstr ""
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}。要允许超额计费,请在“帐户设置”中设置配额"
-#: erpnext/manufacturing/doctype/work_order/work_order.py:310
+#: erpnext/manufacturing/doctype/work_order/work_order.py:319
msgid "Cannot produce more Item {0} than Sales Order quantity {1}"
msgstr "不能生产超过销售订单数量{1}的物料{0}"
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1024
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1033
msgid "Cannot produce more item for {0}"
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1028
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1037
msgid "Cannot produce more than {0} items for {1}"
msgstr ""
@@ -9354,7 +9354,7 @@ msgstr ""
msgid "Capacity Planning"
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.py:672
+#: erpnext/manufacturing/doctype/work_order/work_order.py:681
msgid "Capacity Planning Error, planned start time can not be same as end time"
msgstr "容量规划错误,计划的开始时间不能与结束时间相同"
@@ -9913,6 +9913,7 @@ msgstr "需要的支票"
msgid "Cheques and Deposits Incorrectly cleared"
msgstr ""
+#: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js:50
#: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:50
msgid "Cheques and Deposits incorrectly cleared"
msgstr "支票及存款非正常清账"
@@ -10076,7 +10077,7 @@ msgid "Client Secret"
msgstr ""
#: erpnext/buying/doctype/purchase_order/purchase_order.js:362
-#: erpnext/buying/doctype/purchase_order/purchase_order_list.js:49
+#: erpnext/buying/doctype/purchase_order/purchase_order_list.js:42
#: erpnext/crm/doctype/opportunity/opportunity.js:118
#: erpnext/manufacturing/doctype/production_plan/production_plan.js:111
#: erpnext/manufacturing/doctype/work_order/work_order.js:631
@@ -10131,7 +10132,7 @@ msgstr "关闭POS"
#: erpnext/accounts/doctype/closed_document/closed_document.json
#: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.json
#: erpnext/buying/doctype/purchase_order/purchase_order.json
-#: erpnext/buying/doctype/purchase_order/purchase_order_list.js:15
+#: erpnext/buying/doctype/purchase_order/purchase_order_list.js:16
#: erpnext/crm/doctype/appointment/appointment.json
#: erpnext/crm/doctype/opportunity/opportunity.json
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
@@ -10164,7 +10165,7 @@ msgstr "已关闭文件"
msgid "Closed Documents"
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1464
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1473
msgid "Closed Work Order can not be stopped or Re-opened"
msgstr ""
@@ -10197,7 +10198,7 @@ msgstr "期末(期初+总计)"
msgid "Closing Account Head"
msgstr ""
-#: erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py:100
+#: erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py:92
msgid "Closing Account {0} must be of type Liability / Equity"
msgstr "关闭科目{0}的类型必须是负债/权益"
@@ -11002,7 +11003,7 @@ msgstr ""
msgid "Company and Posting Date is mandatory"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2203
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2204
msgid "Company currencies of both the companies should match for Inter Company Transactions."
msgstr "两家公司的公司货币应该符合Inter公司交易。"
@@ -11169,7 +11170,7 @@ msgstr ""
#: erpnext/assets/doctype/asset_repair/asset_repair.json
#: erpnext/assets/doctype/asset_repair/asset_repair_list.js:7
#: erpnext/buying/doctype/purchase_order/purchase_order.json
-#: erpnext/buying/doctype/purchase_order/purchase_order_list.js:43
+#: erpnext/buying/doctype/purchase_order/purchase_order_list.js:36
#: erpnext/crm/doctype/email_campaign/email_campaign.json
#: erpnext/manufacturing/doctype/bom_creator/bom_creator.json
#: erpnext/manufacturing/doctype/bom_creator/bom_creator_list.js:9
@@ -11238,7 +11239,7 @@ msgstr "完成作业"
msgid "Completed Qty"
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.py:938
+#: erpnext/manufacturing/doctype/work_order/work_order.py:947
msgid "Completed Qty cannot be greater than 'Qty to Manufacture'"
msgstr "完成的数量不能大于“制造数量”"
@@ -12020,6 +12021,10 @@ msgstr "转换率"
msgid "Conversion factor for default Unit of Measure must be 1 in row {0}"
msgstr "行{0}中默认计量单位的转换系数必须是1"
+#: erpnext/controllers/stock_controller.py:76
+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
msgid "Conversion rate cannot be 0 or 1"
msgstr "汇率不能为0或1"
@@ -12475,7 +12480,7 @@ msgstr ""
msgid "Could Not Delete Demo Data"
msgstr ""
-#: erpnext/selling/doctype/quotation/quotation.py:574
+#: erpnext/selling/doctype/quotation/quotation.py:575
msgid "Could not auto create Customer due to the following missing mandatory field(s):"
msgstr "由于缺少以下必填字段,因此无法自动创建客户:"
@@ -12602,8 +12607,8 @@ msgstr "信用"
#: erpnext/accounts/doctype/dunning/dunning.js:57
#: erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:34
#: erpnext/accounts/doctype/journal_entry/journal_entry.js:115
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:67
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:68
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:69
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:94
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:102
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:108
@@ -12626,11 +12631,11 @@ msgstr "信用"
#: erpnext/buying/doctype/purchase_order/purchase_order.js:125
#: erpnext/buying/doctype/purchase_order/purchase_order.js:391
#: erpnext/buying/doctype/purchase_order/purchase_order.js:410
-#: erpnext/buying/doctype/purchase_order/purchase_order.js:421
-#: erpnext/buying/doctype/purchase_order/purchase_order.js:428
-#: erpnext/buying/doctype/purchase_order/purchase_order.js:438
-#: erpnext/buying/doctype/purchase_order/purchase_order.js:456
-#: erpnext/buying/doctype/purchase_order/purchase_order.js:462
+#: erpnext/buying/doctype/purchase_order/purchase_order.js:422
+#: erpnext/buying/doctype/purchase_order/purchase_order.js:429
+#: erpnext/buying/doctype/purchase_order/purchase_order.js:439
+#: erpnext/buying/doctype/purchase_order/purchase_order.js:457
+#: erpnext/buying/doctype/purchase_order/purchase_order.js:463
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:49
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:156
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:187
@@ -12970,7 +12975,7 @@ msgstr ""
msgid "Create a variant with the template image."
msgstr ""
-#: erpnext/stock/stock_ledger.py:1808
+#: erpnext/stock/stock_ledger.py:1817
msgid "Create an incoming stock transaction for the Item."
msgstr "创建物料的进货库存交易。"
@@ -13035,7 +13040,7 @@ msgid "Creating Purchase Order ..."
msgstr "创建采购订单..."
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:703
-#: erpnext/buying/doctype/purchase_order/purchase_order.js:523
+#: erpnext/buying/doctype/purchase_order/purchase_order.js:524
#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:73
msgid "Creating Purchase Receipt ..."
msgstr ""
@@ -13049,7 +13054,7 @@ msgstr ""
msgid "Creating Stock Entry"
msgstr ""
-#: erpnext/buying/doctype/purchase_order/purchase_order.js:538
+#: erpnext/buying/doctype/purchase_order/purchase_order.js:539
msgid "Creating Subcontracting Order ..."
msgstr ""
@@ -13562,7 +13567,7 @@ msgstr "货币不能使用其他货币进行输入后更改"
msgid "Currency for {0} must be {1}"
msgstr "货币{0}必须{1}"
-#: erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py:106
+#: erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py:98
msgid "Currency of the Closing Account must be {0}"
msgstr "在关闭科目的货币必须是{0}"
@@ -15046,7 +15051,7 @@ msgstr ""
msgid "Default BOM ({0}) must be active for this item or its template"
msgstr "该物料或其模板物料的默认物料清单状态必须是激活的"
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1297
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1306
msgid "Default BOM for {0} not found"
msgstr "默认BOM {0}未找到"
@@ -15054,7 +15059,7 @@ msgstr "默认BOM {0}未找到"
msgid "Default BOM not found for FG Item {0}"
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1294
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1303
msgid "Default BOM not found for Item {0} and Project {1}"
msgstr "找不到物料{0}和项目{1}的默认BOM"
@@ -15687,7 +15692,7 @@ msgstr ""
#. Option for the 'Status' (Select) field in DocType 'Stock Reservation Entry'
#: erpnext/buying/doctype/purchase_order/purchase_order.js:370
#: erpnext/buying/doctype/purchase_order/purchase_order.json
-#: erpnext/buying/doctype/purchase_order/purchase_order_list.js:19
+#: erpnext/buying/doctype/purchase_order/purchase_order_list.js:20
#: erpnext/controllers/website_list_for_contact.py:209
#: erpnext/stock/doctype/serial_no/serial_no.json
#: erpnext/stock/doctype/shipment/shipment.json
@@ -18034,7 +18039,7 @@ msgstr ""
msgid "Educational Qualification"
msgstr ""
-#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py:145
+#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py:147
msgid "Either 'Selling' or 'Buying' must be selected"
msgstr ""
@@ -19029,7 +19034,7 @@ msgstr ""
msgid "Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings."
msgstr ""
-#: erpnext/stock/stock_ledger.py:2095
+#: erpnext/stock/stock_ledger.py:2104
msgid "Example: Serial No {0} reserved in {1}."
msgstr ""
@@ -19352,7 +19357,7 @@ msgstr ""
msgid "Expense"
msgstr "费用"
-#: erpnext/controllers/stock_controller.py:707
+#: erpnext/controllers/stock_controller.py:722
msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account"
msgstr "费用/差异科目({0})必须是一个“益损”类科目"
@@ -19394,7 +19399,7 @@ msgstr "费用/差异科目({0})必须是一个“益损”类科目"
msgid "Expense Account"
msgstr "费用科目"
-#: erpnext/controllers/stock_controller.py:687
+#: erpnext/controllers/stock_controller.py:702
msgid "Expense Account Missing"
msgstr "费用帐户丢失"
@@ -20501,7 +20506,7 @@ msgstr "对于默认供应商(可选)"
msgid "For Item"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1112
+#: erpnext/controllers/stock_controller.py:1127
msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}"
msgstr ""
@@ -20596,7 +20601,7 @@ msgstr ""
msgid "For item {0}, rate must be a positive number. To Allow negative rates, enable {1} in {2}"
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1607
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1616
msgid "For operation {0}: Quantity ({1}) can not be greater than pending quantity({2})"
msgstr ""
@@ -20631,7 +20636,7 @@ msgstr ""
msgid "For the item {0}, the quantity should be {1} according to the BOM {2}."
msgstr ""
-#: erpnext/controllers/stock_controller.py:276
+#: erpnext/controllers/stock_controller.py:291
msgid "For the {0}, no stock is available for the return in the warehouse {1}."
msgstr ""
@@ -21085,7 +21090,7 @@ msgstr ""
msgid "From Range"
msgstr ""
-#: erpnext/stock/doctype/item_attribute/item_attribute.py:85
+#: erpnext/stock/doctype/item_attribute/item_attribute.py:82
msgid "From Range has to be less than To Range"
msgstr "从范围必须小于去范围"
@@ -21634,8 +21639,8 @@ msgstr "获取物料"
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:259
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:288
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:319
-#: erpnext/buying/doctype/purchase_order/purchase_order.js:566
-#: erpnext/buying/doctype/purchase_order/purchase_order.js:586
+#: 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
@@ -22528,7 +22533,7 @@ msgstr ""
msgid "Here are the error logs for the aforementioned failed depreciation entries: {0}"
msgstr ""
-#: erpnext/stock/stock_ledger.py:1793
+#: erpnext/stock/stock_ledger.py:1802
msgid "Here are the options to proceed:"
msgstr ""
@@ -23015,7 +23020,7 @@ msgstr ""
msgid "If more than one package of the same type (for print)"
msgstr ""
-#: erpnext/stock/stock_ledger.py:1803
+#: erpnext/stock/stock_ledger.py:1812
msgid "If not, you can Cancel / Submit this entry"
msgstr ""
@@ -23040,7 +23045,7 @@ msgstr ""
msgid "If the account is frozen, entries are allowed to restricted users."
msgstr ""
-#: erpnext/stock/stock_ledger.py:1796
+#: erpnext/stock/stock_ledger.py:1805
msgid "If the item is transacting as a Zero Valuation Rate item in this entry, please enable 'Allow Zero Valuation Rate' in the {0} Item table."
msgstr "如果该项在此条目中正在作为零评估率项目进行交易,请在{0}项表中启用“允许零评估率”。"
@@ -24138,7 +24143,7 @@ msgstr ""
msgid "Increment"
msgstr ""
-#: erpnext/stock/doctype/item_attribute/item_attribute.py:88
+#: erpnext/stock/doctype/item_attribute/item_attribute.py:85
msgid "Increment cannot be 0"
msgstr "增量不能为0"
@@ -24250,13 +24255,13 @@ msgstr ""
msgid "Inspected By"
msgstr "验货人"
-#: erpnext/controllers/stock_controller.py:1010
+#: erpnext/controllers/stock_controller.py:1025
msgid "Inspection Rejected"
msgstr ""
#. Label of the inspection_required (Check) field in DocType 'Stock Entry'
-#: erpnext/controllers/stock_controller.py:984
-#: erpnext/controllers/stock_controller.py:986
+#: erpnext/controllers/stock_controller.py:999
+#: erpnext/controllers/stock_controller.py:1001
#: erpnext/stock/doctype/stock_entry/stock_entry.json
msgid "Inspection Required"
msgstr "需要检验"
@@ -24273,7 +24278,7 @@ msgstr ""
msgid "Inspection Required before Purchase"
msgstr ""
-#: erpnext/controllers/stock_controller.py:997
+#: erpnext/controllers/stock_controller.py:1012
msgid "Inspection Submission"
msgstr ""
@@ -24361,12 +24366,12 @@ msgstr "权限不足"
#: erpnext/stock/doctype/pick_list/pick_list.py:117
#: erpnext/stock/doctype/pick_list/pick_list.py:896
#: erpnext/stock/doctype/stock_entry/stock_entry.py:765
-#: erpnext/stock/serial_batch_bundle.py:988 erpnext/stock/stock_ledger.py:1490
-#: erpnext/stock/stock_ledger.py:1963
+#: erpnext/stock/serial_batch_bundle.py:988 erpnext/stock/stock_ledger.py:1499
+#: erpnext/stock/stock_ledger.py:1972
msgid "Insufficient Stock"
msgstr "库存不足"
-#: erpnext/stock/stock_ledger.py:1978
+#: erpnext/stock/stock_ledger.py:1987
msgid "Insufficient Stock for Batch"
msgstr ""
@@ -24553,7 +24558,7 @@ msgstr ""
msgid "Internal Work History"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1077
+#: erpnext/controllers/stock_controller.py:1092
msgid "Internal transfers can only be done in company's default currency"
msgstr ""
@@ -24611,7 +24616,7 @@ msgstr "无效框架订单对所选客户和物料无效"
msgid "Invalid Child Procedure"
msgstr "无效的子程序"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1982
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1983
msgid "Invalid Company for Inter Company Transaction."
msgstr "公司间交易的公司无效。"
@@ -24767,7 +24772,7 @@ msgstr ""
msgid "Invalid {0}"
msgstr "无效的{0}"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1980
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1981
msgid "Invalid {0} for Inter Company Transaction."
msgstr "Inter Company Transaction无效{0}。"
@@ -24947,7 +24952,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:2031
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2032
#: 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"
@@ -26776,11 +26781,11 @@ msgstr "物料{0}不存在"
msgid "Item {0} does not exist in the system or has expired"
msgstr "物料{0}不存在于系统中或已过期"
-#: erpnext/controllers/stock_controller.py:361
+#: erpnext/controllers/stock_controller.py:376
msgid "Item {0} does not exist."
msgstr "物料{0}不存在."
-#: erpnext/controllers/selling_controller.py:694
+#: erpnext/controllers/selling_controller.py:704
msgid "Item {0} entered multiple times."
msgstr ""
@@ -27037,7 +27042,7 @@ msgstr ""
msgid "Items under this warehouse will be suggested"
msgstr ""
-#: erpnext/controllers/stock_controller.py:77
+#: erpnext/controllers/stock_controller.py:92
msgid "Items {0} do not exist in the Item master."
msgstr ""
@@ -27210,7 +27215,7 @@ msgstr ""
msgid "Job Worker Warehouse"
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1655
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1664
msgid "Job card {0} created"
msgstr "已创建作业卡{0}"
@@ -28068,7 +28073,7 @@ msgstr ""
msgid "Link existing Quality Procedure."
msgstr ""
-#: erpnext/buying/doctype/purchase_order/purchase_order.js:605
+#: erpnext/buying/doctype/purchase_order/purchase_order.js:606
msgid "Link to Material Request"
msgstr "链接到材料请求"
@@ -28826,7 +28831,7 @@ msgstr ""
#. Label of the reqd (Check) field in DocType 'Inventory Dimension'
#: erpnext/accounts/doctype/payment_entry/payment_entry.js:243
#: erpnext/accounts/doctype/pos_field/pos_field.json
-#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py:145
+#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py:147
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:69
#: erpnext/manufacturing/doctype/bom/bom.js:86
#: erpnext/manufacturing/doctype/bom/bom.js:570
@@ -28853,7 +28858,7 @@ msgstr ""
msgid "Mandatory Depends On"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1536
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1537
msgid "Mandatory Field"
msgstr ""
@@ -28869,7 +28874,7 @@ msgstr ""
msgid "Mandatory For Profit and Loss Account"
msgstr ""
-#: erpnext/selling/doctype/quotation/quotation.py:578
+#: erpnext/selling/doctype/quotation/quotation.py:579
msgid "Mandatory Missing"
msgstr "必填项"
@@ -29371,7 +29376,7 @@ msgstr "材料收讫"
#. Label of the material_request (Link) field in DocType 'Subcontracting Order
#. Service Item'
#: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
-#: erpnext/buying/doctype/purchase_order/purchase_order.js:545
+#: 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_item/request_for_quotation_item.json
@@ -29482,7 +29487,7 @@ msgstr ""
msgid "Material Request Type"
msgstr ""
-#: erpnext/selling/doctype/sales_order/sales_order.py:1583
+#: erpnext/selling/doctype/sales_order/sales_order.py:1586
msgid "Material Request not created, as quantity for Raw Materials already available."
msgstr "物料申请未创建,因为原物料的数量已经够用。"
@@ -29773,7 +29778,7 @@ msgstr ""
msgid "Megawatt"
msgstr ""
-#: erpnext/stock/stock_ledger.py:1809
+#: erpnext/stock/stock_ledger.py:1818
msgid "Mention Valuation Rate in the Item master."
msgstr "物料主数据中的提及评估率。"
@@ -30183,13 +30188,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:2047
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2605
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2048
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2606
#: erpnext/assets/doctype/asset_category/asset_category.py:117
msgid "Missing Account"
msgstr "帐户遗失"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1422
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1423
msgid "Missing Asset"
msgstr ""
@@ -30231,7 +30236,7 @@ msgid "Missing email template for dispatch. Please set one in Delivery Settings.
msgstr "缺少发送的电子邮件模板。请在“发送设置”中设置一个。"
#: erpnext/manufacturing/doctype/bom/bom.py:1003
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1041
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1050
msgid "Missing value"
msgstr ""
@@ -30699,7 +30704,7 @@ msgid "Music"
msgstr ""
#. Label of the must_be_whole_number (Check) field in DocType 'UOM'
-#: erpnext/manufacturing/doctype/work_order/work_order.py:997
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1006
#: erpnext/setup/doctype/uom/uom.json
#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:137
#: erpnext/utilities/transaction_base.py:284
@@ -31320,7 +31325,7 @@ msgstr "新的发布日期应该是将来的"
msgid "New task"
msgstr "新任务"
-#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py:224
+#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py:254
msgid "New {0} pricing rules are created"
msgstr "创建新的{0}定价规则"
@@ -31421,7 +31426,7 @@ msgstr "没有行动"
msgid "No Answer"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2149
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2150
msgid "No Customer found for Inter Company Transactions which represents company {0}"
msgstr "找不到代表公司{0}的公司间交易的客户"
@@ -31503,7 +31508,7 @@ msgstr ""
msgid "No Summary"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2133
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2134
msgid "No Supplier found for Inter Company Transactions which represents company {0}"
msgstr "找不到代表公司{0}的公司间交易的供应商"
@@ -31723,7 +31728,7 @@ msgstr "没有价值"
msgid "No {0} Accounts found for this company."
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2197
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2198
msgid "No {0} found for Inter Company Transactions."
msgstr "Inter公司没有找到{0}。"
@@ -31879,11 +31884,11 @@ msgid "Not in stock"
msgstr "没存货"
#: erpnext/buying/doctype/purchase_order/purchase_order.py:684
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1319
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1459
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1526
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1328
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1468
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1535
#: erpnext/selling/doctype/sales_order/sales_order.py:791
-#: erpnext/selling/doctype/sales_order/sales_order.py:1569
+#: erpnext/selling/doctype/sales_order/sales_order.py:1572
msgid "Not permitted"
msgstr "不允许"
@@ -32221,7 +32226,7 @@ msgstr "转换机会"
#. Option for the 'Status' (Select) field in DocType 'Issue'
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js:27
#: erpnext/buying/doctype/purchase_order/purchase_order.json
-#: erpnext/buying/doctype/purchase_order/purchase_order_list.js:17
+#: erpnext/buying/doctype/purchase_order/purchase_order_list.js:18
#: erpnext/buying/doctype/supplier/supplier_list.js:5
#: erpnext/manufacturing/doctype/job_card/job_card.json
#: erpnext/selling/doctype/sales_order/sales_order.json
@@ -32672,7 +32677,7 @@ msgid "Opening Invoice Item"
msgstr "待处理费用清单项"
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1526
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1637
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1638
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 ""
@@ -32872,7 +32877,7 @@ msgstr ""
msgid "Operation Time must be greater than 0"
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1047
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1056
msgid "Operation Time must be greater than 0 for Operation {0}"
msgstr "运行时间必须大于0的操作{0}"
@@ -33487,7 +33492,7 @@ msgstr ""
msgid "Over Picking Allowance"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1243
+#: erpnext/controllers/stock_controller.py:1258
msgid "Over Receipt"
msgstr ""
@@ -33873,7 +33878,7 @@ msgstr "盒装产品"
msgid "Packed Items"
msgstr ""
-#: erpnext/controllers/stock_controller.py:1081
+#: erpnext/controllers/stock_controller.py:1096
msgid "Packed Items cannot be transferred internally"
msgstr ""
@@ -34747,7 +34752,7 @@ msgstr ""
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:84
#: erpnext/accounts/doctype/sales_invoice/sales_invoice_dashboard.py:25
#: erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js:39
-#: erpnext/buying/doctype/purchase_order/purchase_order.js:426
+#: erpnext/buying/doctype/purchase_order/purchase_order.js:427
#: erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py:20
#: erpnext/selling/doctype/sales_order/sales_order.js:784
#: erpnext/selling/doctype/sales_order/sales_order_dashboard.py:28
@@ -35089,7 +35094,7 @@ msgstr ""
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:124
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:122
#: erpnext/accounts/workspace/receivables/receivables.json
-#: erpnext/buying/doctype/purchase_order/purchase_order.js:434
+#: erpnext/buying/doctype/purchase_order/purchase_order.js:435
#: erpnext/selling/doctype/sales_order/sales_order.js:777
msgid "Payment Request"
msgstr "付款申请"
@@ -35120,7 +35125,7 @@ msgstr "付款申请{0}"
msgid "Payment Request is already created"
msgstr ""
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:302
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:303
msgid "Payment Request took too long to respond. Please try requesting for payment again."
msgstr ""
@@ -35281,7 +35286,7 @@ msgstr "付款金额不能小于或等于0"
msgid "Payment methods are mandatory. Please add at least one payment method."
msgstr "付款方式是强制性的。请添加至少一种付款方式。"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:314
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:315
#: erpnext/selling/page/point_of_sale/pos_payment.js:259
msgid "Payment of {0} received successfully."
msgstr ""
@@ -35294,7 +35299,7 @@ msgstr ""
msgid "Payment related to {0} is not completed"
msgstr "与{0}相关的付款尚未完成"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:291
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:292
msgid "Payment request failed"
msgstr ""
@@ -36122,7 +36127,7 @@ msgstr "请将帐户添加到根级别的公司-{}"
msgid "Please add {1} role to user {0}."
msgstr ""
-#: erpnext/controllers/stock_controller.py:1254
+#: erpnext/controllers/stock_controller.py:1269
msgid "Please adjust the qty or edit {0} to proceed."
msgstr ""
@@ -36130,7 +36135,7 @@ msgstr ""
msgid "Please attach CSV file"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2740
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2741
msgid "Please cancel and amend the Payment Entry"
msgstr ""
@@ -36196,7 +36201,7 @@ msgstr ""
msgid "Please convert the parent account in corresponding child company to a group account."
msgstr "请将相应子公司中的母公司帐户转换为组帐户。"
-#: erpnext/selling/doctype/quotation/quotation.py:576
+#: erpnext/selling/doctype/quotation/quotation.py:577
msgid "Please create Customer from Lead {0}."
msgstr "请根据潜在客户{0}创建客户。"
@@ -36254,7 +36259,7 @@ msgstr "请启用弹出窗口"
msgid "Please enable {0} in the {1}."
msgstr ""
-#: erpnext/controllers/selling_controller.py:696
+#: erpnext/controllers/selling_controller.py:706
msgid "Please enable {} in {} to allow same item in multiple rows"
msgstr ""
@@ -36389,7 +36394,7 @@ msgstr "请在公司设置中维护默认货币"
msgid "Please enter message before sending"
msgstr "在发送前,请填写留言"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:279
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:280
msgid "Please enter mobile number first."
msgstr ""
@@ -36520,7 +36525,7 @@ msgstr "请选择模板类型以下载模板"
msgid "Please select Apply Discount On"
msgstr "请选择适用的折扣"
-#: erpnext/selling/doctype/sales_order/sales_order.py:1534
+#: erpnext/selling/doctype/sales_order/sales_order.py:1537
msgid "Please select BOM against item {0}"
msgstr "请选择物料{0}的物料清单"
@@ -36606,7 +36611,7 @@ msgstr "请先选择记帐日期"
msgid "Please select Price List"
msgstr "请选择价格清单"
-#: erpnext/selling/doctype/sales_order/sales_order.py:1536
+#: erpnext/selling/doctype/sales_order/sales_order.py:1539
msgid "Please select Qty against item {0}"
msgstr "请选择为物料{0}指定数量"
@@ -36817,7 +36822,7 @@ msgstr ""
msgid "Please set Account"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1536
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1537
msgid "Please set Account for Change Amount"
msgstr ""
@@ -36903,7 +36908,7 @@ msgstr "请设置公司"
msgid "Please set a Cost Center for the Asset or set an Asset Depreciation Cost Center for the Company {}"
msgstr ""
-#: erpnext/selling/doctype/sales_order/sales_order.py:1326
+#: erpnext/selling/doctype/sales_order/sales_order.py:1329
msgid "Please set a Supplier against the Items to be considered in the Purchase Order."
msgstr "请根据采购订单中要考虑的项目设置供应商。"
@@ -36924,7 +36929,7 @@ msgstr "请在仓库{0}中设置科目"
msgid "Please set an Address on the Company '%s'"
msgstr ""
-#: erpnext/controllers/stock_controller.py:682
+#: erpnext/controllers/stock_controller.py:697
msgid "Please set an Expense Account in the Items table"
msgstr ""
@@ -36936,19 +36941,19 @@ 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:2044
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2045
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:2602
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2603
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:2604
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2605
msgid "Please set default Cash or Bank account in Mode of Payments {}"
msgstr "请在付款方式{}中设置默认的现金或银行帐户"
@@ -36964,7 +36969,7 @@ msgstr ""
msgid "Please set default UOM in Stock Settings"
msgstr "请在“库存设置”中设置默认的UOM"
-#: erpnext/controllers/stock_controller.py:554
+#: erpnext/controllers/stock_controller.py:569
msgid "Please set default cost of goods sold account in company {0} for booking rounding gain and loss during stock transfer"
msgstr ""
@@ -37052,7 +37057,7 @@ msgstr "请注明"
msgid "Please specify Company"
msgstr "请注明公司"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:101
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:102
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:399
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:480
msgid "Please specify Company to proceed"
@@ -37076,7 +37081,7 @@ msgstr "请指定属性表中的至少一个属性"
msgid "Please specify either Quantity or Valuation Rate or both"
msgstr "请注明无论是数量或估价率或两者"
-#: erpnext/stock/doctype/item_attribute/item_attribute.py:82
+#: erpnext/stock/doctype/item_attribute/item_attribute.py:79
msgid "Please specify from/to range"
msgstr "请从指定/至范围"
@@ -37244,7 +37249,7 @@ msgstr "邮政费用"
#: 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:110
+#: 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
@@ -37516,7 +37521,7 @@ msgstr "上一财务年度未关闭"
msgid "Previous Work Experience"
msgstr ""
-#: erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py:162
+#: erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py:154
msgid "Previous Year is not closed, please close it first"
msgstr ""
@@ -37753,7 +37758,7 @@ msgstr "价格表{1}中的商品{0}找不到价格"
msgid "Price or Product Discount"
msgstr ""
-#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py:147
+#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py:149
msgid "Price or product discount slabs are required"
msgstr "价格或产品折扣板是必需的"
@@ -37830,7 +37835,7 @@ msgstr "定价规则项目代码"
msgid "Pricing Rule Item Group"
msgstr "定价规则项目组"
-#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py:221
+#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py:251
msgid "Pricing Rule {0} is updated"
msgstr "定价规则{0}已更新"
@@ -39282,8 +39287,8 @@ msgstr ""
#: erpnext/accounts/workspace/payables/payables.json
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/assets/doctype/asset_repair_purchase_invoice/asset_repair_purchase_invoice.json
-#: erpnext/buying/doctype/purchase_order/purchase_order.js:417
-#: erpnext/buying/doctype/purchase_order/purchase_order_list.js:57
+#: erpnext/buying/doctype/purchase_order/purchase_order.js:418
+#: erpnext/buying/doctype/purchase_order/purchase_order_list.js:50
#: erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js:18
#: erpnext/buying/workspace/buying/buying.json
#: erpnext/crm/doctype/contract/contract.json
@@ -39573,7 +39578,7 @@ msgstr "采购价格清单"
#: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:20
#: erpnext/assets/doctype/asset/asset.json
#: erpnext/buying/doctype/purchase_order/purchase_order.js:387
-#: erpnext/buying/doctype/purchase_order/purchase_order_list.js:61
+#: erpnext/buying/doctype/purchase_order/purchase_order_list.js:54
#: erpnext/setup/doctype/authorization_rule/authorization_rule.json
#: erpnext/stock/doctype/landed_cost_item/landed_cost_item.json
#: erpnext/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.json
@@ -39955,7 +39960,7 @@ msgstr ""
msgid "Qty To Manufacture"
msgstr "生产数量"
-#: erpnext/manufacturing/doctype/work_order/work_order.py:993
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1002
msgid "Qty To Manufacture ({0}) cannot be a fraction for the UOM {2}. To allow this, disable '{1}' in the UOM {2}."
msgstr ""
@@ -40529,11 +40534,11 @@ msgstr "待生产数量"
msgid "Quantity to Manufacture"
msgstr "制造数量"
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1600
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1609
msgid "Quantity to Manufacture can not be zero for the operation {0}"
msgstr "操作{0}的制造数量不能为零"
-#: erpnext/manufacturing/doctype/work_order/work_order.py:985
+#: erpnext/manufacturing/doctype/work_order/work_order.py:994
msgid "Quantity to Manufacture must be greater than 0."
msgstr "量生产必须大于0。"
@@ -41374,7 +41379,7 @@ msgstr "搁置的理由"
msgid "Reason for Failure"
msgstr ""
-#: erpnext/buying/doctype/purchase_order/purchase_order.js:702
+#: erpnext/buying/doctype/purchase_order/purchase_order.js:703
#: erpnext/selling/doctype/sales_order/sales_order.js:1352
msgid "Reason for Hold"
msgstr "保留原因"
@@ -41730,7 +41735,7 @@ msgid "Recurse Over Qty cannot be less than 0"
msgstr ""
#: erpnext/accounts/doctype/pricing_rule/pricing_rule.py:315
-#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py:201
+#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py:231
msgid "Recursive Discounts with Mixed condition is not supported by the system"
msgstr ""
@@ -42459,7 +42464,7 @@ msgstr ""
msgid "Rented"
msgstr ""
-#: erpnext/buying/doctype/purchase_order/purchase_order_list.js:53
+#: erpnext/buying/doctype/purchase_order/purchase_order_list.js:46
#: erpnext/crm/doctype/opportunity/opportunity.js:123
#: erpnext/stock/doctype/delivery_note/delivery_note.js:305
#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:295
@@ -42768,7 +42773,7 @@ msgstr "要求报价"
msgid "Request Parameters"
msgstr ""
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:305
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:306
msgid "Request Timeout"
msgstr ""
@@ -43086,7 +43091,7 @@ msgstr "保留数量"
msgid "Reserved Quantity for Production"
msgstr "预留生产量"
-#: erpnext/stock/stock_ledger.py:2101
+#: erpnext/stock/stock_ledger.py:2110
msgid "Reserved Serial No."
msgstr ""
@@ -43100,11 +43105,11 @@ msgstr ""
#: erpnext/stock/doctype/pick_list/pick_list.js:146
#: erpnext/stock/report/reserved_stock/reserved_stock.json
#: erpnext/stock/report/stock_balance/stock_balance.py:482
-#: erpnext/stock/stock_ledger.py:2085
+#: erpnext/stock/stock_ledger.py:2094
msgid "Reserved Stock"
msgstr ""
-#: erpnext/stock/stock_ledger.py:2131
+#: erpnext/stock/stock_ledger.py:2140
msgid "Reserved Stock for Batch"
msgstr ""
@@ -43410,7 +43415,7 @@ msgstr ""
#. Option for the 'Status' (Select) field in DocType 'Purchase Invoice'
#. Option for the 'Status' (Select) field in DocType 'Sales Invoice'
#. Option for the 'Status' (Select) field in DocType 'Subcontracting Receipt'
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:67
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:68
#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -43874,8 +43879,8 @@ msgstr ""
msgid "Rounding Loss Allowance should be between 0 and 1"
msgstr ""
-#: erpnext/controllers/stock_controller.py:566
#: erpnext/controllers/stock_controller.py:581
+#: erpnext/controllers/stock_controller.py:596
msgid "Rounding gain/loss Entry for Stock Transfer"
msgstr ""
@@ -43924,12 +43929,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:1720
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1721
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:1715
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1716
msgid "Row #{0} (Payment Table): Amount must be positive"
msgstr "行#{0}(付款表):金额必须为正值"
@@ -44075,7 +44080,7 @@ msgstr "行#{0}:引用{1} {2}中的重复条目"
msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date"
msgstr "行#{0}:预计交货日期不能在采购订单日期之前"
-#: erpnext/controllers/stock_controller.py:684
+#: erpnext/controllers/stock_controller.py:699
msgid "Row #{0}: Expense Account not set for the Item {1}. {2}"
msgstr ""
@@ -44245,7 +44250,7 @@ msgid "Row #{0}: Selling rate for item {1} is lower than its {2}.\n"
"\t\t\t\t\tthis validation."
msgstr ""
-#: erpnext/controllers/stock_controller.py:158
+#: erpnext/controllers/stock_controller.py:173
msgid "Row #{0}: Serial No {1} does not belong to Batch {2}"
msgstr "行#{0}:序列号{1}不属于批次{2}"
@@ -44317,7 +44322,7 @@ msgstr ""
msgid "Row #{0}: Stock not available to reserve for the Item {1} in Warehouse {2}."
msgstr ""
-#: erpnext/controllers/stock_controller.py:171
+#: erpnext/controllers/stock_controller.py:186
msgid "Row #{0}: The batch {1} has already expired."
msgstr "行#{0}:批次{1}已过期。"
@@ -44337,7 +44342,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:1421
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1422
msgid "Row #{0}: You must select an Asset for Item {1}."
msgstr ""
@@ -44523,7 +44528,7 @@ msgstr "行{0}:BOM#的货币{1}应等于所选货币{2}"
msgid "Row {0}: Debit entry can not be linked with a {1}"
msgstr "行{0}:借记分录不能与连接的{1}"
-#: erpnext/controllers/selling_controller.py:718
+#: erpnext/controllers/selling_controller.py:728
msgid "Row {0}: Delivery Warehouse ({1}) and Customer Warehouse ({2}) can not be same"
msgstr "第{0}行:交货仓库({1})和客户仓库({2})不能相同"
@@ -44577,7 +44582,7 @@ msgstr "行{0}:开始时间和结束时间必填。"
msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}"
msgstr "行{0}:从时间和结束时间{1}是具有重叠{2}"
-#: erpnext/controllers/stock_controller.py:1072
+#: erpnext/controllers/stock_controller.py:1087
msgid "Row {0}: From Warehouse is mandatory for internal transfers"
msgstr ""
@@ -44598,7 +44603,7 @@ msgid "Row {0}: Item Tax template updated as per validity and rate applied"
msgstr ""
#: erpnext/controllers/buying_controller.py:377
-#: erpnext/controllers/selling_controller.py:494
+#: erpnext/controllers/selling_controller.py:504
msgid "Row {0}: Item rate has been updated as per valuation rate since its an internal stock transfer"
msgstr ""
@@ -44698,7 +44703,7 @@ msgstr ""
msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}"
msgstr "第{0}行:原材料{1}必须使用转包物料"
-#: erpnext/controllers/stock_controller.py:1063
+#: erpnext/controllers/stock_controller.py:1078
msgid "Row {0}: Target Warehouse is mandatory for internal transfers"
msgstr ""
@@ -45328,12 +45333,12 @@ msgstr ""
msgid "Sales Order {0} is not submitted"
msgstr "销售订单{0}未提交"
-#: erpnext/manufacturing/doctype/work_order/work_order.py:236
+#: erpnext/manufacturing/doctype/work_order/work_order.py:245
msgid "Sales Order {0} is not valid"
msgstr "销售订单{0}无效"
#: erpnext/controllers/selling_controller.py:406
-#: erpnext/manufacturing/doctype/work_order/work_order.py:241
+#: erpnext/manufacturing/doctype/work_order/work_order.py:250
msgid "Sales Order {0} is {1}"
msgstr "销售订单{0} {1}"
@@ -46517,7 +46522,7 @@ msgstr ""
msgid "Selected POS Opening Entry should be open."
msgstr "所选的POS入口条目应打开。"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2192
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2193
msgid "Selected Price List should have buying and selling fields checked."
msgstr "选定价格清单应该有买入和卖出的字段。"
@@ -46976,7 +46981,7 @@ msgstr ""
msgid "Serial Nos are created successfully"
msgstr ""
-#: erpnext/stock/stock_ledger.py:2091
+#: erpnext/stock/stock_ledger.py:2100
msgid "Serial Nos are reserved in Stock Reservation Entries, you need to unreserve them before proceeding."
msgstr ""
@@ -47053,7 +47058,7 @@ msgstr ""
msgid "Serial and Batch Bundle updated"
msgstr ""
-#: erpnext/controllers/stock_controller.py:107
+#: erpnext/controllers/stock_controller.py:122
msgid "Serial and Batch Bundle {0} is already used in {1} {2}."
msgstr ""
@@ -47703,7 +47708,7 @@ msgid "Setting up company"
msgstr "建立公司"
#: erpnext/manufacturing/doctype/bom/bom.py:1002
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1040
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1049
msgid "Setting {} is required"
msgstr ""
@@ -48507,15 +48512,15 @@ msgstr ""
msgid "Something went wrong please try again"
msgstr ""
-#: erpnext/accounts/doctype/pricing_rule/utils.py:735
+#: erpnext/accounts/doctype/pricing_rule/utils.py:738
msgid "Sorry, this coupon code is no longer valid"
msgstr "抱歉,此优惠券代码不再有效"
-#: erpnext/accounts/doctype/pricing_rule/utils.py:733
+#: erpnext/accounts/doctype/pricing_rule/utils.py:736
msgid "Sorry, this coupon code's validity has expired"
msgstr "抱歉,此优惠券代码的有效性已过期"
-#: erpnext/accounts/doctype/pricing_rule/utils.py:730
+#: erpnext/accounts/doctype/pricing_rule/utils.py:733
msgid "Sorry, this coupon code's validity has not started"
msgstr "抱歉,此优惠券代码的有效性尚未开始"
@@ -50003,7 +50008,7 @@ msgstr "停止原因"
msgid "Stopped"
msgstr "已停止"
-#: erpnext/manufacturing/doctype/work_order/work_order.py:676
+#: erpnext/manufacturing/doctype/work_order/work_order.py:685
msgid "Stopped Work Order cannot be cancelled, Unstop it first to cancel"
msgstr "停止的工单不能取消,先取消停止"
@@ -50974,7 +50979,7 @@ msgstr ""
#. Name of a DocType
#. Label of a Link in the Buying Workspace
#. Label of the supplier_quotation (Link) field in DocType 'Quotation'
-#: erpnext/buying/doctype/purchase_order/purchase_order.js:570
+#: erpnext/buying/doctype/purchase_order/purchase_order.js:571
#: erpnext/buying/doctype/purchase_order/purchase_order.json
#: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:45
@@ -51004,7 +51009,7 @@ msgstr "供应商报价比较"
msgid "Supplier Quotation Item"
msgstr "供应商报价物料"
-#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:430
+#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:431
msgid "Supplier Quotation {0} Created"
msgstr "供应商报价{0}已创建"
@@ -51655,11 +51660,11 @@ msgstr ""
msgid "Target Warehouse is mandatory for Decapitalization"
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.py:450
+#: erpnext/manufacturing/doctype/work_order/work_order.py:459
msgid "Target Warehouse is required before Submit"
msgstr ""
-#: erpnext/controllers/selling_controller.py:724
+#: erpnext/controllers/selling_controller.py:734
msgid "Target Warehouse is set for some items but the customer is not an internal customer."
msgstr ""
@@ -51964,7 +51969,7 @@ msgstr ""
msgid "Tax Rule"
msgstr "税务规则"
-#: erpnext/accounts/doctype/tax_rule/tax_rule.py:137
+#: erpnext/accounts/doctype/tax_rule/tax_rule.py:134
msgid "Tax Rule Conflicts with {0}"
msgstr "税收规则与{0}冲突"
@@ -51974,7 +51979,7 @@ msgstr "税收规则与{0}冲突"
msgid "Tax Settings"
msgstr ""
-#: erpnext/accounts/doctype/tax_rule/tax_rule.py:86
+#: erpnext/accounts/doctype/tax_rule/tax_rule.py:83
msgid "Tax Template is mandatory."
msgstr "税务模板字段必填。"
@@ -52635,7 +52640,7 @@ msgstr ""
msgid "The GL Entries will be cancelled in the background, it can take a few minutes."
msgstr ""
-#: erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py:186
+#: 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."
msgstr ""
@@ -52752,6 +52757,10 @@ msgstr "以下已删除的属性存在于变式中,但不在模板中。您可
msgid "The following employees are currently still reporting to {0}:"
msgstr "以下员工目前仍在向{0}报告:"
+#: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py:185
+msgid "The following invalid Pricing Rules are deleted:"
+msgstr ""
+
#: erpnext/stock/doctype/material_request/material_request.py:781
msgid "The following {0} were created: {1}"
msgstr "已创建以下{0}:{1}"
@@ -53224,7 +53233,7 @@ msgstr ""
msgid "This schedule was created when Asset {0} was scrapped."
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1357
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1358
msgid "This schedule was created when Asset {0} was sold through Sales Invoice {1}."
msgstr ""
@@ -53275,7 +53284,7 @@ msgstr ""
msgid "This will restrict user access to other employee records"
msgstr ""
-#: erpnext/controllers/selling_controller.py:725
+#: erpnext/controllers/selling_controller.py:735
msgid "This {} will be treated as material transfer."
msgstr ""
@@ -53587,7 +53596,7 @@ msgstr "要支付"
#. Option for the 'Status' (Select) field in DocType 'Delivery Note'
#. Option for the 'Status' (Select) field in DocType 'Purchase Receipt'
#: erpnext/buying/doctype/purchase_order/purchase_order.json
-#: erpnext/buying/doctype/purchase_order/purchase_order_list.js:37
+#: erpnext/buying/doctype/purchase_order/purchase_order_list.js:34
#: erpnext/manufacturing/doctype/production_plan/production_plan.json
#: erpnext/selling/doctype/sales_order/sales_order.json
#: erpnext/selling/doctype/sales_order/sales_order_list.js:50
@@ -53832,7 +53841,7 @@ msgid "To Package No."
msgstr ""
#. Option for the 'Status' (Select) field in DocType 'Sales Order'
-#: erpnext/buying/doctype/purchase_order/purchase_order_list.js:21
+#: erpnext/buying/doctype/purchase_order/purchase_order_list.js:22
#: erpnext/selling/doctype/sales_order/sales_order.json
#: erpnext/selling/doctype/sales_order/sales_order_list.js:25
msgid "To Pay"
@@ -53861,13 +53870,13 @@ msgstr ""
#. Option for the 'Status' (Select) field in DocType 'Purchase Order'
#: erpnext/buying/doctype/purchase_order/purchase_order.json
-#: erpnext/buying/doctype/purchase_order/purchase_order_list.js:30
+#: erpnext/buying/doctype/purchase_order/purchase_order_list.js:31
msgid "To Receive"
msgstr "等收货"
#. Option for the 'Status' (Select) field in DocType 'Purchase Order'
#: erpnext/buying/doctype/purchase_order/purchase_order.json
-#: erpnext/buying/doctype/purchase_order/purchase_order_list.js:25
+#: erpnext/buying/doctype/purchase_order/purchase_order_list.js:26
msgid "To Receive and Bill"
msgstr "待收货与开票"
@@ -54068,8 +54077,8 @@ msgstr ""
#. Label of a Card Break in the Manufacturing Workspace
#. Label of the tools (Column Break) field in DocType 'Email Digest'
#. Label of a Card Break in the Stock Workspace
-#: erpnext/buying/doctype/purchase_order/purchase_order.js:601
-#: erpnext/buying/doctype/purchase_order/purchase_order.js:677
+#: erpnext/buying/doctype/purchase_order/purchase_order.js:602
+#: 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
@@ -54923,8 +54932,8 @@ msgstr "付款总额不得超过{}"
msgid "Total percentage against cost centers should be 100"
msgstr ""
-#: erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py:749
-#: erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py:750
+#: 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
msgid "Total {0} ({1})"
@@ -55687,7 +55696,7 @@ msgstr ""
msgid "UnReconcile"
msgstr ""
-#: erpnext/setup/utils.py:115
+#: erpnext/setup/utils.py:113
msgid "Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually"
msgstr "无法为关键日期{2}查找{0}到{1}的汇率。请手动创建汇率记录"
@@ -55695,7 +55704,7 @@ msgstr "无法为关键日期{2}查找{0}到{1}的汇率。请手动创建汇率
msgid "Unable to find score starting at {0}. You need to have standing scores covering 0 to 100"
msgstr "无法从{0}开始获得分数。你需要有0到100的常规分数"
-#: erpnext/manufacturing/doctype/work_order/work_order.py:646
+#: erpnext/manufacturing/doctype/work_order/work_order.py:655
msgid "Unable to find the time slot in the next {0} days for the operation {1}. Please increase the 'Capacity Planning For (Days)' in the {2}."
msgstr ""
@@ -56151,7 +56160,7 @@ msgstr "更新打印格式"
msgid "Update Rate and Availability"
msgstr ""
-#: erpnext/buying/doctype/purchase_order/purchase_order.js:590
+#: erpnext/buying/doctype/purchase_order/purchase_order.js:591
msgid "Update Rate as per Last Purchase"
msgstr ""
@@ -56728,11 +56737,11 @@ msgstr "库存评估价"
msgid "Valuation Rate (In / Out)"
msgstr ""
-#: erpnext/stock/stock_ledger.py:1812
+#: erpnext/stock/stock_ledger.py:1821
msgid "Valuation Rate Missing"
msgstr "估价率缺失"
-#: erpnext/stock/stock_ledger.py:1790
+#: erpnext/stock/stock_ledger.py:1799
msgid "Valuation Rate for the Item {0}, is required to do accounting entries for {1} {2}."
msgstr "要为{1} {2}进行会计分录,必须使用项目{0}的评估率。"
@@ -57377,7 +57386,7 @@ msgstr ""
msgid "Wages per hour"
msgstr ""
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:283
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:284
msgid "Waiting for payment..."
msgstr ""
@@ -57668,7 +57677,7 @@ msgstr ""
msgid "Warehouse {0} does not belong to company {1}"
msgstr "仓库{0}不属于公司{1}"
-#: erpnext/controllers/stock_controller.py:594
+#: erpnext/controllers/stock_controller.py:609
msgid "Warehouse {0} is not linked to any account, please mention the account in the warehouse record or set default inventory account in company {1}."
msgstr ""
@@ -58109,7 +58118,7 @@ msgstr ""
msgid "Welcome email sent"
msgstr "欢迎电子邮件已发送"
-#: erpnext/setup/utils.py:166
+#: erpnext/setup/utils.py:164
msgid "Welcome to {0}"
msgstr "欢迎{0}"
@@ -58318,12 +58327,12 @@ msgstr "工作单摘要"
msgid "Work Order cannot be created for following reason:
{0}"
msgstr "由于以下原因,无法创建工作订单:
{0}"
-#: erpnext/manufacturing/doctype/work_order/work_order.py:978
+#: erpnext/manufacturing/doctype/work_order/work_order.py:987
msgid "Work Order cannot be raised against a Item Template"
msgstr "不能为模板物料新建工单"
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1468
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1544
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1477
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1553
msgid "Work Order has been {0}"
msgstr "工单已{0}"
@@ -58361,7 +58370,7 @@ msgstr ""
msgid "Work-in-Progress Warehouse"
msgstr ""
-#: erpnext/manufacturing/doctype/work_order/work_order.py:448
+#: erpnext/manufacturing/doctype/work_order/work_order.py:457
msgid "Work-in-Progress Warehouse is required before Submit"
msgstr "提交前需要指定在制品仓库"
@@ -58782,7 +58791,7 @@ msgstr "您还可以在公司{}中设置默认的CWIP帐户"
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:84
+#: 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 ""
@@ -58794,7 +58803,7 @@ msgstr "您不能在“对日记账分录”列中选择此凭证。"
msgid "You can only have Plans with the same billing cycle in a Subscription"
msgstr "您只能在订阅中拥有相同结算周期的计划"
-#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:271
+#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:272
#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:894
msgid "You can only redeem max {0} points in this order."
msgstr "您只能按此顺序兑换最多{0}个积分。"
@@ -58999,7 +59008,7 @@ msgstr "[重要] [ERPNext]自动重新排序错误"
msgid "`Allow Negative rates for Items`"
msgstr ""
-#: erpnext/stock/stock_ledger.py:1804
+#: erpnext/stock/stock_ledger.py:1813
msgid "after"
msgstr ""
@@ -59204,7 +59213,7 @@ msgstr ""
msgid "per hour"
msgstr ""
-#: erpnext/stock/stock_ledger.py:1805
+#: erpnext/stock/stock_ledger.py:1814
msgid "performing either one below:"
msgstr ""
@@ -59288,7 +59297,7 @@ msgstr ""
msgid "to"
msgstr "到"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2742
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2743
msgid "to unallocate the amount of this Return Invoice before cancelling it."
msgstr ""
@@ -59326,7 +59335,7 @@ msgstr "{0}“{1}”被禁用"
msgid "{0} '{1}' not in Fiscal Year {2}"
msgstr "{0}“ {1}”不属于{2}财年"
-#: erpnext/manufacturing/doctype/work_order/work_order.py:380
+#: erpnext/manufacturing/doctype/work_order/work_order.py:389
msgid "{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3}"
msgstr "{0}({1})不能大于工单{3}中的计划数量({2})"
@@ -59346,7 +59355,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:750
+#: erpnext/accounts/doctype/pricing_rule/utils.py:753
msgid "{0} Coupon used are {1}. Allowed quantity is exhausted"
msgstr "{0}使用的优惠券是{1}。允许数量已耗尽"
@@ -59466,7 +59475,7 @@ msgstr "{0} {1}"
msgid "{0} has Payment Term based allocation enabled. Select a Payment Term for Row #{1} in Payment References section"
msgstr ""
-#: erpnext/setup/default_success_action.py:14
+#: erpnext/setup/default_success_action.py:15
msgid "{0} has been submitted successfully"
msgstr "{0}已成功提交"
@@ -59575,7 +59584,7 @@ msgstr "{0}物料已生产"
msgid "{0} must be negative in return document"
msgstr "{0}在退货凭证中必须为负"
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1993
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1994
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 ""
@@ -59591,7 +59600,7 @@ msgstr "{0}参数无效"
msgid "{0} payment entries can not be filtered by {1}"
msgstr "{0}付款凭证不能由{1}过滤"
-#: erpnext/controllers/stock_controller.py:1246
+#: erpnext/controllers/stock_controller.py:1261
msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}."
msgstr ""
@@ -59611,16 +59620,16 @@ msgstr ""
msgid "{0} units of {1} are required in {2}{3}, on {4} {5} for {6} to complete the transaction."
msgstr ""
-#: erpnext/stock/stock_ledger.py:1463 erpnext/stock/stock_ledger.py:1954
-#: erpnext/stock/stock_ledger.py:1968
+#: erpnext/stock/stock_ledger.py:1472 erpnext/stock/stock_ledger.py:1963
+#: erpnext/stock/stock_ledger.py:1977
msgid "{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction."
msgstr "{0} {1}在需要{2}在{3} {4}:{5}来完成这一交易单位。"
-#: erpnext/stock/stock_ledger.py:2078 erpnext/stock/stock_ledger.py:2124
+#: erpnext/stock/stock_ledger.py:2087 erpnext/stock/stock_ledger.py:2133
msgid "{0} units of {1} needed in {2} on {3} {4} to complete this transaction."
msgstr ""
-#: erpnext/stock/stock_ledger.py:1457
+#: erpnext/stock/stock_ledger.py:1466
msgid "{0} units of {1} needed in {2} to complete this transaction."
msgstr "{0}单位{1}在{2}完成此交易所需。"
@@ -59790,7 +59799,7 @@ msgstr "{0} {1}: 科目{2}无效"
msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}"
msgstr "{0} {1}在{2}会计分录只能用货币单位:{3}"
-#: erpnext/controllers/stock_controller.py:713
+#: erpnext/controllers/stock_controller.py:728
msgid "{0} {1}: Cost Center is mandatory for Item {2}"
msgstr "{0} {1}:成本中心是物料{2}的必须项"
@@ -59856,7 +59865,7 @@ msgstr "{0}:{1}必须小于{2}"
msgid "{0}{1} Did you rename the item? Please contact Administrator / Tech support"
msgstr "{0} {1}您是否重命名了该项目?请联系管理员/技术支持"
-#: erpnext/controllers/stock_controller.py:1507
+#: erpnext/controllers/stock_controller.py:1522
msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})"
msgstr ""
@@ -59922,7 +59931,7 @@ msgstr ""
msgid "{} To Bill"
msgstr ""
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1779
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1780
msgid "{} can't be cancelled since the Loyalty Points earned has been redeemed. First cancel the {} No {}"
msgstr "由于所赚取的忠诚度积分已被兑换,因此无法取消{}。首先取消{}否{}"