diff --git a/erpnext/locale/zh.po b/erpnext/locale/zh.po
index 86fc68bb499..d840c75855f 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: hello@frappe.io\n"
-"POT-Creation-Date: 2026-05-17 10:04+0000\n"
-"PO-Revision-Date: 2026-05-18 20:21\n"
+"POT-Creation-Date: 2026-05-24 10:11+0000\n"
+"PO-Revision-Date: 2026-05-24 21:22\n"
 "Last-Translator: hello@frappe.io\n"
 "Language-Team: Chinese Simplified\n"
 "MIME-Version: 1.0\n"
@@ -268,7 +268,7 @@ msgstr "本拣配清单的物料交付百分比"
 msgid "% of materials delivered against this Sales Order"
 msgstr "此销售订单% 的物料已出货。"
 
-#: erpnext/controllers/accounts_controller.py:2387
+#: erpnext/controllers/accounts_controller.py:2388
 msgid "'Account' in the Accounting section of Customer {0}"
 msgstr "客户{0}会计科目中的'账户'"
 
@@ -284,7 +284,7 @@ msgstr "“根据”和“分组依据”不能相同"
 msgid "'Days Since Last Order' must be greater than or equal to zero"
 msgstr "“ 最后的订单到目前的天数”必须大于或等于零"
 
-#: erpnext/controllers/accounts_controller.py:2392
+#: erpnext/controllers/accounts_controller.py:2393
 msgid "'Default {0} Account' in Company {1}"
 msgstr "公司{1}的'默认{0}科目'"
 
@@ -346,8 +346,8 @@ msgstr "'{0}' 科目已被 {1} 占用. 请使用另一个科目"
 msgid "'{0}' has been already added."
 msgstr "'{0}'已添加"
 
-#: erpnext/setup/doctype/company/company.py:303
-#: erpnext/setup/doctype/company/company.py:314
+#: erpnext/setup/doctype/company/company.py:307
+#: erpnext/setup/doctype/company/company.py:318
 msgid "'{0}' should be in company currency {1}."
 msgstr "'{0}'必须使用公司货币{1}"
 
@@ -517,8 +517,8 @@ msgstr "1000+"
 msgid "11-50"
 msgstr "11-50"
 
-#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:95
-#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:101
+#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:107
+#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:113
 msgid "1{0}"
 msgstr "1{0}"
 
@@ -607,8 +607,8 @@ msgstr "90-120天"
 msgid "90 Above"
 msgstr "90天以上"
 
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1348
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1349
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1271
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1272
 msgid "<0"
 msgstr "<0"
 
@@ -799,7 +799,7 @@ msgstr "<label class=\"control-label\" style=\"margin-bottom: 0px;\">日期设
 msgid "<li>Clearance date must be after cheque date for row(s): {0}</li>"
 msgstr "<li>以下行{0}的清算日期必须晚于支票日期：</li>"
 
-#: erpnext/controllers/accounts_controller.py:2270
+#: erpnext/controllers/accounts_controller.py:2271
 msgid "<li>Item {0} in row(s) {1} billed more than {2}</li>"
 msgstr "{0}"
 
@@ -816,7 +816,7 @@ msgstr "<li>以下行{0}需要付款凭证：</li>"
 msgid "<li>{}</li>"
 msgstr "<li>{}</li>"
 
-#: erpnext/controllers/accounts_controller.py:2267
+#: erpnext/controllers/accounts_controller.py:2268
 msgid "<p>Cannot overbill for the following Items:</p>"
 msgstr "<p>以下物料不允许超额开票：</p>"
 
@@ -879,7 +879,7 @@ msgstr "<p>以下项目的过账日期{0}不得早于采购订单日期：</p><u
 msgid "<p>Price List Rate has not been set as editable in Selling Settings. In this scenario, setting <strong>Update Price List Based On</strong> to <strong>Price List Rate</strong> will prevent auto-updation of Item Price.</p>Are you sure you want to continue?"
 msgstr "<p>销售设置中未将价格表费率设为可编辑。在此情况下，将<strong>价格表更新依据</strong>设为<strong>价格表费率</strong>将禁用物料价格自动更新功能。</p>是否确认继续操作？"
 
-#: erpnext/controllers/accounts_controller.py:2279
+#: erpnext/controllers/accounts_controller.py:2280
 msgid "<p>To allow over-billing, please set allowance in Accounts Settings.</p>"
 msgstr "<p>要允许超额开票，请在账户设置中设置容差。</p>"
 
@@ -1041,7 +1041,7 @@ msgstr "A - B"
 msgid "A - C"
 msgstr "A - C"
 
-#: erpnext/selling/doctype/customer/customer.py:355
+#: erpnext/selling/doctype/customer/customer.py:345
 msgid "A Customer Group exists with same name please change the Customer name or rename the Customer Group"
 msgstr "同名的客户组已经存在，请更改客户姓名或重命名该客户组"
 
@@ -1205,11 +1205,11 @@ msgstr "简称"
 msgid "Abbreviation"
 msgstr "简称"
 
-#: erpnext/setup/doctype/company/company.py:238
+#: erpnext/setup/doctype/company/company.py:241
 msgid "Abbreviation already used for another company"
 msgstr "简称已用于另一家公司"
 
-#: erpnext/setup/doctype/company/company.py:235
+#: erpnext/setup/doctype/company/company.py:238
 msgid "Abbreviation is mandatory"
 msgstr "简称字段必填"
 
@@ -1217,7 +1217,7 @@ msgstr "简称字段必填"
 msgid "Abbreviation: {0} must appear only once"
 msgstr "简称{0}必须唯一"
 
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1345
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1268
 msgid "Above"
 msgstr "以上"
 
@@ -1271,7 +1271,7 @@ msgid "Accepted Qty in Stock UOM"
 msgstr "收货数量(库存单位)"
 
 #. Label of the qty (Float) field in DocType 'Purchase Receipt Item'
-#: erpnext/public/js/controllers/transaction.js:2839
+#: erpnext/public/js/controllers/transaction.js:2841
 #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
 msgid "Accepted Quantity"
 msgstr "收货数量"
@@ -1307,7 +1307,7 @@ msgstr "服务商{0}必须提供访问密钥"
 msgid "According to CEFACT/ICG/2010/IC013 or CEFACT/ICG/2010/IC010"
 msgstr "依据CEFACT/ICG/2010/IC013或IC010标准"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1075
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:784
 msgid "According to the BOM {0}, the Item '{1}' is missing in the stock entry."
 msgstr "根据物料清单{0}，库存交易缺少物料'{1}'"
 
@@ -1426,7 +1426,7 @@ msgid "Account Manager"
 msgstr "客户经理"
 
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1009
-#: erpnext/controllers/accounts_controller.py:2396
+#: erpnext/controllers/accounts_controller.py:2397
 msgid "Account Missing"
 msgstr "科目缺失"
 
@@ -1444,7 +1444,7 @@ msgstr "科目缺失"
 msgid "Account Name"
 msgstr "科目名称"
 
-#: erpnext/accounts/doctype/account/account.py:373
+#: erpnext/accounts/doctype/account/account.py:374
 msgid "Account Not Found"
 msgstr "找不到科目"
 
@@ -1457,7 +1457,7 @@ msgstr "找不到科目"
 msgid "Account Number"
 msgstr "科目代码"
 
-#: erpnext/accounts/doctype/account/account.py:359
+#: erpnext/accounts/doctype/account/account.py:360
 msgid "Account Number {0} already used in account {1}"
 msgstr "已在科目{1}中使用的科目代码{0}"
 
@@ -1496,7 +1496,7 @@ msgstr "账户子类型"
 #. Label of the account_type (Select) field in DocType 'Payment Ledger Entry'
 #. Label of the account_type (Select) field in DocType 'Party Type'
 #: erpnext/accounts/doctype/account/account.json
-#: erpnext/accounts/doctype/account/account.py:206
+#: erpnext/accounts/doctype/account/account.py:207
 #: erpnext/accounts/doctype/account/account_tree.js:154
 #: erpnext/accounts/doctype/bank_account/bank_account.json
 #: erpnext/accounts/doctype/bank_account_type/bank_account_type.json
@@ -1512,11 +1512,11 @@ msgstr "科目类型"
 msgid "Account Value"
 msgstr "会计账金额"
 
-#: erpnext/accounts/doctype/account/account.py:328
+#: erpnext/accounts/doctype/account/account.py:329
 msgid "Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'"
 msgstr "科目余额在'贷方'，余额方向不能设置为'借方'"
 
-#: erpnext/accounts/doctype/account/account.py:322
+#: erpnext/accounts/doctype/account/account.py:323
 msgid "Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'"
 msgstr "科目余额在'借方'，余额方向不能设置为'贷方'"
 
@@ -1583,24 +1583,24 @@ msgstr ""
 msgid "Account where the cost of this item will be debited on purchase"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/account.py:427
+#: erpnext/accounts/doctype/account/account.py:428
 msgid "Account with child nodes cannot be converted to ledger"
 msgstr "有下级科目(子节点)的科目不能转换为记账科目"
 
-#: erpnext/accounts/doctype/account/account.py:279
+#: erpnext/accounts/doctype/account/account.py:280
 msgid "Account with child nodes cannot be set as ledger"
 msgstr "有子节点的科目不能被设置为记账科目"
 
-#: erpnext/accounts/doctype/account/account.py:438
+#: erpnext/accounts/doctype/account/account.py:439
 msgid "Account with existing transaction can not be converted to group."
 msgstr "有交易的科目不能被转换为组。"
 
-#: erpnext/accounts/doctype/account/account.py:467
+#: erpnext/accounts/doctype/account/account.py:468
 msgid "Account with existing transaction can not be deleted"
 msgstr "有交易的科目不能被删除"
 
-#: erpnext/accounts/doctype/account/account.py:273
-#: erpnext/accounts/doctype/account/account.py:429
+#: erpnext/accounts/doctype/account/account.py:274
+#: erpnext/accounts/doctype/account/account.py:430
 msgid "Account with existing transaction cannot be converted to ledger"
 msgstr "已关联过账交易的科目不能被转换为记账科目"
 
@@ -1608,11 +1608,11 @@ msgstr "已关联过账交易的科目不能被转换为记账科目"
 msgid "Account {0} added multiple times"
 msgstr "科目{0}被重复添加"
 
-#: erpnext/accounts/doctype/account/account.py:291
+#: erpnext/accounts/doctype/account/account.py:292
 msgid "Account {0} cannot be converted to Group as it is already set as {1} for {2}."
 msgstr "科目{0}无法转换为组，因其已设置为{2}的{1}。"
 
-#: erpnext/accounts/doctype/account/account.py:288
+#: erpnext/accounts/doctype/account/account.py:289
 msgid "Account {0} cannot be disabled as it is already set as {1} for {2}."
 msgstr "科目{0}无法禁用，因其已设置为{2}的{1}。"
 
@@ -1620,11 +1620,11 @@ msgstr "科目{0}无法禁用，因其已设置为{2}的{1}。"
 msgid "Account {0} does not belong to company {1}"
 msgstr ""
 
-#: erpnext/setup/doctype/company/company.py:285
+#: erpnext/setup/doctype/company/company.py:289
 msgid "Account {0} does not belong to company: {1}"
 msgstr "科目{0}不属于公司：{1}"
 
-#: erpnext/accounts/doctype/account/account.py:589
+#: erpnext/accounts/doctype/account/account.py:590
 msgid "Account {0} does not exist"
 msgstr "科目{0}不存在"
 
@@ -1640,15 +1640,15 @@ msgstr "科目{0}与科目模式{2}中的公司{1}不符"
 msgid "Account {0} doesn't belong to Company {1}"
 msgstr "科目{0}不属于公司{1}"
 
-#: erpnext/accounts/doctype/account/account.py:546
+#: erpnext/accounts/doctype/account/account.py:547
 msgid "Account {0} exists in parent company {1}."
 msgstr "科目{0}存在于上级公司{1}"
 
-#: erpnext/accounts/doctype/account/account.py:411
+#: erpnext/accounts/doctype/account/account.py:412
 msgid "Account {0} is added in the child company {1}"
 msgstr "子公司{1}中添加了科目{0}"
 
-#: erpnext/setup/doctype/company/company.py:274
+#: erpnext/setup/doctype/company/company.py:278
 msgid "Account {0} is disabled."
 msgstr "科目{0}已禁用。"
 
@@ -1656,7 +1656,7 @@ msgstr "科目{0}已禁用。"
 msgid "Account {0} is frozen"
 msgstr "科目{0}已冻结"
 
-#: erpnext/controllers/accounts_controller.py:1471
+#: erpnext/controllers/accounts_controller.py:1472
 msgid "Account {0} is invalid. Account Currency must be {1}"
 msgstr "科目{0}状态为失效。科目货币必须是{1}"
 
@@ -1664,19 +1664,19 @@ msgstr "科目{0}状态为失效。科目货币必须是{1}"
 msgid "Account {0} should be of type Expense"
 msgstr "科目{0}应为费用类型科目。"
 
-#: erpnext/accounts/doctype/account/account.py:152
+#: erpnext/accounts/doctype/account/account.py:153
 msgid "Account {0}: Parent account {1} can not be a ledger"
 msgstr "科目{0}：父(上级)科目{1}不能是记账科目"
 
-#: erpnext/accounts/doctype/account/account.py:158
+#: erpnext/accounts/doctype/account/account.py:159
 msgid "Account {0}: Parent account {1} does not belong to company: {2}"
 msgstr "科目{0}的上级科目{1}不属于公司{2}"
 
-#: erpnext/accounts/doctype/account/account.py:146
+#: erpnext/accounts/doctype/account/account.py:147
 msgid "Account {0}: Parent account {1} does not exist"
 msgstr "科目{0}的上级科目{1}不存在"
 
-#: erpnext/accounts/doctype/account/account.py:149
+#: erpnext/accounts/doctype/account/account.py:150
 msgid "Account {0}: You can not assign itself as parent account"
 msgstr "科目{0}不能是自己的上级科目"
 
@@ -1692,7 +1692,7 @@ msgstr "科目{0}只能通过库存相关业务更新"
 msgid "Account: {0} is not permitted under Payment Entry"
 msgstr "收付款凭证中不能使用科目{0}"
 
-#: erpnext/controllers/accounts_controller.py:3287
+#: erpnext/controllers/accounts_controller.py:3281
 msgid "Account: {0} with currency: {1} can not be selected"
 msgstr "科目：{0}货币：{1}不能选择"
 
@@ -1977,8 +1977,8 @@ msgstr "会计分录"
 msgid "Accounting Entry for Asset"
 msgstr "资产会计分录"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:2038
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:2058
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1148
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1168
 msgid "Accounting Entry for LCV in Stock Entry {0}"
 msgstr "库存凭证{0}中LCV的会计分录入账"
 
@@ -2002,8 +2002,8 @@ msgstr "服务会计凭证"
 #: erpnext/controllers/stock_controller.py:733
 #: erpnext/controllers/stock_controller.py:750
 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:941
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1983
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1997
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1100
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1114
 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:778
 msgid "Accounting Entry for Stock"
 msgstr "库存会计分录"
@@ -2012,7 +2012,7 @@ msgstr "库存会计分录"
 msgid "Accounting Entry for {0}"
 msgstr "{0}会计凭证"
 
-#: erpnext/controllers/accounts_controller.py:2437
+#: erpnext/controllers/accounts_controller.py:2438
 msgid "Accounting Entry for {0}: {1} can only be made in currency: {2}"
 msgstr "{0} {1} 相关的会计凭证：货币只能是：{2}"
 
@@ -2082,12 +2082,12 @@ msgstr ""
 #: erpnext/buying/doctype/supplier/supplier.json
 #: erpnext/selling/doctype/customer/customer.json
 #: erpnext/setup/doctype/company/company.json
-#: erpnext/setup/doctype/company/company.py:444
+#: erpnext/setup/doctype/company/company.py:448
 #: erpnext/setup/doctype/customer_group/customer_group.json
 #: erpnext/setup/doctype/email_digest/email_digest.json
 #: erpnext/setup/doctype/incoterm/incoterm.json
 #: erpnext/setup/doctype/supplier_group/supplier_group.json
-#: erpnext/setup/install.py:395
+#: erpnext/setup/install.py:427
 msgid "Accounts"
 msgstr "会计"
 
@@ -2117,8 +2117,8 @@ msgstr ""
 #. Entry'
 #. Name of a report
 #. Label of a Workspace Sidebar Item
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:154
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:256
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:158
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:261
 #: erpnext/accounts/doctype/journal_entry/journal_entry.json
 #: erpnext/accounts/report/accounts_payable/accounts_payable.json
 #: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:126
@@ -2218,15 +2218,15 @@ msgstr "科目表不能为空。"
 msgid "Accounts to Merge"
 msgstr "待合并科目"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:158
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:265
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:162
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:270
 msgid "Accrued Expenses"
 msgstr ""
 
 #. Option for the 'Account Type' (Select) field in DocType 'Account'
 #: erpnext/accounts/doctype/account/account.json
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:63
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:112
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:67
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:117
 #: erpnext/accounts/report/account_balance/account_balance.js:37
 msgid "Accumulated Depreciation"
 msgstr "累计折旧"
@@ -2391,7 +2391,7 @@ msgstr "已执行的操作"
 
 #. Label of the enable_serial_and_batch_no_for_item (Check) field in DocType
 #. 'Stock Settings'
-#: erpnext/stock/doctype/item/item.js:419
+#: erpnext/stock/doctype/item/item.js:412
 #: erpnext/stock/doctype/stock_settings/stock_settings.json
 msgid "Activate Serial / Batch No for Item"
 msgstr ""
@@ -2515,7 +2515,7 @@ msgstr "实际结束日期"
 msgid "Actual End Date (via Timesheet)"
 msgstr "实际结束日期（通过工时表）"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:229
+#: erpnext/manufacturing/doctype/work_order/work_order.py:230
 msgid "Actual End Date cannot be before Actual Start Date"
 msgstr "实际结束日期不得早于实际开始日期"
 
@@ -2646,7 +2646,7 @@ msgstr "实际税额不能包含在第{0}行的物料单价中"
 msgid "Ad-hoc Qty"
 msgstr "临时数量"
 
-#: erpnext/stock/doctype/item/item.js:688
+#: erpnext/stock/doctype/item/item.js:675
 #: erpnext/stock/doctype/price_list/price_list.js:8
 msgid "Add / Edit Prices"
 msgstr "添加/编辑价格"
@@ -3145,7 +3145,7 @@ msgstr "附加信息"
 msgid "Additional Information updated successfully."
 msgstr "附加信息更新成功。"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:836
+#: erpnext/manufacturing/doctype/work_order/work_order.js:818
 msgid "Additional Material Transfer"
 msgstr "额外物料调拨"
 
@@ -3168,7 +3168,7 @@ msgstr "额外工费成本"
 msgid "Additional Transferred Qty"
 msgstr "额外调拨数量"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:710
+#: erpnext/manufacturing/doctype/work_order/work_order.py:711
 msgid "Additional Transferred Qty {0}\n"
 "\t\t\t\t\tcannot be greater than {1}.\n"
 "\t\t\t\t\tTo fix this, increase the percentage value\n"
@@ -3326,11 +3326,6 @@ msgstr "地址必须关联公司，请在链接表中添加公司记录"
 msgid "Address used to determine Tax Category in transactions"
 msgstr "业务交易用于决定税别的地址"
 
-#. Label of the adjust_qty (Float) field in DocType 'Sales Forecast Item'
-#: erpnext/manufacturing/doctype/sales_forecast_item/sales_forecast_item.json
-msgid "Adjust Qty"
-msgstr "调整数量"
-
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1160
 msgid "Adjustment Against"
 msgstr "源单"
@@ -3343,8 +3338,8 @@ msgstr "基于采购发票汇率的调整"
 msgid "Administrative Assistant"
 msgstr "行政助理"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:103
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:168
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:107
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:173
 msgid "Administrative Expenses"
 msgstr "行政费用"
 
@@ -3412,7 +3407,7 @@ msgstr "预付款状态"
 #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/controllers/accounts_controller.py:287
+#: erpnext/controllers/accounts_controller.py:288
 #: erpnext/setup/doctype/company/company.json
 msgid "Advance Payments"
 msgstr "预付款"
@@ -3674,11 +3669,11 @@ msgstr "账龄"
 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:154
 #: erpnext/accounts/report/accounts_payable/accounts_payable.html:138
 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:139
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1279
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1202
 msgid "Age (Days)"
 msgstr "账龄天数"
 
-#: erpnext/stock/report/stock_ageing/stock_ageing.py:228
+#: erpnext/stock/report/stock_ageing/stock_ageing.py:216
 msgid "Age ({0})"
 msgstr "天数 ({0})"
 
@@ -3828,21 +3823,21 @@ msgstr "所有客户组"
 #: erpnext/patches/v11_0/update_department_lft_rgt.py:9
 #: erpnext/patches/v11_0/update_department_lft_rgt.py:11
 #: erpnext/patches/v11_0/update_department_lft_rgt.py:16
-#: erpnext/setup/doctype/company/company.py:437
-#: erpnext/setup/doctype/company/company.py:440
-#: erpnext/setup/doctype/company/company.py:445
-#: erpnext/setup/doctype/company/company.py:451
-#: erpnext/setup/doctype/company/company.py:457
-#: erpnext/setup/doctype/company/company.py:463
-#: erpnext/setup/doctype/company/company.py:469
-#: erpnext/setup/doctype/company/company.py:475
-#: erpnext/setup/doctype/company/company.py:481
-#: erpnext/setup/doctype/company/company.py:487
-#: erpnext/setup/doctype/company/company.py:493
-#: erpnext/setup/doctype/company/company.py:499
-#: erpnext/setup/doctype/company/company.py:505
-#: erpnext/setup/doctype/company/company.py:511
-#: erpnext/setup/doctype/company/company.py:517
+#: erpnext/setup/doctype/company/company.py:441
+#: erpnext/setup/doctype/company/company.py:444
+#: erpnext/setup/doctype/company/company.py:449
+#: erpnext/setup/doctype/company/company.py:455
+#: erpnext/setup/doctype/company/company.py:461
+#: erpnext/setup/doctype/company/company.py:467
+#: erpnext/setup/doctype/company/company.py:473
+#: erpnext/setup/doctype/company/company.py:479
+#: erpnext/setup/doctype/company/company.py:485
+#: erpnext/setup/doctype/company/company.py:491
+#: erpnext/setup/doctype/company/company.py:497
+#: erpnext/setup/doctype/company/company.py:503
+#: erpnext/setup/doctype/company/company.py:509
+#: erpnext/setup/doctype/company/company.py:515
+#: erpnext/setup/doctype/company/company.py:521
 msgid "All Departments"
 msgstr "所有部门"
 
@@ -3922,7 +3917,7 @@ msgstr "所有供应商"
 msgid "All Territories"
 msgstr "所有区域"
 
-#: erpnext/setup/doctype/company/company.py:382
+#: erpnext/setup/doctype/company/company.py:386
 msgid "All Warehouses"
 msgstr "所有仓库"
 
@@ -3944,15 +3939,15 @@ msgstr "所有物料已申请"
 msgid "All items have already been Invoiced/Returned"
 msgstr "所有物料已开具发票/退回"
 
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:1236
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:1277
 msgid "All items have already been received"
 msgstr "所有物料已收货"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:3319
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py:138
 msgid "All items have already been transferred for this Work Order."
 msgstr "所有物料已发料到该生产工单。"
 
-#: erpnext/public/js/controllers/transaction.js:2948
+#: erpnext/public/js/controllers/transaction.js:2950
 msgid "All items in this document already have a linked Quality Inspection."
 msgstr "本单据所有物料均已关联质检单"
 
@@ -3974,11 +3969,11 @@ msgstr "在CRM文档流转（线索->商机->报价）过程中，所有评论
 msgid "All the items have been already returned."
 msgstr "所有物料已退回"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1274
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1256
 msgid "All the required items (raw materials) will be fetched from BOM and populated in this table. Here you can also change the Source Warehouse for any item. And during the production, you can track transferred raw materials from this table."
 msgstr "所需物料（原材料）将从BOM提取并填充本表，可修改物料的源仓库，生产过程中可在此追踪原材料转移"
 
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:872
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:913
 msgid "All these items have already been Invoiced/Returned"
 msgstr "所有物料已经开票/被退货"
 
@@ -4094,7 +4089,7 @@ msgstr "已分配数量"
 
 #. Label of the allow_account_creation_against_child_company (Check) field in
 #. DocType 'Company'
-#: erpnext/accounts/doctype/account/account.py:544
+#: erpnext/accounts/doctype/account/account.py:545
 #: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:68
 #: erpnext/setup/doctype/company/company.json
 msgid "Allow Account Creation Against Child Company"
@@ -4158,7 +4153,7 @@ msgstr "允许退货"
 msgid "Allow Internal Transfers at Arm's Length Price"
 msgstr "启用近距离调拨价"
 
-#: erpnext/controllers/selling_controller.py:858
+#: erpnext/controllers/selling_controller.py:859
 msgid "Allow Item to Be Added Multiple Times in a Transaction"
 msgstr "允许在交易中物料号重复"
 
@@ -4548,8 +4543,8 @@ msgid "Also you can't switch back to FIFO after setting the valuation method to
 msgstr "本物料设置为移动平均计价法后不可切换回先进先出法。"
 
 #: erpnext/manufacturing/doctype/bom/bom.js:288
-#: erpnext/manufacturing/doctype/work_order/work_order.js:165
-#: erpnext/manufacturing/doctype/work_order/work_order.js:180
+#: erpnext/manufacturing/doctype/work_order/work_order.js:146
+#: erpnext/manufacturing/doctype/work_order/work_order.js:161
 #: erpnext/public/js/utils.js:587
 #: erpnext/stock/doctype/stock_entry/stock_entry.js:322
 msgid "Alternate Item"
@@ -4790,7 +4785,7 @@ msgstr "始终询问"
 msgid "Amount"
 msgstr "金额"
 
-#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:22
+#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:34
 msgid "Amount (AED)"
 msgstr "金额（阿联酋迪拉姆）"
 
@@ -4924,12 +4919,12 @@ msgid "Amount to Bill"
 msgstr "待开票金额"
 
 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1259
-msgid "Amount {0} {1} against {2} {3}"
-msgstr "金额 {0}{1} 业务单据 {2} {3}"
+msgid "Amount {0} {1} adjusted against {2} {3}"
+msgstr ""
 
 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1270
-msgid "Amount {0} {1} deducted against {2}"
-msgstr "金额{0} {1}抵扣{2}"
+msgid "Amount {0} {1} as adjustment to {2}"
+msgstr ""
 
 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1234
 msgid "Amount {0} {1} transferred from {2} to {3}"
@@ -4974,7 +4969,7 @@ msgstr "金额"
 msgid "An Item Group is a way to classify items based on types."
 msgstr "物料组用于对物料进行分类"
 
-#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:558
+#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:601
 msgid "An error has been appeared while reposting item valuation via {0}"
 msgstr "通过 {0} 进行的物料成本价追溯调整出错了"
 
@@ -5530,7 +5525,7 @@ msgstr "存在预留库存时不可禁用{0}"
 msgid "As there are sufficient Sub Assembly Items, Work Order is not required for Warehouse {0}."
 msgstr "由于子装配件充足，仓库{0}无需工单"
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1839
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1841
 msgid "As there are sufficient raw materials, Material Request is not required for Warehouse {0}."
 msgstr "因仓库 {0} 有足够库存，未生成物料需求。"
 
@@ -5845,8 +5840,8 @@ msgstr "资产数量"
 #. Option for the 'Account Type' (Select) field in DocType 'Account'
 #. Label of the asset_received_but_not_billed (Link) field in DocType 'Company'
 #: erpnext/accounts/doctype/account/account.json
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:165
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:279
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:169
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:284
 #: erpnext/accounts/report/account_balance/account_balance.js:38
 #: erpnext/setup/doctype/company/company.json
 msgid "Asset Received But Not Billed"
@@ -6110,7 +6105,7 @@ msgstr "未为{item_code}创建资产，请手动创建"
 msgid "Assets {assets_link} created for {item_code}"
 msgstr "已为{item_code}创建资产{assets_link}"
 
-#: erpnext/manufacturing/doctype/job_card/job_card.js:240
+#: erpnext/manufacturing/doctype/job_card/job_card.js:709
 msgid "Assign Job to Employee"
 msgstr "派工"
 
@@ -6171,7 +6166,7 @@ msgstr "应选择至少一个适用模块"
 msgid "At least one of the Selling or Buying must be selected"
 msgstr "必须选择销售或采购至少一项"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:317
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:57
 msgid "At least one raw material item must be present in the stock entry for the type {0}"
 msgstr ""
 
@@ -6179,21 +6174,17 @@ msgstr ""
 msgid "At least one row is required for a financial report template"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:876
-msgid "At least one warehouse is mandatory"
-msgstr "必须指定至少一个仓库"
-
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:779
-msgid "At row #{0}: the Difference Account must not be a Stock type account, please change the Account Type for the account {1} or select a different account"
-msgstr "第{0}行：差异科目不得为库存类型科目，请修改科目{1}类型或选择其他科目。"
+#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:169
+msgid "At row #{0}: the Difference Account must not be a Stock type account..."
+msgstr ""
 
 #: erpnext/manufacturing/doctype/routing/routing.py:50
 msgid "At row #{0}: the sequence id {1} cannot be less than previous row sequence id {2}"
 msgstr "行{0}：序列ID{1}不能小于前一行的序列ID{2}"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:790
-msgid "At row #{0}: you have selected the Difference Account {1}, which is a Cost of Goods Sold type account. Please select a different account"
-msgstr "第{0}行：所选差异科目{1}为销售成本类型科目，请选择其他科目。"
+#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:180
+msgid "At row #{0}: you have selected the Difference Account {1}..."
+msgstr ""
 
 #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1184
 msgid "At row {0}: Batch No is mandatory for Item {1}"
@@ -6623,7 +6614,7 @@ msgstr "可用日期"
 #: erpnext/public/js/utils.js:647
 #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
 #: erpnext/stock/doctype/pick_list_item/pick_list_item.json
-#: erpnext/stock/report/stock_ageing/stock_ageing.py:177
+#: erpnext/stock/report/stock_ageing/stock_ageing.py:165
 msgid "Available Qty"
 msgstr "可用数量"
 
@@ -6712,10 +6703,6 @@ msgstr ""
 msgid "Available for use date is required"
 msgstr "请输入启用日期"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1039
-msgid "Available quantity is {0}, you need {1}"
-msgstr "可用数量 {0}，需求数量 {1}"
-
 #: erpnext/stock/dashboard/item_dashboard.js:251
 msgid "Available {0}"
 msgstr "可用{0}"
@@ -6724,8 +6711,8 @@ msgstr "可用{0}"
 msgid "Available-for-use Date should be after purchase date"
 msgstr "启用日应晚于采购日"
 
-#: erpnext/stock/report/stock_ageing/stock_ageing.py:178
-#: erpnext/stock/report/stock_ageing/stock_ageing.py:212
+#: erpnext/stock/report/stock_ageing/stock_ageing.py:166
+#: erpnext/stock/report/stock_ageing/stock_ageing.py:200
 #: erpnext/stock/report/stock_balance/stock_balance.py:594
 msgid "Average Age"
 msgstr "平均库龄"
@@ -6831,7 +6818,7 @@ msgstr "库位数量"
 #: erpnext/manufacturing/doctype/bom/bom.json
 #: erpnext/manufacturing/doctype/bom/bom_tree.js:8
 #: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
-#: erpnext/manufacturing/doctype/work_order/work_order.js:216
+#: erpnext/manufacturing/doctype/work_order/work_order.js:197
 #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json
 #: erpnext/manufacturing/report/bom_explorer/bom_explorer.js:8
 #: erpnext/manufacturing/report/bom_explorer/bom_explorer.py:67
@@ -6854,7 +6841,7 @@ msgstr "物料清单"
 msgid "BOM 1"
 msgstr "物料清单1"
 
-#: erpnext/manufacturing/doctype/bom/bom.py:1811
+#: erpnext/manufacturing/doctype/bom/bom.py:1832
 msgid "BOM 1 {0} and BOM 2 {1} should not be same"
 msgstr "物料清单1 {0} 与物料清单2 {0} 不能相同"
 
@@ -6926,11 +6913,6 @@ msgstr "BOM底层物料"
 msgid "BOM ID"
 msgstr "物料清单代码"
 
-#. Label of the bom_info_section (Section Break) field in DocType 'Stock Entry'
-#: erpnext/stock/doctype/stock_entry/stock_entry.json
-msgid "BOM Info"
-msgstr "物料清单信息"
-
 #. Name of a DocType
 #: erpnext/manufacturing/doctype/bom_item/bom_item.json
 msgid "BOM Item"
@@ -7084,7 +7066,7 @@ msgstr "展示在网站上的BOM物料"
 msgid "BOM Website Operation"
 msgstr "展示在网站上的BOM工序"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:2430
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/disassemble.py:156
 msgid "BOM and Finished Good Quantity is mandatory for Disassembly"
 msgstr ""
 
@@ -7152,7 +7134,7 @@ msgstr "倒填库存交易"
 #. Order Operation'
 #: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
 #: erpnext/manufacturing/doctype/job_card/job_card.json
-#: erpnext/manufacturing/doctype/work_order/work_order.js:386
+#: erpnext/manufacturing/doctype/work_order/work_order.js:367
 #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json
 msgid "Backflush Materials From WIP Warehouse"
 msgstr "从在制品仓库后冲原材料"
@@ -7437,8 +7419,8 @@ msgid "Bank Balance"
 msgstr "银行存款余额"
 
 #. Label of the bank_charges (Currency) field in DocType 'Invoice Discounting'
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:133
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:219
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:137
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:224
 #: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.json
 msgid "Bank Charges"
 msgstr "银行费用"
@@ -7553,8 +7535,8 @@ msgstr "银行担保类型"
 msgid "Bank Name"
 msgstr "银行名称"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:179
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:309
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:183
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:314
 msgid "Bank Overdraft Account"
 msgstr "银行透支账户"
 
@@ -7963,7 +7945,7 @@ msgstr "物料批号到期状态"
 #: erpnext/manufacturing/doctype/job_card/job_card.json
 #: erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:89
 #: erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py:115
-#: erpnext/public/js/controllers/transaction.js:2865
+#: erpnext/public/js/controllers/transaction.js:2867
 #: erpnext/public/js/utils/barcode_scanner.js:281
 #: erpnext/public/js/utils/serial_no_batch_selector.js:450
 #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
@@ -8058,7 +8040,7 @@ msgstr "数量"
 #. Label of the batch_size (Float) field in DocType 'Work Order Operation'
 #: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
 #: erpnext/manufacturing/doctype/operation/operation.json
-#: erpnext/manufacturing/doctype/work_order/work_order.js:368
+#: erpnext/manufacturing/doctype/work_order/work_order.js:349
 #: erpnext/manufacturing/doctype/work_order/work_order.json
 #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json
 msgid "Batch Size"
@@ -8075,7 +8057,7 @@ msgstr "计量单位"
 msgid "Batch and Serial No"
 msgstr "批次和序列号"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:937
+#: erpnext/manufacturing/doctype/work_order/work_order.py:938
 msgid "Batch not created for item {} since it does not have a batch series."
 msgstr "未为物料{}创建批次，因其无批次编号规则"
 
@@ -8098,12 +8080,12 @@ msgstr "批号 {0} 和仓库"
 msgid "Batch {0} is not available in warehouse {1}"
 msgstr "批次{0}在仓库{1}中不可用"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:3503
+#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:103
 #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:289
 msgid "Batch {0} of Item {1} has expired."
 msgstr "物料{1}的批号{0} 已过期。"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:3509
+#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:98
 msgid "Batch {0} of Item {1} is disabled."
 msgstr "物料{1}批号{0}已禁用。"
 
@@ -8158,7 +8140,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:1264
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1187
 #: erpnext/accounts/report/purchase_register/purchase_register.py:214
 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
 msgid "Bill Date"
@@ -8167,7 +8149,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:1263
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1186
 #: erpnext/accounts/report/purchase_register/purchase_register.py:213
 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
 msgid "Bill No"
@@ -8181,11 +8163,13 @@ msgstr ""
 
 #. Label of a Card Break in the Manufacturing Workspace
 #. Label of a Link in the Manufacturing Workspace
+#. Label of the bom_info_section (Section Break) field in DocType 'Stock Entry'
 #. Label of a Workspace Sidebar Item
 #: erpnext/manufacturing/doctype/bom/bom.py:1382
 #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
 #: erpnext/stock/doctype/material_request/material_request.js:139
 #: erpnext/stock/doctype/stock_entry/stock_entry.js:774
+#: erpnext/stock/doctype/stock_entry/stock_entry.json
 #: erpnext/workspace_sidebar/subcontracting.json
 msgid "Bill of Materials"
 msgstr "物料清单"
@@ -8286,7 +8270,7 @@ msgstr "发票地址详情"
 msgid "Billing Address Name"
 msgstr "开票地址名称"
 
-#: erpnext/controllers/accounts_controller.py:574
+#: erpnext/controllers/accounts_controller.py:575
 msgid "Billing Address does not belong to the {0}"
 msgstr "账单地址不属于{0}"
 
@@ -8893,8 +8877,8 @@ msgstr "构建树形结构"
 msgid "Buildable Qty"
 msgstr "可生产数量"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:61
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:102
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:65
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:107
 msgid "Buildings"
 msgstr "房屋"
 
@@ -9112,8 +9096,8 @@ msgstr "CRM备注"
 msgid "CRM Settings"
 msgstr "客户关系设置"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:67
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:117
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:71
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:122
 msgid "CWIP Account"
 msgstr "在建工程科目"
 
@@ -9368,7 +9352,7 @@ msgstr ""
 msgid "Can be approved by {0}"
 msgstr "可以被 {0} 批准"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:2583
+#: erpnext/manufacturing/doctype/work_order/work_order.py:2581
 msgid "Can not close Work Order. Since {0} Job Cards are in Work In Progress state."
 msgstr "无法关闭工单，因{0}张作业卡处于进行中状态"
 
@@ -9402,12 +9386,12 @@ msgid "Can only make payment against unbilled {0}"
 msgstr "只能为未开票{0}付款"
 
 #: erpnext/accounts/doctype/payment_entry/payment_entry.js:1499
-#: erpnext/controllers/accounts_controller.py:3196
+#: erpnext/controllers/accounts_controller.py:3190
 #: erpnext/public/js/controllers/accounts.js:103
 msgid "Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'"
 msgstr "仅在收费模式为“基于上一行金额”或“前一行的总计”才能参考（这一）行"
 
-#: erpnext/setup/doctype/company/company.py:206
+#: erpnext/setup/doctype/company/company.py:209
 #: erpnext/stock/doctype/stock_settings/stock_settings.py:181
 msgid "Can't change the valuation method, as there are transactions against some items which do not have its own valuation method"
 msgstr "有些物料未在物料主数据中维护成本计算方法且已关联物料凭证与会计凭证，考虑资料一致性此处成本计算方法不能被修改"
@@ -9449,7 +9433,7 @@ msgstr "无法指定出纳员"
 msgid "Cannot Calculate Arrival Time as Driver Address is Missing."
 msgstr "无司机地址，无法计算预估到达时间"
 
-#: erpnext/setup/doctype/company/company.py:225
+#: erpnext/setup/doctype/company/company.py:228
 msgid "Cannot Change Inventory Account Setting"
 msgstr "无法更改库存科目设置"
 
@@ -9507,7 +9491,7 @@ msgstr ""
 msgid "Cannot cancel as processing of cancelled documents is pending."
 msgstr "因相关已取消单据后台提交尚未完成，不能进行取消操作"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1115
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1116
 msgid "Cannot cancel because submitted Stock Entry {0} exists"
 msgstr "不能取消，因为提交的仓储记录{0}已经存在"
 
@@ -9527,7 +9511,7 @@ msgstr ""
 msgid "Cannot cancel this document as it is linked with the submitted asset {asset_link}. Please cancel the asset to continue."
 msgstr "该单据关联已提交资产{asset_link}，需先取消资产"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:554
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:418
 msgid "Cannot cancel transaction for Completed Work Order."
 msgstr "无法取消已完成工单的交易。"
 
@@ -9535,7 +9519,7 @@ msgstr "无法取消已完成工单的交易。"
 msgid "Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item"
 msgstr "已有物料移动交易后不能更改物料的属性。请创建一个新物料并将库存转移到新物料"
 
-#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:73
+#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:74
 msgid "Cannot change Reference Document Type."
 msgstr "不可修改参考单据类型"
 
@@ -9547,7 +9531,7 @@ msgstr "无法更改第{0}行中服务停止日期"
 msgid "Cannot change Variant properties after stock transaction. You will have to make a new Item to do this."
 msgstr "存货业务发生后不能更改多规格物料的属性。需要创建新物料。"
 
-#: erpnext/setup/doctype/company/company.py:330
+#: erpnext/setup/doctype/company/company.py:334
 msgid "Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency."
 msgstr "因为已有交易不能改变公司的默认货币，请先取消交易。"
 
@@ -9563,11 +9547,11 @@ msgstr "因为有下级成本中心，不能将其转换为记账成本中心，
 msgid "Cannot convert Task to non-group because the following child Tasks exist: {0}."
 msgstr "存在子任务{0}，无法转换为非组任务"
 
-#: erpnext/accounts/doctype/account/account.py:440
+#: erpnext/accounts/doctype/account/account.py:441
 msgid "Cannot convert to Group because Account Type is selected."
 msgstr "科目类型字段清空后才能执行操作->转换为组"
 
-#: erpnext/accounts/doctype/account/account.py:276
+#: erpnext/accounts/doctype/account/account.py:277
 msgid "Cannot covert to Group because Account Type is selected."
 msgstr "科目类型字段须为空才能转换为组。"
 
@@ -9575,7 +9559,7 @@ msgstr "科目类型字段须为空才能转换为组。"
 msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts."
 msgstr "无法为未来日期的采购收据创建库存预留"
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:2023
+#: erpnext/selling/doctype/sales_order/sales_order.py:2045
 #: erpnext/stock/doctype/pick_list/pick_list.py:257
 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 "为销售订单 {0} 创建了库存预留，请取消预留后再创建拣货单"
@@ -9609,12 +9593,12 @@ msgstr "无法删除汇兑损益行"
 msgid "Cannot delete Serial No {0}, as it is used in stock transactions"
 msgstr "无法删除已在库存业务单据中使用过的序列号{0}"
 
-#: erpnext/controllers/accounts_controller.py:3809
+#: erpnext/controllers/accounts_controller.py:3815
 msgid "Cannot delete an item which has been ordered"
 msgstr ""
 
 #: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:197
-#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:784
+#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:785
 msgid "Cannot delete protected core DocType: {0}"
 msgstr ""
 
@@ -9626,7 +9610,7 @@ msgstr ""
 msgid "Cannot disable Serial and Batch No for Item, as there are existing records for serial / batch."
 msgstr ""
 
-#: erpnext/setup/doctype/company/company.py:560
+#: erpnext/setup/doctype/company/company.py:564
 msgid "Cannot disable perpetual inventory, as there are existing Stock Ledger Entries for the company {0}. Please cancel the stock transactions first and try again."
 msgstr "无法停用永续盘存制，因公司{0}存在库存分类账记录。请先取消库存交易再重试。"
 
@@ -9634,20 +9618,20 @@ msgstr "无法停用永续盘存制，因公司{0}存在库存分类账记录。
 msgid "Cannot disable {0} as it may lead to incorrect stock valuation."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:727
+#: erpnext/manufacturing/doctype/work_order/work_order.py:728
 msgid "Cannot disassemble more than produced quantity."
 msgstr "拆解数量不得超过产出数量。"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:919
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/disassemble.py:40
 msgid "Cannot disassemble {0} qty against Stock Entry {1}. Only {2} qty available to disassemble."
 msgstr ""
 
-#: erpnext/setup/doctype/company/company.py:222
+#: erpnext/setup/doctype/company/company.py:225
 msgid "Cannot enable Item-wise Inventory Account, as there are existing Stock Ledger Entries for the company {0} with Warehouse-wise Inventory Account. Please cancel the stock transactions first and try again."
 msgstr "无法启用按物料核算库存科目，因公司{0}已存在按仓库核算的库存分类账记录。请先取消库存交易再重试。"
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:783
-#: erpnext/selling/doctype/sales_order/sales_order.py:806
+#: erpnext/selling/doctype/sales_order/sales_order.py:786
+#: erpnext/selling/doctype/sales_order/sales_order.py:809
 msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No."
 msgstr "物料{0}同时存在启用和未启用序列号交付，无法确保"
 
@@ -9663,7 +9647,7 @@ msgstr "未找到匹配此条码的物料或仓库"
 msgid "Cannot find Item with this Barcode"
 msgstr "找不到该条码对应的物料"
 
-#: erpnext/controllers/accounts_controller.py:3761
+#: erpnext/controllers/accounts_controller.py:3767
 msgid "Cannot find a default warehouse for item {0}. Please set one in the Item Master or in Stock Settings."
 msgstr "找不到物料{0}的默认仓库，请在物料主数据或库存设置中设置"
 
@@ -9671,15 +9655,15 @@ msgstr "找不到物料{0}的默认仓库，请在物料主数据或库存设置
 msgid "Cannot merge {0} '{1}' into '{2}' as both have existing accounting entries in different currencies for company '{3}'."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:577
+#: erpnext/manufacturing/doctype/work_order/work_order.py:578
 msgid "Cannot produce more Item {0} than Sales Order quantity {1} {2}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1472
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1473
 msgid "Cannot produce more item for {0}"
 msgstr "无法为{0}生产更多物料"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1476
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1477
 msgid "Cannot produce more than {0} items for {1}"
 msgstr "无法为{1}生产超过{0}件物料"
 
@@ -9687,12 +9671,12 @@ msgstr "无法为{1}生产超过{0}件物料"
 msgid "Cannot receive from customer against negative outstanding"
 msgstr "存在负未清金额时不可从客户收货"
 
-#: erpnext/controllers/accounts_controller.py:4083
+#: erpnext/controllers/accounts_controller.py:4089
 msgid "Cannot reduce quantity than ordered or purchased quantity"
 msgstr ""
 
 #: erpnext/accounts/doctype/payment_entry/payment_entry.js:1512
-#: erpnext/controllers/accounts_controller.py:3211
+#: erpnext/controllers/accounts_controller.py:3205
 #: erpnext/public/js/controllers/accounts.js:120
 msgid "Cannot refer row number greater than or equal to current row number for this Charge type"
 msgstr "此收取类型不能引用大于或等于本行的数据。"
@@ -9705,14 +9689,14 @@ msgstr "无法获取更新链接令牌，查看错误日志"
 msgid "Cannot retrieve link token. Check Error Log for more information"
 msgstr "无法获取链接令牌，查看错误日志"
 
-#: erpnext/selling/doctype/customer/customer.py:368
+#: erpnext/selling/doctype/customer/customer.py:358
 msgid "Cannot select a Group type Customer Group. Please select a non-group Customer Group."
 msgstr ""
 
 #: erpnext/accounts/doctype/payment_entry/payment_entry.js:1505
 #: erpnext/accounts/doctype/payment_entry/payment_entry.js:1683
 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1827
-#: erpnext/controllers/accounts_controller.py:3201
+#: erpnext/controllers/accounts_controller.py:3195
 #: erpnext/public/js/controllers/accounts.js:112
 #: erpnext/public/js/controllers/taxes_and_totals.js:550
 msgid "Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row"
@@ -9734,11 +9718,11 @@ msgstr "无法为公司设置多个物料默认值。"
 msgid "Cannot set multiple account rows for the same company"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4049
+#: erpnext/controllers/accounts_controller.py:4055
 msgid "Cannot set quantity less than delivered quantity."
 msgstr "无法设定数量小于出货数量."
 
-#: erpnext/controllers/accounts_controller.py:4050
+#: erpnext/controllers/accounts_controller.py:4056
 msgid "Cannot set quantity less than received quantity."
 msgstr "数量不可小于已接收数量."
 
@@ -9750,7 +9734,7 @@ msgstr "无法设置允许字段<b>{0}</b>复制到多规格物料"
 msgid "Cannot start deletion. Another deletion {0} is already queued/running. Please wait for it to complete."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4077
+#: erpnext/controllers/accounts_controller.py:4083
 msgid "Cannot update rate as item {0} is already ordered or purchased against this quotation"
 msgstr ""
 
@@ -9783,7 +9767,7 @@ msgstr "产能（库存单位）"
 msgid "Capacity Planning"
 msgstr "产能计划"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1101
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1102
 msgid "Capacity Planning Error, planned start time can not be same as end time"
 msgstr "产能计划错误，计划开始时间不能等于结束时间"
 
@@ -9802,13 +9786,13 @@ msgstr "产能（库存单位）"
 msgid "Capacity must be greater than 0"
 msgstr "产能必须大于0"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:44
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:77
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:48
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:82
 msgid "Capital Equipment"
 msgstr "资本设备"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:190
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:333
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:194
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:338
 msgid "Capital Stock"
 msgstr "股本"
 
@@ -10140,7 +10124,7 @@ msgstr "请将科目类型改为应收或选择其他科目"
 msgid "Change this date manually to setup the next synchronization start date"
 msgstr "手工修改后下次同步由此日期开始"
 
-#: erpnext/selling/doctype/customer/customer.py:158
+#: erpnext/selling/doctype/customer/customer.py:148
 msgid "Changed customer name to '{}' as '{}' already exists."
 msgstr "客户名称已存在，已更改为'{}'"
 
@@ -10148,7 +10132,7 @@ msgstr "客户名称已存在，已更改为'{}'"
 msgid "Changes in {0}"
 msgstr "{0}变更记录"
 
-#: erpnext/stock/doctype/item/item.js:385
+#: erpnext/stock/doctype/item/item.js:378
 msgid "Changing Customer Group for the selected Customer is not allowed."
 msgstr "不允许更改所选客户的客户组。"
 
@@ -10163,7 +10147,7 @@ msgid "Channel Partner"
 msgstr "渠道服务商"
 
 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:2258
-#: erpnext/controllers/accounts_controller.py:3264
+#: erpnext/controllers/accounts_controller.py:3258
 msgid "Charge of type 'Actual' in row {0} cannot be included in Item Rate or Paid Amount"
 msgstr "行{0}的'实际'类型费用不可包含在物料单价或实付金额中"
 
@@ -10217,7 +10201,7 @@ msgstr "科目表树"
 #: erpnext/accounts/doctype/cost_center/cost_center_tree.js:52
 #: erpnext/accounts/workspace/invoicing/invoicing.json
 #: erpnext/public/js/setup_wizard.js:43
-#: erpnext/setup/doctype/company/company.js:123
+#: erpnext/setup/doctype/company/company.js:139
 #: erpnext/setup/doctype/company/company.json
 #: erpnext/setup/workspace/home/home.json
 #: erpnext/workspace_sidebar/accounts_setup.json
@@ -10360,7 +10344,7 @@ msgstr "支票宽度"
 
 #. Label of the reference_date (Date) field in DocType 'Payment Entry'
 #: erpnext/accounts/doctype/payment_entry/payment_entry.json
-#: erpnext/public/js/controllers/transaction.js:2776
+#: erpnext/public/js/controllers/transaction.js:2778
 msgid "Cheque/Reference Date"
 msgstr "业务日期"
 
@@ -10418,7 +10402,7 @@ msgstr "子单据名称/编号"
 
 #. Label of the child_row_reference (Data) field in DocType 'Quality
 #. Inspection'
-#: erpnext/public/js/controllers/transaction.js:2871
+#: erpnext/public/js/controllers/transaction.js:2873
 #: erpnext/stock/doctype/quality_inspection/quality_inspection.json
 msgid "Child Row Reference"
 msgstr "子行引用"
@@ -10612,11 +10596,11 @@ msgstr "封闭文件"
 msgid "Closed Documents"
 msgstr "已关闭单据类型"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:2506
+#: erpnext/manufacturing/doctype/work_order/work_order.py:2504
 msgid "Closed Work Order can not be stopped or Re-opened"
 msgstr "已关闭工单不可停止或重新打开"
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:542
+#: erpnext/selling/doctype/sales_order/sales_order.py:547
 msgid "Closed order cannot be cancelled. Unclose to cancel."
 msgstr "关闭的定单不能被取消。 Unclose取消。"
 
@@ -10868,8 +10852,8 @@ msgstr "佣金率％"
 msgid "Commission Rate (%)"
 msgstr "佣金率（％）"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:104
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:172
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:108
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:177
 msgid "Commission on Sales"
 msgstr "销售佣金"
 
@@ -10903,7 +10887,7 @@ msgstr "通信媒体时隙"
 msgid "Communication Medium Type"
 msgstr "通信媒体类型"
 
-#: erpnext/setup/install.py:107
+#: erpnext/setup/install.py:108
 msgid "Compact Item Print"
 msgstr "紧凑型物料打印(除单价与金额外其它字段在物料描述字段打印)"
 
@@ -11302,8 +11286,8 @@ msgstr "公司"
 #: erpnext/setup/doctype/employee/employee_tree.js:8
 #: erpnext/setup/doctype/employee_external_work_history/employee_external_work_history.json
 #: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.json
-#: erpnext/setup/doctype/vehicle/vehicle.json erpnext/setup/install.py:166
-#: erpnext/setup/install.py:175 erpnext/setup/workspace/home/home.json
+#: erpnext/setup/doctype/vehicle/vehicle.json erpnext/setup/install.py:198
+#: erpnext/setup/install.py:207 erpnext/setup/workspace/home/home.json
 #: erpnext/stock/dashboard_chart_source/stock_value_by_item_group/stock_value_by_item_group.js:8
 #: erpnext/stock/dashboard_chart_source/warehouse_wise_stock_value/warehouse_wise_stock_value.js:8
 #: erpnext/stock/doctype/bin/bin.json
@@ -11445,11 +11429,11 @@ msgstr "公司地址"
 msgid "Company Address Name"
 msgstr "公司地址名称"
 
-#: erpnext/controllers/accounts_controller.py:4411
+#: erpnext/controllers/accounts_controller.py:4399
 msgid "Company Address is missing. You don't have permission to create an Address. Please contact your System Manager."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4399
+#: erpnext/controllers/accounts_controller.py:4387
 msgid "Company Address is missing. You don't have permission to update it. Please contact your System Manager."
 msgstr "公司地址信息缺失。您无权限更新该信息，请联系系统管理员。"
 
@@ -11552,7 +11536,7 @@ msgstr "必须填写公司和过账日期"
 msgid "Company and account filters not set!"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2580
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2661
 msgid "Company currencies of both the companies should match for Inter Company Transactions."
 msgstr "两家公司的本币应匹配关联公司交易。"
 
@@ -11587,7 +11571,7 @@ msgstr ""
 msgid "Company link field name used for filtering (optional - leave empty to delete all records)"
 msgstr ""
 
-#: erpnext/setup/doctype/company/company.js:222
+#: erpnext/setup/doctype/company/company.js:238
 msgid "Company name not same"
 msgstr "公司名不一样"
 
@@ -11626,12 +11610,12 @@ msgstr "内部供应商所属公司"
 msgid "Company {0} added multiple times"
 msgstr "公司{0}被重复添加"
 
-#: erpnext/accounts/doctype/account/account.py:509
+#: erpnext/accounts/doctype/account/account.py:510
 #: erpnext/manufacturing/report/material_requirements_planning_report/material_requirements_planning_report.py:1308
 msgid "Company {0} does not exist"
 msgstr "公司{0}不存在"
 
-#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:83
+#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:105
 msgid "Company {0} is added more than once"
 msgstr "公司{0}被多次添加"
 
@@ -11673,7 +11657,7 @@ msgstr "竞争对手名称"
 msgid "Competitors"
 msgstr "竞争对手"
 
-#: erpnext/manufacturing/doctype/job_card/job_card.js:277
+#: erpnext/manufacturing/doctype/job_card/job_card.js:661
 #: erpnext/manufacturing/doctype/workstation/workstation.js:151
 msgid "Complete Job"
 msgstr "停止计时"
@@ -11720,12 +11704,12 @@ msgstr ""
 msgid "Completed Qty"
 msgstr "完工数量"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1390
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1391
 msgid "Completed Qty cannot be greater than 'Qty to Manufacture'"
 msgstr "完成数量不可超过'待生产数量'"
 
-#: erpnext/manufacturing/doctype/job_card/job_card.js:331
-#: erpnext/manufacturing/doctype/job_card/job_card.js:452
+#: erpnext/manufacturing/doctype/job_card/job_card.js:259
+#: erpnext/manufacturing/doctype/job_card/job_card.js:393
 #: erpnext/manufacturing/doctype/workstation/workstation.js:296
 msgid "Completed Quantity"
 msgstr "完成数量"
@@ -11914,7 +11898,7 @@ msgstr "显示辅助核算"
 msgid "Consider Minimum Order Qty"
 msgstr "考虑最小订单数量"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1096
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1078
 msgid "Consider Process Loss"
 msgstr "考量工艺损耗"
 
@@ -12108,7 +12092,7 @@ msgstr "已消耗物料成本"
 msgid "Consumed Qty"
 msgstr "已耗用数量"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1766
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1767
 msgid "Consumed Qty cannot be greater than Reserved Qty for item {0}"
 msgstr "物料{0}的消耗数量不可超过预留数量"
 
@@ -12137,7 +12121,7 @@ msgstr "资本化需填写消耗库存/资产/服务项"
 msgid "Consumed Stock Total Value"
 msgstr "耗用的库存金额"
 
-#: erpnext/stock/doctype/stock_entry_type/stock_entry_type.py:135
+#: erpnext/stock/doctype/stock_entry_type/stock_entry_type.py:136
 msgid "Consumed quantity of item {0} exceeds transferred quantity."
 msgstr ""
 
@@ -12265,7 +12249,7 @@ msgstr "联系人电话"
 msgid "Contact Person"
 msgstr "联系人"
 
-#: erpnext/controllers/accounts_controller.py:586
+#: erpnext/controllers/accounts_controller.py:587
 msgid "Contact Person does not belong to the {0}"
 msgstr "联系人不属于{0}"
 
@@ -12459,15 +12443,15 @@ 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 "物料{0}的换算系数已重置为1.0，因其单位{1}与库存单位{2}相同"
 
-#: erpnext/controllers/accounts_controller.py:2977
+#: erpnext/controllers/accounts_controller.py:2971
 msgid "Conversion rate cannot be 0"
 msgstr "汇率不能为 0"
 
-#: erpnext/controllers/accounts_controller.py:2984
+#: erpnext/controllers/accounts_controller.py:2978
 msgid "Conversion rate is 1.00, but document currency is different from company currency"
 msgstr "汇率设置为1.00，但单据货币与公司货币不同"
 
-#: erpnext/controllers/accounts_controller.py:2980
+#: erpnext/controllers/accounts_controller.py:2974
 msgid "Conversion rate must be 1.00 if document currency is same as company currency"
 msgstr "单据货币与公司本位币相同时，汇率必须为1.00"
 
@@ -12544,13 +12528,13 @@ msgstr "纠正"
 msgid "Corrective Action"
 msgstr "纠正措施"
 
-#: erpnext/manufacturing/doctype/job_card/job_card.js:509
+#: erpnext/manufacturing/doctype/job_card/job_card.js:447
 msgid "Corrective Job Card"
 msgstr "返工生产任务单"
 
 #. Label of the corrective_operation_section (Tab Break) field in DocType 'Job
 #. Card'
-#: erpnext/manufacturing/doctype/job_card/job_card.js:516
+#: erpnext/manufacturing/doctype/job_card/job_card.js:456
 #: erpnext/manufacturing/doctype/job_card/job_card.json
 msgid "Corrective Operation"
 msgstr "返工工序"
@@ -12717,7 +12701,7 @@ msgstr ""
 #: erpnext/accounts/report/accounts_payable/accounts_payable.js:28
 #: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:47
 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:30
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1249
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1172
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:47
 #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js:42
 #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204
@@ -12850,7 +12834,7 @@ msgstr "成本中心{}为组成本中心，不可用于交易"
 msgid "Cost Center: {0} does not exist"
 msgstr "成本中心：{0}不存在"
 
-#: erpnext/setup/doctype/company/company.js:113
+#: erpnext/setup/doctype/company/company.js:129
 msgid "Cost Centers"
 msgstr "成本中心"
 
@@ -12893,17 +12877,13 @@ msgstr "出货物料成本"
 #. Label of the cost_of_good_sold_section (Section Break) field in DocType
 #. 'Item Default'
 #: erpnext/accounts/doctype/account/account.json
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:84
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:143
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:88
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:148
 #: erpnext/accounts/report/account_balance/account_balance.js:43
 #: erpnext/stock/doctype/item_default/item_default.json
 msgid "Cost of Goods Sold"
 msgstr "销货成本"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:793
-msgid "Cost of Goods Sold Account in Items Table"
-msgstr "物料表中的销售成本科目"
-
 #: erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py:40
 msgid "Cost of Issued Items"
 msgstr "已发料物料成本"
@@ -12983,7 +12963,7 @@ msgstr "无法删除演示数据"
 msgid "Could not auto create Customer due to the following missing mandatory field(s):"
 msgstr "无法自动创建客户，缺失必填字段："
 
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:692
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:733
 msgid "Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again"
 msgstr "无法自动创建退款单，请取消选中&#39;退款&#39;并再次提交"
 
@@ -13172,7 +13152,7 @@ msgstr "创建发票"
 msgid "Create Item"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:206
+#: erpnext/manufacturing/doctype/work_order/work_order.js:187
 msgid "Create Job Card"
 msgstr "创建生产任务单"
 
@@ -13271,7 +13251,7 @@ msgstr "为合并POS发票创建付款凭证。"
 msgid "Create Payment Request"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:818
+#: erpnext/manufacturing/doctype/work_order/work_order.js:800
 msgid "Create Pick List"
 msgstr "创建拣货单"
 
@@ -13416,7 +13396,7 @@ msgstr "创建任务"
 msgid "Create Tasks"
 msgstr ""
 
-#: erpnext/setup/doctype/company/company.js:157
+#: erpnext/setup/doctype/company/company.js:173
 msgid "Create Tax Template"
 msgstr "创建税费模板"
 
@@ -13454,12 +13434,12 @@ msgstr "创建用户权限限制"
 msgid "Create Users"
 msgstr "创建用户"
 
-#: erpnext/stock/doctype/item/item.js:984
+#: erpnext/stock/doctype/item/item.js:971
 msgid "Create Variant"
 msgstr "创建多规格物料"
 
-#: erpnext/stock/doctype/item/item.js:798
-#: erpnext/stock/doctype/item/item.js:842
+#: erpnext/stock/doctype/item/item.js:785
+#: erpnext/stock/doctype/item/item.js:829
 msgid "Create Variants"
 msgstr "创建多规格物料"
 
@@ -13490,12 +13470,12 @@ msgstr ""
 msgid "Create a new rule to automatically classify transactions."
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:825
-#: erpnext/stock/doctype/item/item.js:977
+#: erpnext/stock/doctype/item/item.js:812
+#: erpnext/stock/doctype/item/item.js:964
 msgid "Create a variant with the template image."
 msgstr "使用模板图像创建变型"
 
-#: erpnext/stock/stock_ledger.py:2071
+#: erpnext/stock/stock_ledger.py:2037
 msgid "Create an incoming stock transaction for the Item."
 msgstr "为物料创建一笔收货记录"
 
@@ -13529,7 +13509,7 @@ msgstr "是否创建{0}{1}？"
 msgid "Created By Migration"
 msgstr ""
 
-#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:245
+#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:220
 msgid "Created {0} scorecards for {1} between:"
 msgstr "已为{1}创建{0}张计分卡，时间范围："
 
@@ -13562,7 +13542,7 @@ msgstr "正在创建交货单..."
 msgid "Creating Delivery Schedule..."
 msgstr "正在创建交货计划..."
 
-#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:140
+#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:162
 msgid "Creating Dimensions..."
 msgstr "创建辅助核算......"
 
@@ -13757,7 +13737,7 @@ msgstr "授信天数"
 msgid "Credit Limit"
 msgstr "信用额度"
 
-#: erpnext/selling/doctype/customer/customer.py:650
+#: erpnext/selling/doctype/customer/customer.py:640
 msgid "Credit Limit Crossed"
 msgstr "超信用额度"
 
@@ -13804,7 +13784,7 @@ msgstr "授信月数"
 #: erpnext/accounts/doctype/journal_entry/journal_entry.json
 #: 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.py:1273
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1196
 #: erpnext/controllers/sales_and_purchase_return.py:453
 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:303
 #: erpnext/stock/doctype/delivery_note/delivery_note.js:89
@@ -13832,7 +13812,7 @@ msgstr "已退款"
 msgid "Credit Note will update it's own outstanding amount, even if 'Return Against' is specified."
 msgstr "即使指定'源单'，在本单处理付款与核销"
 
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:689
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:730
 msgid "Credit Note {0} has been created automatically"
 msgstr "退款单{0}已自动创建"
 
@@ -13840,7 +13820,7 @@ msgstr "退款单{0}已自动创建"
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:376
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:384
-#: erpnext/controllers/accounts_controller.py:2376
+#: erpnext/controllers/accounts_controller.py:2377
 msgid "Credit To"
 msgstr "贷记"
 
@@ -13849,20 +13829,20 @@ msgstr "贷记"
 msgid "Credit in Company Currency"
 msgstr "贷方(本币）"
 
-#: erpnext/selling/doctype/customer/customer.py:616
-#: erpnext/selling/doctype/customer/customer.py:673
+#: erpnext/selling/doctype/customer/customer.py:606
+#: erpnext/selling/doctype/customer/customer.py:663
 msgid "Credit limit has been crossed for customer {0} ({1}/{2})"
 msgstr "客户{0}（{1} / {2}）的信用额度已超过"
 
-#: erpnext/selling/doctype/customer/customer.py:395
+#: erpnext/selling/doctype/customer/customer.py:385
 msgid "Credit limit is already defined for the Company {0}"
 msgstr "公司{0}已定义信用额度"
 
-#: erpnext/selling/doctype/customer/customer.py:672
+#: erpnext/selling/doctype/customer/customer.py:662
 msgid "Credit limit reached for customer {0}"
 msgstr "客户{0}已达到信用额度"
 
-#: erpnext/accounts/utils.py:2827
+#: erpnext/accounts/utils.py:2826
 msgid "Credit limit warning — submission may be blocked: {0}"
 msgstr ""
 
@@ -13870,8 +13850,8 @@ msgstr ""
 msgid "Creditor Turnover Ratio"
 msgstr "应付账款周转率"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:155
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:257
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:159
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:262
 msgid "Creditors"
 msgstr "应付账款"
 
@@ -14041,7 +14021,7 @@ msgstr "外币汇率必须适用于买入或卖出。"
 msgid "Currency and Price List"
 msgstr "货币和价格表"
 
-#: erpnext/accounts/doctype/account/account.py:346
+#: erpnext/accounts/doctype/account/account.py:347
 msgid "Currency can not be changed after making entries using some other currency"
 msgstr "货币不能使用其他货币进行输入后更改"
 
@@ -14051,7 +14031,7 @@ msgstr ""
 
 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1604
 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1672
-#: erpnext/accounts/utils.py:2546
+#: erpnext/accounts/utils.py:2545
 msgid "Currency for {0} must be {1}"
 msgstr "货币{0}必须{1}"
 
@@ -14134,8 +14114,8 @@ msgstr "当前发票开始日期"
 msgid "Current Level"
 msgstr "当前层级"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:153
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:255
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:157
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:260
 msgid "Current Liabilities"
 msgstr "流动负债"
 
@@ -14493,8 +14473,8 @@ msgstr "客户地址"
 msgid "Customer Addresses And Contacts"
 msgstr "客户地址和联系方式"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:159
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:269
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:163
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:274
 msgid "Customer Advances"
 msgstr ""
 
@@ -14508,7 +14488,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:1243
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1166
 #: erpnext/buying/doctype/purchase_order/purchase_order.json
 #: erpnext/stock/doctype/delivery_stop/delivery_stop.json
 msgid "Customer Contact"
@@ -14613,7 +14593,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:115
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1301
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1224
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:96
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:187
 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:56
@@ -14673,7 +14653,7 @@ msgstr "客户物料"
 msgid "Customer Items"
 msgstr "客户物料"
 
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1292
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1215
 msgid "Customer LPO"
 msgstr "客户采购订单号"
 
@@ -14725,7 +14705,7 @@ msgstr "客户手机号"
 #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
 #: erpnext/accounts/doctype/process_statement_of_accounts_customer/process_statement_of_accounts_customer.json
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1232
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1155
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:157
 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:92
 #: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:35
@@ -14831,7 +14811,7 @@ msgstr "受托加工材料"
 msgid "Customer Provided Item Cost"
 msgstr "客户提供物料成本"
 
-#: erpnext/setup/doctype/company/company.py:486
+#: erpnext/setup/doctype/company/company.py:490
 msgid "Customer Service"
 msgstr "客户服务"
 
@@ -14889,8 +14869,8 @@ msgid "Customer required for 'Customerwise Discount'"
 msgstr "”客户折扣“需要指定客户"
 
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1142
-#: erpnext/selling/doctype/sales_order/sales_order.py:438
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:436
+#: erpnext/selling/doctype/sales_order/sales_order.py:446
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:437
 msgid "Customer {0} does not belong to project {1}"
 msgstr "客户{0}不属于项目{1}"
 
@@ -15002,7 +14982,7 @@ msgstr "D - E"
 msgid "DFS"
 msgstr "DFS"
 
-#: erpnext/projects/doctype/project/project.py:679
+#: erpnext/projects/doctype/project/project.py:717
 msgid "Daily Project Summary for {0}"
 msgstr "{0}的每日项目摘要"
 
@@ -15093,7 +15073,7 @@ msgstr "出生日期不能晚于今天。"
 msgid "Date of Commencement"
 msgstr "开始日期"
 
-#: erpnext/setup/doctype/company/company.js:94
+#: erpnext/setup/doctype/company/company.js:110
 msgid "Date of Commencement should be greater than Date of Incorporation"
 msgstr "开始日期应晚于公司注册日期"
 
@@ -15319,7 +15299,7 @@ msgstr "借方(交易货币)"
 #: erpnext/accounts/doctype/journal_entry/journal_entry.json
 #: erpnext/accounts/doctype/journal_entry_template/journal_entry_template.json
 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:178
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1276
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1199
 #: erpnext/controllers/sales_and_purchase_return.py:457
 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:304
 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:45
@@ -15349,7 +15329,7 @@ msgstr "即使指定'退货依据'，借项凭证仍将更新自身未清金额"
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1013
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1024
-#: erpnext/controllers/accounts_controller.py:2376
+#: erpnext/controllers/accounts_controller.py:2377
 msgid "Debit To"
 msgstr "借记科目（应收账款）"
 
@@ -15508,14 +15488,14 @@ msgstr "默认预付账款科目"
 
 #. Label of the default_advance_paid_account (Link) field in DocType 'Company'
 #: erpnext/setup/doctype/company/company.json
-#: erpnext/setup/doctype/company/company.py:315
+#: erpnext/setup/doctype/company/company.py:319
 msgid "Default Advance Paid Account"
 msgstr "默认预付账款科目"
 
 #. Label of the default_advance_received_account (Link) field in DocType
 #. 'Company'
 #: erpnext/setup/doctype/company/company.json
-#: erpnext/setup/doctype/company/company.py:304
+#: erpnext/setup/doctype/company/company.py:308
 msgid "Default Advance Received Account"
 msgstr "默认预收账款科目"
 
@@ -15534,15 +15514,15 @@ msgstr "默认物料清单"
 msgid "Default BOM ({0}) must be active for this item or its template"
 msgstr "该物料或其模板物料的默认物料清单状态必须是生效"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:2268
+#: erpnext/manufacturing/doctype/work_order/work_order.py:2270
 msgid "Default BOM for {0} not found"
 msgstr "默认BOM {0}未找到"
 
-#: erpnext/controllers/accounts_controller.py:4121
+#: erpnext/controllers/accounts_controller.py:4109
 msgid "Default BOM not found for FG Item {0}"
 msgstr "未找到产成品{0}的默认物料清单"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:2265
+#: erpnext/manufacturing/doctype/work_order/work_order.py:2267
 msgid "Default BOM not found for Item {0} and Project {1}"
 msgstr "物料{0}和物料{1}找不到默认BOM"
 
@@ -15713,6 +15693,16 @@ msgstr "默认物料组"
 msgid "Default Item Manufacturer"
 msgstr "默认物料制造商"
 
+#. Label of the default_letter_head (Link) field in DocType 'Company'
+#: erpnext/setup/doctype/company/company.json
+msgid "Default Letter Head (DocType)"
+msgstr ""
+
+#. Label of the default_letter_head_report (Link) field in DocType 'Company'
+#: erpnext/setup/doctype/company/company.json
+msgid "Default Letter Head (Report)"
+msgstr ""
+
 #. Label of the default_manufacturer_part_no (Data) field in DocType 'Item'
 #: erpnext/stock/doctype/item/item.json
 msgid "Default Manufacturer Part No"
@@ -15947,7 +15937,7 @@ msgstr ""
 msgid "Default settings for your stock-related transactions"
 msgstr "库存相关业务默认设置"
 
-#: erpnext/setup/doctype/company/company.js:191
+#: erpnext/setup/doctype/company/company.js:207
 msgid "Default tax templates for sales, purchase and items are created."
 msgstr "已创建销售、采购和物料的默认税务模板"
 
@@ -16120,12 +16110,12 @@ msgstr "删除销售线索与地址"
 
 #. Label of the delete_transactions_status (Select) field in DocType
 #. 'Transaction Deletion Record'
-#: erpnext/setup/doctype/company/company.js:168
+#: erpnext/setup/doctype/company/company.js:184
 #: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.json
 msgid "Delete Transactions"
 msgstr "删除业务单据(交易)"
 
-#: erpnext/setup/doctype/company/company.js:237
+#: erpnext/setup/doctype/company/company.js:253
 msgid "Delete all the Transactions for this Company"
 msgstr "删除所有交易本公司"
 
@@ -16146,8 +16136,8 @@ msgstr ""
 msgid "Deleting {0} and all associated Common Code documents..."
 msgstr "正在删除{0}及其所有关联通用代码单据..."
 
-#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1101
-#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1120
+#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1102
+#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1121
 msgid "Deletion in Progress!"
 msgstr "删除进行中！"
 
@@ -16258,11 +16248,11 @@ msgstr "已出货数量"
 msgid "Delivered Qty (in Stock UOM)"
 msgstr "已交付数量（库存计量单位）"
 
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:597
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:596
 msgid "Delivered Qty cannot be increased by more than {0} for item {1}"
 msgstr ""
 
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:590
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:589
 msgid "Delivered Qty cannot be reduced by more than {0} for item {1}"
 msgstr ""
 
@@ -16343,7 +16333,7 @@ msgstr "交付经理"
 #: erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:129
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:415
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js:36
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js:45
 #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
 #: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.js:22
 #: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:21
@@ -16407,7 +16397,7 @@ msgstr "销售出库趋势"
 msgid "Delivery Note {0} is not submitted"
 msgstr "销售出库{0}未提交"
 
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1296
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1219
 #: erpnext/stock/doctype/delivery_trip/delivery_trip.js:75
 msgid "Delivery Notes"
 msgstr "销售出库"
@@ -16493,10 +16483,6 @@ msgstr "出货仓"
 msgid "Delivery to"
 msgstr "交货目的地"
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:457
-msgid "Delivery warehouse required for stock item {0}"
-msgstr "物料{0}为库存管理物料，且在主数据中未定义默认仓库，请在销售订单行填写出货仓库信息"
-
 #. Label of the sales_orders_and_material_requests_tab (Tab Break) field in
 #. DocType 'Master Production Schedule'
 #: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.json
@@ -16616,8 +16602,8 @@ msgstr "折旧额"
 #. Label of the depreciation_tab (Tab Break) field in DocType 'Asset'
 #. Group in Asset's connections
 #: erpnext/accounts/doctype/account/account.json
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:105
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:176
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:109
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:181
 #: erpnext/accounts/report/account_balance/account_balance.js:44
 #: erpnext/accounts/report/cash_flow/cash_flow.py:162
 #: erpnext/assets/doctype/asset/asset.json
@@ -16710,7 +16696,7 @@ msgstr "折旧选项"
 msgid "Depreciation Posting Date"
 msgstr "折旧过账日期"
 
-#: erpnext/assets/doctype/asset/asset.js:917
+#: erpnext/assets/doctype/asset/asset.js:919
 msgid "Depreciation Posting Date cannot be before Available-for-use Date"
 msgstr "折旧过账日期不可早于可用日期"
 
@@ -16868,11 +16854,11 @@ msgstr "差异(借方-贷方)"
 msgid "Difference Account"
 msgstr "差异科目"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:782
+#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:172
 msgid "Difference Account in Items Table"
 msgstr "物料表中的差异科目"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:771
+#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:160
 msgid "Difference Account must be a Asset/Liability type account (Temporary Opening), since this Stock Entry is an Opening Entry"
 msgstr "因本库存凭证为期初凭证，差异科目必须为资产/负债类科目（临时期初）。"
 
@@ -16988,15 +16974,15 @@ msgstr "维度"
 msgid "Direct Expense"
 msgstr "直接费用"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:82
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:141
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:86
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:146
 msgid "Direct Expenses"
 msgstr "直接费用"
 
 #. Option for the 'Account Type' (Select) field in DocType 'Account'
 #: erpnext/accounts/doctype/account/account.json
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:141
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:237
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:145
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:242
 msgid "Direct Income"
 msgstr "直接收入"
 
@@ -17077,6 +17063,11 @@ msgstr "禁用小数精度尾差"
 msgid "Disable Serial No And Batch Selector"
 msgstr "禁用序列号与批号选择"
 
+#. Label of the disable_sdbnb_in_sr (Check) field in DocType 'Company'
+#: erpnext/setup/doctype/company/company.json
+msgid "Disable Stock Delivered But Not Billed in Sales Return"
+msgstr ""
+
 #. Label of the disable_transaction_threshold (Check) field in DocType 'Tax
 #. Withholding Category'
 #: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
@@ -17113,11 +17104,11 @@ msgstr "已禁用仓库{0}不可用于此交易"
 msgid "Disabled items cannot be selected in any transaction."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:904
+#: erpnext/controllers/accounts_controller.py:905
 msgid "Disabled pricing rules since this {} is an internal transfer"
 msgstr "因{}为内部调拨，已禁用定价规则"
 
-#: erpnext/controllers/accounts_controller.py:918
+#: erpnext/controllers/accounts_controller.py:919
 msgid "Disabled tax included prices since this {} is an internal transfer"
 msgstr "因{}为内部调拨，已禁用含税价格"
 
@@ -17133,7 +17124,7 @@ msgstr "不自动获取现有库存数量"
 
 #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry'
 #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type'
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1074
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1056
 #: erpnext/stock/doctype/stock_entry/stock_entry.js:370
 #: erpnext/stock/doctype/stock_entry/stock_entry.js:413
 #: erpnext/stock/doctype/stock_entry/stock_entry.json
@@ -17141,15 +17132,15 @@ msgstr "不自动获取现有库存数量"
 msgid "Disassemble"
 msgstr "工单拆解"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:232
+#: erpnext/manufacturing/doctype/work_order/work_order.js:213
 msgid "Disassemble Order"
 msgstr "工单拆解"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:2372
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/disassemble.py:104
 msgid "Disassemble Qty cannot be less than or equal to 0."
 msgstr "拆解数量不能小于或等于 0。"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:463
+#: erpnext/manufacturing/doctype/work_order/work_order.js:445
 msgid "Disassemble Qty cannot be less than or equal to <b>0</b>."
 msgstr ""
 
@@ -17436,7 +17427,7 @@ msgstr "自主裁量原因"
 msgid "Dislikes"
 msgstr "不喜欢"
 
-#: erpnext/setup/doctype/company/company.py:480
+#: erpnext/setup/doctype/company/company.py:484
 msgid "Dispatch"
 msgstr "调度"
 
@@ -17631,8 +17622,8 @@ msgstr "分摊名称"
 msgid "Distributor"
 msgstr "分销商"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:191
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:338
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:195
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:343
 msgid "Dividends Paid"
 msgstr "股利支付"
 
@@ -17694,7 +17685,7 @@ msgstr "不要在货币旁显示货币代号，例如$等。"
 msgid "Do not update variants on save"
 msgstr "不在保存时更新多规格物料"
 
-#: erpnext/assets/doctype/asset/asset.js:955
+#: erpnext/assets/doctype/asset/asset.js:957
 msgid "Do you really want to restore this scrapped asset?"
 msgstr "真要恢复该已报废资产？"
 
@@ -17718,7 +17709,7 @@ msgstr "你想通过电子邮件通知所有的客户？"
 msgid "Do you want to submit the material request"
 msgstr "创建的物料需求直接提交? 选否只保存(草稿状态)"
 
-#: erpnext/manufacturing/doctype/job_card/job_card.js:111
+#: erpnext/manufacturing/doctype/job_card/job_card.js:108
 msgid "Do you want to submit the stock entry?"
 msgstr "是否确认提交库存凭证？"
 
@@ -17785,11 +17776,11 @@ msgstr ""
 msgid "Document Type "
 msgstr "文档类型 "
 
-#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:65
+#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:66
 msgid "Document Type already used as a dimension"
 msgstr "文档类型已作为维度使用"
 
-#: erpnext/setup/install.py:198
+#: erpnext/setup/install.py:230
 msgid "Documentation"
 msgstr "用户操作手册"
 
@@ -17952,12 +17943,6 @@ msgstr "驾照类别"
 msgid "Driving License Category"
 msgstr "驾照类别"
 
-#. Label of the drop_ar_procedures (Button) field in DocType 'Accounts
-#. Settings'
-#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-msgid "Drop Procedures"
-msgstr "删除存储过程"
-
 #. Label of the drop_ship (Section Break) field in DocType 'POS Invoice Item'
 #. Label of the drop_ship (Section Break) field in DocType 'Sales Invoice Item'
 #. Label of the drop_ship (Tab Break) field in DocType 'Purchase Order'
@@ -17978,12 +17963,6 @@ msgstr ""
 msgid "Drop some files here, or click to select files"
 msgstr ""
 
-#. Description of the 'Drop Procedures' (Button) field in DocType 'Accounts
-#. Settings'
-#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-msgid "Drops existing SQL Procedures and Function setup by Accounts Receivable report"
-msgstr "删除应收账款报告设置的现有SQL存储过程和函数"
-
 #: erpnext/accounts/party.py:700
 msgid "Due Date cannot be after {0}"
 msgstr "到期日不可晚于{0}"
@@ -18142,8 +18121,8 @@ msgstr "工期(天）"
 msgid "Duration in Days"
 msgstr "持续时间天数"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:170
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:286
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:174
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:291
 #: erpnext/setup/setup_wizard/operations/taxes_setup.py:256
 msgid "Duties and Taxes"
 msgstr "关税与税项"
@@ -18226,7 +18205,7 @@ msgstr ""
 msgid "Each Transaction"
 msgstr "每笔交易"
 
-#: erpnext/stock/report/stock_ageing/stock_ageing.py:184
+#: erpnext/stock/report/stock_ageing/stock_ageing.py:172
 msgid "Earliest"
 msgstr "最早"
 
@@ -18340,6 +18319,10 @@ msgstr "需要指定目标数量和金额"
 msgid "Either target qty or target amount is mandatory."
 msgstr "需要指定目标数量和金额。"
 
+#: erpnext/manufacturing/doctype/job_card/job_card.js:675
+msgid "Elapsed Time"
+msgstr ""
+
 #. Option for the 'Fuel Type' (Select) field in DocType 'Vehicle'
 #: erpnext/setup/doctype/vehicle/vehicle.json
 msgid "Electric"
@@ -18359,8 +18342,8 @@ msgstr "电力费用"
 msgid "Electricity down"
 msgstr "停电"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:48
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:82
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:52
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:87
 msgid "Electronic Equipment"
 msgstr "电子设备"
 
@@ -18564,8 +18547,8 @@ msgstr "员工预支"
 msgid "Employee Advances"
 msgstr "员工预支"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:184
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:322
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:188
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:327
 msgid "Employee Benefits Obligation"
 msgstr ""
 
@@ -18648,7 +18631,7 @@ msgstr ""
 msgid "Employee {0} does not belong to the company {1}"
 msgstr "员工{0}不属于公司{1}"
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:376
+#: erpnext/manufacturing/doctype/job_card/job_card.py:377
 msgid "Employee {0} is currently working on another workstation. Please assign another employee."
 msgstr "员工{0}正在其他工作中心工作，请指派其他员工"
 
@@ -18664,7 +18647,7 @@ msgstr "员工"
 msgid "Empty"
 msgstr "空"
 
-#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:756
+#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:757
 msgid "Empty To Delete List"
 msgstr ""
 
@@ -18861,12 +18844,6 @@ msgstr ""
 msgid "Enable discount accounting for selling"
 msgstr ""
 
-#. Description of the 'Delivered by Supplier (Drop Ship)' (Check) field in
-#. DocType 'Item'
-#: erpnext/stock/doctype/item/item.json
-msgid "Enable for drop shipping - supplier delivers directly to the customer without passing through your warehouse."
-msgstr ""
-
 #. Description of the 'Include Item In Manufacturing' (Check) field in DocType
 #. 'Item'
 #: erpnext/stock/doctype/item/item.json
@@ -18995,8 +18972,8 @@ msgstr "结束日期不能早于开始日期。"
 #. Label of the end_time (Time) field in DocType 'Stock Reposting Settings'
 #. Label of the end_time (Time) field in DocType 'Service Day'
 #. Label of the end_time (Datetime) field in DocType 'Call Log'
-#: erpnext/manufacturing/doctype/job_card/job_card.js:389
-#: erpnext/manufacturing/doctype/job_card/job_card.js:459
+#: erpnext/manufacturing/doctype/job_card/job_card.js:332
+#: erpnext/manufacturing/doctype/job_card/job_card.js:400
 #: erpnext/manufacturing/doctype/workstation_working_hour/workstation_working_hour.json
 #: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json
 #: erpnext/support/doctype/service_day/service_day.json
@@ -19095,8 +19072,8 @@ msgstr "手动输入"
 msgid "Enter Serial Nos"
 msgstr "输入序列号"
 
-#: erpnext/manufacturing/doctype/job_card/job_card.js:416
-#: erpnext/manufacturing/doctype/job_card/job_card.js:485
+#: erpnext/manufacturing/doctype/job_card/job_card.js:361
+#: erpnext/manufacturing/doctype/job_card/job_card.js:423
 #: erpnext/manufacturing/doctype/workstation/workstation.js:312
 msgid "Enter Value"
 msgstr "输入值"
@@ -19121,7 +19098,7 @@ msgstr "输入节假日列表名称"
 msgid "Enter amount to be redeemed."
 msgstr "输入要兑换的金额"
 
-#: erpnext/stock/doctype/item/item.js:1146
+#: erpnext/stock/doctype/item/item.js:1133
 msgid "Enter an Item Code, the name will be auto-filled the same as Item Code on clicking inside the Item Name field."
 msgstr "输入物料代码，点击物料名称字段将自动填充相同名称"
 
@@ -19133,7 +19110,7 @@ msgstr "输入客户邮箱"
 msgid "Enter customer's phone number"
 msgstr "输入客户电话号码"
 
-#: erpnext/assets/doctype/asset/asset.js:926
+#: erpnext/assets/doctype/asset/asset.js:928
 msgid "Enter date to scrap asset"
 msgstr "输入资产报废日期"
 
@@ -19177,7 +19154,7 @@ msgstr "提交前输入受益人名称"
 msgid "Enter the name of the bank or lending institution before submitting."
 msgstr "提交前输入银行或贷款机构名称"
 
-#: erpnext/stock/doctype/item/item.js:1172
+#: erpnext/stock/doctype/item/item.js:1159
 msgid "Enter the opening stock units."
 msgstr "输入期初库存数量"
 
@@ -19185,7 +19162,7 @@ msgstr "输入期初库存数量"
 msgid "Enter the quantity of the Item that will be manufactured from this Bill of Materials."
 msgstr "输入基于此物料清单生产的物料数量"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1236
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1218
 msgid "Enter the quantity to manufacture. Raw material Items will be fetched only when this is set."
 msgstr "输入生产数量。仅当设置此值时才会获取原材料"
 
@@ -19197,8 +19174,8 @@ msgstr "输入{0}金额"
 msgid "Entertainment & Leisure"
 msgstr "娱乐休闲"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:106
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:181
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:110
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:186
 msgid "Entertainment Expenses"
 msgstr "娱乐费用"
 
@@ -19222,8 +19199,8 @@ msgstr "凭证类型"
 #. Option for the 'Root Type' (Select) field in DocType 'Account Category'
 #. Option for the 'Root Type' (Select) field in DocType 'Ledger Merge'
 #: erpnext/accounts/doctype/account/account.json
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:189
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:332
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:193
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:337
 #: erpnext/accounts/doctype/account_category/account_category.json
 #: erpnext/accounts/doctype/ledger_merge/ledger_merge.json
 #: erpnext/accounts/report/account_balance/account_balance.js:29
@@ -19284,7 +19261,7 @@ msgstr "过账折旧分录时出错"
 msgid "Error while processing deferred accounting for {0}"
 msgstr "处理{0}的延迟记账时出错"
 
-#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:554
+#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:597
 msgid "Error while reposting item valuation"
 msgstr "物料成本价追溯调整出错"
 
@@ -19361,7 +19338,7 @@ msgstr "例如：ABCD.##### 如果已设置批号模板且单据中未手工输
 msgid "Example: If the transaction amount is 200, then this will be calculated as {} = {}"
 msgstr ""
 
-#: erpnext/stock/stock_ledger.py:2334
+#: erpnext/stock/stock_ledger.py:2300
 msgid "Example: Serial No {0} reserved in {1}."
 msgstr "示例：序列号{0}在{1}中预留"
 
@@ -19371,7 +19348,7 @@ msgstr "示例：序列号{0}在{1}中预留"
 msgid "Exception Budget Approver Role"
 msgstr "例外预算审批人角色"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:926
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/disassemble.py:47
 msgid "Excess Disassembly"
 msgstr ""
 
@@ -19379,7 +19356,7 @@ msgstr ""
 msgid "Excess Materials Consumed"
 msgstr "超量消耗物料"
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1133
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1141
 msgid "Excess Transfer"
 msgstr "超发"
 
@@ -19410,17 +19387,17 @@ msgstr "汇兑损益"
 #. Invoice Advance'
 #. Label of the exchange_gain_loss (Currency) field in DocType 'Sales Invoice
 #. Advance'
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:131
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:217
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:135
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:222
 #: erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json
 #: erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json
 #: erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json
-#: erpnext/setup/doctype/company/company.py:673
+#: erpnext/setup/doctype/company/company.py:678
 msgid "Exchange Gain/Loss"
 msgstr "汇兑损益"
 
-#: erpnext/controllers/accounts_controller.py:1777
-#: erpnext/controllers/accounts_controller.py:1862
+#: erpnext/controllers/accounts_controller.py:1778
+#: erpnext/controllers/accounts_controller.py:1863
 msgid "Exchange Gain/Loss amount has been booked through {0}"
 msgstr "自动生成了汇兑损益日记帐凭证{0}"
 
@@ -19559,7 +19536,7 @@ msgstr "行政助理"
 msgid "Executive Search"
 msgstr "猎头"
 
-#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:67
+#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:79
 msgid "Exempt Supplies"
 msgstr "免税供应"
 
@@ -19646,7 +19623,7 @@ msgstr "预计结束日期"
 msgid "Expected Delivery Date"
 msgstr "预计交货日期"
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:419
+#: erpnext/selling/doctype/sales_order/sales_order.py:429
 msgid "Expected Delivery Date should be after Sales Order Date"
 msgstr "预计出货日应晚于销售订单日"
 
@@ -19730,7 +19707,7 @@ msgstr "残值"
 msgid "Expense"
 msgstr "费用"
 
-#: erpnext/controllers/stock_controller.py:947
+#: erpnext/controllers/stock_controller.py:948
 msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account"
 msgstr "费用/差异科目({0})必须是一个“损益”类科目"
 
@@ -19808,23 +19785,23 @@ msgstr "必须为物料{0}指定费用科目"
 msgid "Expense for this item will be recognized over a period of months. Eg: prepaid insurance or annual software license"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:81
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:140
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:85
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:145
 msgid "Expenses"
 msgstr "费用"
 
 #. Option for the 'Account Type' (Select) field in DocType 'Account'
 #: erpnext/accounts/doctype/account/account.json
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:88
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:148
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:92
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:153
 #: erpnext/accounts/report/account_balance/account_balance.js:49
 msgid "Expenses Included In Asset Valuation"
 msgstr "结转资产的费用"
 
 #. Option for the 'Account Type' (Select) field in DocType 'Account'
 #: erpnext/accounts/doctype/account/account.json
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:92
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:153
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:96
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:158
 #: erpnext/accounts/report/account_balance/account_balance.js:51
 msgid "Expenses Included In Valuation"
 msgstr "结转库存的费用"
@@ -19903,7 +19880,7 @@ msgstr "外部就职经历"
 msgid "Extra Consumed Qty"
 msgstr "额外消耗数量"
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:263
+#: erpnext/manufacturing/doctype/job_card/job_card.py:264
 msgid "Extra Job Card Quantity"
 msgstr "生产任务单数量超计划数量"
 
@@ -20040,7 +20017,7 @@ msgstr "创建公司失败"
 msgid "Failed to setup defaults"
 msgstr "设置默认值失败"
 
-#: erpnext/setup/doctype/company/company.py:855
+#: erpnext/setup/doctype/company/company.py:860
 msgid "Failed to setup defaults for country {0}. Please contact support."
 msgstr "国家{0}默认设置失败，请联系支持"
 
@@ -20195,21 +20172,29 @@ msgstr "字段映射"
 msgid "Field in Bank Transaction"
 msgstr "银行交易流水字段"
 
+#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:95
+msgid "Fieldname Conflict"
+msgstr ""
+
+#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:87
+msgid "Fieldname {0} already exists in the following doctypes: {1}. A separate dimension field will not be added to these doctypes. GL Entries will use the value of the existing field as the dimension value."
+msgstr ""
+
 #. Description of the 'Do not update variants on save' (Check) field in DocType
 #. 'Item Variant Settings'
 #: erpnext/stock/doctype/item_variant_settings/item_variant_settings.json
 msgid "Fields will be copied over only at time of creation."
 msgstr "字段将仅在创建时复制。"
 
-#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1068
+#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1069
 msgid "File does not belong to this Transaction Deletion Record"
 msgstr ""
 
-#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1062
+#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1063
 msgid "File not found"
 msgstr ""
 
-#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1076
+#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1077
 msgid "File not found on server"
 msgstr ""
 
@@ -20417,9 +20402,9 @@ msgstr "财年开始日"
 msgid "Financial reports will be generated using GL Entry doctypes (should be enabled if Period Closing Voucher is not posted for all years sequentially or missing) "
 msgstr "财务报表将使用总账分录生成（若未按顺序过账所有年度的期间结算凭证，需启用）"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:902
-#: erpnext/manufacturing/doctype/work_order/work_order.js:917
-#: erpnext/manufacturing/doctype/work_order/work_order.js:926
+#: erpnext/manufacturing/doctype/work_order/work_order.js:884
+#: erpnext/manufacturing/doctype/work_order/work_order.js:899
+#: erpnext/manufacturing/doctype/work_order/work_order.js:908
 msgid "Finish"
 msgstr "完成"
 
@@ -20476,15 +20461,15 @@ msgstr "成品物料数量"
 msgid "Finished Good Item Quantity"
 msgstr "成品物料数量"
 
-#: erpnext/controllers/accounts_controller.py:4107
+#: erpnext/controllers/accounts_controller.py:4095
 msgid "Finished Good Item is not specified for service item {0}"
 msgstr "服务物料{0}未指定产成品物料"
 
-#: erpnext/controllers/accounts_controller.py:4124
+#: erpnext/controllers/accounts_controller.py:4112
 msgid "Finished Good Item {0} Qty can not be zero"
 msgstr "产成品物料{0}数量不可为零"
 
-#: erpnext/controllers/accounts_controller.py:4118
+#: erpnext/controllers/accounts_controller.py:4106
 msgid "Finished Good Item {0} must be a sub-contracted item"
 msgstr "产成品物料{0}必须为外协物料"
 
@@ -20530,7 +20515,7 @@ msgid "Finished Good {0} must be a sub-contracted item."
 msgstr "产成品{0}必须为外协物料"
 
 #: erpnext/selling/doctype/sales_order/sales_order.js:1475
-#: erpnext/setup/doctype/company/company.py:385
+#: erpnext/setup/doctype/company/company.py:389
 msgid "Finished Goods"
 msgstr "成品"
 
@@ -20571,7 +20556,7 @@ msgstr "成品仓"
 msgid "Finished Goods based Operating Cost"
 msgstr "启用计件成本"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1749
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:862
 msgid "Finished Item {0} does not match with Work Order {1}"
 msgstr "产成品{0}与工单{1}不匹配"
 
@@ -20749,8 +20734,8 @@ msgstr "固定资产周转率"
 msgid "Fixed Asset item {0} cannot be used in BOMs."
 msgstr "固定资产物料{0}不可用于物料清单。"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:43
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:76
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:47
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:81
 msgid "Fixed Assets"
 msgstr "固定资产"
 
@@ -20823,7 +20808,7 @@ msgstr "遵循自然月"
 msgid "Following Material Requests have been raised automatically based on Item's re-order level"
 msgstr "已根据物料的重订货点设置自动生成了以下物料需求"
 
-#: erpnext/selling/doctype/customer/customer.py:843
+#: erpnext/selling/doctype/customer/customer.py:833
 msgid "Following fields are mandatory to create address:"
 msgstr "创建地址必须填写以下字段："
 
@@ -20880,7 +20865,7 @@ msgstr "公司"
 msgid "For Item"
 msgstr "物料"
 
-#: erpnext/controllers/stock_controller.py:1606
+#: erpnext/controllers/stock_controller.py:1607
 msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}"
 msgstr "基于 {2} {3} 物料 {0} 收货数量不能超过 {1}"
 
@@ -20890,7 +20875,7 @@ msgid "For Job Card"
 msgstr "生产任务单"
 
 #. Label of the for_operation (Link) field in DocType 'Job Card'
-#: erpnext/manufacturing/doctype/job_card/job_card.js:529
+#: erpnext/manufacturing/doctype/job_card/job_card.js:465
 #: erpnext/manufacturing/doctype/job_card/job_card.json
 msgid "For Operation"
 msgstr "工序"
@@ -20911,17 +20896,13 @@ msgstr "价格表"
 msgid "For Production"
 msgstr "生产"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:893
-msgid "For Quantity (Manufactured Qty) is mandatory"
-msgstr "数量（制造数量）字段必填"
-
 #. Label of the material_request_planning (Section Break) field in DocType
 #. 'Production Plan'
 #: erpnext/manufacturing/doctype/production_plan/production_plan.json
 msgid "For Raw Materials"
 msgstr "针对原材料"
 
-#: erpnext/controllers/accounts_controller.py:1442
+#: erpnext/controllers/accounts_controller.py:1443
 msgid "For Return Invoices with Stock effect, '0' qty Items are not allowed. Following rows are affected: {0}"
 msgstr "库存影响的退货发票中不允许零数量物料，受影响行：{0}"
 
@@ -21005,7 +20986,7 @@ msgstr ""
 msgid "For operation {0} at row {1}, please add raw materials or set a BOM against it."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:2653
+#: erpnext/manufacturing/doctype/work_order/work_order.py:2651
 msgid "For operation {0}: Quantity ({1}) can not be greater than pending quantity({2})"
 msgstr "工序{0}：数量（{1}）不得超过待处理数量（{2}）"
 
@@ -21022,7 +21003,7 @@ msgstr ""
 msgid "For projected and forecast quantities, the system will consider all child warehouses under the selected parent warehouse."
 msgstr "对于预计和预测数量，系统将考量所选父仓库下的所有子仓库。"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1781
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:894
 msgid "For quantity {0} should not be greater than allowed quantity {1}"
 msgstr "成品数量 {0} 不能大于剩余可入库数量 {1}"
 
@@ -21036,7 +21017,7 @@ msgstr "供参考"
 msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included"
 msgstr "对于{1}的第{0}行。要在物料单价中包括{2}，也必须包括第{3}行"
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1726
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1728
 msgid "For row {0}: Enter Planned Qty"
 msgstr "请在第{0}行输入计划数量"
 
@@ -21055,7 +21036,7 @@ msgstr "对于'应用于其他'条件，字段{0}为必填项"
 msgid "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes"
 msgstr "为方便客户，这些代码可以在打印格式(如发票和销售出库)中使用"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1064
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:773
 msgid "For the item {0}, the consumed quantity should be {1} according to the BOM {2}."
 msgstr ""
 
@@ -21102,11 +21083,6 @@ msgstr "预测"
 msgid "Forecast Demand"
 msgstr "预测需求"
 
-#. Label of the forecast_qty (Float) field in DocType 'Sales Forecast Item'
-#: erpnext/manufacturing/doctype/sales_forecast_item/sales_forecast_item.json
-msgid "Forecast Qty"
-msgstr "预测数量"
-
 #. Label of a Workspace Sidebar Item
 #: erpnext/workspace_sidebar/manufacturing.json
 msgid "Forecasting"
@@ -21152,7 +21128,7 @@ msgstr "论坛帖子"
 msgid "Forum URL"
 msgstr "论坛URL"
 
-#: erpnext/setup/install.py:210
+#: erpnext/setup/install.py:242
 msgid "Frappe School"
 msgstr ""
 
@@ -21197,8 +21173,8 @@ msgstr "定价规则{0}价格/产品折扣选了产品，需维护免费物料
 msgid "Freeze Stocks Older Than (Days)"
 msgstr "库存变动锁账天数"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:107
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:185
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:111
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:190
 msgid "Freight and Forwarding Charges"
 msgstr "运费"
 
@@ -21632,8 +21608,8 @@ msgstr "已全额付款"
 msgid "Furlong"
 msgstr "弗隆"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:52
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:87
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:56
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:92
 msgid "Furniture and Fixtures"
 msgstr "家具及固定装置"
 
@@ -21650,13 +21626,13 @@ msgid "Further nodes can be only created under 'Group' type nodes"
 msgstr "只能在“组”节点下新建节点"
 
 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:188
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1288
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1211
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:179
 msgid "Future Payment Amount"
 msgstr "报表日后付款金额"
 
 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:187
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1287
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1210
 msgid "Future Payment Ref"
 msgstr "报表日后付款参考"
 
@@ -21749,9 +21725,9 @@ msgstr "已记账损益"
 msgid "Gain/Loss from Revaluation"
 msgstr "重估损益"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:134
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:220
-#: erpnext/setup/doctype/company/company.py:681
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:138
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:225
+#: erpnext/setup/doctype/company/company.py:686
 msgid "Gain/Loss on Asset Disposal"
 msgstr "资产处置收益/损失"
 
@@ -22195,7 +22171,7 @@ msgstr "绩效指标"
 msgid "Goods"
 msgstr "货物"
 
-#: erpnext/setup/doctype/company/company.py:386
+#: erpnext/setup/doctype/company/company.py:390
 #: erpnext/stock/doctype/stock_entry/stock_entry_list.js:21
 msgid "Goods In Transit"
 msgstr "在途物料"
@@ -22204,7 +22180,7 @@ msgstr "在途物料"
 msgid "Goods Transferred"
 msgstr "已调拨"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:2299
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1379
 msgid "Goods are already received against the outward entry {0}"
 msgstr "出库移动物料{0}已收货"
 
@@ -22830,7 +22806,7 @@ msgstr "若业务存在季节性波动，可帮助您将预算/目标分摊至
 msgid "Here are the error logs for the aforementioned failed depreciation entries: {0}"
 msgstr "上述失败折旧分录的错误日志如下：{0}"
 
-#: erpnext/stock/stock_ledger.py:2056
+#: erpnext/stock/stock_ledger.py:2022
 msgid "Here are the options to proceed:"
 msgstr "选择以下方式继续"
 
@@ -22858,7 +22834,7 @@ msgstr "此处每周休息日已根据先前选择预填充，您可新增行单
 msgid "Hertz"
 msgstr "赫兹"
 
-#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:556
+#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:599
 msgid "Hi,"
 msgstr "您好："
 
@@ -23057,7 +23033,7 @@ msgstr ""
 msgid "Hrs"
 msgstr "时长(小时)"
 
-#: erpnext/setup/doctype/company/company.py:492
+#: erpnext/setup/doctype/company/company.py:496
 msgid "Human Resources"
 msgstr "人力资源"
 
@@ -23226,6 +23202,12 @@ msgstr "如勾选，收付款凭证中付款金额就含税"
 msgid "If checked, the tax amount will be considered as already included in the Print Rate / Print Amount"
 msgstr "如果勾选，打印的单价/总额就含税"
 
+#. Description of the 'Delivered by Supplier (Drop Ship)' (Check) field in
+#. DocType 'Item'
+#: erpnext/stock/doctype/item/item.json
+msgid "If checked, this item is treated as drop-shipped by default in Sales Orders, Sales Invoices and Purchase Orders. The flag can be overridden on each transaction line."
+msgstr ""
+
 #: erpnext/public/js/setup_wizard.js:56
 msgid "If checked, we will create demo data for you to explore the system. This demo data can be erased later."
 msgstr "勾选后系统会为您生成供学习探索的样板数据，样板数据使用过后可被清除"
@@ -23446,7 +23428,7 @@ msgstr ""
 msgid "If no taxes are set, and Taxes and Charges Template is selected, the system will automatically apply the taxes from the chosen template."
 msgstr "如果尚无税费明细且选择了税费模板，系统自动从选择的税费模板添加税明细"
 
-#: erpnext/stock/stock_ledger.py:2066
+#: erpnext/stock/stock_ledger.py:2032
 msgid "If not, you can Cancel / Submit this entry"
 msgstr "请选择以下方式中的一种之后"
 
@@ -23478,7 +23460,7 @@ msgstr "若所选定价规则针对'费率'设置，其将覆盖价格表。定
 msgid "If set, the system does not use the user's Email or the standard outgoing Email account for sending request for quotations."
 msgstr "若设置此项，系统将不使用用户的邮件地址或标准外发邮件账户发送询价请求。"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1269
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1251
 msgid "If the BOM results in Scrap material, the Scrap Warehouse needs to be selected."
 msgstr "若物料清单产生废料，需选择废品仓库"
 
@@ -23487,7 +23469,7 @@ msgstr "若物料清单产生废料，需选择废品仓库"
 msgid "If the account is frozen, entries are allowed to restricted users."
 msgstr "如果科目被冻结，只允许有编辑冻结凭证角色的用户过账"
 
-#: erpnext/stock/stock_ledger.py:2059
+#: erpnext/stock/stock_ledger.py:2025
 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，请在明细行中勾选允许成本价为0"
 
@@ -23497,7 +23479,7 @@ msgstr "如在交易中允许物料成本价为0，请在明细行中勾选允
 msgid "If the reorder check is set at the Group warehouse level, the available quantity becomes the sum of the projected quantities of all its child warehouses."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1288
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1270
 msgid "If the selected BOM has Operations mentioned in it, the system will fetch all Operations from BOM, these values can be changed."
 msgstr "若所选物料清单包含工序，系统将从中获取所有工序，这些值可修改"
 
@@ -23574,7 +23556,7 @@ msgstr "如果积分无失效日期，请将失效日期设为空或0。"
 msgid "If yes, then this warehouse will be used to store rejected materials"
 msgstr "如勾选则该仓库是检验不合格待退货的拒收仓"
 
-#: erpnext/stock/doctype/item/item.js:1158
+#: erpnext/stock/doctype/item/item.js:1145
 msgid "If you are maintaining stock of this Item in your Inventory, ERPNext will make a stock ledger entry for each transaction of this item."
 msgstr "若在库存中维护此物料，ERPNext将为每笔交易创建库存分类账分录"
 
@@ -23588,7 +23570,7 @@ msgstr "可以手工勾选匹配，否则按时间先后自动匹配"
 msgid "If you still want to proceed, please disable 'Skip Available Sub Assembly Items' checkbox."
 msgstr "若仍要继续，请取消勾选'跳过可用子装配件'复选框"
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1844
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1846
 msgid "If you still want to proceed, please enable {0}."
 msgstr "请勾选{0}后继续"
 
@@ -23672,7 +23654,7 @@ msgstr "忽略汇率重估及损益日记账"
 msgid "Ignore Existing Ordered Qty"
 msgstr "忽略已采购数量"
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1836
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1838
 msgid "Ignore Existing Projected Quantity"
 msgstr "忽略可用数量"
 
@@ -23763,8 +23745,8 @@ msgstr "报表中不按是否开账凭证标志获取科目期初余额（为了
 msgid "Image in the description has been removed. To disable this behavior, uncheck \"{0}\" in {1}."
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:135
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:229
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:139
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:234
 msgid "Impairment"
 msgstr "减值"
 
@@ -24046,7 +24028,7 @@ msgstr "对于多等级积分方案，系统会根据客户消费金额自动匹
 msgid "In this case, the amount will be calculated as 25% of the transaction amount. If the transaction amount is 200, then this will be calculated as 200 * 0.25 = 50."
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:1191
+#: erpnext/stock/doctype/item/item.js:1178
 msgid "In this section, you can define Company-wide transaction-related defaults for this Item. Eg. Default Warehouse, Default Price List, Supplier, etc."
 msgstr "此处可定义此物料在公司范围内的交易默认值，如默认仓库、价格表、供应商等"
 
@@ -24277,8 +24259,8 @@ msgstr "包括下层组件物料"
 #. Option for the 'Type' (Select) field in DocType 'Process Deferred
 #. Accounting'
 #: erpnext/accounts/doctype/account/account.json
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:140
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:236
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:144
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:241
 #: erpnext/accounts/doctype/account_category/account_category.json
 #: erpnext/accounts/doctype/ledger_merge/ledger_merge.json
 #: erpnext/accounts/doctype/process_deferred_accounting/process_deferred_accounting.json
@@ -24389,7 +24371,7 @@ msgstr "再订购（组）仓库检查错误"
 msgid "Incorrect Company"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1071
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:780
 msgid "Incorrect Component Quantity"
 msgstr "组件数量错误"
 
@@ -24523,15 +24505,15 @@ msgstr "该装箱单是销售出库的一部分"
 msgid "Indirect Expense"
 msgstr "间接费用"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:102
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:167
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:106
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:172
 msgid "Indirect Expenses"
 msgstr "间接费用"
 
 #. Option for the 'Account Type' (Select) field in DocType 'Account'
 #: erpnext/accounts/doctype/account/account.json
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:145
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:242
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:149
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:247
 msgid "Indirect Income"
 msgstr "间接收入"
 
@@ -24599,14 +24581,14 @@ msgstr "已发起"
 msgid "Inspected By"
 msgstr "检验人"
 
-#: erpnext/controllers/stock_controller.py:1500
-#: erpnext/manufacturing/doctype/job_card/job_card.py:833
+#: erpnext/controllers/stock_controller.py:1501
+#: erpnext/manufacturing/doctype/job_card/job_card.py:834
 msgid "Inspection Rejected"
 msgstr "质检不通过"
 
 #. Label of the inspection_required (Check) field in DocType 'Stock Entry'
-#: erpnext/controllers/stock_controller.py:1470
-#: erpnext/controllers/stock_controller.py:1472
+#: erpnext/controllers/stock_controller.py:1471
+#: erpnext/controllers/stock_controller.py:1473
 #: erpnext/stock/doctype/stock_entry/stock_entry.json
 msgid "Inspection Required"
 msgstr "需要检验"
@@ -24623,8 +24605,8 @@ msgstr "需出货检验"
 msgid "Inspection Required before Purchase"
 msgstr "需来料检验"
 
-#: erpnext/controllers/stock_controller.py:1485
-#: erpnext/manufacturing/doctype/job_card/job_card.py:814
+#: erpnext/controllers/stock_controller.py:1486
+#: erpnext/manufacturing/doctype/job_card/job_card.py:815
 msgid "Inspection Submission"
 msgstr "质检单提交"
 
@@ -24654,7 +24636,7 @@ msgstr "安装通知单"
 msgid "Installation Note Item"
 msgstr "安装通知单项"
 
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:643
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:684
 msgid "Installation Note {0} has already been submitted"
 msgstr "安装单{0}已经提交了"
 
@@ -24693,11 +24675,11 @@ msgstr "说明"
 msgid "Insufficient Capacity"
 msgstr "产能不足"
 
-#: erpnext/controllers/accounts_controller.py:4008
-#: erpnext/controllers/accounts_controller.py:4032
-#: erpnext/controllers/accounts_controller.py:4441
-#: erpnext/controllers/accounts_controller.py:4447
-#: erpnext/controllers/accounts_controller.py:4469
+#: erpnext/controllers/accounts_controller.py:4014
+#: erpnext/controllers/accounts_controller.py:4038
+#: erpnext/controllers/accounts_controller.py:4429
+#: erpnext/controllers/accounts_controller.py:4435
+#: erpnext/controllers/accounts_controller.py:4457
 msgid "Insufficient Permissions"
 msgstr "权限不足"
 
@@ -24705,13 +24687,12 @@ msgstr "权限不足"
 #: erpnext/stock/doctype/pick_list/pick_list.py:147
 #: erpnext/stock/doctype/pick_list/pick_list.py:165
 #: erpnext/stock/doctype/pick_list/pick_list.py:1092
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1043
-#: erpnext/stock/serial_batch_bundle.py:1226 erpnext/stock/stock_ledger.py:1747
-#: erpnext/stock/stock_ledger.py:2225
+#: erpnext/stock/serial_batch_bundle.py:1226 erpnext/stock/stock_ledger.py:1713
+#: erpnext/stock/stock_ledger.py:2191
 msgid "Insufficient Stock"
 msgstr "库存不足"
 
-#: erpnext/stock/stock_ledger.py:2240
+#: erpnext/stock/stock_ledger.py:2206
 msgid "Insufficient Stock for Batch"
 msgstr "批次库存不足"
 
@@ -24831,13 +24812,13 @@ msgstr "关联交易信息"
 msgid "Interest"
 msgstr "利息"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:132
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:218
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:136
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:223
 msgid "Interest Expense"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:146
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:243
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:150
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:248
 msgid "Interest Income"
 msgstr ""
 
@@ -24845,8 +24826,8 @@ msgstr ""
 msgid "Interest and/or dunning fee"
 msgstr "利息及/或催收费"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:147
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:244
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:151
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:249
 msgid "Interest on Fixed Deposits"
 msgstr ""
 
@@ -24866,7 +24847,7 @@ msgstr "内部"
 msgid "Internal Customer Accounting"
 msgstr ""
 
-#: erpnext/selling/doctype/customer/customer.py:256
+#: erpnext/selling/doctype/customer/customer.py:246
 msgid "Internal Customer for company {0} already exists"
 msgstr "公司{0}的内部客户已存在"
 
@@ -24874,7 +24855,7 @@ msgstr "公司{0}的内部客户已存在"
 msgid "Internal Purchase Order"
 msgstr "内部采购订单"
 
-#: erpnext/controllers/accounts_controller.py:804
+#: erpnext/controllers/accounts_controller.py:805
 msgid "Internal Sale or Delivery Reference missing."
 msgstr "须填写关联公司销售或出货参考单据编号"
 
@@ -24882,7 +24863,7 @@ msgstr "须填写关联公司销售或出货参考单据编号"
 msgid "Internal Sales Order"
 msgstr "内部销售订单"
 
-#: erpnext/controllers/accounts_controller.py:806
+#: erpnext/controllers/accounts_controller.py:807
 msgid "Internal Sales Reference Missing"
 msgstr "关联方内部销售订单号必填"
 
@@ -24913,7 +24894,7 @@ msgstr "公司{0}的内部供应商已存在"
 msgid "Internal Transfer"
 msgstr "内部转账"
 
-#: erpnext/controllers/accounts_controller.py:815
+#: erpnext/controllers/accounts_controller.py:816
 msgid "Internal Transfer Reference Missing"
 msgstr "缺少内部调拨参考"
 
@@ -24926,7 +24907,7 @@ msgstr "关联方交易"
 msgid "Internal Work History"
 msgstr "内部工作经历"
 
-#: erpnext/controllers/stock_controller.py:1567
+#: erpnext/controllers/stock_controller.py:1568
 msgid "Internal transfers can only be done in company's default currency"
 msgstr "直接调拨币种必须是公司本币"
 
@@ -24946,8 +24927,8 @@ msgstr "间隔在1到59分钟之间"
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1029
 #: erpnext/assets/doctype/asset_category/asset_category.py:69
 #: erpnext/assets/doctype/asset_category/asset_category.py:97
-#: erpnext/controllers/accounts_controller.py:3225
-#: erpnext/controllers/accounts_controller.py:3233
+#: erpnext/controllers/accounts_controller.py:3219
+#: erpnext/controllers/accounts_controller.py:3227
 msgid "Invalid Account"
 msgstr "无效科目"
 
@@ -24968,7 +24949,7 @@ msgstr "无效金额"
 msgid "Invalid Attribute"
 msgstr "无效属性"
 
-#: erpnext/controllers/accounts_controller.py:626
+#: erpnext/controllers/accounts_controller.py:627
 msgid "Invalid Auto Repeat Date"
 msgstr "无效自动重复日期"
 
@@ -24981,7 +24962,7 @@ msgstr ""
 msgid "Invalid Barcode. There is no Item attached to this barcode."
 msgstr "无效条码，未关联任何物料"
 
-#: erpnext/public/js/controllers/transaction.js:3132
+#: erpnext/public/js/controllers/transaction.js:3134
 msgid "Invalid Blanket Order for the selected Customer and Item"
 msgstr "无效框架订单对所选客户和物料无效"
 
@@ -24997,21 +24978,21 @@ msgstr "无效子流程"
 msgid "Invalid Company Field"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2355
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2436
 msgid "Invalid Company for Inter Company Transaction."
 msgstr "公司间交易的公司无效。"
 
 #: erpnext/assets/doctype/asset/asset.py:362
 #: erpnext/assets/doctype/asset/asset.py:369
-#: erpnext/controllers/accounts_controller.py:3248
+#: erpnext/controllers/accounts_controller.py:3242
 msgid "Invalid Cost Center"
 msgstr "无效成本中心"
 
-#: erpnext/selling/doctype/customer/customer.py:369
+#: erpnext/selling/doctype/customer/customer.py:359
 msgid "Invalid Customer Group"
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:421
+#: erpnext/selling/doctype/sales_order/sales_order.py:431
 msgid "Invalid Delivery Date"
 msgstr "无效交付日期"
 
@@ -25071,7 +25052,7 @@ msgstr "无效的期初分录"
 msgid "Invalid POS Invoices"
 msgstr "无效的POS发票"
 
-#: erpnext/accounts/doctype/account/account.py:387
+#: erpnext/accounts/doctype/account/account.py:388
 msgid "Invalid Parent Account"
 msgstr "无效的上级科目"
 
@@ -25105,12 +25086,12 @@ msgstr "无效的工艺损耗配置"
 msgid "Invalid Purchase Invoice"
 msgstr "无效的采购发票"
 
-#: erpnext/controllers/accounts_controller.py:4045
-#: erpnext/controllers/accounts_controller.py:4059
+#: erpnext/controllers/accounts_controller.py:4051
+#: erpnext/controllers/accounts_controller.py:4065
 msgid "Invalid Qty"
 msgstr "无效的数量"
 
-#: erpnext/controllers/accounts_controller.py:1460
+#: erpnext/controllers/accounts_controller.py:1461
 msgid "Invalid Quantity"
 msgstr "无效的物料数量"
 
@@ -25135,12 +25116,12 @@ msgstr "无效的排程计划"
 msgid "Invalid Selling Price"
 msgstr "无效的销售单价"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1824
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:937
 msgid "Invalid Serial and Batch Bundle"
 msgstr "无效的序列号和批次组合"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1105
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1127
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py:43
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py:65
 msgid "Invalid Source and Target Warehouse"
 msgstr ""
 
@@ -25165,7 +25146,7 @@ msgstr "科目{}的{} {}会计凭证中存在无效金额: {}"
 msgid "Invalid condition expression"
 msgstr "无效的条件表达式"
 
-#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1057
+#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1058
 msgid "Invalid file URL"
 msgstr ""
 
@@ -25212,7 +25193,7 @@ msgstr "对于科目{2} {1}值{0}无效"
 msgid "Invalid {0}"
 msgstr "无效的{0}"
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2353
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2434
 msgid "Invalid {0} for Inter Company Transaction."
 msgstr "Inter Company Transaction无效{0}。"
 
@@ -25222,7 +25203,7 @@ msgid "Invalid {0}: {1}"
 msgstr "无效的{0}：{1}"
 
 #. Label of the inventory_section (Tab Break) field in DocType 'Item'
-#: erpnext/setup/install.py:385 erpnext/stock/doctype/item/item.json
+#: erpnext/setup/install.py:417 erpnext/stock/doctype/item/item.json
 msgid "Inventory"
 msgstr "库存"
 
@@ -25271,8 +25252,8 @@ msgstr ""
 msgid "Investment Banking"
 msgstr "投资银行业务"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:72
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:124
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:76
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:129
 msgid "Investments"
 msgstr "投资"
 
@@ -25322,7 +25303,7 @@ msgstr "应收账款融资(发票贴现)"
 msgid "Invoice Document Type Selection Error"
 msgstr "发票单据类型选择错误"
 
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1268
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1191
 msgid "Invoice Grand Total"
 msgstr "发票总计"
 
@@ -25427,7 +25408,7 @@ msgstr "可开票时间为0，无法开具发票"
 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:171
 #: erpnext/accounts/report/accounts_payable/accounts_payable.html:139
 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:140
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1270
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1193
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:166
 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:194
 msgid "Invoiced Amount"
@@ -25448,7 +25429,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:2404
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2485
 #: 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"
@@ -25544,8 +25525,7 @@ msgstr "是替代"
 msgid "Is Billable"
 msgstr "可开票"
 
-#. Label of the is_billing_contact (Check) field in DocType 'Contact'
-#: erpnext/erpnext_integrations/custom/contact.json
+#: erpnext/setup/install.py:170
 msgid "Is Billing Contact"
 msgstr "是发票联系人"
 
@@ -25987,8 +25967,7 @@ msgstr "是模板"
 msgid "Is Transporter"
 msgstr "是物流公司"
 
-#. Label of the is_your_company_address (Check) field in DocType 'Address'
-#: erpnext/accounts/custom/address.json
+#: erpnext/setup/install.py:161
 msgid "Is Your Company Address"
 msgstr "是公司地址"
 
@@ -26094,8 +26073,8 @@ msgstr "问题类型"
 #. Description of the 'Is Rate Adjustment Entry (Debit Note)' (Check) field in
 #. DocType 'Sales Invoice'
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-msgid "Issue a debit note with 0 qty against an existing Sales Invoice"
-msgstr "基于已有销售发票开一张0数量发票"
+msgid "Issue a debit note against an existing Sales Invoice to adjust the rate. The quantity will be retained from the original invoice."
+msgstr ""
 
 #. Option for the 'Current State' (Select) field in DocType 'Share Balance'
 #. Option for the 'Status' (Select) field in DocType 'Material Request'
@@ -26129,7 +26108,7 @@ msgstr "发货日期"
 msgid "It can take upto few hours for accurate stock values to be visible after merging items."
 msgstr "合并后的物料库存数量更新可能需几个小时"
 
-#: erpnext/public/js/controllers/transaction.js:2533
+#: erpnext/public/js/controllers/transaction.js:2535
 msgid "It is needed to fetch Item Details."
 msgstr "以获取物料详细信息。"
 
@@ -26501,7 +26480,7 @@ msgstr "购物车"
 #: erpnext/manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:86
 #: erpnext/manufacturing/report/work_order_stock_report/work_order_stock_report.py:119
 #: erpnext/projects/doctype/timesheet/timesheet.js:214
-#: erpnext/public/js/controllers/transaction.js:2827
+#: erpnext/public/js/controllers/transaction.js:2829
 #: erpnext/public/js/stock_reservation.js:112
 #: erpnext/public/js/stock_reservation.js:318 erpnext/public/js/utils.js:579
 #: erpnext/public/js/utils.js:736
@@ -26563,7 +26542,7 @@ msgstr "购物车"
 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js:8
 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:433
 #: erpnext/stock/report/serial_no_ledger/serial_no_ledger.js:7
-#: erpnext/stock/report/stock_ageing/stock_ageing.py:138
+#: erpnext/stock/report/stock_ageing/stock_ageing.py:126
 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:104
 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.py:25
 #: erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.py:26
@@ -26762,7 +26741,7 @@ msgstr "物料详细信息"
 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:55
 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.js:37
 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:99
-#: erpnext/stock/report/stock_ageing/stock_ageing.py:148
+#: erpnext/stock/report/stock_ageing/stock_ageing.py:136
 #: erpnext/stock/report/stock_analytics/stock_analytics.js:8
 #: erpnext/stock/report/stock_analytics/stock_analytics.py:52
 #: erpnext/stock/report/stock_balance/stock_balance.js:32
@@ -26985,7 +26964,7 @@ msgstr "物料制造商"
 #: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:371
 #: erpnext/manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:92
 #: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:138
-#: erpnext/public/js/controllers/transaction.js:2833
+#: erpnext/public/js/controllers/transaction.js:2835
 #: erpnext/public/js/utils.js:826
 #: erpnext/selling/doctype/quotation_item/quotation_item.json
 #: erpnext/selling/doctype/sales_order/sales_order.js:1324
@@ -27025,7 +27004,7 @@ msgstr "物料制造商"
 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:54
 #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:133
 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:440
-#: erpnext/stock/report/stock_ageing/stock_ageing.py:145
+#: erpnext/stock/report/stock_ageing/stock_ageing.py:133
 #: erpnext/stock/report/stock_analytics/stock_analytics.py:45
 #: erpnext/stock/report/stock_balance/stock_balance.py:480
 #: erpnext/stock/report/stock_ledger/stock_ledger.py:292
@@ -27069,10 +27048,6 @@ msgstr ""
 msgid "Item Price"
 msgstr "物料价格"
 
-#: erpnext/stock/get_item_details.py:1136
-msgid "Item Price Added for {0} in Price List {1}"
-msgstr ""
-
 #. Label of the item_price_settings_section (Section Break) field in DocType
 #. 'Accounts Settings'
 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -27088,9 +27063,10 @@ msgstr "物料价格设置"
 msgid "Item Price Stock"
 msgstr "物料价格与库存"
 
-#: erpnext/stock/get_item_details.py:1160
-msgid "Item Price added for {0} in Price List {1}"
-msgstr "物料价格{0}自动添加到价格表{1}中了，以备以后订单使用"
+#: erpnext/stock/get_item_details.py:1155
+#: erpnext/stock/get_item_details.py:1179
+msgid "Item Price added for {0} in Price List - {1}"
+msgstr ""
 
 #: erpnext/stock/doctype/item_price/item_price.py:140
 msgid "Item Price appears multiple times based on Price List, Supplier/Customer, Currency, Item, Batch, UOM, Qty, and Dates."
@@ -27100,7 +27076,7 @@ msgstr "物料价格在价格表，供应商/客户，货币，物料，批号
 msgid "Item Price created at rate {0}"
 msgstr ""
 
-#: erpnext/stock/get_item_details.py:1119
+#: erpnext/stock/get_item_details.py:1138
 msgid "Item Price updated for {0} in Price List {1}"
 msgstr "物料价格{0}更新到价格表{1}中了，之后的订单会使用新价格"
 
@@ -27287,7 +27263,7 @@ msgstr "多规格物料清单"
 msgid "Item Variant Settings"
 msgstr "物料多规格设置"
 
-#: erpnext/stock/doctype/item/item.js:1007
+#: erpnext/stock/doctype/item/item.js:994
 msgid "Item Variant {0} already exists with same attributes"
 msgstr "相同规格/属性的多规格物料{0}已存在"
 
@@ -27392,7 +27368,7 @@ msgstr "物料与仓库"
 msgid "Item and Warranty Details"
 msgstr "物料和保修"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:3482
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py:297
 msgid "Item for row {0} does not match Material Request"
 msgstr "行{0}的物料与物料请求不匹配"
 
@@ -27422,11 +27398,7 @@ msgstr "物料名称"
 msgid "Item operation"
 msgstr "工序"
 
-#: erpnext/controllers/accounts_controller.py:4099
-msgid "Item qty can not be updated as raw materials are already processed."
-msgstr "因原材料已处理，物料数量不可更新"
-
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1242
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:605
 msgid "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}"
 msgstr "因勾选了成本价为0，物料 {0} 的单价已设置为0"
 
@@ -27449,7 +27421,7 @@ msgstr "物料成本价追溯调整后台处理中，报表中显示的物料成
 msgid "Item variant {0} exists with same attributes"
 msgstr "有相同属性的多规格物料{0}已存在"
 
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:564
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:563
 msgid "Item with name {0} not found in the Purchase Order"
 msgstr ""
 
@@ -27478,7 +27450,7 @@ msgstr "物料{0}不存在于系统中或已过期"
 msgid "Item {0} does not exist."
 msgstr "物料{0}不存在"
 
-#: erpnext/controllers/selling_controller.py:855
+#: erpnext/controllers/selling_controller.py:856
 msgid "Item {0} entered multiple times."
 msgstr "物料{0}重复输入"
 
@@ -27490,11 +27462,11 @@ msgstr "物料{0}已被退回"
 msgid "Item {0} has been disabled"
 msgstr "物料{0}已禁用"
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:790
+#: erpnext/selling/doctype/sales_order/sales_order.py:793
 msgid "Item {0} has no Serial No. Only serialized items can have delivery based on Serial No"
 msgstr "物料{0}无序列号，只有序列化物料可按序列号交货"
 
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:583
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:582
 msgid "Item {0} has no changes in delivered quantity. Please unselect the row if you do not wish to update its quantity."
 msgstr ""
 
@@ -27518,7 +27490,7 @@ msgstr "物料{0}已取消"
 msgid "Item {0} is disabled"
 msgstr "物料{0}已禁用"
 
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:569
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:568
 msgid "Item {0} is not a drop ship item. Only drop ship items can have Delivered Qty updated."
 msgstr ""
 
@@ -27538,7 +27510,7 @@ msgstr "物料{0}非外协物料"
 msgid "Item {0} is not a template item."
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:2211
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1302
 msgid "Item {0} is not active or end of life has been reached"
 msgstr "物料{0}处于失效或寿命终止状态"
 
@@ -27554,7 +27526,7 @@ msgstr "物料{0}必须为非库存物料"
 msgid "Item {0} must be a non-stock item"
 msgstr "物料{0}必须是非允许库存物料"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1575
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/subcontracting.py:59
 msgid "Item {0} not found in 'Raw Materials Supplied' table in {1} {2}"
 msgstr "在{1} {2}的'供应的原材料'表中未找到物料{0}"
 
@@ -27570,7 +27542,7 @@ msgstr "物料{0}的订单数量{1}不能小于最低订货量{2}（物料主数
 msgid "Item {0}: {1} qty produced. "
 msgstr "物料{0}：已生产数量{1}"
 
-#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462
+#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1384
 msgid "Item {} does not exist."
 msgstr "物料{}不存在"
 
@@ -27616,7 +27588,7 @@ msgstr "物料销售台账"
 msgid "Item-wise sales Register"
 msgstr ""
 
-#: erpnext/stock/get_item_details.py:724
+#: erpnext/stock/get_item_details.py:743
 msgid "Item/Item Code required to get Item Tax Template."
 msgstr "获取物料税模板需要物料/物料编码。"
 
@@ -27640,7 +27612,7 @@ msgstr "物料"
 msgid "Items Filter"
 msgstr "物料过滤"
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1688
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1690
 #: erpnext/selling/doctype/sales_order/sales_order.js:1757
 msgid "Items Required"
 msgstr "所需物料"
@@ -27664,11 +27636,11 @@ msgstr "待创建物料需求物料"
 msgid "Items and Pricing"
 msgstr "物料和定价"
 
-#: erpnext/controllers/accounts_controller.py:4255
+#: erpnext/controllers/accounts_controller.py:4243
 msgid "Items cannot be updated as Subcontracting Inward Order(s) exist against this Subcontracted Sales Order."
 msgstr "因存在针对此外包销售订单的外包收货订单，物料无法更新。"
 
-#: erpnext/controllers/accounts_controller.py:4248
+#: erpnext/controllers/accounts_controller.py:4236
 msgid "Items cannot be updated as Subcontracting Order is created against the Purchase Order {0}."
 msgstr "因已针对采购订单{0}创建外协订单，物料不可更新"
 
@@ -27680,7 +27652,7 @@ msgstr "用于物料需求的物料号"
 msgid "Items not found."
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1238
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:601
 msgid "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}"
 msgstr "因勾选了成本价为0，这些物料 {0} 的单价已设置为0"
 
@@ -27690,7 +27662,7 @@ msgstr "因勾选了成本价为0，这些物料 {0} 的单价已设置为0"
 msgid "Items to Be Repost"
 msgstr "待重过账物料"
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1687
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1689
 msgid "Items to Manufacture are required to pull the Raw Materials associated with it."
 msgstr "需有装配件或子装配件明细后才可计算采购原材料需求。"
 
@@ -27755,9 +27727,9 @@ msgstr "生产任务单产能"
 #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
 #: erpnext/manufacturing/doctype/bom/bom.json
 #: erpnext/manufacturing/doctype/job_card/job_card.json
-#: erpnext/manufacturing/doctype/job_card/job_card.py:998
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1004
 #: erpnext/manufacturing/doctype/operation/operation.json
-#: erpnext/manufacturing/doctype/work_order/work_order.js:415
+#: erpnext/manufacturing/doctype/work_order/work_order.js:396
 #: erpnext/manufacturing/doctype/work_order/work_order.json
 #: erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:29
 #: erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py:86
@@ -27819,7 +27791,7 @@ msgstr "生产任务单工时记录"
 msgid "Job Card and Capacity Planning"
 msgstr "生产任务单与产能计划"
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1474
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1491
 msgid "Job Card {0} has been completed"
 msgstr "作业卡{0}已完成"
 
@@ -27895,7 +27867,7 @@ msgstr "委外供应商名"
 msgid "Job Worker Warehouse"
 msgstr "委外仓库"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:2708
+#: erpnext/manufacturing/doctype/work_order/work_order.py:2706
 msgid "Job card {0} created"
 msgstr "已创建生产任务单{0}"
 
@@ -28115,7 +28087,7 @@ msgstr "千瓦"
 msgid "Kilowatt-Hour"
 msgstr "千瓦时"
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1000
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1006
 msgid "Kindly cancel the Manufacturing Entries first against the work order {0}."
 msgstr "请先取消工单入库"
 
@@ -28243,7 +28215,7 @@ msgstr "最后完成日期"
 msgid "Last Fiscal Year"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/account.py:660
+#: erpnext/accounts/doctype/account/account.py:661
 msgid "Last GL Entry update was done {}. This operation is not allowed while system is actively being used. Please wait for 5 minutes before retrying."
 msgstr "总账分录最后更新于{}。系统使用期间不允许此操作，请5分钟后重试"
 
@@ -28325,7 +28297,7 @@ msgstr "最后一次尾气检查日期不能是未来的日期"
 msgid "Last transacted"
 msgstr "最后交易时间"
 
-#: erpnext/stock/report/stock_ageing/stock_ageing.py:185
+#: erpnext/stock/report/stock_ageing/stock_ageing.py:173
 msgid "Latest"
 msgstr "最新"
 
@@ -28576,12 +28548,12 @@ msgstr "旧系统字段"
 msgid "Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization."
 msgstr "属于本机构的，带独立科目表的法人/附属机构。"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:111
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:190
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:115
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:195
 msgid "Legal Expenses"
 msgstr "法律费用"
 
-#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:19
+#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:31
 msgid "Legend"
 msgstr "图例"
 
@@ -28804,8 +28776,8 @@ msgstr "借款开始日期"
 msgid "Loan Start Date and Loan Period are mandatory to save the Invoice Discounting"
 msgstr "借款开始日期和借款期限是保存发票贴现的必要条件"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:176
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:300
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:180
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:305
 msgid "Loans (Liabilities)"
 msgstr "借款（负债）"
 
@@ -28850,8 +28822,8 @@ msgstr "物料的销售价和采购价"
 msgid "Logo"
 msgstr "Logo"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:183
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:318
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:187
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:323
 msgid "Long-term Provisions"
 msgstr ""
 
@@ -29095,10 +29067,10 @@ msgstr "机器故障"
 msgid "Machine operator errors"
 msgstr "操作失误"
 
-#: erpnext/setup/doctype/company/company.py:719
-#: erpnext/setup/doctype/company/company.py:734
-#: erpnext/setup/doctype/company/company.py:735
-#: erpnext/setup/doctype/company/company.py:736
+#: erpnext/setup/doctype/company/company.py:724
+#: erpnext/setup/doctype/company/company.py:739
+#: erpnext/setup/doctype/company/company.py:740
+#: erpnext/setup/doctype/company/company.py:741
 msgid "Main"
 msgstr "主"
 
@@ -29341,9 +29313,9 @@ msgstr "主修/选修科目"
 
 #. Label of the make (Data) field in DocType 'Vehicle'
 #: erpnext/accounts/doctype/journal_entry/journal_entry.js:127
-#: erpnext/manufacturing/doctype/job_card/job_card.js:550
-#: erpnext/manufacturing/doctype/work_order/work_order.js:857
-#: erpnext/manufacturing/doctype/work_order/work_order.js:891
+#: erpnext/manufacturing/doctype/job_card/job_card.js:480
+#: erpnext/manufacturing/doctype/work_order/work_order.js:839
+#: erpnext/manufacturing/doctype/work_order/work_order.js:873
 #: erpnext/setup/doctype/vehicle/vehicle.json
 msgid "Make"
 msgstr "生成"
@@ -29363,7 +29335,7 @@ msgstr "创建折旧凭证"
 msgid "Make Difference Entry"
 msgstr "创建差异分录"
 
-#: erpnext/stock/doctype/item/item.js:696
+#: erpnext/stock/doctype/item/item.js:683
 msgid "Make Lead Time"
 msgstr "制定提前期"
 
@@ -29401,12 +29373,12 @@ msgstr "创建销售发票"
 msgid "Make Serial No / Batch from Work Order"
 msgstr "从工单生成序列号/批号"
 
-#: erpnext/manufacturing/doctype/job_card/job_card.js:109
+#: erpnext/manufacturing/doctype/job_card/job_card.js:106
 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:256
 msgid "Make Stock Entry"
 msgstr "创建物料移动"
 
-#: erpnext/manufacturing/doctype/job_card/job_card.js:424
+#: erpnext/manufacturing/doctype/job_card/job_card.js:369
 msgid "Make Subcontracting PO"
 msgstr "创建外协采购订单"
 
@@ -29422,11 +29394,11 @@ msgstr "发起呼叫"
 msgid "Make project from a template."
 msgstr "基于模板创建项目。"
 
-#: erpnext/stock/doctype/item/item.js:804
+#: erpnext/stock/doctype/item/item.js:791
 msgid "Make {0} Variant"
 msgstr "生成{0}个多规格物料"
 
-#: erpnext/stock/doctype/item/item.js:806
+#: erpnext/stock/doctype/item/item.js:793
 msgid "Make {0} Variants"
 msgstr "生成{0}个多规格物料"
 
@@ -29434,8 +29406,8 @@ msgstr "生成{0}个多规格物料"
 msgid "Making Journal Entries against advance accounts: {0} is not recommended. These Journals won't be available for Reconciliation."
 msgstr "因无法核销，不建议在日记账凭证中包括预收/付款科目：{0}"
 
-#: erpnext/setup/doctype/company/company.js:161
-#: erpnext/setup/doctype/company/company.js:172
+#: erpnext/setup/doctype/company/company.js:177
+#: erpnext/setup/doctype/company/company.js:188
 msgid "Manage"
 msgstr "管理"
 
@@ -29454,7 +29426,7 @@ msgstr ""
 msgid "Manage your orders"
 msgstr "管理您的订单"
 
-#: erpnext/setup/doctype/company/company.py:498
+#: erpnext/setup/doctype/company/company.py:502
 msgid "Management"
 msgstr "管理人员"
 
@@ -29470,7 +29442,7 @@ msgstr "总经理"
 msgid "Mandatory Accounting Dimension"
 msgstr "必填会计维度"
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1881
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1962
 msgid "Mandatory Field"
 msgstr "必填字段"
 
@@ -29569,8 +29541,8 @@ msgstr "请到会计设置-递延记账设置中取消勾选自动生成递延
 #: erpnext/stock/doctype/material_request_item/material_request_item.json
 #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
 #: erpnext/stock/doctype/stock_entry/stock_entry.json
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1319
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:696
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:713
 #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json
 #: erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json
 #: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
@@ -29674,7 +29646,7 @@ msgstr "物料的制造商"
 #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
 #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
 #: erpnext/selling/doctype/sales_order/sales_order_dashboard.py:29
-#: erpnext/setup/doctype/company/company.json erpnext/setup/install.py:390
+#: erpnext/setup/doctype/company/company.json erpnext/setup/install.py:422
 #: erpnext/setup/setup_wizard/data/industry_type.txt:31
 #: erpnext/stock/doctype/batch/batch.json erpnext/stock/doctype/item/item.json
 #: erpnext/stock/doctype/item_lead_time/item_lead_time.json
@@ -29719,10 +29691,6 @@ msgstr "生产日期"
 msgid "Manufacturing Manager"
 msgstr "生产经理"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:2569
-msgid "Manufacturing Quantity is mandatory"
-msgstr "请填写生产数量"
-
 #. Label of the manufacturing_section_section (Section Break) field in DocType
 #. 'Sales Order Item'
 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -29903,12 +29871,12 @@ msgstr "标记为已关闭"
 msgid "Market Segment"
 msgstr "细分市场"
 
-#: erpnext/setup/doctype/company/company.py:450
+#: erpnext/setup/doctype/company/company.py:454
 msgid "Marketing"
 msgstr "市场营销"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:112
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:191
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:116
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:196
 msgid "Marketing Expenses"
 msgstr "市场营销费用"
 
@@ -29987,7 +29955,7 @@ msgstr ""
 msgid "Material"
 msgstr "物料"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:882
+#: erpnext/manufacturing/doctype/work_order/work_order.js:864
 msgid "Material Consumption"
 msgstr "工单耗用"
 
@@ -29995,7 +29963,7 @@ msgstr "工单耗用"
 #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type'
 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:114
 #: erpnext/stock/doctype/stock_entry/stock_entry.json
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1320
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:697
 #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json
 msgid "Material Consumption for Manufacture"
 msgstr "工单耗用"
@@ -30076,7 +30044,7 @@ msgstr "其他入库"
 #: erpnext/buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:33
 #: erpnext/buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:184
 #: erpnext/buying/workspace/buying/buying.json
-#: erpnext/manufacturing/doctype/job_card/job_card.js:166
+#: erpnext/manufacturing/doctype/job_card/job_card.js:214
 #: erpnext/manufacturing/doctype/production_plan/production_plan.js:159
 #: erpnext/manufacturing/doctype/production_plan/production_plan.json
 #: erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json
@@ -30173,11 +30141,11 @@ msgstr "物料需求中的计划物料"
 msgid "Material Request Type"
 msgstr "物料需求类型"
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:1158
+#: erpnext/selling/doctype/sales_order/sales_order.py:1171
 msgid "Material Request already created for the ordered quantity"
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:1969
+#: erpnext/selling/doctype/sales_order/sales_order.py:1991
 msgid "Material Request not created, as quantity for Raw Materials already available."
 msgstr "因原材料可用数量足够，物料需求未创建，。"
 
@@ -30245,7 +30213,7 @@ msgstr "原材料已退回"
 #. Option for the 'Purpose' (Select) field in DocType 'Pick List'
 #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry'
 #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type'
-#: erpnext/manufacturing/doctype/job_card/job_card.js:180
+#: erpnext/manufacturing/doctype/job_card/job_card.js:225
 #: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:83
 #: erpnext/stock/doctype/item/item.json
@@ -30311,12 +30279,12 @@ msgstr "委外原材料"
 msgid "Materials To Be Transferred"
 msgstr ""
 
-#: erpnext/controllers/subcontracting_controller.py:1543
+#: erpnext/controllers/subcontracting_controller.py:1545
 msgid "Materials are already received against the {0} {1}"
 msgstr "已根据{0}{1}接收物料"
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:184
-#: erpnext/manufacturing/doctype/job_card/job_card.py:854
+#: erpnext/manufacturing/doctype/job_card/job_card.py:185
+#: erpnext/manufacturing/doctype/job_card/job_card.py:855
 msgid "Materials needs to be transferred to the work in progress warehouse for the job card {0}"
 msgstr "请先为生产任务单 {0} 发料(直接调拨)"
 
@@ -30387,9 +30355,9 @@ msgstr "最高分数"
 msgid "Max discount allowed for item: {0} is {1}%"
 msgstr "物料{0}的最大折扣为 {1}%"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1058
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1065
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1088
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1040
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1047
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1070
 #: erpnext/stock/doctype/pick_list/pick_list.js:203
 #: erpnext/stock/doctype/stock_entry/stock_entry.js:382
 msgid "Max: {0}"
@@ -30421,11 +30389,11 @@ msgstr "最大付款金额"
 msgid "Maximum Producible Items"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:4088
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:1049
 msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}."
 msgstr "可以为批号{1}和物料{2}保留最大样本数量{0}。"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:4079
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:1038
 msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}."
 msgstr "批号{1}和批号{3}中的物料{2}已保留最大样本数量{0}。"
 
@@ -30486,7 +30454,7 @@ msgstr "兆焦耳"
 msgid "Megawatt"
 msgstr "兆瓦"
 
-#: erpnext/stock/stock_ledger.py:2072
+#: erpnext/stock/stock_ledger.py:2038
 msgid "Mention Valuation Rate in the Item master."
 msgstr "请在物料主数据中维护成本价"
 
@@ -30544,7 +30512,7 @@ msgstr "与现有科目合并"
 msgid "Merged"
 msgstr "已合并"
 
-#: erpnext/accounts/doctype/account/account.py:603
+#: erpnext/accounts/doctype/account/account.py:604
 msgid "Merging is only possible if following properties are same in both records. Is Group, Root Type, Company and Account Currency"
 msgstr "合并要求两条记录的以下属性相同：是否组、根类型、公司和账户货币"
 
@@ -30574,7 +30542,7 @@ msgstr "发送给用户以收集项目进度"
 msgid "Messages greater than 160 characters will be split into multiple messages"
 msgstr "超过160字符的消息将被分割为多条消息"
 
-#: erpnext/setup/install.py:137
+#: erpnext/setup/install.py:138
 msgid "Messaging CRM Campaign"
 msgstr ""
 
@@ -30775,7 +30743,7 @@ msgstr "最小数量不能大于最大数量"
 msgid "Min Qty should be greater than Recurse Over Qty"
 msgstr "最小数量应大于递归数量"
 
-#: erpnext/stock/doctype/item/item.js:958
+#: erpnext/stock/doctype/item/item.js:945
 msgid "Min Value: {0}, Max Value: {1}, in Increments of: {2}"
 msgstr ""
 
@@ -30864,8 +30832,8 @@ msgstr "会议记录"
 msgid "Miscellaneous"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:116
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:224
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:120
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:229
 msgid "Miscellaneous Expenses"
 msgstr "杂项费用"
 
@@ -30873,15 +30841,15 @@ msgstr "杂项费用"
 msgid "Mismatch"
 msgstr "不匹配"
 
-#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1463
+#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1385
 msgid "Missing"
 msgstr "缺失"
 
 #: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:97
 #: erpnext/accounts/doctype/pos_profile/pos_profile.py:201
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:594
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2421
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3029
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2502
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3110
 #: erpnext/assets/doctype/asset_category/asset_category.py:126
 msgid "Missing Account"
 msgstr "缺少账户"
@@ -30911,7 +30879,7 @@ msgstr "缺少筛选条件"
 msgid "Missing Finance Book"
 msgstr "缺少财务账簿"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:872
 msgid "Missing Finished Good"
 msgstr "无成品明细行"
 
@@ -30919,7 +30887,7 @@ msgstr "无成品明细行"
 msgid "Missing Formula"
 msgstr "未维护公式"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1078
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:787
 msgid "Missing Item"
 msgstr "缺少物料"
 
@@ -30956,7 +30924,7 @@ msgid "Missing required filter: {0}"
 msgstr ""
 
 #: erpnext/manufacturing/doctype/bom/bom.py:1228
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1498
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1499
 msgid "Missing value"
 msgstr "缺失值"
 
@@ -31205,7 +31173,7 @@ msgstr ""
 msgid "Multiple Accounts (Journal Template)"
 msgstr ""
 
-#: erpnext/selling/doctype/customer/customer.py:440
+#: erpnext/selling/doctype/customer/customer.py:430
 msgid "Multiple Loyalty Programs found for Customer {}. Please select manually."
 msgstr "发现客户{}存在多个忠诚度计划，请手动选择"
 
@@ -31231,11 +31199,11 @@ msgstr "多个多规格物料"
 msgid "Multiple company fields available: {0}. Please select manually."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:1306
+#: erpnext/controllers/accounts_controller.py:1307
 msgid "Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year"
 msgstr "多个财年的日期{0}存在。请设置公司财年"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1766
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:879
 msgid "Multiple items cannot be marked as finished item"
 msgstr "只允许一个明细行勾选了是成品"
 
@@ -31244,7 +31212,7 @@ msgid "Music"
 msgstr "音乐"
 
 #. Label of the must_be_whole_number (Check) field in DocType 'UOM'
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1445
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1446
 #: erpnext/setup/doctype/uom/uom.json
 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:267
 #: erpnext/utilities/transaction_base.py:628
@@ -31331,7 +31299,7 @@ msgstr ""
 msgid "Naming Series updated"
 msgstr ""
 
-#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:938
+#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:939
 msgid "Naming series '{0}' for DocType '{1}' does not contain standard '.' or '{{' separator. Using fallback extraction."
 msgstr ""
 
@@ -31690,7 +31658,7 @@ msgstr "净重"
 msgid "Net Weight UOM"
 msgstr "净重单位"
 
-#: erpnext/controllers/accounts_controller.py:1666
+#: erpnext/controllers/accounts_controller.py:1667
 msgid "Net total calculation precision loss"
 msgstr "净总计计算精度损失"
 
@@ -31867,7 +31835,7 @@ msgstr "新仓库名称"
 msgid "New Workplace"
 msgstr "新工作地点"
 
-#: erpnext/selling/doctype/customer/customer.py:405
+#: erpnext/selling/doctype/customer/customer.py:395
 msgid "New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0}"
 msgstr "新的信用额度小于该客户未付总额。信用额度至少应该是 {0}"
 
@@ -31921,7 +31889,7 @@ msgstr "下次邮件发送时间："
 msgid "No <strong>Account Data</strong> row found"
 msgstr ""
 
-#: erpnext/setup/doctype/company/test_company.py:93
+#: erpnext/setup/doctype/company/test_company.py:94
 msgid "No Account matched these filters: {}"
 msgstr "没有符合过滤条件{}的科目"
 
@@ -31934,7 +31902,7 @@ msgstr "没有控制措施"
 msgid "No Answer"
 msgstr "未答复"
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2526
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2607
 msgid "No Customer found for Inter Company Transactions which represents company {0}"
 msgstr "未找到代表公司{0}的关联公司交易客户"
 
@@ -31947,7 +31915,7 @@ msgstr "无满足筛选条件的客户"
 msgid "No Delivery Note selected for Customer {}"
 msgstr "没有为客户{}选择销售出库"
 
-#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:755
+#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:756
 msgid "No DocTypes in To Delete list. Please generate or import the list before submitting."
 msgstr ""
 
@@ -31963,7 +31931,7 @@ msgstr "没有条码为{0}的物料"
 msgid "No Item with Serial No {0}"
 msgstr "没启用序列号管理为{0}的物料"
 
-#: erpnext/controllers/subcontracting_controller.py:1459
+#: erpnext/controllers/subcontracting_controller.py:1461
 msgid "No Items selected for transfer."
 msgstr "未选择待转移物料"
 
@@ -32027,7 +31995,7 @@ msgstr "当前无可用库存"
 msgid "No Summary"
 msgstr "无摘要"
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2510
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2591
 msgid "No Supplier found for Inter Company Transactions which represents company {0}"
 msgstr "未找到代表公司{0}的关联公司交易供应商"
 
@@ -32039,7 +32007,7 @@ msgstr "当前过账日期未找到代扣税数据"
 msgid "No Tax withholding account set for Company {0} in Tax Withholding Category {1}."
 msgstr ""
 
-#: erpnext/accounts/report/gross_profit/gross_profit.py:998
+#: erpnext/accounts/report/gross_profit/gross_profit.py:990
 msgid "No Terms"
 msgstr "无条款"
 
@@ -32069,7 +32037,7 @@ msgstr ""
 msgid "No accounts found."
 msgstr ""
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:796
+#: erpnext/selling/doctype/sales_order/sales_order.py:799
 msgid "No active BOM found for item {0}. Delivery by Serial No cannot be ensured"
 msgstr "未找到物料{0}的有效物料清单，无法保证按序列号交货"
 
@@ -32391,7 +32359,7 @@ msgstr "无金额"
 msgid "No vouchers found for this transaction"
 msgstr ""
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2574
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2655
 msgid "No {0} found for Inter Company Transactions."
 msgstr "关联公司交易没有找到{0}。"
 
@@ -32436,8 +32404,8 @@ msgstr "公益组织"
 msgid "Non stock items"
 msgstr "非库存物料"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:182
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:317
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:186
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:322
 msgid "Non-Current Liabilities"
 msgstr ""
 
@@ -32538,7 +32506,7 @@ msgstr "无法找到指定公司的最早会计年度。"
 msgid "Not allow to set alternative item for the item {0}"
 msgstr "不允许为物料{0}设置替代物料"
 
-#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:59
+#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:60
 msgid "Not allowed to create accounting dimension for {0}"
 msgstr "不允许为{0}创建会计维度"
 
@@ -32592,7 +32560,7 @@ msgstr "注意：若需将产成品{0}作为原材料使用，请在物料表中
 msgid "Note: Item {0} added multiple times"
 msgstr "注：物料 {0} 添加了多次"
 
-#: erpnext/controllers/accounts_controller.py:712
+#: erpnext/controllers/accounts_controller.py:713
 msgid "Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified"
 msgstr "注意：未指定“现金或银行科目”，无法创建收付款凭证"
 
@@ -32842,18 +32810,18 @@ msgstr "已行驶里程"
 msgid "Offer Date"
 msgstr "录用日期"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:56
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:92
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:60
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:97
 msgid "Office Equipment"
 msgstr "办公设备"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:120
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:196
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:124
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:201
 msgid "Office Maintenance Expenses"
 msgstr "办公维护费用"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:121
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:200
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:125
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:205
 msgid "Office Rent"
 msgstr "办公室租金"
 
@@ -32981,7 +32949,7 @@ msgstr ""
 msgid "Once set, this invoice will be on hold till the set date"
 msgstr "一旦设置，该发票将被临时冻结至设定的日期"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:769
+#: erpnext/manufacturing/doctype/work_order/work_order.js:751
 msgid "Once the Work Order is Closed. It can't be resumed."
 msgstr "不能恢复已关闭工单"
 
@@ -33021,7 +32989,7 @@ msgstr "仅支持收付款凭证中使用此科目"
 msgid "Only CSV and Excel files can be used to for importing data. Please check the file format you are trying to upload"
 msgstr "仅支持CSV和Excel文件格式导入数据，请检查上传文件格式"
 
-#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1071
+#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1072
 msgid "Only CSV files are allowed"
 msgstr ""
 
@@ -33040,7 +33008,7 @@ msgstr "仅对超额部分扣税"
 msgid "Only Include Allocated Payments"
 msgstr "仅含已分配(核销)付款"
 
-#: erpnext/accounts/doctype/account/account.py:136
+#: erpnext/accounts/doctype/account/account.py:137
 msgid "Only Parent can be of type {0}"
 msgstr "只有上级可以是{0}类型"
 
@@ -33077,7 +33045,7 @@ msgstr ""
 msgid "Only one operation can have 'Is Final Finished Good' checked when 'Track Semi Finished Goods' is enabled."
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1334
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:712
 msgid "Only one {0} entry can be created against the Work Order {1}"
 msgstr "每个工单{1}仅能创建一个{0}条目"
 
@@ -33295,8 +33263,8 @@ msgstr ""
 msgid "Opening Balance Details"
 msgstr "起始余额明细"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:192
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:343
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:196
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:348
 msgid "Opening Balance Equity"
 msgstr "所有者权益期初余额"
 
@@ -33352,7 +33320,7 @@ msgid "Opening Invoice Tool"
 msgstr ""
 
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1651
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1990
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2071
 msgid "Opening Invoice has rounding adjustment of {0}.<br><br> '{1}' account is required to post these values. Please set it in Company: {2}.<br><br> Or, '{3}' can be enabled to not post any rounding adjustment."
 msgstr "期初发票存在{0}的舍入调整。<br><br>需设置'{1}'科目以过账这些值，请在公司{2}中设置。<br><br>或启用'{3}'以不过账任何舍入调整"
 
@@ -33420,7 +33388,10 @@ msgid "Opening stock creation has been queued and will be created in the backgro
 msgstr ""
 
 #. Label of the operating_component (Link) field in DocType 'Workstation Cost'
+#. Label of the operating_component (Data) field in DocType 'Landed Cost Taxes
+#. and Charges'
 #: erpnext/manufacturing/doctype/workstation_cost/workstation_cost.json
+#: erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json
 msgid "Operating Component"
 msgstr "运营组件"
 
@@ -33452,7 +33423,7 @@ msgstr "工费成本（本币）"
 msgid "Operating Cost Per BOM Quantity"
 msgstr "每个成品工费成本"
 
-#: erpnext/manufacturing/doctype/bom/bom.py:1731
+#: erpnext/manufacturing/doctype/bom/bom.py:1749
 msgid "Operating Cost as per Work Order / BOM"
 msgstr "按工单/物料清单计算的运营成本"
 
@@ -33495,15 +33466,15 @@ msgstr "工序说明"
 
 #. Label of the operation_row_id (Int) field in DocType 'BOM Item'
 #. Label of the operation_id (Data) field in DocType 'Job Card'
+#. Label of the operation_id (Data) field in DocType 'Landed Cost Taxes and
+#. Charges'
 #: erpnext/manufacturing/doctype/bom_item/bom_item.json
 #: erpnext/manufacturing/doctype/job_card/job_card.json
+#: erpnext/manufacturing/doctype/work_order/work_order.js:332
+#: erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json
 msgid "Operation ID"
 msgstr "工序ID"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:351
-msgid "Operation Id"
-msgstr "工序ID"
-
 #. Label of the operation_row_id (Int) field in DocType 'Job Card'
 #: erpnext/manufacturing/doctype/job_card/job_card.json
 msgid "Operation Row ID"
@@ -33528,7 +33499,7 @@ msgstr "工序行号"
 msgid "Operation Time"
 msgstr "工序时间"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1504
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1505
 msgid "Operation Time must be greater than 0 for Operation {0}"
 msgstr "工序{0}的时间必须大于0"
 
@@ -33543,11 +33514,11 @@ msgstr "多少成品工序已完成？"
 msgid "Operation time does not depend on quantity to produce"
 msgstr "加工(操作)时间不随着生产数量变化"
 
-#: erpnext/manufacturing/doctype/job_card/job_card.js:592
+#: erpnext/manufacturing/doctype/job_card/job_card.js:518
 msgid "Operation {0} added multiple times in the work order {1}"
 msgstr "工单{1}中工序{0}被多次添加"
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1247
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1255
 msgid "Operation {0} does not belong to the work order {1}"
 msgstr "工序{0}不属于工单{1}"
 
@@ -33563,9 +33534,9 @@ msgstr "工序{0}时间超过任何工站开工时间{1}，请分解成多个工
 #. Label of the operations (Table) field in DocType 'Work Order'
 #. Label of the operation (Section Break) field in DocType 'Email Digest'
 #: erpnext/manufacturing/doctype/bom/bom.json
-#: erpnext/manufacturing/doctype/work_order/work_order.js:332
+#: erpnext/manufacturing/doctype/work_order/work_order.js:313
 #: erpnext/manufacturing/doctype/work_order/work_order.json
-#: erpnext/setup/doctype/company/company.py:468
+#: erpnext/setup/doctype/company/company.py:472
 #: erpnext/setup/doctype/email_digest/email_digest.json
 #: erpnext/templates/generators/bom.html:61
 msgid "Operations"
@@ -33738,7 +33709,7 @@ msgstr "商机 {0} 已创建"
 msgid "Optimize Route"
 msgstr "优化路线"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1035
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1017
 msgid "Optional. Select a specific manufacture entry to reverse."
 msgstr ""
 
@@ -33888,7 +33859,7 @@ msgstr "采购数量"
 
 #: erpnext/buying/doctype/supplier/supplier_dashboard.py:11
 #: erpnext/selling/doctype/customer/customer_dashboard.py:20
-#: erpnext/selling/doctype/sales_order/sales_order.py:1005
+#: erpnext/selling/doctype/sales_order/sales_order.py:1018
 #: erpnext/setup/doctype/company/company_dashboard.py:23
 msgid "Orders"
 msgstr "订单"
@@ -34106,7 +34077,7 @@ msgstr "未清金额（公司货币）"
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
 #: erpnext/accounts/report/accounts_payable/accounts_payable.html:140
 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:141
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1277
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1200
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:169
 #: erpnext/accounts/report/purchase_register/purchase_register.py:289
 #: erpnext/accounts/report/sales_register/sales_register.py:319
@@ -34172,7 +34143,7 @@ msgstr "超量出/入库比率(%)"
 msgid "Over Picking Allowance"
 msgstr "允许超量拣货(％)"
 
-#: erpnext/controllers/stock_controller.py:1737
+#: erpnext/controllers/stock_controller.py:1738
 msgid "Over Receipt"
 msgstr "超收"
 
@@ -34200,7 +34171,7 @@ msgstr ""
 msgid "Overbilling of {0} {1} ignored for item {2} because you have {3} role."
 msgstr "因您具有{3}角色，物料{2}的{0} {1}超计费已被忽略"
 
-#: erpnext/controllers/accounts_controller.py:2184
+#: erpnext/controllers/accounts_controller.py:2185
 msgid "Overbilling of {} ignored because you have {} role."
 msgstr "因您具有{}角色，{}超计费已被忽略"
 
@@ -34685,7 +34656,7 @@ msgstr "套件明细"
 msgid "Packed Items"
 msgstr "套件明细"
 
-#: erpnext/controllers/stock_controller.py:1571
+#: erpnext/controllers/stock_controller.py:1572
 msgid "Packed Items cannot be transferred internally"
 msgstr "套件中的下层物料不可直接调拨"
 
@@ -34722,7 +34693,7 @@ msgstr "装箱单"
 msgid "Packing Slip Item"
 msgstr "装箱单项"
 
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:659
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:700
 msgid "Packing Slip(s) cancelled"
 msgstr "装箱单（ S）取消"
 
@@ -34763,7 +34734,7 @@ msgstr "已付款"
 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:173
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1271
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1194
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:167
 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:201
 #: erpnext/accounts/report/pos_register/pos_register.py:209
@@ -34923,7 +34894,7 @@ msgstr "父批"
 msgid "Parent Company"
 msgstr "母公司"
 
-#: erpnext/setup/doctype/company/company.py:603
+#: erpnext/setup/doctype/company/company.py:607
 msgid "Parent Company must be a group company"
 msgstr "母公司必须是集团公司"
 
@@ -35263,7 +35234,7 @@ msgstr "百万分率"
 #: erpnext/accounts/report/accounts_payable/accounts_payable.js:105
 #: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:82
 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:65
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1204
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1127
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:82
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:147
 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:49
@@ -35290,7 +35261,7 @@ msgstr "往来单位"
 
 #. Name of a DocType
 #: erpnext/accounts/doctype/party_account/party_account.json
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1216
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1139
 msgid "Party Account"
 msgstr "往来单位科目"
 
@@ -35323,7 +35294,7 @@ msgstr ""
 msgid "Party Account No. (Bank Statement)"
 msgstr "往来单位银行账号(银行对账)"
 
-#: erpnext/controllers/accounts_controller.py:2468
+#: erpnext/controllers/accounts_controller.py:2469
 msgid "Party Account {0} currency ({1}) and document currency ({2}) should be same"
 msgstr "往来单位主数据中定义的结算货币需与业务交易货币相同"
 
@@ -35475,7 +35446,7 @@ msgstr "客户/供应商可交易物料"
 #: erpnext/accounts/report/accounts_payable/accounts_payable.js:92
 #: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:69
 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:52
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1198
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1121
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:69
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:141
 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:42
@@ -35584,7 +35555,7 @@ msgstr "历史事件"
 msgid "Pause"
 msgstr "暂停"
 
-#: erpnext/manufacturing/doctype/job_card/job_card.js:263
+#: erpnext/manufacturing/doctype/job_card/job_card.js:660
 msgid "Pause Job"
 msgstr "暂停生产任务单"
 
@@ -35635,7 +35606,7 @@ msgid "Payable"
 msgstr "应付账款"
 
 #: erpnext/accounts/report/accounts_payable/accounts_payable.js:50
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1214
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1137
 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:209
 #: erpnext/accounts/report/purchase_register/purchase_register.py:194
 #: erpnext/accounts/report/purchase_register/purchase_register.py:235
@@ -35669,7 +35640,7 @@ msgstr "付款人设置"
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js:55
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:98
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice_dashboard.py:25
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js:42
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js:51
 #: erpnext/buying/doctype/purchase_order/purchase_order.js:394
 #: erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py:24
 #: erpnext/selling/doctype/sales_order/sales_order.js:1213
@@ -35816,7 +35787,7 @@ msgstr "选择收付款凭证后有修改，请重新选取。"
 msgid "Payment Entry is already created"
 msgstr "收付款凭证已创建"
 
-#: erpnext/controllers/accounts_controller.py:1617
+#: erpnext/controllers/accounts_controller.py:1618
 msgid "Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice."
 msgstr "订单{1}上已关联收付款凭证{0}，是否将其作为本发票的预付款？"
 
@@ -36106,7 +36077,7 @@ msgstr ""
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
 #: erpnext/buying/doctype/purchase_order/purchase_order.json
-#: erpnext/controllers/accounts_controller.py:2748
+#: erpnext/controllers/accounts_controller.py:2749
 #: erpnext/selling/doctype/quotation/quotation.json
 #: erpnext/selling/doctype/sales_order/sales_order.json
 msgid "Payment Schedule"
@@ -36135,7 +36106,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:1267
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1190
 #: erpnext/accounts/report/gross_profit/gross_profit.py:449
 #: erpnext/accounts/workspace/invoicing/invoicing.json
 #: erpnext/public/js/controllers/transaction.js:498
@@ -36262,7 +36233,7 @@ msgstr ""
 msgid "Payment methods are mandatory. Please add at least one payment method."
 msgstr "必须设置付款方式，请至少添加一种"
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3033
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3114
 msgid "Payment methods refreshed. Please review before proceeding."
 msgstr ""
 
@@ -36337,8 +36308,8 @@ msgstr "付款信息已更新"
 msgid "Payroll Entry"
 msgstr "工资计算"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:156
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:262
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:160
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:267
 msgid "Payroll Payable"
 msgstr "应付职工薪资"
 
@@ -36385,10 +36356,14 @@ msgstr "待办事项"
 msgid "Pending Amount"
 msgstr "待付款金额"
 
+#. Label of the pending_qty (Float) field in DocType 'Job Card'
 #. Label of the pending_qty (Float) field in DocType 'Production Plan Item'
+#. Label of the pending_qty (Float) field in DocType 'Work Order Operation'
 #: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:254
+#: erpnext/manufacturing/doctype/job_card/job_card.json
 #: erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json
-#: erpnext/manufacturing/doctype/work_order/work_order.js:356
+#: erpnext/manufacturing/doctype/work_order/work_order.js:337
+#: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json
 #: erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py:182
 #: erpnext/selling/doctype/sales_order/sales_order.js:1726
 #: erpnext/selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:45
@@ -36397,9 +36372,18 @@ msgstr "待处理数量"
 
 #: erpnext/buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.py:54
 #: erpnext/buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.py:44
+#: erpnext/manufacturing/doctype/job_card/job_card.js:273
 msgid "Pending Quantity"
 msgstr "待处理数量"
 
+#: erpnext/manufacturing/doctype/job_card/job_card.js:70
+msgid "Pending Quantity cannot be greater than {0}"
+msgstr ""
+
+#: erpnext/manufacturing/doctype/job_card/job_card.js:62
+msgid "Pending Quantity cannot be less than 0"
+msgstr ""
+
 #. Option for the 'Status' (Select) field in DocType 'Task'
 #. Option in a Select field in the tasks Web Form
 #: erpnext/projects/doctype/task/task.json
@@ -36429,6 +36413,14 @@ msgstr "今天待定活动"
 msgid "Pending processing"
 msgstr "等待后台处理"
 
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1464
+msgid "Pending quantity cannot be greater than the for quantity."
+msgstr ""
+
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1458
+msgid "Pending quantity cannot be negative."
+msgstr ""
+
 #: erpnext/setup/setup_wizard/data/industry_type.txt:36
 msgid "Pension Funds"
 msgstr "养老基金"
@@ -37102,8 +37094,8 @@ msgstr "工厂看板"
 msgid "Plant Floor"
 msgstr "车间"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:57
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:97
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:61
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:102
 msgid "Plants and Machineries"
 msgstr "植物和机械设备"
 
@@ -37187,7 +37179,7 @@ msgstr "请包括银行户头Bank Account字段"
 msgid "Please add the account to root level Company - {0}"
 msgstr "请将账户添加至根级公司-{0}"
 
-#: erpnext/accounts/doctype/account/account.py:233
+#: erpnext/accounts/doctype/account/account.py:234
 msgid "Please add the account to root level Company - {}"
 msgstr "请将账户添加至根级公司-{}"
 
@@ -37195,7 +37187,7 @@ msgstr "请将账户添加至根级公司-{}"
 msgid "Please add {1} role to user {0}."
 msgstr "请为用户{0}添加{1}角色"
 
-#: erpnext/controllers/stock_controller.py:1748
+#: erpnext/controllers/stock_controller.py:1749
 msgid "Please adjust the qty or edit {0} to proceed."
 msgstr "请调整数量或修改 {0} 后继续"
 
@@ -37203,7 +37195,7 @@ msgstr "请调整数量或修改 {0} 后继续"
 msgid "Please attach CSV file"
 msgstr "请附加CSV文件"
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3174
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3255
 msgid "Please cancel and amend the Payment Entry"
 msgstr "请取消并修改付款分录"
 
@@ -37237,7 +37229,7 @@ msgstr "有工艺路线与启用计件成本两个勾选字段必须二选一"
 msgid "Please check the 'Activate Serial and Batch No for Item' checkbox in the {0} to make Serial and Batch Bundle for the item."
 msgstr ""
 
-#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:562
+#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:605
 msgid "Please check the error message and take necessary actions to fix the error and then restart the reposting again."
 msgstr "请详细检查相关错误消息，修正相关主数据或业务数据后重新执行"
 
@@ -37262,11 +37254,15 @@ msgstr "请点击“生成表”来获取序列号增加了对项目{0}"
 msgid "Please click on 'Generate Schedule' to get schedule"
 msgstr "请点击计划任务标签下的“生成排期表”按钮生成计划排期"
 
+#: erpnext/manufacturing/doctype/job_card/job_card.js:58
+msgid "Please complete the job first before entering Pending Quantity"
+msgstr ""
+
 #: erpnext/accounts/doctype/bank_transaction_rule/bank_transaction_rule.py:80
 msgid "Please configure accounts for the Bank Entry rule."
 msgstr ""
 
-#: erpnext/selling/doctype/customer/customer.py:642
+#: erpnext/selling/doctype/customer/customer.py:632
 msgid "Please contact any of the following users to extend the credit limits for {0}: {1}"
 msgstr "请联系以下人员为客户 <b>{0}</b> 增加信用额度：{1}"
 
@@ -37274,11 +37270,11 @@ msgstr "请联系以下人员为客户 <b>{0}</b> 增加信用额度：{1}"
 msgid "Please contact any of the following users to {} this transaction."
 msgstr "请联系以下用户以{}此交易"
 
-#: erpnext/selling/doctype/customer/customer.py:635
+#: erpnext/selling/doctype/customer/customer.py:625
 msgid "Please contact your administrator to extend the credit limits for {0}."
 msgstr "请联系管理员延长{0}的信用额度"
 
-#: erpnext/accounts/doctype/account/account.py:384
+#: erpnext/accounts/doctype/account/account.py:385
 msgid "Please convert the parent account in corresponding child company to a group account."
 msgstr "请将对应子公司的上级账户转换为组账户"
 
@@ -37290,11 +37286,11 @@ msgstr "请从线索{0}创建客户"
 msgid "Please create Landed Cost Vouchers against Invoices that have 'Update Stock' enabled."
 msgstr "请对启用'更新库存'的发票创建到岸成本凭证"
 
-#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:74
+#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:75
 msgid "Please create a new Accounting Dimension if required."
 msgstr "如需，请新建会计维度"
 
-#: erpnext/controllers/accounts_controller.py:805
+#: erpnext/controllers/accounts_controller.py:806
 msgid "Please create purchase from internal sale or delivery document itself"
 msgstr "请自关联方内部销售或出货单创建采购订单"
 
@@ -37338,7 +37334,7 @@ msgstr "请确保理解相关影响后勾选"
 msgid "Please enable {0} in the {1}."
 msgstr "请在 {0} 启用 {1}"
 
-#: erpnext/controllers/selling_controller.py:857
+#: erpnext/controllers/selling_controller.py:858
 msgid "Please enable {} in {} to allow same item in multiple rows"
 msgstr "请在{}中启用{}以允许同一物料多行显示"
 
@@ -37358,7 +37354,7 @@ msgstr "请确保{}账户为资产负债表账户"
 msgid "Please ensure {} account {} is a Receivable account."
 msgstr "请确保{}账户{}为应收账户"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:757
+#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:145
 msgid "Please enter <b>Difference Account</b> or set default <b>Stock Adjustment Account</b> for company {0}"
 msgstr "请输入<b>差异账户</b>或为公司{0}设置默认<b>库存调整账户</b>"
 
@@ -37379,7 +37375,7 @@ msgstr ""
 msgid "Please enter Cost Center"
 msgstr "请输入成本中心"
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:425
+#: erpnext/selling/doctype/sales_order/sales_order.py:435
 msgid "Please enter Delivery Date"
 msgstr "请输入出货日期"
 
@@ -37396,7 +37392,7 @@ msgstr "请输入您的费用科目"
 msgid "Please enter Item Code to get Batch Number"
 msgstr "请输入产品代码来获得批号"
 
-#: erpnext/public/js/controllers/transaction.js:2989
+#: erpnext/public/js/controllers/transaction.js:2991
 msgid "Please enter Item Code to get batch no"
 msgstr "请输入物料号，以获得批号"
 
@@ -37412,7 +37408,7 @@ msgstr "请先输入维护明细"
 msgid "Please enter Planned Qty for Item {0} at row {1}"
 msgstr "请为第{1}行的物料{0}输入计划数量"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:73
+#: erpnext/manufacturing/doctype/work_order/work_order.js:44
 msgid "Please enter Production Item first"
 msgstr "请先输入成品"
 
@@ -37469,7 +37465,7 @@ msgstr "请至少输入一个交货日期和数量"
 msgid "Please enter company name first"
 msgstr "请先输入公司名"
 
-#: erpnext/controllers/accounts_controller.py:2974
+#: erpnext/controllers/accounts_controller.py:2968
 msgid "Please enter default currency in Company Master"
 msgstr "请在公司设置中维护默认货币"
 
@@ -37497,7 +37493,7 @@ msgstr "请输入离职日期。"
 msgid "Please enter serial nos"
 msgstr "请输入序列号"
 
-#: erpnext/setup/doctype/company/company.js:214
+#: erpnext/setup/doctype/company/company.js:230
 msgid "Please enter the company name to confirm"
 msgstr "请输入公司名确认"
 
@@ -37565,11 +37561,11 @@ msgstr "请确保上述员工向其他在职员工汇报"
 msgid "Please make sure the file you are using has 'Parent Account' column present in the header."
 msgstr "请确保文件标题包含'上级账户'列"
 
-#: erpnext/setup/doctype/company/company.js:216
+#: erpnext/setup/doctype/company/company.js:232
 msgid "Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone."
 msgstr "不可撤销操作，确认要删除公司所有业务资料? 主数据将被保留"
 
-#: erpnext/stock/doctype/item/item.js:709
+#: erpnext/stock/doctype/item/item.js:696
 msgid "Please mention 'Weight UOM' along with Weight."
 msgstr "在库存页签填写了了单重，请填写重量单位。"
 
@@ -37628,7 +37624,7 @@ msgstr "请选择<b>模板类型</b>以下载模板"
 msgid "Please select Apply Discount On"
 msgstr "请选择适用的折扣"
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:1884
+#: erpnext/selling/doctype/sales_order/sales_order.py:1906
 msgid "Please select BOM against item {0}"
 msgstr "请选择物料{0}的物料清单"
 
@@ -37674,7 +37670,7 @@ msgstr "请为资产保养日志选择完成日期"
 msgid "Please select Customer first"
 msgstr "请先选择公司"
 
-#: erpnext/setup/doctype/company/company.py:534
+#: erpnext/setup/doctype/company/company.py:538
 msgid "Please select Existing Company for creating Chart of Accounts"
 msgstr "请选择现有的公司创建会计科目表"
 
@@ -37683,8 +37679,8 @@ msgstr "请选择现有的公司创建会计科目表"
 msgid "Please select Finished Good Item for Service Item {0}"
 msgstr "请为服务项{0}选择产成品"
 
-#: erpnext/assets/doctype/asset/asset.js:752
-#: erpnext/assets/doctype/asset/asset.js:767
+#: erpnext/assets/doctype/asset/asset.js:754
+#: erpnext/assets/doctype/asset/asset.js:769
 msgid "Please select Item Code first"
 msgstr "请先选择物料号"
 
@@ -37716,7 +37712,7 @@ msgstr "请先选择记账日期"
 msgid "Please select Price List"
 msgstr "请选择价格表"
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:1886
+#: erpnext/selling/doctype/sales_order/sales_order.py:1908
 msgid "Please select Qty against item {0}"
 msgstr "请选择为物料{0}指定数量"
 
@@ -37736,7 +37732,7 @@ msgstr "请为物料{0}选择开始日期和结束日期"
 msgid "Please select Stock Asset Account"
 msgstr "请选择库存资产科目"
 
-#: erpnext/controllers/accounts_controller.py:2823
+#: erpnext/controllers/accounts_controller.py:2824
 msgid "Please select Unrealized Profit / Loss account or add default Unrealized Profit / Loss account account for company {0}"
 msgstr "请在单据中维护公司内部交易未实现损益科目，或在公司 {0} 主数据中维护相应的默认科目"
 
@@ -37753,7 +37749,7 @@ msgstr "请选择一个公司"
 #: erpnext/manufacturing/doctype/bom/bom.js:727
 #: erpnext/manufacturing/doctype/bom/bom.py:280
 #: erpnext/public/js/controllers/accounts.js:277
-#: erpnext/public/js/controllers/transaction.js:3288
+#: erpnext/public/js/controllers/transaction.js:3290
 msgid "Please select a Company first."
 msgstr "请先选择公司"
 
@@ -37777,7 +37773,7 @@ msgstr "请选择供应商"
 msgid "Please select a Warehouse"
 msgstr "请选择仓库"
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1601
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1618
 msgid "Please select a Work Order first."
 msgstr "请先选择生产工单"
 
@@ -37854,7 +37850,7 @@ msgstr "请先设置物料编码再设置仓库"
 msgid "Please select at least one filter: Item Code, Batch, or Serial No."
 msgstr "请至少选择一个筛选条件：物料编码、批次或序列号"
 
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:557
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:556
 msgid "Please select at least one item to update delivered quantity."
 msgstr ""
 
@@ -37874,7 +37870,7 @@ msgstr ""
 msgid "Please select atleast one item to continue"
 msgstr "请至少选择一个物料以继续操作"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:399
+#: erpnext/manufacturing/doctype/work_order/work_order.js:380
 msgid "Please select atleast one operation to create Job Card"
 msgstr "请至少选择一个工序以创建工卡"
 
@@ -37932,7 +37928,7 @@ msgstr "请选择公司"
 msgid "Please select the Multiple Tier Program type for more than one collection rules."
 msgstr "请为积分规则选择多等级积分方案。"
 
-#: erpnext/stock/doctype/item/item.js:371
+#: erpnext/stock/doctype/item/item.js:364
 msgid "Please select the Warehouse first"
 msgstr ""
 
@@ -37986,7 +37982,7 @@ msgstr "请在公司{1}设置'{0}'"
 msgid "Please set Account"
 msgstr "请设置账户"
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1881
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1962
 msgid "Please set Account for Change Amount"
 msgstr "请设置找零金额账户"
 
@@ -38080,7 +38076,7 @@ msgstr "请设置公司"
 msgid "Please set a Cost Center for the Asset or set an Asset Depreciation Cost Center for the Company {}"
 msgstr "请为资产设置成本中心或为公司{}设置资产折旧成本中心"
 
-#: erpnext/projects/doctype/project/project.py:735
+#: erpnext/projects/doctype/project/project.py:773
 msgid "Please set a default Holiday List for Company {0}"
 msgstr "请为公司{0}设置默认假期列表"
 
@@ -38117,23 +38113,23 @@ msgstr "请在“税费和收费表”中至少设置一行"
 msgid "Please set both the Tax ID and Fiscal Code on Company {0}"
 msgstr "请为公司{0}同时设置税号和财政代码"
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2418
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2499
 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:94
 #: erpnext/accounts/doctype/pos_profile/pos_profile.py:198
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3026
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3107
 msgid "Please set default Cash or Bank account in Mode of Payment {}"
 msgstr "请在付款方式{}设置默认现金或银行账户"
 
 #: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:96
 #: erpnext/accounts/doctype/pos_profile/pos_profile.py:200
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3028
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3109
 msgid "Please set default Cash or Bank account in Mode of Payments {}"
 msgstr "请在付款方式{}设置默认现金或银行账户"
 
-#: erpnext/accounts/utils.py:2541
+#: erpnext/accounts/utils.py:2540
 msgid "Please set default Exchange Gain/Loss Account in Company {}"
 msgstr "请在公司{}设置默认汇兑损益账户"
 
@@ -38162,7 +38158,7 @@ msgstr "请在公司{1}主数据中设置默认科目{0}"
 msgid "Please set filter based on Item or Warehouse"
 msgstr "根据物料或仓库请设置过滤条件"
 
-#: erpnext/controllers/accounts_controller.py:2384
+#: erpnext/controllers/accounts_controller.py:2385
 msgid "Please set one of the following:"
 msgstr "请设置以下其中一项："
 
@@ -38170,7 +38166,7 @@ msgstr "请设置以下其中一项："
 msgid "Please set opening number of booked depreciations"
 msgstr "请设置已登记折旧的期初数量。"
 
-#: erpnext/public/js/controllers/transaction.js:2676
+#: erpnext/public/js/controllers/transaction.js:2678
 msgid "Please set recurring after saving"
 msgstr "请保存后设置自动重复参数"
 
@@ -38182,15 +38178,15 @@ msgstr "请设置客户地址"
 msgid "Please set the Default Cost Center in {0} company."
 msgstr "请在{0}公司中设置默认成本中心。"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:686
+#: erpnext/manufacturing/doctype/work_order/work_order.js:668
 msgid "Please set the Item Code first"
 msgstr "请先设定物料代码"
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1664
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1681
 msgid "Please set the Target Warehouse in the Job Card"
 msgstr "请在工单中设置目标仓库"
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1668
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1685
 msgid "Please set the WIP Warehouse in the Job Card"
 msgstr "请在工单中设置在制品仓库"
 
@@ -38229,7 +38225,7 @@ msgstr "请在物料清单创建器{1}中设置{0}"
 msgid "Please set {0} in Company {1} to account for Exchange Gain / Loss"
 msgstr "请在公司{1}设置{0}以核算汇兑损益"
 
-#: erpnext/controllers/accounts_controller.py:594
+#: erpnext/controllers/accounts_controller.py:595
 msgid "Please set {0} to {1}, the same account that was used in the original invoice {2}."
 msgstr "请将{0}设为{1}，与原发票{2}使用的账户相同"
 
@@ -38251,7 +38247,7 @@ msgstr "请选择公司"
 msgid "Please specify Company to proceed"
 msgstr "请输入公司后继续"
 
-#: erpnext/controllers/accounts_controller.py:3207
+#: erpnext/controllers/accounts_controller.py:3201
 #: erpnext/public/js/controllers/accounts.js:117
 msgid "Please specify a valid Row ID for row {0} in table {1}"
 msgstr "请指定行{0}在表中的有效行ID {1}"
@@ -38369,8 +38365,8 @@ msgstr "邮政路线字符串"
 msgid "Post Title Key"
 msgstr "帖子标题密钥"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:122
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:201
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:126
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:206
 msgid "Postal Expenses"
 msgstr "邮政费用"
 
@@ -38453,7 +38449,7 @@ msgstr "过账日期"
 #: erpnext/accounts/report/accounts_payable/accounts_payable.js:16
 #: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:15
 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:18
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1196
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1119
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:15
 #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:38
 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:7
@@ -38575,10 +38571,6 @@ msgstr "记账日期时间"
 msgid "Posting Time"
 msgstr "记账时间"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:2519
-msgid "Posting date and posting time is mandatory"
-msgstr "记账日期和记账时间必填"
-
 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:841
 msgid "Posting date does not match the selected transaction"
 msgstr ""
@@ -38652,15 +38644,15 @@ msgstr "由{0}驱动"
 msgid "Pre Sales"
 msgstr "售前"
 
-#: erpnext/accounts/utils.py:2779
+#: erpnext/accounts/utils.py:2778
 msgid "Pre-Submit Warning"
 msgstr ""
 
-#: erpnext/accounts/utils.py:2828
+#: erpnext/accounts/utils.py:2827
 msgid "Pre-Submit Warning: Credit Limit"
 msgstr ""
 
-#: erpnext/accounts/utils.py:2840
+#: erpnext/accounts/utils.py:2839
 msgid "Pre-Submit Warning: Packed Qty"
 msgstr ""
 
@@ -38910,7 +38902,7 @@ msgstr "价格表国家"
 msgid "Price List Currency"
 msgstr "价格表货币"
 
-#: erpnext/stock/get_item_details.py:1334
+#: erpnext/stock/get_item_details.py:1357
 msgid "Price List Currency not selected"
 msgstr "价格表货币没有选择"
 
@@ -39265,7 +39257,7 @@ msgstr "打印收据"
 msgid "Print Receipt on Order Complete"
 msgstr "订单完成时打印收据"
 
-#: erpnext/setup/install.py:114
+#: erpnext/setup/install.py:115
 msgid "Print UOM after Quantity"
 msgstr "数量后打印计量单位"
 
@@ -39274,8 +39266,8 @@ msgstr "数量后打印计量单位"
 msgid "Print Without Amount"
 msgstr "不打印金额"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:123
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:202
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:127
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:207
 msgid "Print and Stationery"
 msgstr "打印和文具"
 
@@ -39283,7 +39275,7 @@ msgstr "打印和文具"
 msgid "Print settings updated in respective print format"
 msgstr "打印设置在相应的打印格式更新"
 
-#: erpnext/setup/install.py:121
+#: erpnext/setup/install.py:122
 msgid "Print taxes with zero amount"
 msgstr "零税额也打印"
 
@@ -39386,10 +39378,6 @@ msgstr "问题"
 msgid "Procedure"
 msgstr "程序"
 
-#: erpnext/accounts/doctype/accounts_settings/accounts_settings.js:47
-msgid "Procedures dropped"
-msgstr "存储过程已删除"
-
 #. Label of the process_deferred_accounting (Link) field in DocType 'Journal
 #. Entry'
 #. Name of a DocType
@@ -39443,7 +39431,7 @@ msgstr "加工损耗百分比不能超过100"
 msgid "Process Loss Qty"
 msgstr "制程损耗数量"
 
-#: erpnext/manufacturing/doctype/job_card/job_card.js:346
+#: erpnext/manufacturing/doctype/job_card/job_card.js:289
 msgid "Process Loss Quantity"
 msgstr "加工损耗量"
 
@@ -39524,6 +39512,10 @@ msgstr "处理订阅"
 msgid "Process in Single Transaction"
 msgstr "在单事务中处理"
 
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1461
+msgid "Process loss quantity cannot be negative."
+msgstr ""
+
 #. Label of the processed_boms (Long Text) field in DocType 'BOM Update Log'
 #: erpnext/manufacturing/doctype/bom_update_log/bom_update_log.json
 msgid "Processed BOMs"
@@ -39685,7 +39677,7 @@ msgstr "产品价格ID"
 #. Label of a Card Break in the Manufacturing Workspace
 #: erpnext/manufacturing/doctype/workstation/workstation.json
 #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json
-#: erpnext/setup/doctype/company/company.py:474
+#: erpnext/setup/doctype/company/company.py:478
 msgid "Production"
 msgstr "生产"
 
@@ -39899,7 +39891,7 @@ msgstr "为任务进度百分比不能超过100个。"
 msgid "Progress (%)"
 msgstr "进展(%)"
 
-#: erpnext/projects/doctype/project/project.py:374
+#: erpnext/projects/doctype/project/project.py:412
 msgid "Project Collaboration Invitation"
 msgstr "项目合作邀请"
 
@@ -39943,7 +39935,7 @@ msgstr "项目状态"
 msgid "Project Summary"
 msgstr "项目汇总"
 
-#: erpnext/projects/doctype/project/project.py:673
+#: erpnext/projects/doctype/project/project.py:711
 msgid "Project Summary for {0}"
 msgstr "{0}的项目摘要"
 
@@ -40074,7 +40066,7 @@ msgstr "可用数量"
 #. Label of a Card Break in the Projects Workspace
 #. Title of a Workspace Sidebar
 #: erpnext/config/projects.py:7 erpnext/desktop_icon/projects.json
-#: erpnext/projects/doctype/project/project.py:451
+#: erpnext/projects/doctype/project/project.py:489
 #: erpnext/projects/workspace/projects/projects.json
 #: erpnext/selling/doctype/customer/customer_dashboard.py:26
 #: erpnext/selling/doctype/sales_order/sales_order_dashboard.py:28
@@ -40220,7 +40212,7 @@ msgid "Prospects Engaged But Not Converted"
 msgstr "有跟进未转化线索"
 
 #: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:198
-#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:785
+#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:786
 msgid "Protected DocType"
 msgstr ""
 
@@ -40235,7 +40227,7 @@ msgstr "提供公司注册邮箱地址"
 msgid "Providing"
 msgstr "提供"
 
-#: erpnext/setup/doctype/company/company.py:573
+#: erpnext/setup/doctype/company/company.py:577
 msgid "Provisional Account"
 msgstr "暂记账户"
 
@@ -40307,7 +40299,7 @@ msgstr "出版"
 #: erpnext/accounts/doctype/tax_rule/tax_rule.json
 #: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
 #: erpnext/projects/doctype/project/project_dashboard.py:16
-#: erpnext/setup/doctype/company/company.py:462 erpnext/setup/install.py:404
+#: erpnext/setup/doctype/company/company.py:466 erpnext/setup/install.py:436
 #: erpnext/stock/doctype/item/item.json
 #: erpnext/stock/doctype/item_lead_time/item_lead_time.json
 #: erpnext/stock/doctype/item_reorder/item_reorder.json
@@ -40631,7 +40623,7 @@ msgstr "采购订单{0}已创建"
 msgid "Purchase Order {0} is not submitted"
 msgstr "采购订单{0}未提交"
 
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:922
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:930
 msgid "Purchase Orders"
 msgstr "采购订单"
 
@@ -40661,7 +40653,7 @@ msgstr "待开票采购订单"
 msgid "Purchase Orders to Receive"
 msgstr "待入库采购订单"
 
-#: erpnext/controllers/accounts_controller.py:2016
+#: erpnext/controllers/accounts_controller.py:2017
 msgid "Purchase Orders {0} are un-linked"
 msgstr "采购订单{0}已取消关联"
 
@@ -40795,7 +40787,7 @@ msgstr "采购退货"
 #. Label of the purchase_tax_template (Link) field in DocType 'Tax Rule'
 #. Label of a Workspace Sidebar Item
 #: erpnext/accounts/doctype/tax_rule/tax_rule.json
-#: erpnext/setup/doctype/company/company.js:145
+#: erpnext/setup/doctype/company/company.js:161
 #: erpnext/workspace_sidebar/taxes.json
 msgid "Purchase Tax Template"
 msgstr "采购税费模板"
@@ -40902,10 +40894,6 @@ msgstr "采购"
 msgid "Purpose"
 msgstr "目的"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:574
-msgid "Purpose must be one of {0}"
-msgstr "目的必须是一个{0}"
-
 #. Label of the purposes (Table) field in DocType 'Maintenance Visit'
 #: erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json
 msgid "Purposes"
@@ -40961,6 +40949,7 @@ msgstr ""
 #. Label of the qty (Float) field in DocType 'Delivery Schedule Item'
 #. Label of the qty (Float) field in DocType 'Product Bundle Item'
 #. Label of the qty (Float) field in DocType 'Landed Cost Item'
+#. Label of the qty (Float) field in DocType 'Landed Cost Taxes and Charges'
 #. Option for the 'Distribute Charges Based On' (Select) field in DocType
 #. 'Landed Cost Voucher'
 #. Label of the qty (Float) field in DocType 'Packed Item'
@@ -41009,6 +40998,7 @@ msgstr ""
 #: erpnext/selling/doctype/sales_order/sales_order.js:1506
 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:255
 #: erpnext/stock/doctype/landed_cost_item/landed_cost_item.json
+#: erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json
 #: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
 #: erpnext/stock/doctype/packed_item/packed_item.json
 #: erpnext/stock/doctype/pick_list_item/pick_list_item.json
@@ -41117,11 +41107,11 @@ msgstr "每单位数量"
 msgid "Qty To Manufacture"
 msgstr "工单数量"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1441
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1442
 msgid "Qty To Manufacture ({0}) cannot be a fraction for the UOM {2}. To allow this, disable '{1}' in the UOM {2}."
 msgstr "待生产数量（{0}）不能是计量单位{2}的分数。若要允许，请在计量单位{2}中禁用'{1}'"
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:260
+#: erpnext/manufacturing/doctype/job_card/job_card.py:261
 msgid "Qty To Manufacture in the job card cannot be greater than Qty To Manufacture in the work order for the operation {0}. <br><br><b>Solution: </b> Either you can reduce the Qty To Manufacture in the job card or set the 'Overproduction Percentage For Work Order' in the {1}."
 msgstr ""
 
@@ -41172,8 +41162,8 @@ msgstr "数量(库存单位)"
 msgid "Qty for which recursion isn't applicable."
 msgstr "达到这个数量就送固定数量"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1063
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1086
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1045
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1068
 msgid "Qty for {0}"
 msgstr "{0} 数量"
 
@@ -41228,8 +41218,8 @@ msgstr ""
 msgid "Qty to Fetch"
 msgstr "待获取数量"
 
-#: erpnext/manufacturing/doctype/job_card/job_card.js:318
-#: erpnext/manufacturing/doctype/job_card/job_card.py:890
+#: erpnext/manufacturing/doctype/job_card/job_card.js:247
+#: erpnext/manufacturing/doctype/job_card/job_card.py:893
 msgid "Qty to Manufacture"
 msgstr "生产数量"
 
@@ -41465,17 +41455,17 @@ msgstr "质检模板"
 msgid "Quality Inspection Template Name"
 msgstr "质检模板名称"
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:799
+#: erpnext/manufacturing/doctype/job_card/job_card.py:800
 msgid "Quality Inspection is required for the item {0} before completing the job card {1}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:810
-#: erpnext/manufacturing/doctype/job_card/job_card.py:819
+#: erpnext/manufacturing/doctype/job_card/job_card.py:811
+#: erpnext/manufacturing/doctype/job_card/job_card.py:820
 msgid "Quality Inspection {0} is not submitted for the item: {1}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:829
-#: erpnext/manufacturing/doctype/job_card/job_card.py:838
+#: erpnext/manufacturing/doctype/job_card/job_card.py:830
+#: erpnext/manufacturing/doctype/job_card/job_card.py:839
 msgid "Quality Inspection {0} is rejected for the item: {1}"
 msgstr ""
 
@@ -41489,7 +41479,7 @@ msgstr "质检单"
 msgid "Quality Inspections"
 msgstr ""
 
-#: erpnext/setup/doctype/company/company.py:504
+#: erpnext/setup/doctype/company/company.py:508
 msgid "Quality Management"
 msgstr "质量管理"
 
@@ -41756,7 +41746,7 @@ msgstr ""
 msgid "Quantity must be less than or equal to {0}"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1116
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1098
 #: erpnext/stock/doctype/pick_list/pick_list.js:209
 msgid "Quantity must not be more than {0}"
 msgstr "数量不能超过{0}"
@@ -41766,21 +41756,21 @@ msgid "Quantity required for Item {0} in row {1}"
 msgstr "请为第{1}行的物料{0}输入需求数量"
 
 #: erpnext/manufacturing/doctype/bom/bom.py:724
-#: erpnext/manufacturing/doctype/job_card/job_card.js:399
-#: erpnext/manufacturing/doctype/job_card/job_card.js:469
+#: erpnext/manufacturing/doctype/job_card/job_card.js:342
+#: erpnext/manufacturing/doctype/job_card/job_card.js:410
 #: erpnext/manufacturing/doctype/workstation/workstation.js:303
 msgid "Quantity should be greater than 0"
 msgstr "量应大于0"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:361
+#: erpnext/manufacturing/doctype/work_order/work_order.js:342
 msgid "Quantity to Manufacture"
 msgstr "生产数量"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:2646
+#: erpnext/manufacturing/doctype/work_order/work_order.py:2644
 msgid "Quantity to Manufacture can not be zero for the operation {0}"
 msgstr "工序 {0} 生产数量不能为0"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1433
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1434
 msgid "Quantity to Manufacture must be greater than 0."
 msgstr "生产数量应大于0。"
 
@@ -41922,11 +41912,11 @@ msgstr "报价对象"
 msgid "Quotation Trends"
 msgstr "报价趋势"
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:489
+#: erpnext/selling/doctype/sales_order/sales_order.py:494
 msgid "Quotation {0} is cancelled"
 msgstr "报价{0}已被取消"
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:402
+#: erpnext/selling/doctype/sales_order/sales_order.py:413
 msgid "Quotation {0} not of type {1}"
 msgstr "报价{0} 不属于{1}类型"
 
@@ -42233,7 +42223,7 @@ msgstr "供应商的货币转换为公司的本币后的单价"
 msgid "Rate at which this tax is applied"
 msgstr "此科目的默认税率"
 
-#: erpnext/controllers/accounts_controller.py:3925
+#: erpnext/controllers/accounts_controller.py:3931
 msgid "Rate of '{}' items cannot be changed"
 msgstr ""
 
@@ -42399,7 +42389,7 @@ msgstr "外发原材料"
 msgid "Raw Materials Consumption"
 msgstr "原材料耗用"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:320
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:60
 msgid "Raw Materials Missing"
 msgstr ""
 
@@ -42438,12 +42428,6 @@ msgstr "原材料不能为空。"
 msgid "Raw Materials to Customer"
 msgstr "发往客户的原材料"
 
-#. Option for the 'Data Fetch Method' (Select) field in DocType 'Accounts
-#. Settings'
-#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json
-msgid "Raw SQL"
-msgstr "原始SQL"
-
 #. Description of the 'Validate consumed quantity (as per BOM)' (Check) field
 #. in DocType 'Buying Settings'
 #: erpnext/buying/doctype/buying_settings/buying_settings.json
@@ -42452,7 +42436,7 @@ msgstr ""
 
 #: erpnext/buying/doctype/purchase_order/purchase_order.js:345
 #: erpnext/manufacturing/doctype/production_plan/production_plan.js:124
-#: erpnext/manufacturing/doctype/work_order/work_order.js:785
+#: erpnext/manufacturing/doctype/work_order/work_order.js:767
 #: erpnext/selling/doctype/sales_order/sales_order.js:1012
 #: erpnext/selling/doctype/sales_order/sales_order_list.js:70
 #: erpnext/stock/doctype/material_request/material_request.js:243
@@ -42633,7 +42617,7 @@ msgid "Receivable / Payable Account"
 msgstr "应收/应付账款"
 
 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:79
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1212
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1135
 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:241
 #: erpnext/accounts/report/sales_register/sales_register.py:217
 #: erpnext/accounts/report/sales_register/sales_register.py:271
@@ -43094,7 +43078,7 @@ msgstr "参考 #"
 msgid "Reference #{0} dated {1}"
 msgstr "参考＃ {0}记载日期为{1}"
 
-#: erpnext/public/js/controllers/transaction.js:2789
+#: erpnext/public/js/controllers/transaction.js:2791
 msgid "Reference Date for Early Payment Discount"
 msgstr "提前付款折扣的参考日期"
 
@@ -43258,11 +43242,11 @@ msgstr "参考：{0}，物料代号：{1}和客户：{2}"
 msgid "References"
 msgstr "参考"
 
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:403
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:404
 msgid "References to Sales Invoices are Incomplete"
 msgstr "销售发票参考不完整"
 
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:395
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:396
 msgid "References to Sales Orders are Incomplete"
 msgstr "销售订单参考不完整"
 
@@ -43424,7 +43408,7 @@ msgid "Remaining Amount"
 msgstr "剩余金额"
 
 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:189
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1289
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1212
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:180
 msgid "Remaining Balance"
 msgstr "余额"
@@ -43482,7 +43466,7 @@ msgstr "备注"
 #: erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html:11
 #: erpnext/accounts/report/accounts_payable/accounts_payable.html:135
 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:136
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1321
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1244
 #: erpnext/accounts/report/general_ledger/general_ledger.html:163
 #: erpnext/accounts/report/general_ledger/general_ledger.py:818
 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:112
@@ -43546,7 +43530,7 @@ msgstr "在物料属性中重命名属性值。"
 msgid "Rename Log"
 msgstr "重命名日志"
 
-#: erpnext/accounts/doctype/account/account.py:558
+#: erpnext/accounts/doctype/account/account.py:559
 msgid "Rename Not Allowed"
 msgstr "不能重命名"
 
@@ -43563,7 +43547,7 @@ msgstr "已为文档类型{0}的批量重命名任务加入队列。"
 msgid "Rename jobs for doctype {0} have not been enqueued."
 msgstr "未能将文档类型{0}的批量重命名任务加入队列。"
 
-#: erpnext/accounts/doctype/account/account.py:550
+#: erpnext/accounts/doctype/account/account.py:551
 msgid "Renaming it is only allowed via parent company {0}, to avoid mismatch."
 msgstr "为避免冲突，仅允许通过母公司{0}重命名"
 
@@ -43683,11 +43667,11 @@ msgstr ""
 msgid "Report Template"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/account.py:462
+#: erpnext/accounts/doctype/account/account.py:463
 msgid "Report Type is mandatory"
 msgstr "报表类型必填"
 
-#: erpnext/setup/install.py:216
+#: erpnext/setup/install.py:248
 msgid "Report an Issue"
 msgstr "提交一个问题"
 
@@ -43932,7 +43916,7 @@ msgstr "索取资料"
 #: erpnext/buying/doctype/buying_settings/buying_settings.json
 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:328
-#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:430
+#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:434
 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:88
 #: erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:70
@@ -44113,7 +44097,7 @@ msgstr "需要履行"
 msgid "Research"
 msgstr "研究"
 
-#: erpnext/setup/doctype/company/company.py:510
+#: erpnext/setup/doctype/company/company.py:514
 msgid "Research & Development"
 msgstr "研究与发展"
 
@@ -44158,7 +44142,7 @@ msgstr "预留管理"
 msgid "Reservation Based On"
 msgstr "预留类型"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:943
+#: erpnext/manufacturing/doctype/work_order/work_order.js:925
 #: erpnext/selling/doctype/sales_order/sales_order.js:107
 #: erpnext/stock/doctype/pick_list/pick_list.js:153
 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:179
@@ -44202,7 +44186,7 @@ msgstr "子装配件预留"
 msgid "Reserved"
 msgstr "预留"
 
-#: erpnext/controllers/stock_controller.py:1329
+#: erpnext/controllers/stock_controller.py:1330
 msgid "Reserved Batch Conflict"
 msgstr ""
 
@@ -44272,14 +44256,14 @@ msgstr "预留数量"
 msgid "Reserved Quantity for Production"
 msgstr "生产预留数量"
 
-#: erpnext/stock/stock_ledger.py:2340
+#: erpnext/stock/stock_ledger.py:2306
 msgid "Reserved Serial No."
 msgstr "预留序列号"
 
 #. Label of the reserved_stock (Float) field in DocType 'Bin'
 #. Name of a report
 #: erpnext/manufacturing/doctype/plant_floor/stock_summary_template.html:24
-#: erpnext/manufacturing/doctype/work_order/work_order.js:959
+#: erpnext/manufacturing/doctype/work_order/work_order.js:941
 #: erpnext/public/js/stock_reservation.js:236
 #: erpnext/selling/doctype/sales_order/sales_order.js:128
 #: erpnext/selling/doctype/sales_order/sales_order.js:495
@@ -44288,13 +44272,13 @@ msgstr "预留序列号"
 #: erpnext/stock/doctype/pick_list/pick_list.js:173
 #: erpnext/stock/report/reserved_stock/reserved_stock.json
 #: erpnext/stock/report/stock_balance/stock_balance.py:576
-#: erpnext/stock/stock_ledger.py:2324
+#: erpnext/stock/stock_ledger.py:2290
 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:204
 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:332
 msgid "Reserved Stock"
 msgstr "已预留库存"
 
-#: erpnext/stock/stock_ledger.py:2369
+#: erpnext/stock/stock_ledger.py:2335
 msgid "Reserved Stock for Batch"
 msgstr "批次预留库存"
 
@@ -44560,7 +44544,7 @@ msgstr "结果标题字段"
 msgid "Resume"
 msgstr "恢复"
 
-#: erpnext/manufacturing/doctype/job_card/job_card.js:247
+#: erpnext/manufacturing/doctype/job_card/job_card.js:659
 msgid "Resume Job"
 msgstr "恢复作业"
 
@@ -44585,8 +44569,8 @@ msgstr "零售商"
 msgid "Retain Sample"
 msgstr "保留样品"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:196
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:348
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:200
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:353
 msgid "Retained Earnings"
 msgstr "留存收益"
 
@@ -44661,7 +44645,7 @@ msgstr "被退货源单"
 msgid "Return Against Subcontracting Receipt"
 msgstr "源委外入库"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:302
+#: erpnext/manufacturing/doctype/work_order/work_order.js:283
 msgid "Return Components"
 msgstr "原材料退回"
 
@@ -44795,8 +44779,8 @@ msgstr "退货"
 msgid "Revaluation Journals"
 msgstr "汇率重估日记账凭证"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:197
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:353
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:201
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:358
 msgid "Revaluation Surplus"
 msgstr "重估盈余"
 
@@ -45024,11 +45008,11 @@ msgstr "一级科目类型"
 msgid "Root Type for {0} must be one of the Asset, Liability, Income, Expense and Equity"
 msgstr "{0}的根类型必须是资产、负债、收入、费用或权益"
 
-#: erpnext/accounts/doctype/account/account.py:459
+#: erpnext/accounts/doctype/account/account.py:460
 msgid "Root Type is mandatory"
 msgstr "一级科目类型是必填字段"
 
-#: erpnext/accounts/doctype/account/account.py:215
+#: erpnext/accounts/doctype/account/account.py:216
 msgid "Root cannot be edited."
 msgstr "根不能被编辑。"
 
@@ -45047,8 +45031,8 @@ msgstr "赠品数量取整"
 #. Option for the 'Account Type' (Select) field in DocType 'Account'
 #. Label of the round_off_section (Section Break) field in DocType 'Company'
 #: erpnext/accounts/doctype/account/account.json
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:124
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:206
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:128
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:211
 #: erpnext/accounts/report/account_balance/account_balance.js:56
 #: erpnext/setup/doctype/company/company.json
 msgid "Round Off"
@@ -45228,17 +45212,17 @@ msgstr "行＃{0}：单价不能大于{1} {2}中使用的单价"
 msgid "Row # {0}: Returned Item {1} does not exist in {2} {3}"
 msgstr "第{0}行:退回物料{1}在{2} {3}中不存在"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:279
+#: erpnext/manufacturing/doctype/work_order/work_order.py:280
 msgid "Row #1: Sequence ID must be 1 for Operation {0}."
 msgstr "第1行：工序{0}的序列ID必须为1。"
 
 #: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:565
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2073
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2154
 msgid "Row #{0} (Payment Table): Amount must be negative"
 msgstr "行＃{0}（付款表）：金额必须为负数"
 
 #: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:563
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2068
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2149
 msgid "Row #{0} (Payment Table): Amount must be positive"
 msgstr "行＃{0}（付款表）：金额必须为正值"
 
@@ -45263,7 +45247,7 @@ msgstr "行号{0}：验收仓库与拒收仓库不能相同"
 msgid "Row #{0}: Accepted Warehouse is mandatory for the accepted Item {1}"
 msgstr "行号{0}：验收物料{1}必须指定验收仓库"
 
-#: erpnext/controllers/accounts_controller.py:1294
+#: erpnext/controllers/accounts_controller.py:1295
 msgid "Row #{0}: Account {1} does not belong to company {2}"
 msgstr "第 {0} 行 ：科目 {1} 不是公司 {3} 的有效科目"
 
@@ -45324,31 +45308,31 @@ msgstr "第{0}行：无法取消本库存凭证，因关联外包收货订单中
 msgid "Row #{0}: Cannot create entry with different taxable AND withholding document links."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3802
+#: erpnext/controllers/accounts_controller.py:3808
 msgid "Row #{0}: Cannot delete item {1} which has already been billed."
 msgstr "第{0}行: 不能删除已开票物料 {1}"
 
-#: erpnext/controllers/accounts_controller.py:3776
+#: erpnext/controllers/accounts_controller.py:3782
 msgid "Row #{0}: Cannot delete item {1} which has already been delivered"
 msgstr "第{0}行: 不能删除已出货物料 {1}"
 
-#: erpnext/controllers/accounts_controller.py:3795
+#: erpnext/controllers/accounts_controller.py:3801
 msgid "Row #{0}: Cannot delete item {1} which has already been received"
 msgstr "第{0}行: 不能删除已收货物料 {1}"
 
-#: erpnext/controllers/accounts_controller.py:3782
+#: erpnext/controllers/accounts_controller.py:3788
 msgid "Row #{0}: Cannot delete item {1} which has work order assigned to it."
 msgstr "第{0}行: 不能删除已关联工单的物料 {1}"
 
-#: erpnext/controllers/accounts_controller.py:3788
+#: erpnext/controllers/accounts_controller.py:3794
 msgid "Row #{0}: Cannot delete item {1} which is already ordered against this Sales Order."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3936
+#: erpnext/controllers/accounts_controller.py:3942
 msgid "Row #{0}: Cannot set Rate if the billed amount is greater than the amount for Item {1}."
 msgstr "第{0}行：开票金额超过物料{1}金额时不可设置费率。"
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1128
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1136
 msgid "Row #{0}: Cannot transfer more than Required Qty {1} for Item {2} against Job Card {3}"
 msgstr "第 {0} 行：对生产任务单 {3} 发物料 {2} 不可超过需求量 {1}"
 
@@ -45398,11 +45382,11 @@ msgstr "第{0}行：针对外包收货订单物料{2}（{3}）的客户提供物
 msgid "Row #{0}: Customer Provided Item {1} cannot be added multiple times in the Subcontracting Inward process."
 msgstr "第{0}行：客户提供物料{1}在外包收货流程中不可重复添加。"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:356
+#: erpnext/manufacturing/doctype/work_order/work_order.py:357
 msgid "Row #{0}: Customer Provided Item {1} cannot be added multiple times."
 msgstr "第{0}行：客户提供物料{1}不可重复添加。"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:381
+#: erpnext/manufacturing/doctype/work_order/work_order.py:382
 msgid "Row #{0}: Customer Provided Item {1} does not exist in the Required Items table linked to the Subcontracting Inward Order."
 msgstr "第{0}行：客户提供物料{1}不存在于关联外包收货订单的所需物料表中。"
 
@@ -45410,7 +45394,7 @@ msgstr "第{0}行：客户提供物料{1}不存在于关联外包收货订单的
 msgid "Row #{0}: Customer Provided Item {1} exceeds quantity available through Subcontracting Inward Order"
 msgstr "第{0}行：客户提供物料{1}超出外包收货订单可用数量"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:369
+#: erpnext/manufacturing/doctype/work_order/work_order.py:370
 msgid "Row #{0}: Customer Provided Item {1} has insufficient quantity in the Subcontracting Inward Order. Available quantity is {2}."
 msgstr "第{0}行：外包收货订单中客户提供物料{1}数量不足。可用数量为{2}。"
 
@@ -45466,7 +45450,7 @@ msgstr "行号#{0}：服务项{1}未指定产成品"
 msgid "Row #{0}: Finished Good Item {1} must be a sub-contracted item"
 msgstr "行号#{0}：产成品{1}必须为外协物料"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:530
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:395
 msgid "Row #{0}: Finished Good must be {1}"
 msgstr "行号#{0}：产成品必须为{1}"
 
@@ -45495,7 +45479,7 @@ msgstr ""
 msgid "Row #{0}: From Date cannot be before To Date"
 msgstr "行号#{0}：起始日期不能早于截止日期"
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:880
+#: erpnext/manufacturing/doctype/job_card/job_card.py:881
 msgid "Row #{0}: From Time and To Time fields are required"
 msgstr "第{0}行：必须填写起止时间。"
 
@@ -45503,7 +45487,7 @@ msgstr "第{0}行：必须填写起止时间。"
 msgid "Row #{0}: Item added"
 msgstr "行＃{0}：已添加"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1629
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/subcontracting.py:78
 msgid "Row #{0}: Item {1} cannot be transferred more than {2} against {3} {4}"
 msgstr ""
 
@@ -45572,7 +45556,7 @@ msgstr "第{0}行：下次折旧日期不得早于启用日期。"
 msgid "Row #{0}: Next Depreciation Date cannot be before Purchase Date"
 msgstr "第{0}行：下次折旧日期不得早于采购日期。"
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:675
+#: erpnext/selling/doctype/sales_order/sales_order.py:678
 msgid "Row #{0}: Not allowed to change Supplier as Purchase Order already exists"
 msgstr "行＃{0}：因采购订单已经存在不能再更改供应商"
 
@@ -45584,10 +45568,6 @@ msgstr "第 {0} 行:物料 {2} 可预留库存数量仅有 {1}"
 msgid "Row #{0}: Opening Accumulated Depreciation must be less than or equal to {1}"
 msgstr "第{0}行：期初累计折旧不得超过{1}。"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:955
-msgid "Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order {3}. Please update operation status via Job Card {4}."
-msgstr "第{0}行生产工单{3}成品数量{2}工序{1}未完成。请在生产任务单{4}上更新工序状态。"
-
 #: erpnext/controllers/subcontracting_inward_controller.py:208
 #: erpnext/controllers/subcontracting_inward_controller.py:342
 msgid "Row #{0}: Overconsumption of Customer Provided Item {1} against Work Order {2} is not allowed in the Subcontracting Inward process."
@@ -45613,7 +45593,7 @@ msgstr "行号#{0}：请选择子装配仓库"
 msgid "Row #{0}: Please set reorder quantity"
 msgstr "行＃{0}：请设置重订货点数量"
 
-#: erpnext/controllers/accounts_controller.py:617
+#: erpnext/controllers/accounts_controller.py:618
 msgid "Row #{0}: Please update deferred revenue/expense account in item row or default account in company master"
 msgstr "行号#{0}：请更新物料行的递延收入/费用科目或公司主数据的默认科目"
 
@@ -45635,15 +45615,15 @@ msgstr "行号#{0}：数量必须为正数"
 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 "第 {0} 行：物料 {2} 批号 {3} 在仓库 {4} 中预留数量须 <= 可预留数量（实际数量 - 已预留数量） {1}"
 
-#: erpnext/controllers/stock_controller.py:1466
+#: erpnext/controllers/stock_controller.py:1467
 msgid "Row #{0}: Quality Inspection is required for Item {1}"
 msgstr "行号#{0}：物料{1}需进行质量检验"
 
-#: erpnext/controllers/stock_controller.py:1481
+#: erpnext/controllers/stock_controller.py:1482
 msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}"
 msgstr "行号#{0}：物料{2}的质量检验{1}未提交"
 
-#: erpnext/controllers/stock_controller.py:1496
+#: erpnext/controllers/stock_controller.py:1497
 msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}"
 msgstr "行号#{0}：物料{2}的质量检验{1}被拒收"
 
@@ -45651,7 +45631,7 @@ msgstr "行号#{0}：物料{2}的质量检验{1}被拒收"
 msgid "Row #{0}: Quantity cannot be a non-positive number. Please increase the quantity or remove the Item {1}"
 msgstr "第{0}行：数量不能为非正数。请增加数量或移除物料{1}"
 
-#: erpnext/controllers/accounts_controller.py:1457
+#: erpnext/controllers/accounts_controller.py:1458
 msgid "Row #{0}: Quantity for Item {1} cannot be zero."
 msgstr "行号#{0}：物料{1}数量不能为零"
 
@@ -45667,8 +45647,8 @@ msgstr ""
 msgid "Row #{0}: Quantity to reserve for the Item {1} should be greater than 0."
 msgstr "第 {0} 行：物料 {1} 预留数量须大于 0"
 
-#: erpnext/controllers/accounts_controller.py:872
-#: erpnext/controllers/accounts_controller.py:884
+#: erpnext/controllers/accounts_controller.py:873
+#: erpnext/controllers/accounts_controller.py:885
 #: erpnext/utilities/transaction_base.py:172
 #: erpnext/utilities/transaction_base.py:178
 msgid "Row #{0}: Rate must be same as {1}: {2} ({3} / {4})"
@@ -45717,7 +45697,7 @@ msgid "Row #{0}: Selling rate for item {1} is lower than its {2}.\n"
 "\t\t\t\t\tthis validation."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:285
+#: erpnext/manufacturing/doctype/work_order/work_order.py:286
 msgid "Row #{0}: Sequence ID must be {1} or {2} for Operation {3}."
 msgstr "第{0}行：工序{3}的序列ID必须为{1}或{2}。"
 
@@ -45737,19 +45717,19 @@ msgstr "第 {0} 行：序列号 {1} 已被选择"
 msgid "Row #{0}: Serial No(s) {1} are not a part of the linked Subcontracting Inward Order. Please select valid Serial No(s)."
 msgstr "第{0}行：序列号{1}不属于关联的外包收货订单。请选择有效的序列号。"
 
-#: erpnext/controllers/accounts_controller.py:645
+#: erpnext/controllers/accounts_controller.py:646
 msgid "Row #{0}: Service End Date cannot be before Invoice Posting Date"
 msgstr "第{0}行: 服务结束日不能早于发票记账日"
 
-#: erpnext/controllers/accounts_controller.py:639
+#: erpnext/controllers/accounts_controller.py:640
 msgid "Row #{0}: Service Start Date cannot be greater than Service End Date"
 msgstr "第{0}行:服务开始日不能晚于服务结束日"
 
-#: erpnext/controllers/accounts_controller.py:633
+#: erpnext/controllers/accounts_controller.py:634
 msgid "Row #{0}: Service Start and End Date is required for deferred accounting"
 msgstr "第{0}行:递延会计处理，服务开始与结束日必填"
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:497
+#: erpnext/selling/doctype/sales_order/sales_order.py:502
 msgid "Row #{0}: Set Supplier for item {1}"
 msgstr "行＃{0}：请为物料{1}分派供应商"
 
@@ -45761,19 +45741,19 @@ msgstr "第{0}行：因已启用“追踪半成品”，物料清单{1}不可用
 msgid "Row #{0}: Source Warehouse must be same as Customer Warehouse {1} from the linked Subcontracting Inward Order"
 msgstr "第{0}行：源仓库必须与关联外包收货订单中的客户仓库{1}相同"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:390
+#: erpnext/manufacturing/doctype/work_order/work_order.py:391
 msgid "Row #{0}: Source Warehouse {1} for item {2} cannot be a customer warehouse."
 msgstr "第{0}行：物料{2}的源仓库{1}不能是客户仓库。"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:345
+#: erpnext/manufacturing/doctype/work_order/work_order.py:346
 msgid "Row #{0}: Source Warehouse {1} for item {2} must be same as Source Warehouse {3} in the Work Order."
 msgstr "第{0}行：物料{2}的源仓库{1}必须与工作订单中的源仓库{3}相同。"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1102
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py:40
 msgid "Row #{0}: Source and Target Warehouse cannot be the same for Material Transfer"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1124
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py:62
 msgid "Row #{0}: Source, Target Warehouse and Inventory Dimensions cannot be the exact same for Material Transfer"
 msgstr ""
 
@@ -45789,6 +45769,10 @@ msgstr "行号#{0}：状态为必填项"
 msgid "Row #{0}: Status must be {1} for Invoice Discounting {2}"
 msgstr "行＃{0}：发票贴现的状态必须为{1} {2}"
 
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:485
+msgid "Row #{0}: Stock Delivered But Not Billed account cannot be used for items linked to a Sales Invoice"
+msgstr ""
+
 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:403
 msgid "Row #{0}: Stock cannot be reserved for Item {1} against a disabled Batch {2}."
 msgstr "第 {0} 行： 物料 {1} 预留数量不可使用无效批号 {2}"
@@ -45805,7 +45789,7 @@ msgstr "行号#{0}：不可在组仓库{1}预留库存"
 msgid "Row #{0}: Stock is already reserved for the Item {1}."
 msgstr "行号#{0}：物料{1}已预留库存"
 
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:557
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:598
 msgid "Row #{0}: Stock is reserved for item {1} in warehouse {2}."
 msgstr "行号#{0}：仓库{2}中物料{1}的库存已预留"
 
@@ -45882,7 +45866,7 @@ msgstr "行号#{0}：创建期初{2}发票需提供{1}"
 msgid "Row #{0}: {1} of {2} should be {3}. Please update the {1} or select a different account."
 msgstr "行号#{0}：{2}的{1}应为{3}，请更新{1}或选择其他科目"
 
-#: erpnext/controllers/accounts_controller.py:4042
+#: erpnext/controllers/accounts_controller.py:4048
 msgid "Row #{0}:Quantity for Item {1} cannot be zero."
 msgstr ""
 
@@ -45991,7 +45975,7 @@ msgstr "行号#{}：{} {}不属于公司{}，请选择有效的{}"
 msgid "Row No {0}: Warehouse is required. Please set a Default Warehouse for Item {1} and Company {2}"
 msgstr "行号{0}：必须指定仓库，请为物料{1}和公司{2}设置默认仓库"
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:747
+#: erpnext/manufacturing/doctype/job_card/job_card.py:748
 msgid "Row {0} : Operation is required against the raw material item {1}"
 msgstr "第{0}行，原材料 {1} 工序信息必填"
 
@@ -45999,7 +45983,7 @@ msgstr "第{0}行，原材料 {1} 工序信息必填"
 msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required."
 msgstr "第 {0} 行拣货数量少于需求数量，短缺 {1} {2}"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1653
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/subcontracting.py:94
 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}"
 msgstr "行号{0}# 在{2} {3}的'供应原材料'表中未找到物料{1}"
 
@@ -46031,11 +46015,11 @@ msgstr "行号{0}：分配金额{1}不能超过发票未结金额{2}"
 msgid "Row {0}: Allocated amount {1} must be less than or equal to remaining payment amount {2}"
 msgstr "行号{0}：分配金额{1}不能超过剩余付款金额{2}"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1314
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:691
 msgid "Row {0}: As {1} is enabled, raw materials cannot be added to {2} entry. Use {3} entry to consume raw materials."
 msgstr "第 {0} 行：生产设置中已勾选 入库成品原材料成本取自工单耗用，工单入库中不允许倒扣原材料，请创建工单耗用物料移动消耗原材料"
 
-#: erpnext/stock/doctype/material_request/material_request.py:862
+#: erpnext/stock/doctype/material_request/material_request.py:861
 msgid "Row {0}: Bill of Materials not found for the Item {1}"
 msgstr "没有为第{0}行的物料{1}定义物料清单"
 
@@ -46052,7 +46036,7 @@ msgstr ""
 msgid "Row {0}: Conversion Factor is mandatory"
 msgstr "行{0}：转换系数必填"
 
-#: erpnext/controllers/accounts_controller.py:3245
+#: erpnext/controllers/accounts_controller.py:3239
 msgid "Row {0}: Cost Center {1} does not belong to Company {2}"
 msgstr "第 {0} 行 ：成本中心 {1} 不是公司 {3} 的有效成本中心"
 
@@ -46072,7 +46056,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:879
+#: erpnext/controllers/selling_controller.py:880
 msgid "Row {0}: Delivery Warehouse ({1}) and Customer Warehouse ({2}) can not be same"
 msgstr "第{0}行:出货仓 （{1}) 不能与客户仓 ({2}) 相同"
 
@@ -46080,7 +46064,7 @@ msgstr "第{0}行:出货仓 （{1}) 不能与客户仓 ({2}) 相同"
 msgid "Row {0}: Delivery Warehouse cannot be same as Customer Warehouse for Item {1}."
 msgstr "第{0}行：物料{1}的交货仓库不能与客户仓库相同。"
 
-#: erpnext/controllers/accounts_controller.py:2736
+#: erpnext/controllers/accounts_controller.py:2737
 msgid "Row {0}: Due Date in the Payment Terms table cannot be before Posting Date"
 msgstr "第{0}行: 付款计划中的到期日不能早于记账日"
 
@@ -46125,16 +46109,16 @@ msgstr "行号{0}：供应商{1}必须填写邮箱地址以发送邮件"
 msgid "Row {0}: From Time and To Time is mandatory."
 msgstr "行{0}：开始和结束时间必填。"
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:325
+#: erpnext/manufacturing/doctype/job_card/job_card.py:326
 #: erpnext/projects/doctype/timesheet/timesheet.py:225
 msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}"
 msgstr "行{0}：{1} 与 {2} 的开始与结束时间有重叠"
 
-#: erpnext/controllers/stock_controller.py:1562
+#: erpnext/controllers/stock_controller.py:1563
 msgid "Row {0}: From Warehouse is mandatory for internal transfers"
 msgstr "第 {0} 行，直接调拨发料仓必填"
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:316
+#: erpnext/manufacturing/doctype/job_card/job_card.py:317
 msgid "Row {0}: From time must be less than to time"
 msgstr "第{0}行：开始时间必须早于结束时间"
 
@@ -46150,7 +46134,7 @@ msgstr "第{0}行：无效参考{1}"
 msgid "Row {0}: Item Tax template updated as per validity and rate applied"
 msgstr "行号{0}：物料税模板已按有效税率更新"
 
-#: erpnext/controllers/selling_controller.py:644
+#: erpnext/controllers/selling_controller.py:645
 msgid "Row {0}: Item rate has been updated as per valuation rate since its an internal stock transfer"
 msgstr "行号{0}：内部调拨时物料单价已按估价率更新"
 
@@ -46174,7 +46158,7 @@ msgstr "行号{0}：物料{1}数量不可超过可用数量"
 msgid "Row {0}: Operation time should be greater than 0 for operation {1}"
 msgstr ""
 
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:614
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:655
 msgid "Row {0}: Packed Qty must be equal to {1} Qty."
 msgstr "第 {0} 行：装箱数量必须与 {1} 数量相等"
 
@@ -46242,7 +46226,7 @@ msgstr "行号{0}：采购发票{1}无库存影响"
 msgid "Row {0}: Qty cannot be greater than {1} for the Item {2}."
 msgstr "行号{0}：物料{2}数量不可超过{1}"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:621
+#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:195
 msgid "Row {0}: Qty in Stock UOM can not be zero."
 msgstr "行号{0}：库存单位的数量不可为零"
 
@@ -46254,10 +46238,6 @@ msgstr "行号{0}：数量必须大于0"
 msgid "Row {0}: Quantity cannot be negative."
 msgstr "行号{0}：数量不能为负数"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1029
-msgid "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})"
-msgstr "第{0}行：在记账时间点({2} {3}) 物料{4}在{1}中的可用数量不足"
-
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:886
 msgid "Row {0}: Sales Invoice {1} is already created for {2}"
 msgstr ""
@@ -46266,11 +46246,11 @@ msgstr ""
 msgid "Row {0}: Shift cannot be changed since the depreciation has already been processed"
 msgstr "行号{0}：折旧已处理后不可变更班次"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1666
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/subcontracting.py:105
 msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}"
 msgstr "行号{0}：原材料{1}必须关联外协物料"
 
-#: erpnext/controllers/stock_controller.py:1553
+#: erpnext/controllers/stock_controller.py:1554
 msgid "Row {0}: Target Warehouse is mandatory for internal transfers"
 msgstr "第 {0} 行，直接调拨收料仓必填"
 
@@ -46282,11 +46262,11 @@ msgstr "行号{0}：任务{1}不属于项目{2}"
 msgid "Row {0}: The entire expense amount for account {1} in {2} has already been allocated."
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:667
+#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:108
 msgid "Row {0}: The item {1}, quantity must be positive number"
 msgstr "第 {0} 行： 物料 {1} 数量必须为正数"
 
-#: erpnext/controllers/accounts_controller.py:3222
+#: erpnext/controllers/accounts_controller.py:3216
 msgid "Row {0}: The {3} Account {1} does not belong to the company {2}"
 msgstr "行号{0}：{3}科目{1}不属于公司{2}"
 
@@ -46294,11 +46274,11 @@ msgstr "行号{0}：{3}科目{1}不属于公司{2}"
 msgid "Row {0}: To set {1} periodicity, difference between from and to date must be greater than or equal to {2}"
 msgstr "行号{0}：设置{1}周期时，起止日期差值必须大于等于{2}"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:3577
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py:348
 msgid "Row {0}: Transferred quantity cannot be greater than the requested quantity."
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:615
+#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:189
 msgid "Row {0}: UOM Conversion Factor is mandatory"
 msgstr "行{0}：单位转换系数是必需的"
 
@@ -46311,11 +46291,11 @@ msgid "Row {0}: Warehouse {1} is linked to company {2}. Please select a warehous
 msgstr ""
 
 #: erpnext/manufacturing/doctype/bom/bom.py:1248
-#: erpnext/manufacturing/doctype/work_order/work_order.py:419
+#: erpnext/manufacturing/doctype/work_order/work_order.py:420
 msgid "Row {0}: Workstation or Workstation Type is mandatory for an operation {1}"
 msgstr "行号{0}：工序{1}必须指定工作站或工作站类型"
 
-#: erpnext/controllers/accounts_controller.py:1176
+#: erpnext/controllers/accounts_controller.py:1177
 msgid "Row {0}: user has not applied the rule {1} on the item {2}"
 msgstr "第{0}行: 用户未为物料 {2} 选择规则 {1}"
 
@@ -46327,7 +46307,7 @@ msgstr "行 {0}: {1} 帐户已经应用于会计尺寸 {2}"
 msgid "Row {0}: {1} must be greater than 0"
 msgstr "第{0}行：{1}必须大于0"
 
-#: erpnext/controllers/accounts_controller.py:782
+#: erpnext/controllers/accounts_controller.py:783
 msgid "Row {0}: {1} {2} cannot be same as {3} (Party Account) {4}"
 msgstr "行 {0}: {1} {2} 不能与 {3} (组队帐户) {4}"
 
@@ -46373,7 +46353,7 @@ msgstr "在{0}中删除的行"
 msgid "Rows with Same Account heads will be merged on Ledger"
 msgstr "相同科目会被自动合并"
 
-#: erpnext/controllers/accounts_controller.py:2747
+#: erpnext/controllers/accounts_controller.py:2748
 msgid "Rows with duplicate due dates in other rows were found: {0}"
 msgstr "其他行已存在相同的付款到期日：{0}"
 
@@ -46381,7 +46361,7 @@ msgstr "其他行已存在相同的付款到期日：{0}"
 msgid "Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually."
 msgstr "第 {0} 行，源单据类型不能为收付款凭证"
 
-#: erpnext/controllers/accounts_controller.py:283
+#: erpnext/controllers/accounts_controller.py:284
 msgid "Rows: {0} in {1} section are Invalid. Reference Name should point to a valid Payment Entry or Journal Entry."
 msgstr "行数： {0} {1} 部分无效。参考名称应指向有效的付款条目或日记条目。"
 
@@ -46588,8 +46568,8 @@ msgstr "安全库存"
 #. Label of the salary_information (Tab Break) field in DocType 'Employee'
 #. Label of the salary (Currency) field in DocType 'Employee External Work
 #. History'
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:125
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:211
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:129
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:216
 #: erpnext/setup/doctype/employee/employee.json
 #: erpnext/setup/doctype/employee_external_work_history/employee_external_work_history.json
 msgid "Salary"
@@ -46611,8 +46591,8 @@ msgstr "工资发放方式"
 #. Option for the 'Order Type' (Select) field in DocType 'Quotation'
 #. Option for the 'Order Type' (Select) field in DocType 'Sales Order'
 #. Label of the sales_details (Tab Break) field in DocType 'Item'
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:142
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:238
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:146
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:243
 #: erpnext/accounts/doctype/item_tax_template/item_tax_template_dashboard.py:9
 #: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
 #: erpnext/accounts/doctype/payment_term/payment_term_dashboard.py:8
@@ -46626,18 +46606,18 @@ msgstr "工资发放方式"
 #: erpnext/regional/report/vat_audit_report/vat_audit_report.py:143
 #: erpnext/selling/doctype/quotation/quotation.json
 #: erpnext/selling/doctype/sales_order/sales_order.json
-#: erpnext/setup/doctype/company/company.py:456
-#: erpnext/setup/doctype/company/company.py:648
+#: erpnext/setup/doctype/company/company.py:460
+#: erpnext/setup/doctype/company/company.py:653
 #: erpnext/setup/doctype/company/company_dashboard.py:9
 #: erpnext/setup/doctype/sales_person/sales_person_dashboard.py:12
-#: erpnext/setup/install.py:399
+#: erpnext/setup/install.py:431
 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:297
 #: erpnext/stock/doctype/item/item.json
 #: erpnext/stock/doctype/pick_list/pick_list_dashboard.py:16
 msgid "Sales"
 msgstr "销售"
 
-#: erpnext/setup/doctype/company/company.py:648
+#: erpnext/setup/doctype/company/company.py:653
 msgid "Sales Account"
 msgstr "销售科目"
 
@@ -46661,8 +46641,8 @@ msgstr "销售贡献和激励措施"
 msgid "Sales Defaults"
 msgstr "销售默认值"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:126
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:212
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:130
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:217
 msgid "Sales Expenses"
 msgstr "销售费用"
 
@@ -46831,11 +46811,11 @@ msgstr "销售发票非由用户{}创建"
 msgid "Sales Invoice mode is activated in POS. Please create Sales Invoice instead."
 msgstr "POS中已启用销售发票模式，请直接创建销售发票。"
 
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:634
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:675
 msgid "Sales Invoice {0} has already been submitted"
 msgstr "销售发票{0}已提交过"
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:593
+#: erpnext/selling/doctype/sales_order/sales_order.py:597
 msgid "Sales Invoice {0} must be deleted before cancelling this Sales Order"
 msgstr "在取消此销售订单之前必须删除销售发票 {0}"
 
@@ -47037,8 +47017,8 @@ msgstr "销售订单为物料{0}的必须项"
 msgid "Sales Order {0} already exists against Customer's Purchase Order {1}. To allow multiple Sales Orders, Enable {2} in {3}"
 msgstr "销售订单 {0} 已存在于客户的采购订单 {1}。若要允许多张销售订单，请在 {3} 中启用 {2}"
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:1921
-#: erpnext/selling/doctype/sales_order/sales_order.py:1934
+#: erpnext/selling/doctype/sales_order/sales_order.py:1943
+#: erpnext/selling/doctype/sales_order/sales_order.py:1956
 msgid "Sales Order {0} is not available for production"
 msgstr ""
 
@@ -47046,12 +47026,12 @@ msgstr ""
 msgid "Sales Order {0} is not submitted"
 msgstr "销售订单{0}未提交"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:495
+#: erpnext/manufacturing/doctype/work_order/work_order.py:496
 msgid "Sales Order {0} is not valid"
 msgstr "销售订单{0}无效"
 
 #: erpnext/controllers/selling_controller.py:476
-#: erpnext/manufacturing/doctype/work_order/work_order.py:500
+#: erpnext/manufacturing/doctype/work_order/work_order.py:501
 msgid "Sales Order {0} is {1}"
 msgstr "销售订单{0} {1}"
 
@@ -47107,7 +47087,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:130
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1310
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1233
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:114
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:196
 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:74
@@ -47213,7 +47193,7 @@ msgstr "销售收款汇总"
 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:158
 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:136
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1307
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1230
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:120
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:193
 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:80
@@ -47306,7 +47286,7 @@ msgstr "销售台账"
 msgid "Sales Representative"
 msgstr "销售代表"
 
-#: erpnext/accounts/report/gross_profit/gross_profit.py:997
+#: erpnext/accounts/report/gross_profit/gross_profit.py:989
 #: erpnext/stock/doctype/delivery_note/delivery_note.js:270
 msgid "Sales Return"
 msgstr "销售退货"
@@ -47330,7 +47310,7 @@ msgstr "销售统计"
 #. Label of the sales_tax_template (Link) field in DocType 'Tax Rule'
 #. Label of a Workspace Sidebar Item
 #: erpnext/accounts/doctype/tax_rule/tax_rule.json
-#: erpnext/setup/doctype/company/company.js:133
+#: erpnext/setup/doctype/company/company.js:149
 #: erpnext/workspace_sidebar/taxes.json
 msgid "Sales Tax Template"
 msgstr "销售税费模板"
@@ -47481,12 +47461,12 @@ msgstr "样品仓"
 
 #. Label of the sample_size (Float) field in DocType 'Quality Inspection'
 #: erpnext/manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:93
-#: erpnext/public/js/controllers/transaction.js:2846
+#: erpnext/public/js/controllers/transaction.js:2848
 #: erpnext/stock/doctype/quality_inspection/quality_inspection.json
 msgid "Sample Size"
 msgstr "样本大小"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:4070
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:1021
 msgid "Sample quantity {0} cannot be more than received quantity {1}"
 msgstr "采样数量{0}不能超过接收数量{1}"
 
@@ -47849,8 +47829,8 @@ msgstr "次要角色"
 msgid "Secretary"
 msgstr "秘书"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:177
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:301
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:181
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:306
 msgid "Secured Loans"
 msgstr "抵押借款"
 
@@ -47888,7 +47868,7 @@ msgstr "选替代物料"
 msgid "Select Alternative Items for Sales Order"
 msgstr "选择供销售订单使用的替代项目"
 
-#: erpnext/stock/doctype/item/item.js:820
+#: erpnext/stock/doctype/item/item.js:807
 msgid "Select Attribute Values"
 msgstr "选择属性值"
 
@@ -47930,7 +47910,7 @@ msgstr "选择公司"
 msgid "Select Company Address"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.js:547
+#: erpnext/manufacturing/doctype/job_card/job_card.js:477
 msgid "Select Corrective Operation"
 msgstr "选择纠正性工序"
 
@@ -47966,7 +47946,7 @@ msgstr "选择维度"
 msgid "Select Dispatch Address "
 msgstr "选择发货地址"
 
-#: erpnext/manufacturing/doctype/job_card/job_card.js:229
+#: erpnext/manufacturing/doctype/job_card/job_card.js:702
 msgid "Select Employees"
 msgstr "选择员工"
 
@@ -47991,7 +47971,7 @@ msgstr "选择物料"
 msgid "Select Items based on Delivery Date"
 msgstr "根据出货日期选择物料"
 
-#: erpnext/public/js/controllers/transaction.js:2885
+#: erpnext/public/js/controllers/transaction.js:2887
 msgid "Select Items for Quality Inspection"
 msgstr "选择待检验物料"
 
@@ -48029,7 +48009,7 @@ msgstr ""
 msgid "Select Possible Supplier"
 msgstr "选择潜在供应商"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1122
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1104
 #: erpnext/stock/doctype/pick_list/pick_list.js:219
 msgid "Select Quantity"
 msgstr "选择数量"
@@ -48127,7 +48107,7 @@ msgstr ""
 msgid "Select all"
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:1153
+#: erpnext/stock/doctype/item/item.js:1140
 msgid "Select an Item Group."
 msgstr "选择物料组。"
 
@@ -48143,7 +48123,7 @@ msgstr "选择发票以加载汇总数据"
 msgid "Select an item from each set to be used in the Sales Order."
 msgstr "从每组中选择一个物料用于销售订单。"
 
-#: erpnext/stock/doctype/item/item.js:834
+#: erpnext/stock/doctype/item/item.js:821
 msgid "Select at least one value from each of the attributes."
 msgstr "从每个属性中至少选择一个值。"
 
@@ -48161,7 +48141,7 @@ msgstr "请先选择公司"
 msgid "Select date"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:2995
+#: erpnext/controllers/accounts_controller.py:2989
 msgid "Select finance book for the item {0} at row {1}"
 msgstr "请为第{1}行的物料{0}选择账簿"
 
@@ -48193,7 +48173,7 @@ msgstr "选择银行户头"
 msgid "Select the Default Workstation where the Operation will be performed. This will be fetched in BOMs and Work Orders."
 msgstr "选择执行工序的默认工作站。此信息将用于物料清单和工单。"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1224
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1206
 msgid "Select the Item to be manufactured."
 msgstr "选择待生产的物料。"
 
@@ -48210,7 +48190,7 @@ msgstr "请先选择仓库"
 msgid "Select the customer or supplier."
 msgstr "选择客户或供应商。"
 
-#: erpnext/assets/doctype/asset/asset.js:929
+#: erpnext/assets/doctype/asset/asset.js:931
 msgid "Select the date"
 msgstr "选择日期"
 
@@ -48246,7 +48226,7 @@ msgstr "设置客户首选联系人后，可以使用手机号过滤客户"
 msgid "Selected POS Opening Entry should be open."
 msgstr "选定的POS期初条目应为开启状态。"
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2569
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2650
 msgid "Selected Price List should have buying and selling fields checked."
 msgstr "价格表主数据中应勾选采购和销售。"
 
@@ -48277,22 +48257,22 @@ msgstr "所选单据必须处于已提交状态"
 msgid "Self delivery"
 msgstr "自运"
 
-#: erpnext/assets/doctype/asset/asset.js:640
+#: erpnext/assets/doctype/asset/asset.js:642
 #: erpnext/stock/doctype/batch/batch_dashboard.py:9
 #: erpnext/stock/doctype/item/item_dashboard.py:20
 msgid "Sell"
 msgstr "销售"
 
 #: erpnext/assets/doctype/asset/asset.js:171
-#: erpnext/assets/doctype/asset/asset.js:629
+#: erpnext/assets/doctype/asset/asset.js:631
 msgid "Sell Asset"
 msgstr "出售资产"
 
-#: erpnext/assets/doctype/asset/asset.js:634
+#: erpnext/assets/doctype/asset/asset.js:636
 msgid "Sell Qty"
 msgstr ""
 
-#: erpnext/assets/doctype/asset/asset.js:650
+#: erpnext/assets/doctype/asset/asset.js:652
 msgid "Sell quantity cannot exceed the asset quantity"
 msgstr ""
 
@@ -48300,7 +48280,7 @@ msgstr ""
 msgid "Sell quantity cannot exceed the asset quantity. Asset {0} has only {1} item(s)."
 msgstr ""
 
-#: erpnext/assets/doctype/asset/asset.js:646
+#: erpnext/assets/doctype/asset/asset.js:648
 msgid "Sell quantity must be greater than zero"
 msgstr ""
 
@@ -48553,7 +48533,7 @@ msgstr "序列号/批号"
 #: erpnext/manufacturing/doctype/job_card/job_card.json
 #: erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:74
 #: erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py:114
-#: erpnext/public/js/controllers/transaction.js:2859
+#: erpnext/public/js/controllers/transaction.js:2861
 #: erpnext/public/js/utils/serial_no_batch_selector.js:433
 #: erpnext/selling/doctype/installation_note_item/installation_note_item.json
 #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
@@ -48758,7 +48738,7 @@ msgstr ""
 msgid "Serial Nos are created successfully"
 msgstr "序列号创建成功"
 
-#: erpnext/stock/stock_ledger.py:2330
+#: erpnext/stock/stock_ledger.py:2296
 msgid "Serial Nos are reserved in Stock Reservation Entries, you need to unreserve them before proceeding."
 msgstr "序列号已在库存预留条目中预留，继续操作前需取消预留。"
 
@@ -49242,7 +49222,7 @@ msgstr "设置预付和分配（先进先出）"
 
 #. Label of the set_basic_rate_manually (Check) field in DocType 'Stock Entry
 #. Detail'
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:300
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:706
 #: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
 msgid "Set Basic Rate Manually"
 msgstr "手动设置成本"
@@ -49261,8 +49241,8 @@ msgstr "设置交货仓库"
 msgid "Set Dropship Items Delivered Quantity"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.js:418
-#: erpnext/manufacturing/doctype/job_card/job_card.js:487
+#: erpnext/manufacturing/doctype/job_card/job_card.js:363
+#: erpnext/manufacturing/doctype/job_card/job_card.js:425
 msgid "Set Finished Good Quantity"
 msgstr "设置产成品数量"
 
@@ -49429,11 +49409,11 @@ msgstr "按物料税模板设置"
 msgid "Set closing balance as per bank statement"
 msgstr ""
 
-#: erpnext/setup/doctype/company/company.py:546
+#: erpnext/setup/doctype/company/company.py:550
 msgid "Set default inventory account for perpetual inventory"
 msgstr "设置永续盘存模式下的默认库存科目"
 
-#: erpnext/setup/doctype/company/company.py:572
+#: erpnext/setup/doctype/company/company.py:576
 msgid "Set default {0} account for non stock items"
 msgstr "设置非库存物料的默认{0}科目"
 
@@ -49465,7 +49445,7 @@ msgstr "子装配件物料单价取其BOM成本"
 msgid "Set targets Item Group-wise for this Sales Person."
 msgstr "为本业务员设置物料组级的销售目标"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1281
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1263
 msgid "Set the Planned Start Date (an Estimated Date at which you want the Production to begin)"
 msgstr "设置计划开始日期（预计开始生产的日期）"
 
@@ -49576,7 +49556,7 @@ msgid "Setting up company"
 msgstr "创建公司"
 
 #: erpnext/manufacturing/doctype/bom/bom.py:1227
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1497
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1498
 msgid "Setting {0} is required"
 msgstr "必须设置{0}"
 
@@ -49596,6 +49576,10 @@ msgstr "销售模块设置"
 msgid "Settled"
 msgstr "已结清"
 
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js:33
+msgid "Settled with Credit Note"
+msgstr ""
+
 #. Title of an Onboarding Step
 #. Label of an action in the Onboarding Step 'Setup Company'
 #: erpnext/setup/onboarding_step/setup_company/setup_company.json
@@ -49788,7 +49772,7 @@ msgstr "运输类型"
 msgid "Shipment details"
 msgstr "运输详情"
 
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:805
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:846
 msgid "Shipments"
 msgstr "发货"
 
@@ -49826,7 +49810,7 @@ msgstr "送货地址名称"
 msgid "Shipping Address Template"
 msgstr "出货地址模板"
 
-#: erpnext/controllers/accounts_controller.py:576
+#: erpnext/controllers/accounts_controller.py:577
 msgid "Shipping Address does not belong to the {0}"
 msgstr "发货地址不属于{0}"
 
@@ -49969,8 +49953,8 @@ msgstr "在网站或其他出版物使用的个人简介"
 msgid "Short-term Investments"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:175
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:296
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:179
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:301
 msgid "Short-term Provisions"
 msgstr ""
 
@@ -50304,7 +50288,7 @@ msgstr "并行"
 msgid "Since there are active depreciable assets under this category, the following accounts are required. <br><br>"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:745
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:504
 msgid "Since there is a process loss of {0} units for the finished good {1}, you should reduce the quantity by {0} units for the finished good {1} in the Items Table."
 msgstr "由于产成品{1}存在{0}单位的加工损耗，应在物料表中将该产成品的数量减少{0}单位。"
 
@@ -50349,7 +50333,7 @@ msgstr "无需出货"
 
 #. Label of the skip_material_transfer (Check) field in DocType 'Work Order
 #. Operation'
-#: erpnext/manufacturing/doctype/work_order/work_order.js:380
+#: erpnext/manufacturing/doctype/work_order/work_order.js:361
 #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json
 #: erpnext/manufacturing/doctype/workstation/workstation.js:454
 msgid "Skip Material Transfer"
@@ -50391,8 +50375,8 @@ msgstr "平滑常数"
 msgid "Soap & Detergent"
 msgstr "肥皂和洗涤剂"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:62
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:107
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:66
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:112
 #: erpnext/setup/setup_wizard/data/industry_type.txt:45
 msgid "Software"
 msgstr "软件"
@@ -50416,7 +50400,7 @@ msgstr "售货员"
 msgid "Solvency Ratios"
 msgstr "偿债能力比率"
 
-#: erpnext/controllers/accounts_controller.py:4391
+#: erpnext/controllers/accounts_controller.py:4379
 msgid "Some required Company details are missing. You don't have permission to update them. Please contact your System Manager."
 msgstr "部分必需的公司信息缺失。您无权限更新这些信息，请联系系统管理员。"
 
@@ -50480,7 +50464,7 @@ msgstr "来源字段名"
 msgid "Source Location"
 msgstr "源地点"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1032
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1014
 msgid "Source Manufacture Entry"
 msgstr ""
 
@@ -50489,11 +50473,11 @@ msgstr ""
 msgid "Source Stock Entry (Manufacture)"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:907
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:524
 msgid "Source Stock Entry {0} belongs to Work Order {1}, not {2}. Please use a manufacture entry from the same Work Order."
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:2352
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/disassemble.py:84
 msgid "Source Stock Entry {0} has no finished goods quantity"
 msgstr ""
 
@@ -50551,7 +50535,12 @@ msgstr "发料仓地址(链接)"
 msgid "Source Warehouse is mandatory for the Item {0}."
 msgstr "物料{0}必须指定来源仓库。"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:304
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/material_receipt_issue.py:38
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py:23
+msgid "Source Warehouse is required for item {0}"
+msgstr ""
+
+#: erpnext/manufacturing/doctype/work_order/work_order.py:305
 msgid "Source Warehouse {0} must be same as Customer Warehouse {1} in the Subcontracting Inward Order."
 msgstr "源仓库{0}必须与外包收货订单中的客户仓库{1}相同。"
 
@@ -50559,24 +50548,23 @@ msgstr "源仓库{0}必须与外包收货订单中的客户仓库{1}相同。"
 msgid "Source and Target Location cannot be same"
 msgstr "源和目标地点不能相同"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:873
-msgid "Source and target warehouse cannot be same for row {0}"
-msgstr "第{0}行中的源和收料仓不能相同"
-
 #: erpnext/stock/dashboard/item_dashboard.js:295
 msgid "Source and target warehouse must be different"
 msgstr "发料和收料仓不同相同"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:152
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:254
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:156
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:259
 msgid "Source of Funds (Liabilities)"
 msgstr "资金来源（负债）"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:840
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:856
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:863
-msgid "Source warehouse is mandatory for row {0}"
-msgstr "请为第{0}行填写发料仓"
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/disassemble.py:28
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:44
+msgid "Source or Target Warehouse is required for item {0}"
+msgstr ""
+
+#: erpnext/selling/doctype/sales_order/sales_order.py:465
+msgid "Source warehouse required for stock item {0}"
+msgstr ""
 
 #. Label of the sourced_by_supplier (Check) field in DocType 'BOM Creator Item'
 #. Label of the sourced_by_supplier (Check) field in DocType 'BOM Explosion
@@ -50617,7 +50605,7 @@ msgstr ""
 msgid "Spent"
 msgstr ""
 
-#: erpnext/assets/doctype/asset/asset.js:690
+#: erpnext/assets/doctype/asset/asset.js:692
 #: erpnext/stock/doctype/batch/batch.js:104
 #: erpnext/stock/doctype/batch/batch.js:185
 #: erpnext/support/doctype/issue/issue.js:114
@@ -50625,7 +50613,7 @@ msgid "Split"
 msgstr "分拆"
 
 #: erpnext/assets/doctype/asset/asset.js:147
-#: erpnext/assets/doctype/asset/asset.js:674
+#: erpnext/assets/doctype/asset/asset.js:676
 msgid "Split Asset"
 msgstr "分割资产"
 
@@ -50649,7 +50637,7 @@ msgstr "拆分前资产号"
 msgid "Split Issue"
 msgstr "拆分问题"
 
-#: erpnext/assets/doctype/asset/asset.js:680
+#: erpnext/assets/doctype/asset/asset.js:682
 msgid "Split Qty"
 msgstr "分割数量"
 
@@ -50733,7 +50721,7 @@ msgstr "标准采购"
 msgid "Standard Description"
 msgstr "标准描述"
 
-#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:115
+#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:127
 msgid "Standard Rated Expenses"
 msgstr "标准税率费用"
 
@@ -50760,8 +50748,8 @@ msgstr "标准模板"
 msgid "Standard Terms and Conditions that can be added to Sales and Purchases. Examples: Validity of the offer, Payment Terms, Safety and Usage, etc."
 msgstr "可添加到销售订单和采购订单的标准交易条款，如报价有效期，付款方式，安全要求及使用方式等"
 
-#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:96
-#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:102
+#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:108
+#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:114
 msgid "Standard rated supplies in {0}"
 msgstr "{0}中的标准税率供应品"
 
@@ -50796,7 +50784,7 @@ msgstr "开始日期不能早于当前日期"
 msgid "Start Date should be lower than End Date"
 msgstr "开始日期应早于结束日期"
 
-#: erpnext/manufacturing/doctype/job_card/job_card.js:223
+#: erpnext/manufacturing/doctype/job_card/job_card.js:658
 #: erpnext/manufacturing/doctype/workstation/workstation.js:124
 msgid "Start Job"
 msgstr "开始计时"
@@ -50925,7 +50913,7 @@ msgstr "状态图样"
 msgid "Status and Reference"
 msgstr ""
 
-#: erpnext/projects/doctype/project/project.py:716
+#: erpnext/projects/doctype/project/project.py:754
 msgid "Status must be Cancelled or Completed"
 msgstr "状态必须是已取消或已完成"
 
@@ -50963,8 +50951,8 @@ msgstr "库存"
 
 #. Option for the 'Account Type' (Select) field in DocType 'Account'
 #: erpnext/accounts/doctype/account/account.json
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:96
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:158
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:100
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:163
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1362
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1388
 #: erpnext/accounts/report/account_balance/account_balance.js:58
@@ -51064,6 +51052,16 @@ msgstr "库存结转分录{0}已加入处理队列，系统需要时间完成处
 msgid "Stock Closing Log"
 msgstr "库存结转日志"
 
+#. Option for the 'Account Type' (Select) field in DocType 'Account'
+#. Label of the stock_delivered_but_not_billed (Link) field in DocType
+#. 'Company'
+#: erpnext/accounts/doctype/account/account.json
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:38
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:65
+#: erpnext/setup/doctype/company/company.json
+msgid "Stock Delivered But Not Billed"
+msgstr ""
+
 #. Label of the warehouse_and_reference (Section Break) field in DocType 'POS
 #. Invoice Item'
 #. Label of the warehouse_and_reference (Section Break) field in DocType 'Sales
@@ -51073,10 +51071,6 @@ msgstr "库存结转日志"
 msgid "Stock Details"
 msgstr "库存详细信息"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:997
-msgid "Stock Entries already created for Work Order {0}: {1}"
-msgstr "工单 {0} 现有入库单 {1} 总入库数量已超工单数量，不可再创建新入库单"
-
 #. Label of the stock_entry (Link) field in DocType 'Journal Entry'
 #. Label of a Link in the Manufacturing Workspace
 #. Option for the 'Receipt Document Type' (Select) field in DocType 'Landed
@@ -51140,7 +51134,7 @@ msgstr "该拣货单的物料移动单已生成"
 msgid "Stock Entry {0} created"
 msgstr "物料移动{0}已创建"
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1527
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1544
 msgid "Stock Entry {0} has created"
 msgstr "库存分录{0}已创建"
 
@@ -51148,8 +51142,8 @@ msgstr "库存分录{0}已创建"
 msgid "Stock Entry {0} is not submitted"
 msgstr "物料移动{0}不提交"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:83
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:142
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:87
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:147
 msgid "Stock Expenses"
 msgstr "存货费用"
 
@@ -51227,8 +51221,8 @@ msgstr "库存水平"
 msgid "Stock Levels HTML"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:160
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:273
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:164
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:278
 msgid "Stock Liabilities"
 msgstr "库存负债"
 
@@ -51331,8 +51325,8 @@ msgstr "库存数量与序列号数量对账"
 #. Option for the 'Account Type' (Select) field in DocType 'Account'
 #. Label of the stock_received_but_not_billed (Link) field in DocType 'Company'
 #: erpnext/accounts/doctype/account/account.json
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:161
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:274
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:165
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:279
 #: erpnext/accounts/report/account_balance/account_balance.js:59
 #: erpnext/setup/doctype/company/company.json
 msgid "Stock Received But Not Billed"
@@ -51381,9 +51375,9 @@ msgstr "物料成本价追溯调整设置"
 #: erpnext/manufacturing/doctype/production_plan/production_plan.js:289
 #: erpnext/manufacturing/doctype/production_plan/production_plan.js:297
 #: erpnext/manufacturing/doctype/production_plan/production_plan.js:303
-#: erpnext/manufacturing/doctype/work_order/work_order.js:945
-#: erpnext/manufacturing/doctype/work_order/work_order.js:954
-#: erpnext/manufacturing/doctype/work_order/work_order.js:961
+#: erpnext/manufacturing/doctype/work_order/work_order.js:927
+#: erpnext/manufacturing/doctype/work_order/work_order.js:936
+#: erpnext/manufacturing/doctype/work_order/work_order.js:943
 #: erpnext/manufacturing/doctype/work_order/work_order_dashboard.py:14
 #: erpnext/public/js/stock_reservation.js:12
 #: erpnext/selling/doctype/sales_order/sales_order.js:109
@@ -51419,10 +51413,10 @@ msgstr "库存预留"
 msgid "Stock Reservation Entries Cancelled"
 msgstr "库存预留单已取消"
 
-#: erpnext/controllers/subcontracting_inward_controller.py:1021
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2259
-#: erpnext/manufacturing/doctype/work_order/work_order.py:2148
-#: erpnext/selling/doctype/sales_order/sales_order.py:874
+#: erpnext/controllers/subcontracting_inward_controller.py:1029
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2261
+#: erpnext/manufacturing/doctype/work_order/work_order.py:2150
+#: erpnext/selling/doctype/sales_order/sales_order.py:887
 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1786
 msgid "Stock Reservation Entries Created"
 msgstr "库存预留单已创建"
@@ -51450,7 +51444,7 @@ msgstr "出库后库存预留单不可修改"
 msgid "Stock Reservation Entry created against a Pick List cannot be updated. If you need to make changes, we recommend canceling the existing entry and creating a new one."
 msgstr "基于拣货单创建的库存预留单不可修改，建议取消当前单据再创建新单据"
 
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:567
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:608
 msgid "Stock Reservation Warehouse Mismatch"
 msgstr "库存预留仓库不匹配"
 
@@ -51490,7 +51484,7 @@ msgstr "预留库存(库存单位)"
 #: erpnext/selling/doctype/selling_settings/selling_settings.py:115
 #: erpnext/setup/doctype/company/company.json
 #: erpnext/setup/workspace/erpnext_settings/erpnext_settings.json
-#: erpnext/stock/doctype/item/item.js:420
+#: erpnext/stock/doctype/item/item.js:413
 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:681
 #: erpnext/stock/doctype/stock_settings/stock_settings.json
 #: erpnext/stock/workspace/stock/stock.json
@@ -51797,11 +51791,11 @@ msgstr "石材"
 msgid "Stop Reason"
 msgstr "停机原因"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1105
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1106
 msgid "Stopped Work Order cannot be cancelled, Unstop it first to cancel"
 msgstr "停止的工单不能取消，先取消停止"
 
-#: erpnext/setup/doctype/company/company.py:383
+#: erpnext/setup/doctype/company/company.py:387
 #: erpnext/setup/setup_wizard/operations/defaults_setup.py:33
 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:537
 #: erpnext/stock/doctype/item/item.py:330 erpnext/tests/utils.py:248
@@ -51862,7 +51856,7 @@ msgstr "子装配件仓库"
 
 #. Label of the operation (Link) field in DocType 'Job Card Time Log'
 #. Name of a DocType
-#: erpnext/manufacturing/doctype/job_card/job_card.js:363
+#: erpnext/manufacturing/doctype/job_card/job_card.js:310
 #: erpnext/manufacturing/doctype/job_card_time_log/job_card_time_log.json
 #: erpnext/manufacturing/doctype/sub_operation/sub_operation.json
 msgid "Sub Operation"
@@ -52124,7 +52118,7 @@ msgstr "委外订单加工费明细"
 msgid "Subcontracting Order Supplied Item"
 msgstr "委外订单原材料明细"
 
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:965
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:973
 msgid "Subcontracting Order {0} created."
 msgstr "外协订单{0}已创建"
 
@@ -52213,7 +52207,7 @@ msgstr ""
 msgid "Subdivision"
 msgstr "细分"
 
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:961
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:969
 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1122
 msgid "Submit Action Failed"
 msgstr "提交操作失败"
@@ -52234,7 +52228,7 @@ msgstr "提交生成的发票"
 msgid "Submit Journal Entries"
 msgstr "提交日记账分录"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:192
+#: erpnext/manufacturing/doctype/work_order/work_order.js:173
 msgid "Submit this Work Order for further processing."
 msgstr "提交此生产工单以进行后续操作。"
 
@@ -52679,7 +52673,7 @@ msgstr "供应商信息"
 #: erpnext/accounts/doctype/tax_rule/tax_rule.json
 #: erpnext/accounts/report/accounts_payable/accounts_payable.js:119
 #: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:102
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1314
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1237
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:200
 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:178
 #: erpnext/accounts/report/purchase_register/purchase_register.js:27
@@ -52778,7 +52772,7 @@ msgstr "供应商台账汇总"
 #. Label of the supplier_name (Data) field in DocType 'Purchase Receipt'
 #. Label of the supplier_name (Data) field in DocType 'Stock Entry'
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1229
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1152
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:157
 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:196
 #: erpnext/accounts/report/purchase_register/purchase_register.py:177
@@ -52866,7 +52860,7 @@ msgstr "首选联系人"
 #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:40
 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
-#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.py:235
+#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.py:240
 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:60
 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:256
 #: erpnext/buying/workspace/buying/buying.json
@@ -52895,7 +52889,7 @@ msgstr "供应商比价"
 msgid "Supplier Quotation Item"
 msgstr "供应商报价明细"
 
-#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:506
+#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:510
 msgid "Supplier Quotation {0} Created"
 msgstr "供应商报价{0}已创建"
 
@@ -52984,7 +52978,7 @@ msgstr "供应商类型"
 #. Label of the supplier_warehouse (Link) field in DocType 'Purchase Receipt'
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
 #: erpnext/buying/doctype/purchase_order/purchase_order.json
-#: erpnext/manufacturing/doctype/job_card/job_card.js:97
+#: erpnext/manufacturing/doctype/job_card/job_card.js:91
 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
 msgid "Supplier Warehouse"
 msgstr "委外仓"
@@ -53011,7 +53005,7 @@ msgstr "客户分配的供应商编号"
 msgid "Supplier of Goods or Services."
 msgstr "提供商品或服务的供应商。"
 
-#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.py:188
+#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.py:190
 msgid "Supplier {0} not found in {1}"
 msgstr "在{1}中找不到供应商{0}"
 
@@ -53024,8 +53018,8 @@ msgstr "供应商"
 msgid "Suppliers"
 msgstr "供应商"
 
-#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:60
-#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:122
+#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:72
+#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:134
 msgid "Supplies subject to the reverse charge provision"
 msgstr "适用反向征税条款的供应品"
 
@@ -53116,7 +53110,7 @@ msgstr "同步已启动"
 msgid "Synchronize all accounts every hour"
 msgstr "每小时同步所有账户"
 
-#: erpnext/accounts/doctype/account/account.py:663
+#: erpnext/accounts/doctype/account/account.py:664
 msgid "System In Use"
 msgstr "使用中的系统"
 
@@ -53147,7 +53141,7 @@ msgstr "系统将使用挂钩货币进行隐式转换。 <br>\n"
 msgid "System will fetch all the entries if limit value is zero."
 msgstr "如果限额为0，系统会抓取所有记录"
 
-#: erpnext/controllers/accounts_controller.py:2229
+#: erpnext/controllers/accounts_controller.py:2230
 msgid "System will not check over billing since amount for Item {0} in {1} is zero"
 msgstr "因为 {1} 中的物料 {0}  金额为0系统无法进行超额开票防错检查"
 
@@ -53168,7 +53162,7 @@ msgstr "代扣所得税摘要"
 msgid "TDS Deducted"
 msgstr "已扣除TDS"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:287
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:292
 msgid "TDS Payable"
 msgstr "应付TDS"
 
@@ -53319,7 +53313,7 @@ msgstr "收料仓地址"
 msgid "Target Warehouse Address Link"
 msgstr "收料仓地址(链接)"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:249
+#: erpnext/manufacturing/doctype/work_order/work_order.py:250
 msgid "Target Warehouse Reservation Error"
 msgstr "目标仓库预留错误"
 
@@ -53327,24 +53321,23 @@ msgstr "目标仓库预留错误"
 msgid "Target Warehouse for Finished Good must be same as Finished Good Warehouse {1} in Work Order {2} linked to the Subcontracting Inward Order."
 msgstr "产成品的目标仓库必须与关联外包收货订单的工作订单{2}中的产成品仓库{1}相同。"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:793
+#: erpnext/manufacturing/doctype/work_order/work_order.py:794
 msgid "Target Warehouse is required before Submit"
 msgstr "提交前需填写目标仓库"
 
-#: erpnext/controllers/selling_controller.py:885
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/material_receipt_issue.py:25
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py:21
+msgid "Target Warehouse is required for item {0}"
+msgstr ""
+
+#: erpnext/controllers/selling_controller.py:886
 msgid "Target Warehouse is set for some items but the customer is not an internal customer."
 msgstr "部分物料设置了目标仓库，但客户不是内部客户"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:320
+#: erpnext/manufacturing/doctype/work_order/work_order.py:321
 msgid "Target Warehouse {0} must be same as Delivery Warehouse {1} in the Subcontracting Inward Order Item."
 msgstr "目标仓库{0}必须与外包收货订单物料中的交货仓库{1}相同。"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:846
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:852
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:867
-msgid "Target warehouse is mandatory for row {0}"
-msgstr "请为第{0}行指定收料仓"
-
 #. Label of the targets (Table) field in DocType 'Sales Partner'
 #. Label of the targets (Table) field in DocType 'Sales Person'
 #. Label of the targets (Table) field in DocType 'Territory'
@@ -53461,8 +53454,8 @@ msgstr "折后税额（本币）"
 msgid "Tax Amount will be rounded on a row(items) level"
 msgstr "税额按每个物料行分别取整"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:41
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:69
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:45
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:74
 #: erpnext/setup/setup_wizard/operations/taxes_setup.py:256
 msgid "Tax Assets"
 msgstr "所得税资产"
@@ -53494,7 +53487,6 @@ msgstr "所得税资产"
 msgid "Tax Breakup"
 msgstr "税费明细"
 
-#. Label of the tax_category (Link) field in DocType 'Address'
 #. Label of the tax_category (Link) field in DocType 'POS Invoice'
 #. Label of the tax_category (Link) field in DocType 'POS Profile'
 #. Label of the tax_category (Link) field in DocType 'Purchase Invoice'
@@ -53516,7 +53508,6 @@ msgstr "税费明细"
 #. Label of the tax_category (Link) field in DocType 'Item Tax'
 #. Label of the tax_category (Link) field in DocType 'Purchase Receipt'
 #. Label of a Workspace Sidebar Item
-#: erpnext/accounts/custom/address.json
 #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
 #: erpnext/accounts/doctype/pos_profile/pos_profile.json
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -53532,6 +53523,7 @@ msgstr "税费明细"
 #: erpnext/selling/doctype/customer/customer.json
 #: erpnext/selling/doctype/quotation/quotation.json
 #: erpnext/selling/doctype/sales_order/sales_order.json
+#: erpnext/setup/install.py:154
 #: erpnext/stock/doctype/delivery_note/delivery_note.json
 #: erpnext/stock/doctype/item_tax/item_tax.json
 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
@@ -53543,8 +53535,8 @@ msgstr "税种"
 msgid "Tax Category has been changed to \"Total\" because all the Items are non-stock items"
 msgstr "税类别已更改为“合计”，因为所有物料均为非库存物料"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:136
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:230
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:140
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:235
 msgid "Tax Expense"
 msgstr ""
 
@@ -53618,7 +53610,7 @@ msgstr "税率 %"
 msgid "Tax Rates"
 msgstr "税率"
 
-#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:52
+#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:64
 msgid "Tax Refunds provided to Tourists under the Tax Refunds for Tourists Scheme"
 msgstr "根据游客退税计划向游客提供的税款退还"
 
@@ -53636,7 +53628,7 @@ msgstr ""
 msgid "Tax Rule"
 msgstr "税费模板分派规则"
 
-#: erpnext/accounts/doctype/tax_rule/tax_rule.py:137
+#: erpnext/accounts/doctype/tax_rule/tax_rule.py:138
 msgid "Tax Rule Conflicts with {0}"
 msgstr "税收规则与{0}冲突"
 
@@ -53651,7 +53643,7 @@ msgstr "税设置"
 msgid "Tax Template"
 msgstr ""
 
-#: erpnext/accounts/doctype/tax_rule/tax_rule.py:85
+#: erpnext/accounts/doctype/tax_rule/tax_rule.py:86
 msgid "Tax Template is mandatory."
 msgstr "税费模板字段必填。"
 
@@ -54004,8 +53996,8 @@ msgstr "技术"
 msgid "Telecommunications"
 msgstr "电信"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:127
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:213
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:131
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:218
 msgid "Telephone Expenses"
 msgstr "电话费"
 
@@ -54056,13 +54048,13 @@ msgstr "临时冻结"
 msgid "Temporary"
 msgstr "临时"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:73
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:129
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:77
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:134
 msgid "Temporary Accounts"
 msgstr "临时科目"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:74
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:130
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:78
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:135
 msgid "Temporary Opening"
 msgstr "临时开账"
 
@@ -54244,7 +54236,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:142
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1298
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1221
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:108
 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:184
 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:68
@@ -54343,7 +54335,7 @@ msgstr ""
 msgid "The 'From Package No.' field must neither be empty nor it's value less than 1."
 msgstr "“From Package No.”字段不能为空，也不能小于1。"
 
-#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:415
+#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:419
 msgid "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings."
 msgstr "门户询价申请功能已禁用。如需启用，请在门户设置中开启"
 
@@ -54396,7 +54388,8 @@ msgstr "第{0}行的支付条款可能是重复的。"
 msgid "The Pick List having Stock Reservation Entries cannot be updated. If you need to make changes, we recommend canceling the existing Stock Reservation Entries before updating the Pick List."
 msgstr "存在库存预留记录的拣货清单无法更新。如需修改，建议在更新前取消现有库存预留"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:2804
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1428
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:119
 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty"
 msgstr "已基于工单生产任务单最大制程损耗重置了制程损耗数量"
 
@@ -54412,7 +54405,7 @@ msgstr "第{0}行的序列号{1}在仓库{2}中不可用"
 msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction."
 msgstr "序列号{0}已为{1}{2}预留，不能用于其他交易"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1821
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:934
 msgid "The Serial and Batch Bundle {0} is not valid for this transaction. The 'Type of Transaction' should be 'Outward' instead of 'Inward' in Serial and Batch Bundle {0}"
 msgstr "序列号批次组合{0}对此交易无效。在序列号批次组合{0}中，'交易类型'应为'出库'而非'入库'"
 
@@ -54448,7 +54441,7 @@ msgstr ""
 msgid "The bank account is not a company account. Please select a company account"
 msgstr ""
 
-#: erpnext/controllers/stock_controller.py:1318
+#: erpnext/controllers/stock_controller.py:1319
 msgid "The batch {0} is already reserved in {1} {2}. So, cannot proceed with the {3} {4}, which is created against the {5} {6}."
 msgstr ""
 
@@ -54456,7 +54449,11 @@ msgstr ""
 msgid "The company {0} is not in South Africa. VAT Audit Report is only available for companies in South Africa."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1320
+#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:21
+msgid "The company {0} is not in United Arab Emirates. UAE VAT 201 report is only available for companies in United Arab Emirates."
+msgstr ""
+
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1328
 msgid "The completed quantity {0} of an operation {1} cannot be greater than the completed quantity {2} of a previous operation {3}."
 msgstr ""
 
@@ -54476,7 +54473,7 @@ msgstr ""
 msgid "The date of the transaction"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1229
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1211
 msgid "The default BOM for that item will be fetched by the system. You can also change the BOM."
 msgstr "系统将获取该物料的默认BOM，也可手动修改"
 
@@ -54509,7 +54506,7 @@ msgstr "转出股东的字段不能为空"
 msgid "The field To Shareholder cannot be blank"
 msgstr "“转入股东”字段不能为空"
 
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:417
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:418
 msgid "The field {0} in row {1} is not set"
 msgstr "第{1}行的字段{0}未设置"
 
@@ -54550,7 +54547,7 @@ msgstr "以下资产自动计提折旧失败：{0}"
 msgid "The following batches are expired, please restock them: <br> {0}"
 msgstr "以下批次已过期，请补货：<br>{0}"
 
-#: erpnext/controllers/accounts_controller.py:427
+#: erpnext/controllers/accounts_controller.py:428
 msgid "The following cancelled repost entries exist for <b>{0}</b>:<br><br>{1}<br><br>Kindly delete these entries before continuing."
 msgstr ""
 
@@ -54575,7 +54572,7 @@ msgstr ""
 msgid "The following rows are duplicates:"
 msgstr ""
 
-#: erpnext/stock/doctype/material_request/material_request.py:872
+#: erpnext/stock/doctype/material_request/material_request.py:871
 msgid "The following {0} were created: {1}"
 msgstr "已创建以下{0}：{1}"
 
@@ -54660,7 +54657,7 @@ msgstr "操作{0}不能作为子工序"
 msgid "The original invoice should be consolidated before or along with the return invoice."
 msgstr "原始发票应在退货发票前或同时合并"
 
-#: erpnext/controllers/accounts_controller.py:205
+#: erpnext/controllers/accounts_controller.py:206
 msgid "The outstanding amount {0} in {1} is lesser than {2}. Updating the outstanding to this invoice."
 msgstr ""
 
@@ -54713,7 +54710,7 @@ msgstr "更新物料时将释放预留库存。确定继续？"
 msgid "The reserved stock will be released. Are you certain you wish to proceed?"
 msgstr "将释放预留库存。确定继续？"
 
-#: erpnext/accounts/doctype/account/account.py:218
+#: erpnext/accounts/doctype/account/account.py:219
 msgid "The root account {0} must be a group"
 msgstr "根级科目{0}必须是组类型"
 
@@ -54729,7 +54726,7 @@ msgstr "所选找零账户{}不属于公司{}"
 msgid "The selected item cannot have Batch"
 msgstr "所选物料不能启用批号管理"
 
-#: erpnext/assets/doctype/asset/asset.js:655
+#: erpnext/assets/doctype/asset/asset.js:657
 msgid "The sell quantity is less than the total asset quantity. The remaining quantity will be split into a new asset. This action cannot be undone. <br><br><b>Do you want to continue?</b>"
 msgstr ""
 
@@ -54836,15 +54833,15 @@ msgstr "{0}的值在物料{1}和{2}之间不一致"
 msgid "The value {0} is already assigned to an existing Item {1}."
 msgstr "现有物料{1}已使用此属性值{0}。"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1257
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1239
 msgid "The warehouse where you store finished Items before they are shipped."
 msgstr "成品发货前存储的仓库"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1250
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1232
 msgid "The warehouse where you store your raw materials. Each required item can have a separate source warehouse. Group warehouse also can be selected as source warehouse. On submission of the Work Order, the raw materials will be reserved in these warehouses for production usage."
 msgstr "原材料存储仓库。每个物料可指定不同源仓库，也可选择组仓库。提交工单时将预留原材料"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1262
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1244
 msgid "The warehouse where your Items will be transferred when you begin production. Group Warehouse can also be selected as a Work in Progress warehouse."
 msgstr "生产开始时物料转移的目标仓库，可选择组仓库作为在制品仓库"
 
@@ -54852,11 +54849,11 @@ msgstr "生产开始时物料转移的目标仓库，可选择组仓库作为在
 msgid "The withdrawal or deposit amounts - only required if there's no amount column."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:893
+#: erpnext/manufacturing/doctype/job_card/job_card.py:896
 msgid "The {0} ({1}) must be equal to {2} ({3})"
 msgstr "{0}（{1}）必须等于{2}（{3}）"
 
-#: erpnext/public/js/controllers/transaction.js:3328
+#: erpnext/public/js/controllers/transaction.js:3330
 msgid "The {0} contains Unit Price Items."
 msgstr "{0}包含单价物料。"
 
@@ -54864,7 +54861,7 @@ msgstr "{0}包含单价物料。"
 msgid "The {0} prefix '{1}' already exists. Please change the Serial No Series, otherwise you will get a Duplicate Entry error."
 msgstr ""
 
-#: erpnext/stock/doctype/material_request/material_request.py:878
+#: erpnext/stock/doctype/material_request/material_request.py:877
 msgid "The {0} {1} created successfully"
 msgstr "成功创建{0}{1}"
 
@@ -54872,7 +54869,7 @@ msgstr "成功创建{0}{1}"
 msgid "The {0} {1} does not match with the {0} {2} in the {3} {4}"
 msgstr "{0}{1}与{3}{4}中的{0}{2}不匹配"
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:996
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1002
 msgid "The {0} {1} is used to calculate the valuation cost for the finished good {2}."
 msgstr "{0} {1} 用于计算入库成品成本"
 
@@ -54888,7 +54885,7 @@ msgstr "资产存在有效维护或维修记录。取消前需完成所有相关
 msgid "There are inconsistencies between the rate, no of shares and the amount calculated"
 msgstr "单价，股份数量和计算的金额之间不一致"
 
-#: erpnext/accounts/doctype/account/account.py:203
+#: erpnext/accounts/doctype/account/account.py:204
 msgid "There are ledger entries against this account. Changing {0} to non-{1} in live system will cause incorrect output in 'Accounts {2}' report"
 msgstr "存在关联总账分录。在生产系统将{0}改为非{1}将导致'{2}'报表错误"
 
@@ -54917,7 +54914,7 @@ msgstr "该日期无可用时段"
 msgid "There are no transactions in the system for the selected bank account and dates that match the filters."
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:1177
+#: erpnext/stock/doctype/item/item.js:1164
 msgid "There are two options to maintain valuation of stock. FIFO (first in - first out) and Moving Average. To understand this topic in detail please visit <a href='https://docs.frappe.io/erpnext/user/manual/en/calculation-of-valuation-rate-in-fifo-and-moving-average' target='_blank'>Item Valuation, FIFO and Moving Average.</a>"
 msgstr "库存计价有两种方法：先进先出（FIFO）和移动平均。详情请参阅<a href='https://docs.frappe.io/erpnext/user/manual/en/calculation-of-valuation-rate-in-fifo-and-moving-average' target='_blank'>物料计价方法</a>"
 
@@ -54957,7 +54954,7 @@ msgstr "未找到{0}:{1}对应的批次"
 msgid "There is one unreconciled transaction before {0}."
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:1758
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:871
 msgid "There must be atleast 1 Finished Good in this Stock Entry"
 msgstr "至少须有一行勾选了是成品的明细行"
 
@@ -55013,11 +55010,11 @@ msgstr "此物料是基于模板物料{0}的多规格物料。"
 msgid "This Month's Summary"
 msgstr "本月摘要"
 
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:974
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:982
 msgid "This Purchase Order has been fully subcontracted."
 msgstr "本采购订单已完全外包。"
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:2187
+#: erpnext/selling/doctype/sales_order/sales_order.py:2209
 msgid "This Sales Order has been fully subcontracted."
 msgstr "本销售订单已完全外包。"
 
@@ -55154,11 +55151,11 @@ msgstr "从会计角度看此操作存在风险"
 msgid "This is done to handle accounting for cases when Purchase Receipt is created after Purchase Invoice"
 msgstr "这样做是为了处理在采购发票后创建采购入库的情况"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1243
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1225
 msgid "This is enabled by default. If you want to plan materials for sub-assemblies of the Item you're manufacturing leave this enabled. If you plan and manufacture the sub-assemblies separately, you can disable this checkbox."
 msgstr "默认启用。如需为子装配件计划物料请保持启用。若单独计划生产子装配件，可取消勾选"
 
-#: erpnext/stock/doctype/item/item.js:1165
+#: erpnext/stock/doctype/item/item.js:1152
 msgid "This is for raw material Items that'll be used to create finished goods. If the Item is an additional service like 'washing' that'll be used in the BOM, keep this unchecked."
 msgstr "适用于用于生产成品的原材料。若物料是BOM中的附加服务（如'清洗'），请勿勾选"
 
@@ -55320,7 +55317,7 @@ msgstr ""
 msgid "This will restrict user access to other employee records"
 msgstr "这将限制用户访问其他员工记录"
 
-#: erpnext/controllers/selling_controller.py:886
+#: erpnext/controllers/selling_controller.py:887
 msgid "This {} will be treated as material transfer."
 msgstr "此{}将被视为物料转移"
 
@@ -55431,7 +55428,7 @@ msgstr "分钟"
 msgid "Time in mins."
 msgstr "分钟"
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:872
+#: erpnext/manufacturing/doctype/job_card/job_card.py:873
 msgid "Time logs are required for {0} {1}"
 msgstr "请为 {0} {1} 填写工时记录"
 
@@ -55540,7 +55537,7 @@ msgstr "待开票"
 msgid "To Currency"
 msgstr "目标货币"
 
-#: erpnext/controllers/accounts_controller.py:626
+#: erpnext/controllers/accounts_controller.py:627
 #: erpnext/setup/doctype/holiday_list/holiday_list.py:121
 msgid "To Date cannot be before From Date"
 msgstr "到日期不能早于日期"
@@ -55814,7 +55811,7 @@ msgid "To include sub-assembly costs and secondary items in Finished Goods on a
 msgstr ""
 
 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:2249
-#: erpnext/controllers/accounts_controller.py:3255
+#: erpnext/controllers/accounts_controller.py:3249
 msgid "To include tax in row {0} in Item rate, taxes in rows {1} must also be included"
 msgstr "第{0}行的物料单价要含税，第{1}行的税也必须包括在内"
 
@@ -55826,7 +55823,7 @@ msgstr "若要合并，两个物料的以下属性必须相同"
 msgid "To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled."
 msgstr "若要在特定交易中不应用定价规则，应禁用所有适用的定价规则。"
 
-#: erpnext/accounts/doctype/account/account.py:554
+#: erpnext/accounts/doctype/account/account.py:555
 msgid "To overrule this, enable '{0}' in company {1}"
 msgstr "要否决此问题，请在公司{1}中启用“ {0}”"
 
@@ -56108,12 +56105,12 @@ msgstr "总佣金"
 
 #. Label of the total_completed_qty (Float) field in DocType 'Job Card'
 #: erpnext/manufacturing/doctype/job_card/job_card.json
-#: erpnext/manufacturing/doctype/job_card/job_card.py:889
+#: erpnext/manufacturing/doctype/job_card/job_card.py:892
 #: erpnext/manufacturing/report/job_card_summary/job_card_summary.py:174
 msgid "Total Completed Qty"
 msgstr "总完工数量"
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:191
+#: erpnext/manufacturing/doctype/job_card/job_card.py:192
 msgid "Total Completed Qty is required for Job Card {0}, please start and complete the job card before submission"
 msgstr ""
 
@@ -56415,7 +56412,7 @@ msgstr "总未付金额"
 msgid "Total Paid Amount"
 msgstr "总付款金额"
 
-#: erpnext/controllers/accounts_controller.py:2801
+#: erpnext/controllers/accounts_controller.py:2802
 msgid "Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total"
 msgstr "付款计划汇总金额与总计(圆整后)金额不符"
 
@@ -56427,7 +56424,7 @@ msgstr "付款申请总金额不得超过{0}金额"
 msgid "Total Payments"
 msgstr "总付款"
 
-#: erpnext/selling/doctype/sales_order/sales_order.py:724
+#: erpnext/selling/doctype/sales_order/sales_order.py:727
 msgid "Total Picked Quantity {0} is more than ordered qty {1}. You can set the Over Picking Allowance in Stock Settings."
 msgstr "已拣货数量{0}超过订单数量{1}。可在库存设置中设置超拣许可量"
 
@@ -56710,7 +56707,7 @@ msgstr "工作站总时间（小时）"
 msgid "Total allocated percentage for sales team should be 100"
 msgstr "销售团队总分配比例应为100"
 
-#: erpnext/selling/doctype/customer/customer.py:194
+#: erpnext/selling/doctype/customer/customer.py:184
 msgid "Total contribution percentage should be equal to 100"
 msgstr "总贡献百分比应等于100"
 
@@ -56885,7 +56882,7 @@ msgstr "交易日期"
 msgid "Transaction Dates"
 msgstr ""
 
-#: erpnext/setup/doctype/company/company.py:1093
+#: erpnext/setup/doctype/company/company.py:1097
 msgid "Transaction Deletion Document {0} has been triggered for company {1}"
 msgstr ""
 
@@ -56909,11 +56906,11 @@ msgstr "业务交易删除记录明细"
 msgid "Transaction Deletion Record To Delete"
 msgstr ""
 
-#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1102
+#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1103
 msgid "Transaction Deletion Record {0} is already running. {1}"
 msgstr ""
 
-#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1121
+#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1122
 msgid "Transaction Deletion Record {0} is currently deleting {1}. Cannot save documents until deletion completes."
 msgstr ""
 
@@ -57018,7 +57015,8 @@ msgstr ""
 msgid "Transaction from which tax is withheld"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:865
+#: erpnext/manufacturing/doctype/job_card/job_card.py:866
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/base.py:38
 msgid "Transaction not allowed against stopped Work Order {0}"
 msgstr "生产工单 {0} 已停止，不允许操作"
 
@@ -57250,8 +57248,8 @@ msgstr "物流信息"
 msgid "Transporter Name"
 msgstr "物流公司名"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:128
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:214
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:132
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:219
 msgid "Travel Expenses"
 msgstr "差旅费"
 
@@ -57530,7 +57528,7 @@ msgstr "阿联酋增值税设置"
 #: erpnext/stock/report/item_prices/item_prices.py:55
 #: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:60
 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:93
-#: erpnext/stock/report/stock_ageing/stock_ageing.py:186
+#: erpnext/stock/report/stock_ageing/stock_ageing.py:174
 #: erpnext/stock/report/stock_analytics/stock_analytics.py:59
 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:136
 #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json
@@ -57591,7 +57589,7 @@ msgstr ""
 msgid "UOM Conversion Factor"
 msgstr "单位换算系数"
 
-#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1467
+#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1469
 msgid "UOM Conversion factor ({0} -> {1}) not found for item: {2}"
 msgstr "物料{2}的计量单位换算系数（{0}→{1}）未找到"
 
@@ -57604,7 +57602,7 @@ msgstr "请为第{0}行输入单位换算系数"
 msgid "UOM Name"
 msgstr "单位名称"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:3992
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:1711
 msgid "UOM conversion factor required for UOM: {0} in Item: {1}"
 msgstr "物料{1}的计量单位{0}需要换算系数"
 
@@ -57676,7 +57674,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:1063
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1064
 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 "未来{0}天内未找到工序{1}的可用时段，请在{2}中增加'产能计划周期（天）'"
 
@@ -57763,7 +57761,7 @@ msgstr ""
 msgid "Undo {}?"
 msgstr ""
 
-#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:937
+#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:938
 msgid "Unexpected Naming Series Pattern"
 msgstr ""
 
@@ -57782,7 +57780,7 @@ msgstr "单位"
 msgid "Unit Of Measure"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:3925
+#: erpnext/controllers/accounts_controller.py:3931
 msgid "Unit Price"
 msgstr ""
 
@@ -57944,7 +57942,7 @@ msgstr "未核销单据"
 msgid "Unreconciled Transactions"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:952
+#: erpnext/manufacturing/doctype/work_order/work_order.js:934
 #: erpnext/selling/doctype/sales_order/sales_order.js:122
 #: erpnext/stock/doctype/pick_list/pick_list.js:161
 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:192
@@ -57984,8 +57982,8 @@ msgstr "未解决"
 msgid "Unscheduled"
 msgstr "计划外"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:178
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:305
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:182
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:310
 msgid "Unsecured Loans"
 msgstr "无担保借款"
 
@@ -58165,7 +58163,7 @@ msgstr "订单变更"
 #. Invoice'
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/controllers/accounts_controller.py:198
+#: erpnext/controllers/accounts_controller.py:199
 msgid "Update Outstanding for Self"
 msgstr "更新本单未付金额"
 
@@ -58248,7 +58246,7 @@ msgstr "正在更新本项目的成本核算与计费字段..."
 msgid "Updating Variants..."
 msgstr "更新多规格物料......"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:1205
+#: erpnext/manufacturing/doctype/work_order/work_order.js:1187
 msgid "Updating Work Order status"
 msgstr "正在更新工单状态"
 
@@ -58450,7 +58448,7 @@ msgstr ""
 msgid "Use Transaction Date Exchange Rate"
 msgstr "使用交易日汇率"
 
-#: erpnext/projects/doctype/project/project.py:567
+#: erpnext/projects/doctype/project/project.py:605
 msgid "Use a name that is different from previous project name"
 msgstr "使用与之前项目名称不同的名称"
 
@@ -58492,7 +58490,7 @@ msgstr ""
 msgid "Used with Financial Report Template"
 msgstr ""
 
-#: erpnext/setup/install.py:204
+#: erpnext/setup/install.py:236
 msgid "User Forum"
 msgstr "用户论坛"
 
@@ -58578,8 +58576,8 @@ msgstr ""
 msgid "Using negative stock disables FIFO/Moving average valuation when inventory is negative."
 msgstr "启用负库存时，若库存为负将禁用先进先出/移动平均计价法"
 
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:129
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:215
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:133
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:220
 msgid "Utility Expenses"
 msgstr "基础设施费用"
 
@@ -58589,7 +58587,7 @@ msgstr "基础设施费用"
 msgid "VAT Accounts"
 msgstr "增值税科目"
 
-#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:28
+#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:40
 msgid "VAT Amount (AED)"
 msgstr "增值税金额（迪拉姆）"
 
@@ -58599,12 +58597,12 @@ msgid "VAT Audit Report"
 msgstr "增值税审计报告"
 
 #: erpnext/regional/report/uae_vat_201/uae_vat_201.html:47
-#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:111
+#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:123
 msgid "VAT on Expenses and All Other Inputs"
 msgstr "费用及所有其他投入的增值税"
 
 #: erpnext/regional/report/uae_vat_201/uae_vat_201.html:15
-#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:45
+#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:57
 msgid "VAT on Sales and All Other Outputs"
 msgstr "销售及所有其他产出的增值税"
 
@@ -58829,11 +58827,11 @@ msgstr "成本价"
 msgid "Valuation Rate (In / Out)"
 msgstr "成本价(入 / 出)"
 
-#: erpnext/stock/stock_ledger.py:2075
+#: erpnext/stock/stock_ledger.py:2041
 msgid "Valuation Rate Missing"
 msgstr "无成本价"
 
-#: erpnext/stock/stock_ledger.py:2053
+#: erpnext/stock/stock_ledger.py:2019
 msgid "Valuation Rate for the Item {0}, is required to do accounting entries for {1} {2}."
 msgstr "要为{1} {2}生成会计凭证，物料{0}须有成本价"
 
@@ -58865,7 +58863,7 @@ msgid "Valuation rate for the item as per Sales Invoice (Only for Internal Trans
 msgstr "按销售发票的物料计价单价（仅限内部调拨）"
 
 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:2273
-#: erpnext/controllers/accounts_controller.py:3279
+#: erpnext/controllers/accounts_controller.py:3273
 msgid "Valuation type charges can not be marked as Inclusive"
 msgstr "计价类型费用不可标记为含税"
 
@@ -58877,7 +58875,7 @@ msgstr "估值类型罪名不能标记为包容性"
 msgid "Value (G - D)"
 msgstr "价值（G-D）"
 
-#: erpnext/stock/report/stock_ageing/stock_ageing.py:229
+#: erpnext/stock/report/stock_ageing/stock_ageing.py:217
 msgid "Value ({0})"
 msgstr "值（{0}）"
 
@@ -59049,7 +59047,7 @@ msgstr "变体物料"
 msgid "Variant Of"
 msgstr "模板物料"
 
-#: erpnext/stock/doctype/item/item.js:857
+#: erpnext/stock/doctype/item/item.js:844
 msgid "Variant creation has been queued."
 msgstr "创建多规格物料任务已添加到后台资料更新队列中。"
 
@@ -59415,7 +59413,7 @@ 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:1253
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1176
 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:56
 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:221
 #: erpnext/accounts/report/general_ledger/general_ledger.js:49
@@ -59489,7 +59487,7 @@ msgstr "源凭证业务类型"
 #: erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger.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:1251
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1174
 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:212
 #: erpnext/accounts/report/general_ledger/general_ledger.py:760
 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31
@@ -59697,7 +59695,7 @@ msgid "Warehouse not found against the account {0}"
 msgstr "账户{0}未关联仓库"
 
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1215
-#: erpnext/stock/doctype/delivery_note/delivery_note.py:444
+#: erpnext/stock/doctype/delivery_note/delivery_note.py:445
 msgid "Warehouse required for stock Item {0}"
 msgstr "物料{0}需要指定仓库"
 
@@ -59722,7 +59720,7 @@ msgstr "仓库{0}不属于公司{1}"
 msgid "Warehouse {0} does not exist"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:246
+#: erpnext/manufacturing/doctype/work_order/work_order.py:247
 msgid "Warehouse {0} is not allowed for Sales Order {1}, it should be {2}"
 msgstr "销售订单{1}不允许使用仓库{0}，应使用{2}"
 
@@ -59859,7 +59857,7 @@ msgstr "警告：库存凭证{2}中已存在另一个{0}＃{1}"
 msgid "Warning: Material Requested Qty is less than Minimum Order Qty"
 msgstr "警告：物料需求数量低于最小起订量"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1482
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1483
 msgid "Warning: Quantity exceeds maximum producible quantity based on quantity of raw materials received through the Subcontracting Inward Order {0}."
 msgstr "警告：数量超过基于外包收货订单{0}接收的原材料数量的最大可生产数量。"
 
@@ -59953,7 +59951,7 @@ msgstr "波长(千米)"
 msgid "Wavelength In Megametres"
 msgstr "波长(兆米)"
 
-#: erpnext/controllers/accounts_controller.py:193
+#: erpnext/controllers/accounts_controller.py:194
 msgid "We can see {0} is made against {1}. If you want {1}'s outstanding to be updated, uncheck the '{2}' checkbox."
 msgstr ""
 
@@ -60152,7 +60150,7 @@ msgstr ""
 msgid "When checked, the system will use the posting datetime of the document for naming the document instead of the creation datetime of the document."
 msgstr ""
 
-#: erpnext/stock/doctype/item/item.js:1184
+#: erpnext/stock/doctype/item/item.js:1171
 msgid "When creating an Item, entering a value for this field will automatically create an Item Price at the backend."
 msgstr "创建物料时填写此字段值，将自动在后台创建物料价格"
 
@@ -60162,7 +60160,7 @@ msgstr "创建物料时填写此字段值，将自动在后台创建物料价格
 msgid "When enabled, it adds a cutoff date filter to Delivery Notes created in bulk from Sales Orders. This allows you to process orders only with a transaction date up to the specified cutoff date, which is useful for period-end processing and batch fulfillment."
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:297
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:703
 msgid "When there are multiple finished goods ({0}) in a Repack stock entry, the basic rate for all finished goods must be set manually. To set rate manually, enable the checkbox 'Set Basic Rate Manually' in the respective finished good row."
 msgstr ""
 
@@ -60172,11 +60170,11 @@ msgstr ""
 msgid "When you pay for something upfront (like annual insurance), the cost is held here and recognized gradually over time"
 msgstr ""
 
-#: erpnext/accounts/doctype/account/account.py:380
+#: erpnext/accounts/doctype/account/account.py:381
 msgid "While creating account for Child Company {0}, parent account {1} found as a ledger account."
 msgstr "在为子公司{0}创建科目时，发现父科目{1}是一个未勾选是组的记账科目。"
 
-#: erpnext/accounts/doctype/account/account.py:370
+#: erpnext/accounts/doctype/account/account.py:371
 msgid "While creating account for Child Company {0}, parent account {1} not found. Please create the parent account in corresponding COA"
 msgstr "为子公司{0}创建账户时未找到上级账户{1}，请在对应科目表中创建"
 
@@ -60321,7 +60319,7 @@ msgstr "已完成工作"
 #: erpnext/assets/doctype/asset/asset_list.js:12
 #: erpnext/manufacturing/doctype/job_card/job_card.json
 #: erpnext/manufacturing/doctype/job_card_operation/job_card_operation.json
-#: erpnext/setup/doctype/company/company.py:384
+#: erpnext/setup/doctype/company/company.py:388
 #: erpnext/support/doctype/warranty_claim/warranty_claim.json
 msgid "Work In Progress"
 msgstr "进行中"
@@ -60358,7 +60356,7 @@ msgstr "进行中"
 #: erpnext/selling/doctype/sales_order/sales_order.js:1094
 #: erpnext/stock/doctype/material_request/material_request.js:216
 #: erpnext/stock/doctype/material_request/material_request.json
-#: erpnext/stock/doctype/material_request/material_request.py:879
+#: erpnext/stock/doctype/material_request/material_request.py:878
 #: erpnext/stock/doctype/pick_list/pick_list.json
 #: erpnext/stock/doctype/serial_no/serial_no.json
 #: erpnext/stock/doctype/stock_entry/stock_entry.json
@@ -60392,7 +60390,7 @@ msgstr "工单已耗用物料"
 msgid "Work Order Item"
 msgstr "工单明细"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:910
+#: erpnext/stock/doctype/stock_entry/stock_entry.py:527
 msgid "Work Order Mismatch"
 msgstr ""
 
@@ -60433,19 +60431,23 @@ msgstr "工单进度追踪表"
 msgid "Work Order Summary Report"
 msgstr ""
 
-#: erpnext/stock/doctype/material_request/material_request.py:885
+#: erpnext/stock/doctype/material_request/material_request.py:884
 msgid "Work Order cannot be created for following reason: <br> {0}"
 msgstr "无法创建生产工单，原因：<br>{0}"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:1426
+#: erpnext/manufacturing/doctype/work_order/work_order.py:1427
 msgid "Work Order cannot be raised against a Item Template"
 msgstr "不能为模板物料创建新生产工单"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:2510
-#: erpnext/manufacturing/doctype/work_order/work_order.py:2590
+#: erpnext/manufacturing/doctype/work_order/work_order.py:2508
+#: erpnext/manufacturing/doctype/work_order/work_order.py:2588
 msgid "Work Order has been {0}"
 msgstr "生产工单已{0}"
 
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:285
+msgid "Work Order is mandatory"
+msgstr ""
+
 #: erpnext/selling/doctype/sales_order/sales_order.js:1297
 msgid "Work Order not created"
 msgstr "生产工单未创建"
@@ -60454,16 +60456,16 @@ msgstr "生产工单未创建"
 msgid "Work Order {0} created"
 msgstr "工作订单{0}已创建"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:2368
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/disassemble.py:100
 msgid "Work Order {0} has no produced qty"
 msgstr ""
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:947
-msgid "Work Order {0}: Job Card not found for the operation {1}"
-msgstr "工单 {0}: Job Card not found 未找到针对工序 {1} 的生产任务单"
+#: erpnext/stock/doctype/stock_entry/stock_entry_handler/base.py:35
+msgid "Work Order {0} must be submitted"
+msgstr ""
 
 #: erpnext/manufacturing/report/job_card_summary/job_card_summary.js:56
-#: erpnext/stock/doctype/material_request/material_request.py:873
+#: erpnext/stock/doctype/material_request/material_request.py:872
 msgid "Work Orders"
 msgstr "工单"
 
@@ -60488,7 +60490,7 @@ msgstr "进行中"
 msgid "Work-in-Progress Warehouse"
 msgstr "车间仓"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:791
+#: erpnext/manufacturing/doctype/work_order/work_order.py:792
 msgid "Work-in-Progress Warehouse is required before Submit"
 msgstr "请指定车间仓后再提交"
 
@@ -60536,7 +60538,7 @@ msgstr "工作时间"
 #: erpnext/manufacturing/doctype/bom_operation/bom_operation.json
 #: erpnext/manufacturing/doctype/bom_website_operation/bom_website_operation.json
 #: erpnext/manufacturing/doctype/job_card/job_card.json
-#: erpnext/manufacturing/doctype/work_order/work_order.js:344
+#: erpnext/manufacturing/doctype/work_order/work_order.js:325
 #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json
 #: erpnext/manufacturing/doctype/workstation/workstation.json
 #: erpnext/manufacturing/report/bom_operations_time/bom_operations_time.js:35
@@ -60627,14 +60629,14 @@ msgstr "工作站列表"
 #. Label of the write_off (Section Break) field in DocType 'Purchase Invoice'
 #. Label of the write_off_section (Section Break) field in DocType 'Sales
 #. Invoice'
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:130
-#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:216
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:134
+#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:221
 #: erpnext/accounts/doctype/journal_entry/journal_entry.json
 #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json
 #: erpnext/accounts/doctype/pos_profile/pos_profile.json
 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json
-#: erpnext/setup/doctype/company/company.py:666
+#: erpnext/setup/doctype/company/company.py:671
 msgid "Write Off"
 msgstr "内部销账"
 
@@ -60739,7 +60741,7 @@ msgstr "账面净值"
 msgid "Wrong Company"
 msgstr "错误公司"
 
-#: erpnext/setup/doctype/company/company.js:233
+#: erpnext/setup/doctype/company/company.js:249
 msgid "Wrong Password"
 msgstr "密码错误"
 
@@ -60795,7 +60797,7 @@ msgstr "新财年开始或结束日期与{0}重叠。请在公司主数据中设
 msgid "You are importing data for the code list:"
 msgstr "您正在导入代码列表的数据："
 
-#: erpnext/controllers/accounts_controller.py:4029
+#: erpnext/controllers/accounts_controller.py:4035
 msgid "You are not allowed to update as per the conditions set in {} Workflow."
 msgstr "根据{}工作流设置的条件，您无权更新"
 
@@ -60807,7 +60809,7 @@ msgstr "你未被授权在会计设置->会计关账 中设置的冻结记账截
 msgid "You are not authorized to make/edit Stock Transactions for Item {0} under warehouse {1} before this time."
 msgstr "您此时无权在仓库{1}下为物料{0}创建/编辑库存交易"
 
-#: erpnext/accounts/doctype/account/account.py:312
+#: erpnext/accounts/doctype/account/account.py:313
 msgid "You are not authorized to set Frozen value"
 msgstr "您没有权限设定冻结值"
 
@@ -60876,11 +60878,11 @@ msgstr "可设置为机器名称或工序类型，例如：缝纫机12号"
 msgid "You can set up the rule to split the transaction across multiple accounts."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:214
+#: erpnext/controllers/accounts_controller.py:215
 msgid "You can use {0} to reconcile against {1} later."
 msgstr ""
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1332
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1340
 msgid "You can't make any changes to Job Card since Work Order is closed."
 msgstr "因生产工单已关闭，生产任务单不能再变更"
 
@@ -60965,7 +60967,7 @@ msgstr ""
 msgid "You do not have permission to import bank transactions"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4005
+#: erpnext/controllers/accounts_controller.py:4011
 msgid "You do not have permissions to {} items in a {}."
 msgstr "您无权{} {}。"
 
@@ -60977,19 +60979,19 @@ msgstr "您的忠诚度积分不足"
 msgid "You don't have enough points to redeem."
 msgstr "您的积分不足以兑换"
 
-#: erpnext/controllers/accounts_controller.py:4466
+#: erpnext/controllers/accounts_controller.py:4454
 msgid "You don't have permission to create a Company Address. Please contact your System Manager."
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4446
+#: erpnext/controllers/accounts_controller.py:4434
 msgid "You don't have permission to update Company details. Please contact your System Manager."
 msgstr ""
 
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:576
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:575
 msgid "You don't have permission to update Received Qty DocField for item {0}"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:4440
+#: erpnext/controllers/accounts_controller.py:4428
 msgid "You don't have permission to update this document. Please contact your System Manager."
 msgstr ""
 
@@ -61001,7 +61003,7 @@ msgstr "创建期初发票时出现{}个错误，请检查{}获取详情"
 msgid "You have already selected items from {0} {1}"
 msgstr "您已经从{0} {1}选择了物料"
 
-#: erpnext/projects/doctype/project/project.py:362
+#: erpnext/projects/doctype/project/project.py:400
 msgid "You have been invited to collaborate on the project {0}."
 msgstr "您已被邀请参与项目{0}的协作"
 
@@ -61041,7 +61043,7 @@ msgstr "添加物料前需先选择客户"
 msgid "You need to cancel POS Closing Entry {} to be able to cancel this document."
 msgstr "需先取消POS结算单{}才能取消此单据"
 
-#: erpnext/controllers/accounts_controller.py:3230
+#: erpnext/controllers/accounts_controller.py:3224
 msgid "You selected the account group {1} as {2} Account in row {0}. Please select a single account."
 msgstr "第{0}行选择账户组{1}作为{2}科目，请选择单个科目"
 
@@ -61088,11 +61090,11 @@ msgstr "邮编"
 msgid "Zero Balance"
 msgstr "余额为0"
 
-#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:65
+#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:77
 msgid "Zero Rated"
 msgstr "零税率"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:621
+#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:195
 msgid "Zero quantity"
 msgstr "零数量"
 
@@ -61118,7 +61120,7 @@ msgstr "[重要][ERPNext]自动补货错误"
 msgid "`Allow Negative rates for Items`"
 msgstr "`允许物料负单价`"
 
-#: erpnext/stock/stock_ledger.py:2067
+#: erpnext/stock/stock_ledger.py:2033
 msgid "after"
 msgstr "之后"
 
@@ -61308,7 +61310,7 @@ msgstr "未安装支付应用，请从{}或{}安装"
 msgid "per hour"
 msgstr "每小时"
 
-#: erpnext/stock/stock_ledger.py:2068
+#: erpnext/stock/stock_ledger.py:2034
 msgid "performing either one below:"
 msgstr "再提交或取消此单据"
 
@@ -61403,7 +61405,7 @@ msgstr "标题"
 msgid "to"
 msgstr "至"
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3176
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3257
 msgid "to unallocate the amount of this Return Invoice before cancelling it."
 msgstr "在取消前需先解除此退货发票的金额分配"
 
@@ -61430,7 +61432,7 @@ msgstr ""
 msgid "unique e.g. SAVE20  To be used to get discount"
 msgstr "唯一值，例如SAVE20，用于获取折扣"
 
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:606
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:605
 msgid "updated delivered quantity for item {0} to {1}"
 msgstr ""
 
@@ -61452,7 +61454,7 @@ msgstr "通过物料清单更新工具"
 msgid "you must select Capital Work in Progress Account in accounts table"
 msgstr "请在明细表设置在建工程科目"
 
-#: erpnext/controllers/accounts_controller.py:1286
+#: erpnext/controllers/accounts_controller.py:1287
 msgid "{0} '{1}' is disabled"
 msgstr "{0}“{1}”已禁用"
 
@@ -61460,7 +61462,7 @@ msgstr "{0}“{1}”已禁用"
 msgid "{0} '{1}' not in Fiscal Year {2}"
 msgstr "{0}“ {1}”不属于{2}财年"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.py:677
+#: erpnext/manufacturing/doctype/work_order/work_order.py:678
 msgid "{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3}"
 msgstr "{0}（{1}）不能大于生产工单{3}中的计划数量（{2}）"
 
@@ -61468,7 +61470,7 @@ msgstr "{0}（{1}）不能大于生产工单{3}中的计划数量（{2}）"
 msgid "{0} <b>{1}</b> has submitted Assets. Remove Item <b>{2}</b> from table to continue."
 msgstr "{0}<b>{1}</b>已提交资产，请从表中移除物料<b>{2}</b>以继续"
 
-#: erpnext/controllers/accounts_controller.py:2383
+#: erpnext/controllers/accounts_controller.py:2384
 msgid "{0} Account not found against Customer {1}."
 msgstr "客户{1}未找到{0}科目"
 
@@ -61501,11 +61503,11 @@ msgstr ""
 msgid "{0} Number {1} is already used in {2} {3}"
 msgstr "{0} 代码 {1} 已被 {2} {3} 占用"
 
-#: erpnext/manufacturing/doctype/bom/bom.py:1689
+#: erpnext/manufacturing/doctype/bom/bom.py:1703
 msgid "{0} Operating Cost for operation {1}"
 msgstr "工序{1}的{0}运营成本"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:578
+#: erpnext/manufacturing/doctype/work_order/work_order.js:560
 msgid "{0} Operations: {1}"
 msgstr "{0} 工序：{1}"
 
@@ -61601,7 +61603,7 @@ msgstr "{0}已创建"
 msgid "{0} creation for the following records will be skipped."
 msgstr ""
 
-#: erpnext/setup/doctype/company/company.py:291
+#: erpnext/setup/doctype/company/company.py:295
 msgid "{0} currency must be same as company's default currency. Please select another account."
 msgstr "{0}货币必须与公司默认货币一致，请选择其他账户"
 
@@ -61617,7 +61619,7 @@ msgstr "{0}当前供应商评分等级为{1}，请谨慎向该供应商询价。
 msgid "{0} does not belong to Company {1}"
 msgstr "{0}不属于公司{1}"
 
-#: erpnext/controllers/accounts_controller.py:353
+#: erpnext/controllers/accounts_controller.py:354
 msgid "{0} does not belong to the Company {1}."
 msgstr ""
 
@@ -61651,7 +61653,7 @@ msgstr "已成功提交{0}"
 msgid "{0} hours"
 msgstr "{0}小时"
 
-#: erpnext/controllers/accounts_controller.py:2741
+#: erpnext/controllers/accounts_controller.py:2742
 msgid "{0} in row {1}"
 msgstr "{1}行中的{0}"
 
@@ -61673,7 +61675,7 @@ msgstr "{0}在以下行被多次添加：{1}"
 msgid "{0} is already running for {1}"
 msgstr "{0}已在{1}运行"
 
-#: erpnext/controllers/accounts_controller.py:175
+#: erpnext/controllers/accounts_controller.py:176
 msgid "{0} is blocked so this transaction cannot proceed"
 msgstr "{0}被临时冻结，所以此交易无法继续"
 
@@ -61694,7 +61696,7 @@ msgstr "对于科目 {1} {0} 必填"
 msgid "{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}"
 msgstr "{0}是强制性的。可能没有为{1}到{2}创建货币兑换记录"
 
-#: erpnext/controllers/accounts_controller.py:3187
+#: erpnext/controllers/accounts_controller.py:3181
 msgid "{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}."
 msgstr "{0}是必填项。{1}和{2}的货币转换记录可能还未生成。"
 
@@ -61702,7 +61704,7 @@ msgstr "{0}是必填项。{1}和{2}的货币转换记录可能还未生成。"
 msgid "{0} is not a CSV file."
 msgstr ""
 
-#: erpnext/selling/doctype/customer/customer.py:236
+#: erpnext/selling/doctype/customer/customer.py:226
 msgid "{0} is not a company bank account"
 msgstr "{0}不是公司银行账户"
 
@@ -61710,7 +61712,7 @@ msgstr "{0}不是公司银行账户"
 msgid "{0} is not a group node. Please select a group node as parent cost center"
 msgstr "{0}不是组节点，请选择组节点作为上级成本中心"
 
-#: erpnext/stock/doctype/stock_entry/stock_entry.py:673
+#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:114
 msgid "{0} is not a stock Item"
 msgstr "{0}不是库存物料"
 
@@ -61750,27 +61752,27 @@ msgstr "{0}被临时冻结至{1}"
 msgid "{0} is open. Close the POS or cancel the existing POS Opening Entry to create a new POS Opening Entry."
 msgstr "{0}处于开启状态。请关闭POS或取消现有POS期初凭证以创建新的POS期初凭证。"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:543
+#: erpnext/manufacturing/doctype/work_order/work_order.js:525
 msgid "{0} items disassembled"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:507
+#: erpnext/manufacturing/doctype/work_order/work_order.js:489
 msgid "{0} items in progress"
 msgstr "{0}物料生产中"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:531
+#: erpnext/manufacturing/doctype/work_order/work_order.js:513
 msgid "{0} items lost during process."
 msgstr "流程中丢失{0}件物料。"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:488
+#: erpnext/manufacturing/doctype/work_order/work_order.js:470
 msgid "{0} items produced"
 msgstr "{0}物料已完工"
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:511
+#: erpnext/manufacturing/doctype/work_order/work_order.js:493
 msgid "{0} items returned"
 msgstr ""
 
-#: erpnext/manufacturing/doctype/work_order/work_order.js:514
+#: erpnext/manufacturing/doctype/work_order/work_order.js:496
 msgid "{0} items to return"
 msgstr ""
 
@@ -61778,7 +61780,7 @@ msgstr ""
 msgid "{0} must be negative in return document"
 msgstr "{0}在退货凭证中必须为负"
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2366
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2447
 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 "不允许{0}与{1}进行交易。请更改公司或在客户记录的'允许交易对象'章节添加该公司"
 
@@ -61794,7 +61796,7 @@ msgstr "{0}参数无效"
 msgid "{0} payment entries can not be filtered by {1}"
 msgstr "{0}收付款凭证不能由{1}过滤"
 
-#: erpnext/controllers/stock_controller.py:1740
+#: erpnext/controllers/stock_controller.py:1741
 msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}."
 msgstr "已收到物料 {1} 数量 {0} 到仓库 {2}，占用库容 {3}"
 
@@ -61823,16 +61825,16 @@ msgstr ""
 msgid "{0} units of {1} are required in {2} with the inventory dimension: {3} on {4} {5} for {6} to complete the transaction."
 msgstr ""
 
-#: erpnext/stock/stock_ledger.py:1720 erpnext/stock/stock_ledger.py:2216
-#: erpnext/stock/stock_ledger.py:2230
+#: erpnext/stock/stock_ledger.py:1686 erpnext/stock/stock_ledger.py:2182
+#: erpnext/stock/stock_ledger.py:2196
 msgid "{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction."
 msgstr "本单据 {5} 记账时间点 {3} {4} 发料仓 {2} 物料 {1} 库存不足 {0}。"
 
-#: erpnext/stock/stock_ledger.py:2317 erpnext/stock/stock_ledger.py:2362
+#: erpnext/stock/stock_ledger.py:2283 erpnext/stock/stock_ledger.py:2328
 msgid "{0} units of {1} needed in {2} on {3} {4} to complete this transaction."
 msgstr "需在{2}的{3}{4}准备{1}的{0}单位以完成本交易"
 
-#: erpnext/stock/stock_ledger.py:1714
+#: erpnext/stock/stock_ledger.py:1680
 msgid "{0} units of {1} needed in {2} to complete this transaction."
 msgstr "为完成此交易，在{2}中的物料{1}数量还缺{0}。"
 
@@ -61844,7 +61846,7 @@ msgstr "{0}至{1}"
 msgid "{0} valid serial nos for Item {1}"
 msgstr "物料{1}有{0}个有效序列号"
 
-#: erpnext/stock/doctype/item/item.js:862
+#: erpnext/stock/doctype/item/item.js:849
 msgid "{0} variants created."
 msgstr "新建了{0}个多规格物料。"
 
@@ -61860,7 +61862,7 @@ msgstr "{0}将作为折扣发放"
 msgid "{0} will be set as the {1} in subsequently scanned items"
 msgstr "{0}将被设置为后续扫描物料中的{1}"
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1005
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1011
 msgid "{0} {1}"
 msgstr "{0}{1}"
 
@@ -61898,8 +61900,8 @@ msgstr "{0} {1} 已完全付款"
 msgid "{0} {1} has already been partly paid. Please use the 'Get Outstanding Invoice' or the 'Get Outstanding Orders' button to get the latest outstanding amounts."
 msgstr "{0} {1} 已被部分付款，请点击 选未付发票 或 选未关闭订单 按钮获取最新未付单据"
 
-#: erpnext/buying/doctype/purchase_order/purchase_order.py:414
-#: erpnext/selling/doctype/sales_order/sales_order.py:602
+#: erpnext/buying/doctype/purchase_order/purchase_order.py:413
+#: erpnext/selling/doctype/sales_order/sales_order.py:605
 #: erpnext/stock/doctype/material_request/material_request.py:257
 msgid "{0} {1} has been modified. Please refresh."
 msgstr "{0} {1}已被修改过，请刷新。"
@@ -62009,7 +62011,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:953
+#: erpnext/controllers/stock_controller.py:954
 msgid "{0} {1}: Cost Center is mandatory for Item {2}"
 msgstr "{0} {1}：请为物料 {2} 填写成本中心"
 
@@ -62058,8 +62060,8 @@ msgstr "将按发票总额的{0}%作为折扣发放"
 msgid "{0}'s {1} cannot be after {2}'s Expected End Date."
 msgstr "{0}的{1}不得晚于{2}的预计结束日期"
 
-#: erpnext/manufacturing/doctype/job_card/job_card.py:1304
 #: erpnext/manufacturing/doctype/job_card/job_card.py:1312
+#: erpnext/manufacturing/doctype/job_card/job_card.py:1320
 msgid "{0}, complete the operation {1} before the operation {2}."
 msgstr "{0}，在工序 {2} 前请先完成工序 {1}"
 
@@ -62079,11 +62081,11 @@ msgstr ""
 msgid "{0}: Virtual DocType (no database table)"
 msgstr ""
 
-#: erpnext/controllers/accounts_controller.py:543
+#: erpnext/controllers/accounts_controller.py:544
 msgid "{0}: {1} does not belong to the Company: {2}"
 msgstr "{0}: {1}不属于公司{2}"
 
-#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1410
+#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1333
 msgid "{0}: {1} does not exist"
 msgstr ""
 
@@ -62091,7 +62093,7 @@ msgstr ""
 msgid "{0}: {1} does not exists"
 msgstr "{0}：{1}不存在"
 
-#: erpnext/setup/doctype/company/company.py:278
+#: erpnext/setup/doctype/company/company.py:282
 msgid "{0}: {1} is a group account."
 msgstr "{0}：{1}为组科目。"
 
@@ -62107,7 +62109,7 @@ msgstr "已为{item_code}创建{count}项资产"
 msgid "{doctype} {name} is cancelled or closed."
 msgstr "{doctype}{name}已取消或关闭"
 
-#: erpnext/controllers/stock_controller.py:2147
+#: erpnext/controllers/stock_controller.py:2148
 msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})"
 msgstr "{item_name}的样本量({sample_size})不得超过验收数量({accepted_quantity})"
 
@@ -62119,7 +62121,7 @@ msgstr "{ref_doctype}{ref_name}的状态为{status}"
 msgid "{}"
 msgstr "{}"
 
-#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2132
+#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2213
 msgid "{} can't be cancelled since the Loyalty Points earned has been redeemed. First cancel the {} No {}"
 msgstr "无法取消{}，因已兑换获得的积分。请先取消{}编号{}"