[Translation] Updated Translations
diff --git a/erpnext/translations/zh-TW.csv b/erpnext/translations/zh-TW.csv
index bd40d1e..b376c5b 100644
--- a/erpnext/translations/zh-TW.csv
+++ b/erpnext/translations/zh-TW.csv
@@ -57,7 +57,7 @@
 DocType: Employee Tax Exemption Declaration,HRA as per Salary Structure,HRA根據薪資結構
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,頭(或組)針對其會計分錄是由和平衡得以維持。
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Outstanding for {0} cannot be less than zero ({1}),傑出的{0}不能小於零( {1} )
-apps/erpnext/erpnext/public/js/controllers/transaction.js +810,Service Stop Date cannot be before Service Start Date,服務停止日期不能早於服務開始日期
+apps/erpnext/erpnext/public/js/controllers/transaction.js +876,Service Stop Date cannot be before Service Start Date,服務停止日期不能早於服務開始日期
 DocType: Manufacturing Settings,Default 10 mins,預設為10分鐘
 DocType: Leave Type,Leave Type Name,休假類型名稱
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,公開顯示
@@ -115,7 +115,7 @@
 DocType: Salary Component,Abbr,縮寫
 DocType: Timesheet,Total Costing Amount,總成本計算金額
 DocType: Delivery Note,Vehicle No,車輛牌照號碼
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Please select Price List,請選擇價格表
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +177,Please select Price List,請選擇價格表
 DocType: Accounts Settings,Currency Exchange Settings,貨幣兌換設置
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +94,Row #{0}: Payment document is required to complete the trasaction,列#{0}:付款單據才能完成trasaction
 DocType: Work Order Operation,Work In Progress,在製品
@@ -126,7 +126,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,會計人員
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,賣價格表
 DocType: Patient,Tobacco Current Use,煙草當前使用
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","開始日期和結束日期與作業卡<a href=""#Form/Job Card/{0}"">{1}</a>重疊"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,賣出率
 DocType: Cost Center,Stock User,庫存用戶
 DocType: Soil Analysis,(Ca+Mg)/K,(鈣+鎂)/ K
@@ -154,7 +153,7 @@
 apps/erpnext/erpnext/accounts/utils.py +74,{0} {1} not in any active Fiscal Year.,{0} {1} 不在任何有效的會計年度
 DocType: Packed Item,Parent Detail docname,家長可採用DocName細節
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",參考:{0},商品編號:{1}和顧客:{2}
-apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py +360,{0} {1} is not present in the parent company,在母公司中不存在{0} {1}
+apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py +377,{0} {1} is not present in the parent company,在母公司中不存在{0} {1}
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +215,Trial Period End Date Cannot be before Trial Period Start Date,試用期結束日期不能在試用期開始日期之前
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,公斤
 DocType: Tax Withholding Category,Tax Withholding Category,預扣稅類別
@@ -167,7 +166,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +6,Advertising,廣告
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,同一家公司進入不止一次
 apps/erpnext/erpnext/accounts/party.py +42,Not permitted for {0},不允許{0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +617,Get items from,取得項目來源
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +624,Get items from,取得項目來源
 DocType: Price List,Price Not UOM Dependant,價格不依賴於UOM
 DocType: Purchase Invoice,Apply Tax Withholding Amount,申請預扣稅金額
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +539,Stock cannot be updated against Delivery Note {0},送貨單{0}不能更新庫存
@@ -193,19 +192,19 @@
 apps/erpnext/erpnext/config/stock.py +28,Stock Reports,庫存報告
 DocType: Warehouse,Warehouse Detail,倉庫的詳細資訊
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,該期限結束日期不能晚於學年年終日期到這個詞聯繫在一起(學年{})。請更正日期,然後再試一次。
-apps/erpnext/erpnext/stock/doctype/item/item.py +285,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",“是固定的資產”不能選中,作為資產記錄存在對項目
+apps/erpnext/erpnext/stock/doctype/item/item.py +294,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",“是固定的資產”不能選中,作為資產記錄存在對項目
 DocType: Delivery Trip,Departure Time,出發時間
 DocType: Vehicle Service,Brake Oil,剎車油
 DocType: Tax Rule,Tax Type,稅收類型
 ,Completed Work Orders,完成的工作訂單
 DocType: Support Settings,Forum Posts,論壇帖子
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +599,Taxable Amount,應稅金額
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +602,Taxable Amount,應稅金額
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +161,You are not authorized to add or update entries before {0},你無權添加或更新{0}之前的條目
 DocType: Leave Policy,Leave Policy Details,退出政策詳情
 DocType: BOM,Item Image (if not slideshow),產品圖片(如果不是幻燈片)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(工時率/ 60)*實際操作時間
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1136,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,行#{0}:參考文檔類型必須是費用索賠或日記帳分錄之一
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1050,Select BOM,選擇BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1052,Select BOM,選擇BOM
 DocType: SMS Log,SMS Log,短信日誌
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,交付項目成本
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +39,The holiday on {0} is not between From Date and To Date,在{0}這個節日之間沒有從日期和結束日期
@@ -235,15 +234,15 @@
 DocType: Soil Analysis,Ca/K,鈣/ K
 DocType: Salary Slip,Employee Loan,員工貸款
 DocType: Fee Schedule,Send Payment Request Email,發送付款請求電子郵件
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +277,Item {0} does not exist in the system or has expired,項目{0}不存在於系統中或已過期
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Item {0} does not exist in the system or has expired,項目{0}不存在於系統中或已過期
 DocType: Supplier,Leave blank if the Supplier is blocked indefinitely,如果供應商被無限期封鎖,請留空
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,房地產
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,帳戶狀態
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +41,Pharmaceuticals,製藥
 DocType: Purchase Invoice Item,Is Fixed Asset,是固定的資產
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +351,"Available qty is {0}, you need {1}",可用數量是{0},則需要{1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +355,"Available qty is {0}, you need {1}",可用數量是{0},則需要{1}
 DocType: Expense Claim Detail,Claim Amount,索賠金額
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +644,Work Order has been {0},工單已{0}
+apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +646,Work Order has been {0},工單已{0}
 DocType: Budget,Applicable on Purchase Order,適用於採購訂單
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +56,Duplicate customer group found in the cutomer group table,在CUTOMER組表中找到重複的客戶群
 DocType: Location,Location Name,地點名稱
@@ -271,7 +270,7 @@
 					<br>Absent: {1}",你想更新考勤? <br>現任:{0} \ <br>缺席:{1}
 apps/erpnext/erpnext/controllers/buying_controller.py +421,Accepted + Rejected Qty must be equal to Received quantity for Item {0},品項{0}的允收+批退的數量必須等於收到量
 DocType: Item,Supply Raw Materials for Purchase,供應原料採購
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +427,"Cannot ensure delivery by Serial No as \
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +435,"Cannot ensure delivery by Serial No as \
 				Item {0} is added with and without Ensure Delivery by \
 				Serial No.",無法通過序列號確保交貨,因為\項目{0}是否添加了確保交貨\序列號
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +203,At least one mode of payment is required for POS invoice.,付款中的至少一個模式需要POS發票。
@@ -294,7 +293,7 @@
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +36,Show only POS,只顯示POS
 DocType: Supplier Group,Supplier Group Name,供應商集團名稱
 DocType: Driver,Driving License Categories,駕駛執照類別
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +123,Please enter Delivery Date,請輸入交貨日期
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +125,Please enter Delivery Date,請輸入交貨日期
 DocType: Depreciation Schedule,Make Depreciation Entry,計提折舊進入
 DocType: Closed Document,Closed Document,封閉文件
 DocType: HR Settings,Leave Settings,保留設置
@@ -349,7 +348,7 @@
 apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,報價請求可以通過點擊以下鏈接進行訪問
 DocType: SG Creation Tool Course,SG Creation Tool Course,SG創建工具課程
 DocType: Bank Statement Transaction Invoice Item,Payment Description,付款說明
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +353,Insufficient Stock,庫存不足
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Insufficient Stock,庫存不足
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,禁用產能規劃和時間跟踪
 DocType: Email Digest,New Sales Orders,新的銷售訂單
 DocType: Bank Account,Bank Account,銀行帳戶
@@ -362,7 +361,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,電視
 DocType: Work Order Operation,Updated via 'Time Log',經由“時間日誌”更新
 apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,選擇客戶或供應商。
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +445,Advance amount cannot be greater than {0} {1},提前量不能大於{0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +448,Advance amount cannot be greater than {0} {1},提前量不能大於{0} {1}
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +55,"Time slot skiped, the slot {0} to {1} overlap exisiting slot {2} to {3}",時隙滑動,時隙{0}到{1}與現有時隙{2}重疊到{3}
 DocType: Naming Series,Series List for this Transaction,本交易系列表
 DocType: Company,Enable Perpetual Inventory,啟用永久庫存
@@ -382,7 +381,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,對銷售發票項目
 DocType: Agriculture Analysis Criteria,Linked Doctype,鏈接的文檔類型
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Cash from Financing,從融資淨現金
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2387,"LocalStorage is full , did not save",localStorage的滿了,沒救
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2389,"LocalStorage is full , did not save",localStorage的滿了,沒救
 DocType: Lead,Address & Contact,地址及聯絡方式
 DocType: Leave Allocation,Add unused leaves from previous allocations,從以前的分配添加未使用的休假
 DocType: Sales Partner,Partner website,合作夥伴網站
@@ -415,7 +414,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,請設置學生組的學生
 DocType: Item Website Specification,Item Website Specification,項目網站規格
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +543,Leave Blocked,禁假的
-apps/erpnext/erpnext/stock/doctype/item/item.py +805,Item {0} has reached its end of life on {1},項{0}已達到其壽命結束於{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +814,Item {0} has reached its end of life on {1},項{0}已達到其壽命結束於{1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,銀行條目
 DocType: Customer,Is Internal Customer,是內部客戶
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +27,"If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)",如果選中自動選擇,則客戶將自動與相關的忠誠度計劃鏈接(保存時)
@@ -435,13 +434,12 @@
 DocType: Item,Publish in Hub,在發布中心
 DocType: Student Admission,Student Admission,學生入學
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,項{0}將被取消
+apps/erpnext/erpnext/stock/doctype/item/item.py +836,Item {0} is cancelled,項{0}將被取消
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,折舊行{0}:折舊開始日期作為過去的日期輸入
 DocType: Contract Template,Fulfilment Terms and Conditions,履行條款和條件
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,物料需求
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1137,Material Request,物料需求
 DocType: Bank Reconciliation,Update Clearance Date,更新日期間隙
-DocType: Item,Purchase Details,採購詳情
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},項目{0}未發現“原材料提供&#39;表中的採購訂單{1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},項目{0}未發現“原材料提供&#39;表中的採購訂單{1}
 DocType: Salary Slip,Total Principal Amount,本金總額
 DocType: Student Guardian,Relation,關係
 DocType: Student Guardian,Mother,母親
@@ -485,12 +483,12 @@
 DocType: Accounts Settings,Settings for Accounts,設置帳戶
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},供應商發票不存在採購發票{0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,管理銷售人員樹。
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.",由於禁用了Google地圖設置,因此無法處理路線。
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +105,"Cannot process route, since Google Maps Settings is disabled.",由於禁用了Google地圖設置,因此無法處理路線。
 DocType: Job Applicant,Cover Letter,求職信
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,傑出的支票及存款清除
 DocType: Item,Synced With Hub,同步轂
 DocType: Driver,Fleet Manager,車隊經理
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Row #{0}: {1} can not be negative for item {2},行#{0}:{1}不能為負值對項{2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +573,Row #{0}: {1} can not be negative for item {2},行#{0}:{1}不能為負值對項{2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +129,Wrong Password,密碼錯誤
 DocType: Item,Variant Of,變種
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Completed Qty can not be greater than 'Qty to Manufacture',完成數量不能大於“數量來製造”
@@ -516,7 +514,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Cost of Sold Asset,出售資產的成本
 apps/erpnext/erpnext/accounts/utils.py +374,Payment Entry has been modified after you pulled it. Please pull it again.,付款項被修改,你把它之後。請重新拉。
 DocType: Program Enrollment Tool,New Student Batch,新學生批次
-apps/erpnext/erpnext/stock/doctype/item/item.py +497,{0} entered twice in Item Tax,{0}輸入兩次項目稅
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,{0} entered twice in Item Tax,{0}輸入兩次項目稅
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +121,Summary for this week and pending activities,本週和待活動總結
 DocType: Student Applicant,Admitted,錄取
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +116,Amount After Depreciation,折舊金額後
@@ -556,7 +554,7 @@
 apps/erpnext/erpnext/accounts/party.py +277,There can only be 1 Account per Company in {0} {1},只能有每公司1帳戶{0} {1}
 DocType: Support Search Source,Response Result Key Path,響應結果關鍵路徑
 DocType: Journal Entry,Inter Company Journal Entry,Inter公司日記帳分錄
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +530,For quantity {0} should not be grater than work order quantity {1},數量{0}不應超過工單數量{1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +534,For quantity {0} should not be grater than work order quantity {1},數量{0}不應超過工單數量{1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +524,Please see attachment,請參閱附件
 DocType: Purchase Order,% Received,% 已收
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,創建挺起胸
@@ -606,7 +604,7 @@
 DocType: Purchase Receipt,Vehicle Date,車日期
 DocType: Student Log,Medical,醫療
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +186,Reason for losing,原因丟失
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1751,Please select Drug,請選擇藥物
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1753,Please select Drug,請選擇藥物
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,主導所有人不能等同於主導者
 apps/erpnext/erpnext/accounts/utils.py +380,Allocated amount can not greater than unadjusted amount,分配的金額不能超過未調整的量更大
 DocType: Location,Area UOM,區域UOM
@@ -634,7 +632,7 @@
 DocType: Purchase Invoice,01-Sales Return,01-銷售退貨
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Temporarily on Hold,暫時擱置
 DocType: Account,Is Group,是集團
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +324,Credit Note {0} has been created automatically,信用票據{0}已自動創建
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +327,Credit Note {0} has been created automatically,信用票據{0}已自動創建
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,自動設置序列號的基礎上FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,檢查供應商發票編號唯一性
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +34,Primary Address Details,主要地址詳情
@@ -652,12 +650,12 @@
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,自定義去作為郵件的一部分的介紹文字。每筆交易都有一個單獨的介紹性文字。
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +56,Row {0} : Operation is required against the raw material item {1},行{0}:對原材料項{1}需要操作
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Please set default payable account for the company {0},請為公司{0}設置預設應付賬款
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +604,Transaction not allowed against stopped Work Order {0},不允許對停止的工單{0}進行交易
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +608,Transaction not allowed against stopped Work Order {0},不允許對停止的工單{0}進行交易
 DocType: Setup Progress Action,Min Doc Count,最小文件計數
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,所有製造過程中的全域設定。
 DocType: Accounts Settings,Accounts Frozen Upto,帳戶被凍結到
 DocType: SMS Log,Sent On,發送於
-apps/erpnext/erpnext/stock/doctype/item/item.py +765,Attribute {0} selected multiple times in Attributes Table,屬性{0}多次選擇在屬性表
+apps/erpnext/erpnext/stock/doctype/item/item.py +774,Attribute {0} selected multiple times in Attributes Table,屬性{0}多次選擇在屬性表
 DocType: HR Settings,Employee record is created using selected field. ,使用所選欄位創建員工記錄。
 DocType: Sales Order,Not Applicable,不適用
 DocType: Amazon MWS Settings,UK,聯合王國
@@ -679,7 +677,7 @@
 DocType: Packing Slip,From Package No.,從包裹編號
 DocType: Item Attribute,To Range,為了範圍
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,證券及存款
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",不能改變估值方法,因為有一些項目沒有自己的估值方法的交易
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +48,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",不能改變估值方法,因為有一些項目沒有自己的估值方法的交易
 DocType: Student Report Generation Tool,Attended by Parents,由父母出席
 apps/erpnext/erpnext/hr/doctype/shift_assignment/shift_assignment.py +39,Employee {0} has already applied for {1} on {2} : ,員工{0}已在{2}上申請{1}:
 DocType: Inpatient Record,AB Positive,AB積極
@@ -691,7 +689,7 @@
 DocType: Loan,Total Payment,總付款
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +117,Cannot cancel transaction for Completed Work Order.,無法取消已完成工單的交易。
 DocType: Manufacturing Settings,Time Between Operations (in mins),作業間隔時間(以分鐘計)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +823,PO already created for all sales order items,已為所有銷售訂單項創建採購訂單
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +831,PO already created for all sales order items,已為所有銷售訂單項創建採購訂單
 DocType: Healthcare Service Unit,Occupied,佔據
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +130,{0} {1} is cancelled so the action cannot be completed,{0} {1} 被取消,因此無法完成操作
 DocType: Customer,Buyer of Goods and Services.,買家商品和服務。
@@ -706,14 +704,14 @@
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,警告採購訂單
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,列出一些你的客戶。他們可以是組織或個人。
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,從日期租用
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,足夠的配件組裝
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +25,Enough Parts to Build,足夠的配件組裝
 DocType: POS Profile User,POS Profile User,POS配置文件用戶
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,行{0}:折舊開始日期是必需的
 DocType: Purchase Invoice Item,Service Start Date,服務開始日期
 DocType: Subscription Invoice,Subscription Invoice,訂閱發票
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,直接收入
 DocType: Patient Appointment,Date TIme,約會時間
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +53,"Can not filter based on Account, if grouped by Account",7 。總計:累積總數達到了這一點。
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"Can not filter based on Account, if grouped by Account",7 。總計:累積總數達到了這一點。
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Administrative Officer,政務主任
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,建立公司和稅收
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,請選擇課程
@@ -728,7 +726,7 @@
 DocType: Lab Test Template,Lab Routine,實驗室常規
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,化妝品
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +18,Please select Completion Date for Completed Asset Maintenance Log,請選擇已完成資產維護日誌的完成日期
-apps/erpnext/erpnext/stock/doctype/item/item.py +570,"To merge, following properties must be same for both items",若要合併,以下屬性必須為這兩個項目是相同的
+apps/erpnext/erpnext/stock/doctype/item/item.py +579,"To merge, following properties must be same for both items",若要合併,以下屬性必須為這兩個項目是相同的
 DocType: Supplier,Block Supplier,塊供應商
 DocType: Shipping Rule,Net Weight,淨重
 DocType: Job Opening,Planned number of Positions,計劃的職位數量
@@ -750,13 +748,13 @@
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,現金流量映射模板
 DocType: Travel Request,Costing Details,成本計算詳情
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js +64,Show Return Entries,顯示返回條目
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2567,Serial no item cannot be a fraction,序號項目不能是一個分數
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2569,Serial no item cannot be a fraction,序號項目不能是一個分數
 DocType: Journal Entry,Difference (Dr - Cr),差異(Dr - Cr)
 DocType: Account,Profit and Loss,損益
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +99,"Not permitted, configure Lab Test Template as required",不允許,根據需要配置實驗室測試模板
 DocType: Patient,Risk Factors,風險因素
 DocType: Patient,Occupational Hazards and Environmental Factors,職業危害與環境因素
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +317,Stock Entries already created for Work Order ,已為工單創建的庫存條目
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +321,Stock Entries already created for Work Order ,已為工單創建的庫存條目
 DocType: Vital Signs,Respiratory rate,呼吸頻率
 apps/erpnext/erpnext/config/stock.py +337,Managing Subcontracting,管理轉包
 DocType: Vital Signs,Body Temperature,體溫
@@ -778,7 +776,7 @@
 DocType: BOM,Operating Cost,營業成本
 DocType: Crop,Produced Items,生產物品
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,將交易與發票匹配
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +865,Unblock Invoice,取消屏蔽發票
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +872,Unblock Invoice,取消屏蔽發票
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,增量不能為0
 DocType: Company,Delete Company Transactions,刪除公司事務
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +366,Reference No and Reference Date is mandatory for Bank transaction,參考編號和參考日期是強制性的銀行交易
@@ -807,8 +805,8 @@
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,所有供應商記分卡。
 DocType: Buying Settings,Purchase Receipt Required,需要採購入庫單
 DocType: Delivery Note,Rail,軌
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +263,Target warehouse in row {0} must be same as Work Order,行{0}中的目標倉庫必須與工單相同
-apps/erpnext/erpnext/stock/doctype/item/item.py +170,Valuation Rate is mandatory if Opening Stock entered,估價費用是強制性的,如果打開股票進入
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +267,Target warehouse in row {0} must be same as Work Order,行{0}中的目標倉庫必須與工單相同
+apps/erpnext/erpnext/stock/doctype/item/item.py +179,Valuation Rate is mandatory if Opening Stock entered,估價費用是強制性的,如果打開股票進入
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +143,No records found in the Invoice table,沒有在發票表中找到記錄
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +36,Please select Company and Party Type first,請選擇公司和黨的第一型
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default",已經在用戶{1}的pos配置文件{0}中設置了默認值,請禁用默認值
@@ -845,7 +843,7 @@
 DocType: Sales Invoice,Shipping Bill Date,運費單日期
 DocType: Production Plan,Production Plan,生產計劃
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,打開發票創建工具
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +906,Sales Return,銷貨退回
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +909,Sales Return,銷貨退回
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +110,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,注:總分配葉{0}應不低於已核定葉{1}期間
 DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,根據序列號輸入設置交易數量
 ,Total Stock Summary,總庫存總結
@@ -859,7 +857,7 @@
 apps/erpnext/erpnext/config/selling.py +28,Customer database.,客戶數據庫。
 DocType: Quotation,Quotation To,報價到
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +243,Opening (Cr),開啟(Cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +937,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,測度項目的默認單位{0}不能直接改變,因為你已經做了一些交易(S)與其他計量單位。您將需要創建一個新的項目,以使用不同的默認計量單位。
+apps/erpnext/erpnext/stock/doctype/item/item.py +946,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,測度項目的默認單位{0}不能直接改變,因為你已經做了一些交易(S)與其他計量單位。您將需要創建一個新的項目,以使用不同的默認計量單位。
 apps/erpnext/erpnext/accounts/utils.py +378,Allocated amount can not be negative,分配金額不能為負
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,請設定公司
 DocType: Share Balance,Share Balance,份額平衡
@@ -874,12 +872,12 @@
 DocType: Payroll Entry,Select Payment Account to make Bank Entry,選擇付款賬戶,使銀行進入
 DocType: Hotel Settings,Default Invoice Naming Series,默認發票命名系列
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll",建立員工檔案管理葉,報銷和工資
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +705,An error occurred during the update process,更新過程中發生錯誤
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +712,An error occurred during the update process,更新過程中發生錯誤
 DocType: Restaurant Reservation,Restaurant Reservation,餐廳預訂
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +166,Proposal Writing,提案寫作
 DocType: Payment Entry Deduction,Payment Entry Deduction,輸入付款扣除
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,包起來
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,通過電子郵件通知客戶
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +45,Notify Customers via Email,通過電子郵件通知客戶
 DocType: Item,Batch Number Series,批號系列
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +54,Another Sales Person {0} exists with the same Employee id,另外銷售人員{0}存在具有相同員工ID
 DocType: Employee Advance,Claimed Amount,聲明金額
@@ -960,7 +958,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,{0}: {1} not found in Invoice Details table,{0}:在發票明細表中找不到{1}
 DocType: Asset,Asset Owner Company,資產所有者公司
 DocType: Company,Round Off Cost Center,四捨五入成本中心
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,維護訪問{0}必須取消這個銷售訂單之前被取消
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +254,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,維護訪問{0}必須取消這個銷售訂單之前被取消
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +14,Material Transfer,物料轉倉
 DocType: Cost Center,Cost Center Number,成本中心編號
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,找不到路徑
@@ -976,7 +974,7 @@
 DocType: Purchase Invoice Item,Deferred Expense Account,遞延費用帳戶
 DocType: BOM Operation,Operation Time,操作時間
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +466,Finish,完
-DocType: Salary Structure Assignment,Base,基礎
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +441,Base,基礎
 DocType: Timesheet,Total Billed Hours,帳單總時間
 DocType: Travel Itinerary,Travel To,前往
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1659,Write Off Amount,核銷金額
@@ -997,7 +995,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,時間表
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,倒沖原物料基於
 DocType: Sales Invoice,Port Code,港口代碼
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1023,Reserve Warehouse,儲備倉庫
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1030,Reserve Warehouse,儲備倉庫
 DocType: Lead,Lead is an Organization,領導是一個組織
 DocType: Instructor Log,Other Details,其他詳細資訊
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Suplier
@@ -1026,7 +1024,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +189,From Address 1,來自地址1
 DocType: Email Digest,Next email will be sent on:,接下來的電子郵件將被發送:
 DocType: Supplier Scorecard,Per Week,每個星期
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item has variants.,項目已變種。
+apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item has variants.,項目已變種。
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,學生總數
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,項{0}未找到
 DocType: Bin,Stock Value,庫存價值
@@ -1059,7 +1057,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,{0} is not a stock Item,{0}不是庫存項目
 apps/erpnext/erpnext/hr/notification/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',請通過點擊“培訓反饋”,然後點擊“新建”
 DocType: Mode of Payment Account,Default Account,預設帳戶
-apps/erpnext/erpnext/stock/doctype/item/item.py +289,Please select Sample Retention Warehouse in Stock Settings first,請先在庫存設置中選擇樣品保留倉庫
+apps/erpnext/erpnext/stock/doctype/item/item.py +298,Please select Sample Retention Warehouse in Stock Settings first,請先在庫存設置中選擇樣品保留倉庫
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +62,Please select the Multiple Tier Program type for more than one collection rules.,請為多個收集規則選擇多層程序類型。
 DocType: Payment Entry,Received Amount (Company Currency),收到的款項(公司幣種)
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,如果機會是由前導而來,前導必須被設定
@@ -1088,7 +1086,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +387,Row {0}: Conversion Factor is mandatory,列#{0}:轉換係數是強制性的
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +353,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",海報價格規則,同樣的標準存在,請通過分配優先解決衝突。價格規則:{0}
 DocType: Exchange Rate Revaluation,Exchange Rate Revaluation Account,匯率重估賬戶
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +534,Cannot deactivate or cancel BOM as it is linked with other BOMs,無法關閉或取消BOM,因為它是與其他材料明細表鏈接
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +539,Cannot deactivate or cancel BOM as it is linked with other BOMs,無法關閉或取消BOM,因為它是與其他材料明細表鏈接
 apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js +106,Please select Company and Posting Date to getting entries,請選擇公司和發布日期以獲取條目
 DocType: Asset,Maintenance,維護
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Get from Patient Encounter,從患者遭遇中獲取
@@ -1098,7 +1096,7 @@
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +26,Currency Exchange must be applicable for Buying or for Selling.,貨幣兌換必須適用於買入或賣出。
 DocType: Item,Maximum sample quantity that can be retained,可以保留的最大樣品數量
 DocType: Project Update,How is the Project Progressing Right Now?,項目現在進展如何?
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +501,Row {0}# Item {1} cannot be transferred more than {2} against Purchase Order {3},對於採購訂單{3},行{0}#項目{1}不能超過{2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +505,Row {0}# Item {1} cannot be transferred more than {2} against Purchase Order {3},對於採購訂單{3},行{0}#項目{1}不能超過{2}
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,銷售活動。
 DocType: Project Task,Make Timesheet,製作時間表
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -1158,7 +1156,7 @@
 DocType: Employee Transfer Property,Employee Transfer Property,員工轉移財產
 apps/erpnext/erpnext/accounts/doctype/cashier_closing/cashier_closing.py +36,From Time Should Be Less Than To Time,從時間應該少於時間
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,生物技術
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1117,"Item {0} (Serial No: {1}) cannot be consumed as is reserverd\
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1121,"Item {0} (Serial No: {1}) cannot be consumed as is reserverd\
 						 to fullfill Sales Order {2}.",無法將項目{0}(序列號:{1})用作reserverd \以完成銷售訂單{2}。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Office Maintenance Expenses,Office維護費用
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,去
@@ -1171,16 +1169,16 @@
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +14,Academic Term: ,學術期限:
 DocType: Salary Component,Do not include in total,不包括在內
 DocType: Company,Default Cost of Goods Sold Account,銷貨帳戶的預設成本
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1283,Sample quantity {0} cannot be more than received quantity {1},採樣數量{0}不能超過接收數量{1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1287,Sample quantity {0} cannot be more than received quantity {1},採樣數量{0}不能超過接收數量{1}
 apps/erpnext/erpnext/stock/get_item_details.py +523,Price List not selected,未選擇價格列表
 DocType: Request for Quotation Supplier,Send Email,發送電子郵件
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,Warning: Invalid Attachment {0},警告:無效的附件{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +253,Warning: Invalid Attachment {0},警告:無效的附件{0}
 DocType: Item,Max Sample Quantity,最大樣品量
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +810,No Permission,無權限
 DocType: Contract Fulfilment Checklist,Contract Fulfilment Checklist,合同履行清單
 DocType: Vital Signs,Heart Rate / Pulse,心率/脈搏
 DocType: Company,Default Bank Account,預設銀行帳戶
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +75,"To filter based on Party, select Party Type first",要根據黨的篩選,選擇黨第一類型
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +78,"To filter based on Party, select Party Type first",要根據黨的篩選,選擇黨第一類型
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +46,'Update Stock' can not be checked because items are not delivered via {0},不能勾選`更新庫存',因為項目未交付{0}
 DocType: Vehicle,Acquisition Date,採集日期
 apps/erpnext/erpnext/utilities/user_progress.py +146,Nos,NOS
@@ -1255,7 +1253,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,預計數量
 DocType: Drug Prescription,Interval UOM,間隔UOM
 DocType: Customer,"Reselect, if the chosen address is edited after save",重新選擇,如果所選地址在保存後被編輯
-apps/erpnext/erpnext/stock/doctype/item/item.js +601,Item Variant {0} already exists with same attributes,項目變種{0}已經具有相同屬性的存在
+apps/erpnext/erpnext/stock/doctype/item/item.js +607,Item Variant {0} already exists with same attributes,項目變種{0}已經具有相同屬性的存在
 DocType: Item,Hub Publishing Details,Hub發布細節
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +153,'Opening',“開放”
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,開做
@@ -1311,7 +1309,7 @@
 DocType: Supplier Quotation,Is Subcontracted,轉包
 DocType: Item Attribute,Item Attribute Values,項目屬性值
 DocType: Examination Result,Examination Result,考試成績
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +921,Purchase Receipt,採購入庫單
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +928,Purchase Receipt,採購入庫單
 ,Received Items To Be Billed,待付款的收受品項
 apps/erpnext/erpnext/config/accounts.py +341,Currency exchange rate master.,貨幣匯率的主人。
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +210,Reference Doctype must be one of {0},參考文檔類型必須是一個{0}
@@ -1319,12 +1317,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +322,Unable to find Time Slot in the next {0} days for Operation {1},找不到時隙在未來{0}天操作{1}
 DocType: Work Order,Plan material for sub-assemblies,計劃材料為子組件
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,銷售合作夥伴和地區
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,BOM {0}必須是積極的
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +628,BOM {0} must be active,BOM {0}必須是積極的
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,沒有可用於傳輸的項目
 DocType: Employee Boarding Activity,Activity Name,活動名稱
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,更改發布日期
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,成品數量<b>{0}</b>和數量<b>{1}</b>不能不同
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +250,Closing (Opening + Total),閉幕(開幕+總計)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +867,Change Release Date,更改發布日期
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +218,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,成品數量<b>{0}</b>和數量<b>{1}</b>不能不同
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +258,Closing (Opening + Total),閉幕(開幕+總計)
 DocType: Delivery Settings,Dispatch Notification Attachment,發貨通知附件
 DocType: Payroll Entry,Number Of Employees,在職員工人數
 DocType: Journal Entry,Depreciation Entry,折舊分錄
@@ -1362,7 +1360,7 @@
 DocType: Support Search Source,Search Term Param Name,搜索字詞Param Name
 DocType: Item Barcode,Item Barcode,商品條碼
 DocType: Woocommerce Settings,Endpoints,端點
-apps/erpnext/erpnext/stock/doctype/item/item.py +707,Item Variants {0} updated,項目變種{0}更新
+apps/erpnext/erpnext/stock/doctype/item/item.py +716,Item Variants {0} updated,項目變種{0}更新
 DocType: Quality Inspection Reading,Reading 6,6閱讀
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +994,Cannot {0} {1} {2} without any negative outstanding invoice,無法{0} {1} {2}沒有任何負面的優秀發票
 DocType: Share Transfer,From Folio No,來自Folio No
@@ -1394,7 +1392,7 @@
 DocType: Program Fee,Program Fee,課程費用
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
 It also updates latest price in all the BOMs.",替換使用所有其他BOM的特定BOM。它將替換舊的BOM鏈接,更新成本,並按照新的BOM重新生成“BOM爆炸項目”表。它還更新了所有BOM中的最新價格。
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +468,The following Work Orders were created:,以下工作訂單已創建:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +483,The following Work Orders were created:,以下工作訂單已創建:
 DocType: Salary Slip,Total in words,總計大寫
 DocType: Inpatient Record,Discharged,出院
 DocType: Material Request Item,Lead Time Date,交貨時間日期
@@ -1453,7 +1451,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,上傳你的信頭和標誌。 (您可以在以後對其進行編輯)。
 DocType: Timesheet Detail,Bill,法案
 DocType: SMS Center,All Lead (Open),所有鉛(開放)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),行{0}:數量不適用於{4}在倉庫{1}在發布條目的時間({2} {3})
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +352,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),行{0}:數量不適用於{4}在倉庫{1}在發布條目的時間({2} {3})
 apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,您只能從復選框列表中選擇最多一個選項。
 DocType: Purchase Invoice,Get Advances Paid,獲取有償進展
 DocType: Item,Automatically Create New Batch,自動創建新批
@@ -1499,9 +1497,9 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},請指定{0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,刪除的項目在數量或價值沒有變化。
 DocType: Delivery Note,Delivery To,交貨給
-apps/erpnext/erpnext/stock/doctype/item/item.js +465,Variant creation has been queued.,變體創建已經排隊。
+apps/erpnext/erpnext/stock/doctype/item/item.js +471,Variant creation has been queued.,變體創建已經排隊。
 DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,列表中的第一個請假批准者將被設置為默認的批准批准者。
-apps/erpnext/erpnext/stock/doctype/item/item.py +761,Attribute table is mandatory,屬性表是強制性的
+apps/erpnext/erpnext/stock/doctype/item/item.py +770,Attribute table is mandatory,屬性表是強制性的
 DocType: Production Plan,Get Sales Orders,獲取銷售訂單
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +69,{0} can not be negative,{0}不能為負數
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +37,Connect to Quickbooks,連接到Quickbooks
@@ -1519,7 +1517,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +187,Please specify a valid Row ID for row {0} in table {1},請指定行{0}在表中的有效行ID {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,無法找到變量:
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +893,Please select a field to edit from numpad,請選擇要從數字鍵盤編輯的字段
-apps/erpnext/erpnext/stock/doctype/item/item.py +280,Cannot be a fixed asset item as Stock Ledger is created.,不能成為股票分類賬創建的固定資產項目。
+apps/erpnext/erpnext/stock/doctype/item/item.py +289,Cannot be a fixed asset item as Stock Ledger is created.,不能成為股票分類賬創建的固定資產項目。
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record.js +7,Admit,承認
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,轉到桌面和開始使用ERPNext
 apps/erpnext/erpnext/templates/pages/order.js +31,Pay Remaining,支付剩餘
@@ -1550,7 +1548,7 @@
 DocType: Tax Rule,Shipping State,運輸狀態
 ,Projected Quantity as Source,預計庫存量的來源
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,項目必須使用'從採購入庫“按鈕進行新增
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +911,Delivery Trip,送貨之旅
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +914,Delivery Trip,送貨之旅
 DocType: Student,A-,一個-
 DocType: Share Transfer,Transfer Type,轉移類型
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,銷售費用
@@ -1575,10 +1573,10 @@
 DocType: Loan,Repayment Schedule,還款計劃
 DocType: Shipping Rule Condition,Shipping Rule Condition,送貨規則條件
 apps/erpnext/erpnext/hr/doctype/payroll_period/payroll_period.py +19,End Date can not be less than Start Date,結束日期不能小於開始日期
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,在零計費時間內無法開具發票
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +262,Invoice can't be made for zero billing hour,在零計費時間內無法開具發票
 DocType: Company,Date of Commencement,開始日期
 DocType: Sales Person,Select company name first.,先選擇公司名稱。
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},電子郵件發送到{0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +380,Email sent to {0},電子郵件發送到{0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,從供應商收到的報價。
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,更換BOM並更新所有BOM中的最新價格
 apps/erpnext/erpnext/setup/doctype/supplier_group/supplier_group.js +13,This is a root supplier group and cannot be edited.,這是一個根源供應商組,無法編輯。
@@ -1625,7 +1623,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +145,Distributor,經銷商
 DocType: Asset Finance Book,Asset Finance Book,資產融資書
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,購物車運輸規則
-apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',請設置“收取額外折扣”
+apps/erpnext/erpnext/public/js/controllers/transaction.js +72,Please set 'Apply Additional Discount On',請設置“收取額外折扣”
 DocType: Party Tax Withholding Config,Applicable Percent,適用百分比
 ,Ordered Items To Be Billed,預付款的訂購物品
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,從範圍必須小於要範圍
@@ -1643,7 +1641,7 @@
 DocType: Lead,Consultant,顧問
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +356,Parents Teacher Meeting Attendance,家長老師見面會
 DocType: Salary Slip,Earnings,收益
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +534,Finished Item {0} must be entered for Manufacture type entry,完成項目{0}必須為製造類條目進入
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +538,Finished Item {0} must be entered for Manufacture type entry,完成項目{0}必須為製造類條目進入
 apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,打開會計平衡
 ,GST Sales Register,消費稅銷售登記冊
 DocType: Sales Invoice Advance,Sales Invoice Advance,銷售發票提前
@@ -1657,13 +1655,13 @@
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',“實際開始日期”不能大於“實際結束日期'
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +359,Management,管理
 DocType: Cheque Print Template,Payer Settings,付款人設置
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +644,No pending Material Requests found to link for the given items.,找不到針對給定項目鏈接的待處理物料請求。
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +651,No pending Material Requests found to link for the given items.,找不到針對給定項目鏈接的待處理物料請求。
 apps/erpnext/erpnext/public/js/utils/party.js +193,Select company first,首先選擇公司
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""",這將追加到變異的項目代碼。例如,如果你的英文縮寫為“SM”,而該項目的代碼是“T-SHIRT”,該變種的項目代碼將是“T-SHIRT-SM”
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,薪資單一被儲存,淨付款就會被顯示出來。
 DocType: Delivery Note,Is Return,退貨
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',開始日期大於任務“{0}”的結束日期
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +886,Return / Debit Note,返回/借記注
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +893,Return / Debit Note,返回/借記注
 DocType: Price List Country,Price List Country,價目表國家
 DocType: Item,UOMs,計量單位
 apps/erpnext/erpnext/stock/utils.py +236,{0} valid serial nos for Item {1},{0}項目{1}的有效的序號
@@ -1680,7 +1678,7 @@
 DocType: Leave Type,Is Earned Leave,獲得休假
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +797,Cost Center For Item with Item Code ',成本中心與項目代碼“項目
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,總計家長教師會議
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2528,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",付款方式未配置。請檢查是否帳戶已就付款方式或POS機配置文件中設置。
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2530,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",付款方式未配置。請檢查是否帳戶已就付款方式或POS機配置文件中設置。
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,同一項目不能輸入多次。
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +30,"Further accounts can be made under Groups, but entries can be made against non-Groups",進一步帳戶可以根據組進行,但條目可針對非組進行
 DocType: Lead,Lead,潛在客戶
@@ -1691,11 +1689,11 @@
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.py +110,You don't have enought Loyalty Points to redeem,您沒有獲得忠誠度積分兌換
 apps/erpnext/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py +23,Please set associated account in Tax Withholding Category {0} against Company {1},請在針對公司{1}的預扣稅分類{0}中設置關聯帳戶
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,行#{0}:駁回採購退貨數量不能進入
-apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,不允許更改所選客戶的客戶組。
+apps/erpnext/erpnext/stock/doctype/item/item.js +203,Changing Customer Group for the selected Customer is not allowed.,不允許更改所選客戶的客戶組。
 ,Purchase Order Items To Be Billed,欲付款的採購訂單品項
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,更新預計到達時間。
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,Updating estimated arrival times.,更新預計到達時間。
 DocType: Program Enrollment Tool,Enrollment Details,註冊詳情
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,無法為公司設置多個項目默認值。
+apps/erpnext/erpnext/stock/doctype/item/item.py +680,Cannot set multiple Item Defaults for a company.,無法為公司設置多個項目默認值。
 DocType: Purchase Invoice Item,Net Rate,淨費率
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +194,Please select a customer,請選擇一個客戶
 DocType: Leave Policy,Leave Allocations,離開分配
@@ -1743,7 +1741,7 @@
 DocType: Grading Scale,Intervals,間隔
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,協調的事務
 DocType: Crop Cycle,Linked Location,鏈接位置
-apps/erpnext/erpnext/stock/doctype/item/item.py +544,"An Item Group exists with same name, please change the item name or rename the item group",具有具有相同名稱的項目群組存在,請更改項目名稱或重新命名該項目群組
+apps/erpnext/erpnext/stock/doctype/item/item.py +553,"An Item Group exists with same name, please change the item name or rename the item group",具有具有相同名稱的項目群組存在,請更改項目名稱或重新命名該項目群組
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,學生手機號碼
 apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +106,Rest Of The World,世界其他地區
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,該項目{0}不能有批
@@ -1752,7 +1750,7 @@
 DocType: Salary Slip,Gross Pay,工資總額
 DocType: Item,Is Item from Hub,是來自Hub的Item
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1638,Get Items from Healthcare Services,從醫療保健服務獲取項目
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,行{0}:活動類型是強制性的。
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Activity Type is mandatory.,行{0}:活動類型是強制性的。
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +39,Accounting Ledger,會計總帳
 DocType: Asset Value Adjustment,Difference Amount,差額
 DocType: Purchase Invoice,Reverse Charge,反向充電
@@ -1781,7 +1779,7 @@
 DocType: GL Entry,Against Voucher,對傳票
 DocType: Item Default,Default Buying Cost Center,預設採購成本中心
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.",為得到最好的 ERPNext 教學,我們建議您花一些時間和觀看這些說明影片。
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +1033,For Default Supplier (optional),對於默認供應商(可選)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +1046,For Default Supplier (optional),對於默認供應商(可選)
 DocType: Supplier Quotation Item,Lead Time in days,交貨天期
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +82,Accounts Payable Summary,應付帳款摘要
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,Not authorized to edit frozen Account {0},無權修改凍結帳戶{0}
@@ -1809,13 +1807,13 @@
 DocType: Employee,Place of Issue,簽發地點
 DocType: Plant Analysis,Laboratory Testing Datetime,實驗室測試日期時間
 DocType: Email Digest,Add Quote,添加報價
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1242,UOM coversion factor required for UOM: {0} in Item: {1},所需的計量單位計量單位:丁文因素:{0}項:{1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1246,UOM coversion factor required for UOM: {0} in Item: {1},所需的計量單位計量單位:丁文因素:{0}項:{1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Indirect Expenses,間接費用
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +128,Row {0}: Qty is mandatory,列#{0}:數量是強制性的
 DocType: Agriculture Analysis Criteria,Agriculture,農業
 apps/erpnext/erpnext/manufacturing/doctype/blanket_order/blanket_order.js +15,Create Sales Order,創建銷售訂單
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +516,Accounting Entry for Asset,資產會計分錄
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +871,Block Invoice,阻止發票
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +878,Block Invoice,阻止發票
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.js +16,Quantity to Make,數量
 apps/erpnext/erpnext/accounts/page/pos/pos.js +801,Sync Master Data,同步主數據
 DocType: Asset Repair,Repair Cost,修理費用
@@ -1825,7 +1823,7 @@
 DocType: Special Test Items,Special Test Items,特殊測試項目
 apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,您需要是具有System Manager和Item Manager角色的用戶才能在Marketplace上註冊。
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,根據您指定的薪資結構,您無法申請福利
-apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,網站形象應該是一個公共文件或網站網址
+apps/erpnext/erpnext/stock/doctype/item/item.py +227,Website Image should be a public file or website URL,網站形象應該是一個公共文件或網站網址
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +71,This is a root item group and cannot be edited.,這是個根項目群組,且無法被編輯。
 apps/erpnext/erpnext/accounts/doctype/account/account.js +133,Merge,合併
 DocType: Journal Entry Account,Purchase Order,採購訂單
@@ -1887,7 +1885,7 @@
 DocType: POS Item Group,POS Item Group,POS項目組
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,電子郵件摘要:
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,替代項目不能與項目代碼相同
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +639,BOM {0} does not belong to Item {1},BOM {0}不屬於項目{1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +644,BOM {0} does not belong to Item {1},BOM {0}不屬於項目{1}
 DocType: Sales Partner,Target Distribution,目標分佈
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06-定期評估
 DocType: Salary Slip,Bank Account No.,銀行賬號
@@ -1989,7 +1987,7 @@
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,列表中的第一個費用審批人將被設置為默認的費用審批人。
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,不能大於100
 apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,您需要是具有System Manager和Item Manager角色的Administrator以外的用戶才能在Marketplace上註冊。
-apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,項{0}不是缺貨登記
+apps/erpnext/erpnext/stock/doctype/item/item.py +826,Item {0} is not a stock Item,項{0}不是缺貨登記
 DocType: Maintenance Visit,Unscheduled,計劃外
 DocType: Employee,Owned,擁有的
 DocType: Salary Component,Depends on Leave Without Pay,依賴於無薪休假
@@ -2052,10 +2050,10 @@
 DocType: Project,Task Weight,任務重
 DocType: Loyalty Program,Loyalty Program Type,忠誠度計劃類型
 DocType: Asset Movement,Stock Manager,庫存管理
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +246,Source warehouse is mandatory for row {0},列{0}的來源倉是必要的
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +250,Source warehouse is mandatory for row {0},列{0}的來源倉是必要的
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,第{0}行的支付條款可能是重複的。
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),農業(測試版)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +916,Packing Slip,包裝單
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +919,Packing Slip,包裝單
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Office Rent,辦公室租金
 apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,設置短信閘道設置
 DocType: Disease,Common Name,通用名稱
@@ -2083,12 +2081,12 @@
 apps/erpnext/erpnext/config/stock.py +312,Item Variants,項目變體
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,服務
 DocType: HR Settings,Email Salary Slip to Employee,電子郵件工資單給員工
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1091,Select Possible Supplier,選擇潛在供應商
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1098,Select Possible Supplier,選擇潛在供應商
 DocType: Customer,"Select, to make the customer searchable with these fields",選擇,使客戶可以使用這些字段進行搜索
 DocType: Shopify Settings,Import Delivery Notes from Shopify on Shipment,在發貨時從Shopify導入交貨單
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,顯示關閉
 DocType: Leave Type,Is Leave Without Pay,是無薪休假
-apps/erpnext/erpnext/stock/doctype/item/item.py +277,Asset Category is mandatory for Fixed Asset item,資產類別是強制性的固定資產項目
+apps/erpnext/erpnext/stock/doctype/item/item.py +286,Asset Category is mandatory for Fixed Asset item,資產類別是強制性的固定資產項目
 DocType: Fee Validity,Fee Validity,費用有效期
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +146,No records found in the Payment table,沒有在支付表中找到記錄
 apps/erpnext/erpnext/education/utils.py +19,This {0} conflicts with {1} for {2} {3},此{0}衝突{1}在{2} {3}
@@ -2097,7 +2095,7 @@
 DocType: GST HSN Code,GST HSN Code,GST HSN代碼
 DocType: Employee External Work History,Total Experience,總經驗
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,打開項目
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +297,Packing Slip(s) cancelled,包裝單( S)已取消
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +300,Packing Slip(s) cancelled,包裝單( S)已取消
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +90,Cash Flow from Investing,從投資現金流
 DocType: Program Course,Program Course,課程計劃
 DocType: Healthcare Service Unit,Allow Appointments,允許約會
@@ -2158,13 +2156,13 @@
 DocType: Travel Itinerary,Mode of Travel,旅行模式
 DocType: Sales Invoice Item,Brand Name,商標名稱
 DocType: Purchase Receipt,Transporter Details,貨運公司細節
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2712,Default warehouse is required for selected item,默認倉庫需要選中的項目
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1088,Possible Supplier,可能的供應商
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2714,Default warehouse is required for selected item,默認倉庫需要選中的項目
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1095,Possible Supplier,可能的供應商
 DocType: Budget,Monthly Distribution,月度分佈
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +72,Receiver List is empty. Please create Receiver List,收受方列表為空。請創建收受方列表
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),醫療保健(beta)
 DocType: Production Plan Sales Order,Production Plan Sales Order,生產計劃銷售訂單
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +419,"No active BOM found for item {0}. Delivery by \
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +427,"No active BOM found for item {0}. Delivery by \
 						Serial No cannot be ensured",未找到項{0}的有效BOM。無法確保交貨\串口號
 DocType: Sales Partner,Sales Partner Target,銷售合作夥伴目標
 DocType: Loan Type,Maximum Loan Amount,最高貸款額度
@@ -2186,7 +2184,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},{0}的排假成功
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,無項目包裝
 DocType: Shipping Rule Condition,From Value,從價值
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +713,Manufacturing Quantity is mandatory,生產數量是必填的
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +717,Manufacturing Quantity is mandatory,生產數量是必填的
 DocType: Loan,Repayment Method,還款方式
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website",如果選中,主頁將是網站的默認項目組
 DocType: Quality Inspection Reading,Reading 4,4閱讀
@@ -2197,7 +2195,7 @@
 DocType: Asset Maintenance Task,Certificate Required,證書要求
 DocType: Company,Default Holiday List,預設假日表列
 DocType: Pricing Rule,Supplier Group,供應商集團
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +151,Row {0}: From Time and To Time of {1} is overlapping with {2},行{0}:從時間和結束時間{1}是具有重疊{2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +163,Row {0}: From Time and To Time of {1} is overlapping with {2},行{0}:從時間和結束時間{1}是具有重疊{2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Stock Liabilities,現貨負債
 DocType: Purchase Invoice,Supplier Warehouse,供應商倉庫
 DocType: Opportunity,Contact Mobile No,聯絡手機號碼
@@ -2217,7 +2215,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,請選擇至少一個域名。
 DocType: Dependent Task,Dependent Task,相關任務
 DocType: Shopify Settings,Shopify Tax Account,Shopify稅收帳戶
-apps/erpnext/erpnext/stock/doctype/item/item.py +462,Conversion factor for default Unit of Measure must be 1 in row {0},預設計量單位的轉換因子必須是1在行{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +471,Conversion factor for default Unit of Measure must be 1 in row {0},預設計量單位的轉換因子必須是1在行{0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +257,Leave of type {0} cannot be longer than {1},請假類型{0}不能長於{1}
 DocType: Delivery Trip,Optimize Route,優化路線
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,嘗試提前X天規劃作業。
@@ -2232,7 +2230,7 @@
 DocType: Healthcare Settings,Healthcare Service Items,醫療服務項目
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +69,Net Change in Cash,現金淨變動
 DocType: Assessment Plan,Grading Scale,分級量表
-apps/erpnext/erpnext/stock/doctype/item/item.py +456,Unit of Measure {0} has been entered more than once in Conversion Factor Table,計量單位{0}已經進入不止一次在轉換係數表
+apps/erpnext/erpnext/stock/doctype/item/item.py +465,Unit of Measure {0} has been entered more than once in Conversion Factor Table,計量單位{0}已經進入不止一次在轉換係數表
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +617,Already completed,已經完成
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,庫存在手
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +68,"Please add the remaining benefits {0} to the application as \
@@ -2250,7 +2248,7 @@
 DocType: Quotation Item,Quotation Item,產品報價
 DocType: Customer,Customer POS Id,客戶POS ID
 DocType: Account,Account Name,帳戶名稱
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +496,From Date cannot be greater than To Date,起始日期不能大於結束日期
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +536,From Date cannot be greater than To Date,起始日期不能大於結束日期
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,Serial No {0} quantity {1} cannot be a fraction,序列號{0}的數量量{1}不能是分數
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,請輸入Woocommerce服務器網址
 DocType: Purchase Order Item,Supplier Part Number,供應商零件編號
@@ -2321,7 +2319,7 @@
 DocType: Purchase Invoice,End date of current invoice's period,當前發票的期限的最後一天
 DocType: Pricing Rule,Applicable For,適用
 DocType: Lab Test,Technician Name,技術員姓名
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +411,"Cannot ensure delivery by Serial No as \
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +419,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
 					Serial No.",無法通過序列號確保交貨,因為\項目{0}是否添加了確保交貨\序列號
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,取消鏈接在發票上的取消付款
@@ -2362,7 +2360,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Marketing Expenses,市場推廣開支
 ,Item Shortage Report,商品短缺報告
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,無法創建標準條件。請重命名標準
-apps/erpnext/erpnext/stock/doctype/item/item.js +360,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量被提及,請同時註明“重量計量單位”
+apps/erpnext/erpnext/stock/doctype/item/item.js +366,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量被提及,請同時註明“重量計量單位”
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,做此存貨分錄所需之物料需求
 DocType: Hub User,Hub Password,集線器密碼
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,為每個批次分離基於課程的組
@@ -2386,7 +2384,7 @@
 DocType: Vehicle,Doors,門
 apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +118,ERPNext Setup Complete!,ERPNext設定完成!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,收取病人登記費
-apps/erpnext/erpnext/stock/doctype/item/item.py +724,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,股票交易後不能更改屬性。創建一個新項目並將庫存轉移到新項目
+apps/erpnext/erpnext/stock/doctype/item/item.py +733,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,股票交易後不能更改屬性。創建一個新項目並將庫存轉移到新項目
 DocType: Course Assessment Criteria,Weightage,權重
 DocType: Purchase Invoice,Tax Breakup,稅收分解
 DocType: Employee,Joining Details,加入詳情
@@ -2400,22 +2398,21 @@
 DocType: Purchase Invoice,Place of Supply,供貨地點
 DocType: Quality Inspection Reading,Reading 2,閱讀2
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +101,Employee {0} already submited an apllication {1} for the payroll period {2},員工{0}已經在工資期間{2}提交了申請{1}
-DocType: Stock Entry,Material Receipt,收料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Material Receipt,收料
 DocType: Bank Statement Transaction Entry,Submit/Reconcile Payments,提交/協調付款
 DocType: Homepage,Products,產品
 DocType: Announcement,Instructor,講師
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +95,Select Item (optional),選擇項目(可選)
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +102,Select Item (optional),選擇項目(可選)
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.py +103,The Loyalty Program isn't valid for the selected company,忠誠度計劃對所選公司無效
 DocType: Fee Schedule Student Group,Fee Schedule Student Group,費用計劃學生組
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.",如果此項目已變種,那麼它不能在銷售訂單等選擇
 DocType: Lead,Next Contact By,下一個聯絡人由
 DocType: Compensatory Leave Request,Compensatory Leave Request,補償請假
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +334,Quantity required for Item {0} in row {1},列{1}項目{0}必須有數量
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +339,Quantity required for Item {0} in row {1},列{1}項目{0}必須有數量
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},倉庫{0} 不能被刪除因為項目{1}還有庫存
 DocType: Blanket Order,Order Type,訂單類型
 ,Item-wise Sales Register,項目明智的銷售登記
 DocType: Asset,Gross Purchase Amount,總購買金額
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,商品代碼&gt;商品分組&gt;品牌
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,期初餘額
 DocType: Asset,Depreciation Method,折舊方法
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,包括在基本速率此稅?
@@ -2439,11 +2436,11 @@
 apps/erpnext/erpnext/controllers/status_updater.py +163,"For an item {0}, quantity must be negative number",對於商品{0},數量必須是負數
 DocType: Naming Series,Set prefix for numbering series on your transactions,為你的交易編號序列設置的前綴
 DocType: Employee Attendance Tool,Employees HTML,員工HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Default BOM ({0}) must be active for this item or its template,預設BOM({0})必須是活動的這個項目或者其模板
+apps/erpnext/erpnext/stock/doctype/item/item.py +485,Default BOM ({0}) must be active for this item or its template,預設BOM({0})必須是活動的這個項目或者其模板
 DocType: Employee,Leave Encashed?,離開兌現?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,機會從字段是強制性的
 DocType: Item,Variants,變種
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1226,Make Purchase Order,製作採購訂單
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1308,Make Purchase Order,製作採購訂單
 DocType: SMS Center,Send To,發送到
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +201,There is not enough leave balance for Leave Type {0},沒有足夠的餘額休假請假類型{0}
 DocType: Payment Reconciliation Payment,Allocated amount,分配量
@@ -2480,7 +2477,7 @@
 DocType: Sales Order,To Deliver and Bill,準備交貨及開立發票
 DocType: Student Group,Instructors,教師
 DocType: GL Entry,Credit Amount in Account Currency,在賬戶幣金額
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +626,BOM {0} must be submitted,BOM {0}必須提交
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +631,BOM {0} must be submitted,BOM {0}必須提交
 DocType: Authorization Control,Authorization Control,授權控制
 apps/erpnext/erpnext/controllers/buying_controller.py +404,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},行#{0}:拒絕倉庫是強制性的反對否決項{1}
 apps/erpnext/erpnext/controllers/stock_controller.py +96,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.",倉庫{0}未與任何帳戶關聯,請在倉庫記錄中提及該帳戶,或在公司{1}中設置默認庫存帳戶。
@@ -2507,8 +2504,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,您輸入重複的項目。請糾正,然後再試一次。
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Associate,關聯
 DocType: Asset Movement,Asset Movement,資產運動
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +601,Work Order {0} must be submitted,必須提交工單{0}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2225,New Cart,新的車
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +605,Work Order {0} must be submitted,必須提交工單{0}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2227,New Cart,新的車
 DocType: Taxable Salary Slab,From Amount,從金額
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,項{0}不是一個序列化的項目
 DocType: Leave Type,Encashment,兌現
@@ -2573,7 +2570,7 @@
 DocType: Bank Guarantee,Margin Money,保證金
 DocType: Budget,Budget,預算
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +79,Set Open,設置打開
-apps/erpnext/erpnext/stock/doctype/item/item.py +274,Fixed Asset Item must be a non-stock item.,固定資產項目必須是一個非庫存項目。
+apps/erpnext/erpnext/stock/doctype/item/item.py +283,Fixed Asset Item must be a non-stock item.,固定資產項目必須是一個非庫存項目。
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +60,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",財政預算案不能對{0}指定的,因為它不是一個收入或支出帳戶
 apps/erpnext/erpnext/hr/utils.py +228,Max exemption amount for {0} is {1},{0}的最大免除金額為{1}
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,已實現
@@ -2590,7 +2587,7 @@
 ,Amount to Deliver,量交付
 DocType: Asset,Insurance Start Date,保險開始日期
 DocType: Salary Component,Flexible Benefits,靈活的好處
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +345,Same item has been entered multiple times. {0},相同的物品已被多次輸入。 {0}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +350,Same item has been entered multiple times. {0},相同的物品已被多次輸入。 {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,這個詞開始日期不能超過哪個術語鏈接學年的開學日期較早(學年{})。請更正日期,然後再試一次。
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +201,There were errors.,有錯誤。
 apps/erpnext/erpnext/hr/doctype/shift_request/shift_request.py +68,Employee {0} has already applied for {1} between {2} and {3} : ,員工{0}已在{2}和{3}之間申請{1}:
@@ -2631,7 +2628,7 @@
 DocType: Account,Frozen,凍結的
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +382,Vehicle Type,車輛類型
 DocType: Sales Invoice Payment,Base Amount (Company Currency),基本金額(公司幣種)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +994,Raw Materials,原料
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1001,Raw Materials,原料
 DocType: Installation Note,Installation Time,安裝時間
 DocType: Sales Invoice,Accounting Details,會計細節
 DocType: Shopify Settings,status html,狀態HTML
@@ -2688,7 +2685,7 @@
 DocType: Chapter,Chapter,章節
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,對
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,選擇此模式後,默認帳戶將在POS發票中自動更新。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1045,Select BOM and Qty for Production,選擇BOM和數量生產
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1047,Select BOM and Qty for Production,選擇BOM和數量生產
 DocType: Asset,Depreciation Schedule,折舊計劃
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,銷售合作夥伴地址和聯繫人
 DocType: Bank Reconciliation Detail,Against Account,針對帳戶
@@ -2724,7 +2721,7 @@
 ,Vehicle Expenses,車輛費用
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,在銷售發票上創建實驗室測試提交
 DocType: Serial No,Invoice Details,發票明細
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,請啟用Google地圖設置以估算和優化路線
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +72,Please enable Google Maps Settings to estimate and optimize routes,請啟用Google地圖設置以估算和優化路線
 DocType: Grant Application,Show on Website,在網站上顯示
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,開始
 DocType: Hub Tracked Item,Hub Category,中心類別
@@ -2733,7 +2730,7 @@
 DocType: Student Report Generation Tool,Add Letterhead,添加信頭
 DocType: Program Enrollment,Self-Driving Vehicle,自駕車
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,供應商記分卡站立
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +464,Row {0}: Bill of Materials not found for the Item {1},行{0}:材料清單未找到項目{1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +479,Row {0}: Bill of Materials not found for the Item {1},行{0}:材料清單未找到項目{1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +112,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,共分配葉{0}不能小於已經批准葉{1}期間
 DocType: Journal Entry,Accounts Receivable,應收帳款
 ,Supplier-Wise Sales Analytics,供應商相關的銷售分析
@@ -2756,7 +2753,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +114,PDC/LC Amount,PDC / LC金額
 DocType: Shareholder,Shareholder,股東
 DocType: Purchase Invoice,Additional Discount Amount,額外的折扣金額
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1797,Get Items from Prescriptions,從Prescriptions獲取物品
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1799,Get Items from Prescriptions,從Prescriptions獲取物品
 DocType: Patient,Patient Details,患者細節
 DocType: Inpatient Record,B Positive,B積極
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
@@ -2806,7 +2803,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1120,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",行#{0}:參考文件類型必須是銷售訂單之一,銷售發票或日記帳分錄
 DocType: Loyalty Program,1 Loyalty Points = How much base currency?,1忠誠度積分=多少基礎貨幣?
 DocType: Item,Retain Sample,保留樣品
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +109,Row {0}: From Time and To Time is mandatory.,行{0}:從時間和時間是強制性的。
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: From Time and To Time is mandatory.,行{0}:從時間和時間是強制性的。
 DocType: Stock Reconciliation Item,Amount Difference,金額差異
 apps/erpnext/erpnext/stock/get_item_details.py +416,Item Price added for {0} in Price List {1},加入項目價格為{0}價格表{1}
 DocType: Delivery Stop,Order Information,訂單信息
@@ -2820,9 +2817,9 @@
 DocType: Normal Test Template,Normal Test Template,正常測試模板
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,禁用的用戶
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +970,Quotation,報價
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1034,Cannot set a received RFQ to No Quote,無法將收到的詢價單設置為無報價
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Cannot set a received RFQ to No Quote,無法將收到的詢價單設置為無報價
 DocType: Salary Slip,Total Deduction,扣除總額
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +22,Select an account to print in account currency,選擇一個賬戶以賬戶貨幣進行打印
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +24,Select an account to print in account currency,選擇一個賬戶以賬戶貨幣進行打印
 ,Production Analytics,生產Analytics(分析)
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,這是基於對這個病人的交易。有關詳情,請參閱下面的時間表
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Item {0} has already been returned,項{0}已被退回
@@ -2831,13 +2828,13 @@
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,供應商記分卡設置
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,評估計劃名稱
 DocType: Work Order Operation,Work Order Operation,工作訂單操作
-apps/erpnext/erpnext/stock/doctype/item/item.py +249,Warning: Invalid SSL certificate on attachment {0},警告:附件無效的SSL證書{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Warning: Invalid SSL certificate on attachment {0},警告:附件無效的SSL證書{0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads",信息幫助你的業務,你所有的聯繫人和更添加為您的線索
 DocType: Work Order Operation,Actual Operation Time,實際操作時間
 DocType: Authorization Rule,Applicable To (User),適用於(用戶)
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +219,Job Description,職位描述
 DocType: Student Applicant,Applied,應用的
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +934,Re-open,重新打開
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Re-open,重新打開
 DocType: Sales Invoice Item,Qty as per Stock UOM,數量按庫存計量單位
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2名稱
 DocType: Attendance,Attendance Request,出席請求
@@ -2862,7 +2859,7 @@
 DocType: Grant Application,Email Notification Sent,電子郵件通知已發送
 DocType: Purchase Invoice,In Words (Company Currency),大寫(Company Currency)
 apps/erpnext/erpnext/accounts/doctype/bank_account/bank_account.py +24,Company is manadatory for company account,公司是公司賬戶的管理者
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1084,"Item Code, warehouse, quantity are required on row",在行上需要項目代碼,倉庫,數量
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1091,"Item Code, warehouse, quantity are required on row",在行上需要項目代碼,倉庫,數量
 DocType: Bank Guarantee,Supplier,供應商
 apps/erpnext/erpnext/hr/doctype/department/department.js +9,This is a root department and cannot be edited.,這是根部門,無法編輯。
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,顯示付款詳情
@@ -2872,8 +2869,8 @@
 DocType: Company,Transactions Annual History,交易年曆
 apps/erpnext/erpnext/controllers/stock_controller.py +231,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,對項目{0}而言, 費用或差異帳戶是強制必填的,因為它影響整個庫存總值。
 DocType: Bank,Bank Name,銀行名稱
-apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +33,-Above,-以上
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1218,Leave the field empty to make purchase orders for all suppliers,將該字段留空以為所有供應商下達採購訂單
+apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +78,-Above,-以上
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1300,Leave the field empty to make purchase orders for all suppliers,將該字段留空以為所有供應商下達採購訂單
 DocType: Healthcare Practitioner,Inpatient Visit Charge Item,住院訪問費用項目
 DocType: Vital Signs,Fluid,流體
 DocType: Leave Application,Total Leave Days,總休假天數
@@ -2884,7 +2881,7 @@
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +37,Select Company...,選擇公司...
 DocType: Leave Control Panel,Leave blank if considered for all departments,保持空白如果考慮到全部部門
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +506,{0} is mandatory for Item {1},{0}是強制性的項目{1}
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +136,"Item {0}: {1} qty produced, ",項目{0}:{1}產生的數量,
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +149,"Item {0}: {1} qty produced, ",項目{0}:{1}產生的數量,
 DocType: Currency Exchange,From Currency,從貨幣
 DocType: Vital Signs,Weight (In Kilogram),體重(公斤)
 DocType: Chapter,"chapters/chapter_name
@@ -2917,7 +2914,7 @@
 DocType: Grading Scale,Grading Scale Intervals,分級刻度間隔
 DocType: Item Default,Purchase Defaults,購買默認值
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +117,Make Job Card,製作工作卡
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +326,"Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again",無法自動創建Credit Note,請取消選中&#39;Issue Credit Note&#39;並再次提交
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +329,"Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again",無法自動創建Credit Note,請取消選中&#39;Issue Credit Note&#39;並再次提交
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,年度利潤
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}在{2}會計分錄只能在貨幣言:{3}
 DocType: Fee Schedule,In Process,在過程
@@ -2963,7 +2960,7 @@
 DocType: Fiscal Year,Companies,企業
 DocType: Supplier Scorecard,Scoring Setup,得分設置
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +24,Electronics,電子
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +359,Debit ({0}),借記卡({0})
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +366,Debit ({0}),借記卡({0})
 DocType: BOM,Allow Same Item Multiple Times,多次允許相同的項目
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,當庫存到達需重新訂購水平時提高物料需求
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +101,Full-time,全日制
@@ -2979,7 +2976,6 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,借方是必填項
 DocType: Clinical Procedure,Inpatient Record,住院病歷
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team",時間表幫助追踪的時間,費用和結算由你的團隊做activites
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,供應商&gt;供應商類型
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,採購價格表
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,供應商記分卡變數模板。
 DocType: Job Offer Term,Offer Term,要約期限
@@ -2994,7 +2990,7 @@
 DocType: Supplier Scorecard,Supplier Score,供應商分數
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js +37,Schedule Admission,安排入場
 DocType: Tax Withholding Rate,Cumulative Transaction Threshold,累積交易閾值
-apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +26,Total Invoiced Amt,總開票金額
+apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,Total Invoiced Amt,總開票金額
 DocType: BOM,Conversion Rate,兌換率
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,產品搜索
 DocType: Cashier Closing,To Time,要時間
@@ -3004,7 +3000,7 @@
 DocType: Loan,Total Amount Paid,總金額支付
 DocType: Asset,Insurance End Date,保險終止日期
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,請選擇付費學生申請者必須入學的學生
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,BOM recursion: {0} cannot be parent or child of {2},BOM遞歸: {0}不能父母或兒童{2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +370,BOM recursion: {0} cannot be parent or child of {2},BOM遞歸: {0}不能父母或兒童{2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +40,Budget List,預算清單
 DocType: Work Order Operation,Completed Qty,完成數量
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,"For {0}, only debit accounts can be linked against another credit entry",{0},只有借方帳戶可以連接另一個貸方分錄
@@ -3012,7 +3008,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",序列化項目{0}無法使用庫存調節更新,請使用庫存條目
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",序列化項目{0}無法使用庫存調節更新,請使用庫存條目
 DocType: Training Event Employee,Training Event Employee,培訓活動的員工
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1295,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,可以為批次{1}和項目{2}保留最大樣本數量{0}。
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1299,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,可以為批次{1}和項目{2}保留最大樣本數量{0}。
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +7,Add Time Slots,添加時間插槽
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +206,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0}產品{1}需要的序號。您已提供{2}。
 DocType: Stock Reconciliation Item,Current Valuation Rate,目前的估值價格
@@ -3025,7 +3021,7 @@
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},無法找到DocType {0}
 DocType: Quality Inspection,Sample Size,樣本大小
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,請輸入收據憑證
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +411,All items have already been invoiced,所有項目已開具發票
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +412,All items have already been invoiced,所有項目已開具發票
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',請指定一個有效的“從案號”
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,進一步的成本中心可以根據組進行,但項可以對非組進行
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +40,Total allocated leaves are more days than maximum allocation of {0} leave type for employee {1} in the period,在此期間,總分配的離職時間超過員工{1}的最大分配{0}離職類型的天數
@@ -3047,7 +3043,7 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +279,You have been invited to collaborate on the project: {0},您已被邀請在項目上進行合作:{0}
 DocType: Supplier Group,Parent Supplier Group,父供應商組
 DocType: Email Digest,Purchase Orders to Bill,向比爾購買訂單
-apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js +47,Accumulated Values in Group Company,集團公司累計價值
+apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js +54,Accumulated Values in Group Company,集團公司累計價值
 DocType: Leave Block List Date,Block Date,封鎖日期
 DocType: Purchase Receipt,Supplier Delivery Note,供應商交貨單
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +70,Apply Now,現在申請
@@ -3081,8 +3077,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +62,Softwares,軟件
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,接下來跟日期不能過去
 DocType: Company,For Reference Only.,僅供參考。
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2593,Select Batch No,選擇批號
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +79,Invalid {0}: {1},無效的{0}:{1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2595,Select Batch No,選擇批號
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +82,Invalid {0}: {1},無效的{0}:{1}
 DocType: Fee Validity,Reference Inv,參考文獻
 DocType: Sales Invoice Advance,Advance Amount,提前量
 DocType: Manufacturing Settings,Capacity Planning,產能規劃
@@ -3096,8 +3092,8 @@
 DocType: Normal Test Items,Require Result Value,需要結果值
 DocType: Item,Show a slideshow at the top of the page,顯示幻燈片在頁面頂部
 DocType: Tax Withholding Rate,Tax Withholding Rate,稅收預扣稅率
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +547,Boms,物料清單
-apps/erpnext/erpnext/stock/doctype/item/item.py +178,Stores,商店
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +552,Boms,物料清單
+apps/erpnext/erpnext/stock/doctype/item/item.py +187,Stores,商店
 DocType: Project Type,Projects Manager,項目經理
 DocType: Serial No,Delivery Time,交貨時間
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +45,Ageing Based On,老齡化基於
@@ -3112,13 +3108,13 @@
 apps/erpnext/erpnext/config/non_profit.py +68,Loan Management,貸款管理
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,跟踪獨立收入和支出進行產品垂直或部門。
 DocType: Item Reorder,Item Reorder,項目重新排序
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +448,Show Salary Slip,顯示工資單
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +873,Transfer Material,轉印材料
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +488,Show Salary Slip,顯示工資單
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +881,Transfer Material,轉印材料
 DocType: Fees,Send Payment Request,發送付款請求
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",指定作業、作業成本並給予該作業一個專屬的作業編號。
 DocType: Travel Request,Any other details,任何其他細節
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,這份文件是超過限制,通過{0} {1}項{4}。你在做另一個{3}對同一{2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,請設置保存後復發
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1282,Please set recurring after saving,請設置保存後復發
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,選擇變化量賬戶
 DocType: Purchase Invoice,Price List Currency,價格表之貨幣
 DocType: Naming Series,User must always select,用戶必須始終選擇
@@ -3141,7 +3137,7 @@
 DocType: Delivery Note,Transport Receipt No,運輸收據編號
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Source of Funds (Liabilities),資金來源(負債)
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +52,Source and Target Location cannot be same,源和目標位置不能相同
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Quantity in row {0} ({1}) must be same as manufactured quantity {2},列{0}的數量({1})必須與生產量{2}相同
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +522,Quantity in row {0} ({1}) must be same as manufactured quantity {2},列{0}的數量({1})必須與生產量{2}相同
 DocType: Supplier Scorecard Scoring Standing,Employee,僱員
 DocType: Bank Guarantee,Fixed Deposit Number,定期存款編號
 DocType: Asset Repair,Failure Date,失敗日期
@@ -3155,6 +3151,7 @@
 DocType: Payment Entry,Payment Deductions or Loss,付款扣除或損失
 DocType: Soil Analysis,Soil Analysis Criterias,土壤分析標準
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,銷售或採購的標準合同條款。
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +58,Group by Voucher,集團透過券
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,你確定要取消這個預約嗎?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,酒店房間價格套餐
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,銷售渠道
@@ -3164,7 +3161,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},帳戶{0}與帳戶模式{2}中的公司{1}不符
 apps/erpnext/erpnext/controllers/buying_controller.py +707,Specified BOM {0} does not exist for Item {1},指定BOM {0}的項目不存在{1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,課程:
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +242,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,維護時間表{0}必須取消早於取消這個銷售訂單
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +244,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,維護時間表{0}必須取消早於取消這個銷售訂單
 DocType: POS Profile,Applicable for Users,適用於用戶
 DocType: Notification Control,Expense Claim Approved,報銷批准
 DocType: Purchase Invoice,Set Advances and Allocate (FIFO),設置進度和分配(FIFO)
@@ -3192,7 +3189,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +232,For Job Card,對於工作卡
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1552,Prescriptions,處方
 DocType: Payment Gateway Account,Payment Account,付款帳號
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +1105,Please specify Company to proceed,請註明公司以處理
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +1112,Please specify Company to proceed,請註明公司以處理
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +81,Net Change in Accounts Receivable,應收賬款淨額變化
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +91,Compensatory Off,補假
 DocType: Job Offer,Accepted,接受的
@@ -3215,7 +3212,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +76,View Fees Records,查看費用記錄
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,使稅收模板
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,用戶論壇
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,原材料不能為空。
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +333,Raw Materials cannot be blank.,原材料不能為空。
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,行#{0}(付款表):金額必須為負數
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.",無法更新庫存,發票包含下降航運項目。
 DocType: Contract,Fulfilment Status,履行狀態
@@ -3257,11 +3254,11 @@
 DocType: BOM,Show Operations,顯示操作
 ,Minutes to First Response for Opportunity,分鐘的機會第一個反應
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +97,Total Absent,共缺席
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1060,Item or Warehouse for row {0} does not match Material Request,行{0}的項目或倉庫不符合物料需求
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1064,Item or Warehouse for row {0} does not match Material Request,行{0}的項目或倉庫不符合物料需求
 apps/erpnext/erpnext/config/stock.py +194,Unit of Measure,計量單位
 DocType: Fiscal Year,Year End Date,年結結束日期
 DocType: Task Depends On,Task Depends On,任務取決於
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1076,Opportunity,機會
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1083,Opportunity,機會
 DocType: Operation,Default Workstation,預設工作站
 DocType: Notification Control,Expense Claim Approved Message,報銷批准的訊息
 DocType: Payment Entry,Deductions or Loss,扣除或損失
@@ -3285,7 +3282,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html +10,Pending Leaves,等待葉子
 DocType: BOM Update Tool,Replace BOM,更換BOM
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +113,Code {0} already exist,代碼{0}已經存在
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +36,Sales orders are not available for production,銷售訂單不可用於生產
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +37,Sales orders are not available for production,銷售訂單不可用於生產
 DocType: Company,Fixed Asset Depreciation Settings,固定資產折舊設置
 DocType: Item,Will also apply for variants unless overrridden,同時將申請變種,除非overrridden
 DocType: Purchase Invoice,Advances,進展
@@ -3297,13 +3294,13 @@
 DocType: SMS Log,No of Requested SMS,無的請求短信
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +328,Leave Without Pay does not match with approved Leave Application records,停薪留職不批准請假的記錄相匹配
 DocType: Travel Request,Domestic,國內
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +846,Please supply the specified items at the best possible rates,請在提供最好的利率規定的項目
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +853,Please supply the specified items at the best possible rates,請在提供最好的利率規定的項目
 apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +19,Employee Transfer cannot be submitted before Transfer Date ,員工轉移無法在轉移日期前提交
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.js +7,Make Invoice,製作發票
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +121,Remaining Balance,保持平衡
 DocType: Selling Settings,Auto close Opportunity after 15 days,15天之後自動關閉商機
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +83,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,由於{1}的記分卡,{0}不允許採購訂單。
-apps/erpnext/erpnext/stock/doctype/item/item.py +516,Barcode {0} is not a valid {1} code,條形碼{0}不是有效的{1}代碼
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Barcode {0} is not a valid {1} code,條形碼{0}不是有效的{1}代碼
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js +25,End Year,結束年份
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,報價/鉛%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,報價/鉛%
@@ -3369,7 +3366,7 @@
 DocType: Asset Category Account,Asset Category Account,資產類別的帳戶
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,行#{0}(付款表):金額必須為正值
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},無法產生更多的項目{0}不是銷售訂單數量{1}
-apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,選擇屬性值
+apps/erpnext/erpnext/stock/doctype/item/item.js +446,Select Attribute Values,選擇屬性值
 DocType: Purchase Invoice,Reason For Issuing document,簽發文件的原因
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +583,Stock Entry {0} is not submitted,股票輸入{0}不提交
 DocType: Payment Reconciliation,Bank / Cash Account,銀行/現金帳戶
@@ -3458,7 +3455,7 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Receipt document must be submitted,收到文件必須提交
 DocType: Purchase Invoice Item,Received Qty,到貨數量
 DocType: Stock Entry Detail,Serial No / Batch,序列號/批次
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +351,Not Paid and Not Delivered,沒有支付,未送達
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +353,Not Paid and Not Delivered,沒有支付,未送達
 DocType: Product Bundle,Parent Item,父項目
 DocType: Account,Account Type,帳戶類型
 DocType: Shopify Settings,Webhooks Details,Webhooks詳細信息
@@ -3485,13 +3482,11 @@
 DocType: Sales Invoice,Is Return (Credit Note),是退貨(信用票據)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,開始工作
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},資產{0}需要序列號
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,請通過設置&gt;設置&gt;命名系列為{0}設置命名系列
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,殘疾人模板必須不能默認模板
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,對於行{0}:輸入計劃的數量
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +542,For row {0}: Enter planned qty,對於行{0}:輸入計劃的數量
 DocType: Account,Income Account,收入帳戶
 DocType: Payment Request,Amount in customer's currency,量客戶的貨幣
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +880,Delivery,交貨
-DocType: Volunteer,Weekdays,平日
 DocType: Stock Reconciliation Item,Current Qty,目前數量
 DocType: Restaurant Menu,Restaurant Menu,餐廳菜單
 apps/erpnext/erpnext/public/js/event.js +23,Add Suppliers,添加供應商
@@ -3535,7 +3530,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,去信頭
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +114,Property already added,已添加屬性
 DocType: Item Supplier,Item Supplier,產品供應商
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,請輸入產品編號,以取得批號
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1383,Please enter Item Code to get batch no,請輸入產品編號,以取得批號
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},請選擇一個值{0} quotation_to {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,沒有選擇轉移項目
 DocType: Company,Stock Settings,庫存設定
@@ -3593,7 +3588,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +229,All Assessment Groups,所有評估組
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,新倉庫名稱
 DocType: Shopify Settings,App Type,應用類型
-apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py +384,Total {0} ({1}),總{0}({1})
+apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py +401,Total {0} ({1}),總{0}({1})
 DocType: C-Form Invoice Detail,Territory,領土
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,請註明無需訪問
 DocType: Stock Settings,Default Valuation Method,預設的估值方法
@@ -3613,7 +3608,7 @@
 DocType: Project Update,Project Update,項目更新
 DocType: Fees,Fees,費用
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,指定的匯率將一種貨幣兌換成另一種
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Quotation {0} is cancelled,{0}報價被取消
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Quotation {0} is cancelled,{0}報價被取消
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,未償還總額
 DocType: Sales Partner,Targets,目標
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +40,Please register the SIREN number in the company information file,請在公司信息文件中註冊SIREN號碼
@@ -3621,7 +3616,7 @@
 DocType: Price List,Price List Master,價格表主檔
 DocType: GST Account,CESS Account,CESS帳戶
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,所有的銷售交易,可以用來標記針對多個**銷售**的人,這樣你可以設置和監控目標。
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1177,Link to Material Request,鏈接到材料請求
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1184,Link to Material Request,鏈接到材料請求
 apps/erpnext/erpnext/templates/pages/help.html +35,Forum Activity,論壇活動
 ,S.O. No.,SO號
 DocType: Bank Statement Transaction Settings Item,Bank Statement Transaction Settings Item,銀行對賬單交易設置項目
@@ -3641,7 +3636,7 @@
 DocType: Leave Block List,Block Days,封鎖天數
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +83,"Shipping Address does not have country, which is required for this Shipping Rule",送貨地址沒有國家,這是此送貨規則所必需的
 DocType: Journal Entry,Excise Entry,海關入境
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +68,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},警告:銷售訂單{0}已經存在針對客戶的採購訂單{1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +70,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},警告:銷售訂單{0}已經存在針對客戶的採購訂單{1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -3673,7 +3668,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +237,Expense / Difference account ({0}) must be a 'Profit or Loss' account,費用/差異帳戶({0})必須是一個'溢利或虧損的帳戶
 DocType: Project,Copied From,複製自
 DocType: Project,Copied From,複製自
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +253,Invoice already created for all billing hours,發票已在所有結算時間創建
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +265,Invoice already created for all billing hours,發票已在所有結算時間創建
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Name error: {0},名稱錯誤:{0}
 DocType: Healthcare Service Unit Type,Item Details,產品詳細信息
 DocType: Cash Flow Mapping,Is Finance Cost,財務成本
@@ -3744,9 +3739,9 @@
 DocType: Lab Test,LabTest Approver,LabTest審批者
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,您已經評估了評估標準{}。
 DocType: Vehicle Service,Engine Oil,機油
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1081,Work Orders Created: {0},創建的工單:{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1083,Work Orders Created: {0},創建的工單:{0}
 DocType: Sales Invoice,Sales Team1,銷售團隊1
-apps/erpnext/erpnext/stock/doctype/item/item.py +565,Item {0} does not exist,項目{0}不存在
+apps/erpnext/erpnext/stock/doctype/item/item.py +574,Item {0} does not exist,項目{0}不存在
 DocType: Sales Invoice,Customer Address,客戶地址
 DocType: Loan,Loan Details,貸款詳情
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +61,Failed to setup post company fixtures,未能設置公司固定裝置
@@ -3766,14 +3761,14 @@
 DocType: Item Group,Show this slideshow at the top of the page,這顯示在幻燈片頁面頂部
 DocType: BOM,Item UOM,項目計量單位
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),稅額後,優惠金額(公司貨幣)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +252,Target warehouse is mandatory for row {0},目標倉庫是強制性的行{0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +256,Target warehouse is mandatory for row {0},目標倉庫是強制性的行{0}
 DocType: Cheque Print Template,Primary Settings,主要設置
 DocType: Purchase Invoice,Select Supplier Address,選擇供應商地址
 apps/erpnext/erpnext/public/js/event.js +27,Add Employees,添加員工
 DocType: Purchase Invoice Item,Quality Inspection,品質檢驗
 DocType: Company,Standard Template,標準模板
 DocType: Training Event,Theory,理論
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +1087,Warning: Material Requested Qty is less than Minimum Order Qty,警告:物料需求的數量低於最少訂購量
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +1103,Warning: Material Requested Qty is less than Minimum Order Qty,警告:物料需求的數量低於最少訂購量
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +212,Account {0} is frozen,帳戶{0}被凍結
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,法人/子公司與帳戶的獨立走勢屬於該組織。
 DocType: Payment Request,Mute Email,靜音電子郵件
@@ -3911,7 +3906,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +38,Newspaper Publishers,報紙出版商
 apps/erpnext/erpnext/hr/utils.py +154,Future dates not allowed,未來的日期不允許
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,選擇財政年度
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Expected Delivery Date should be after Sales Order Date,預計交貨日期應在銷售訂單日期之後
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +120,Expected Delivery Date should be after Sales Order Date,預計交貨日期應在銷售訂單日期之後
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,重新排序級別
 DocType: Company,Chart Of Accounts Template,圖表帳戶模板
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +80,Update stock must be enable for the purchase invoice {0},必須為購買發票{0}啟用更新庫存
@@ -4036,7 +4031,7 @@
 DocType: Serial No,Warranty / AMC Details,保修/ AMC詳情
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,為基於活動的組手動選擇學生
 DocType: Journal Entry,User Remark,用戶備註
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,優化路線。
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +97,Optimizing routes.,優化路線。
 DocType: Travel Itinerary,Non Diary,非日記
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,無法為左員工創建保留獎金
 DocType: Lead,Market Segment,市場分類
@@ -4059,7 +4054,7 @@
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,帳單金額
 DocType: Share Transfer,(including),(包括)
 DocType: Asset,Double Declining Balance,雙倍餘額遞減
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Closed order cannot be cancelled. Unclose to cancel.,關閉的定單不能被取消。 Unclose取消。
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Closed order cannot be cancelled. Unclose to cancel.,關閉的定單不能被取消。 Unclose取消。
 apps/erpnext/erpnext/config/hr.py +120,Payroll Setup,工資單設置
 DocType: Amazon MWS Settings,Synch Products,同步產品
 DocType: Loyalty Point Entry,Loyalty Program,忠誠計劃
@@ -4069,17 +4064,18 @@
 DocType: Bank Reconciliation,Bank Reconciliation,銀行對帳
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,獲取更新
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}帳戶{2}不屬於公司{3}
-apps/erpnext/erpnext/stock/doctype/item/item.js +446,Select at least one value from each of the attributes.,從每個屬性中至少選擇一個值。
+apps/erpnext/erpnext/stock/doctype/item/item.js +452,Select at least one value from each of the attributes.,從每個屬性中至少選擇一個值。
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +164,Material Request {0} is cancelled or stopped,材料需求{0}被取消或停止
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +219,Dispatch State,派遣國
 apps/erpnext/erpnext/config/hr.py +399,Leave Management,離開管理
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +17,Groups,組
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +53,Group by Account,以帳戶分群組
 DocType: Purchase Invoice,Hold Invoice,保留發票
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +37,Please select Employee,請選擇員工
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +304,Lower Income,較低的收入
 DocType: Restaurant Order Entry,Current Order,當前訂單
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +25,Number of serial nos and quantity must be the same,序列號和數量必須相同
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +271,Source and target warehouse cannot be same for row {0},列{0}的來源和目標倉庫不可相同
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +275,Source and target warehouse cannot be same for row {0},列{0}的來源和目標倉庫不可相同
 DocType: Account,Asset Received But Not Billed,已收到但未收費的資產
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",差異帳戶必須是資產/負債類型的帳戶,因為此庫存調整是一個開始分錄
 apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},支付額不能超過貸款金額較大的{0}
@@ -4088,7 +4084,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +91,Purchase Order number required for Item {0},所需物品{0}的採購訂單號
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',“起始日期”必須經過'終止日期'
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.js +32,No Staffing Plans found for this Designation,本指定沒有發現人員配備計劃
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1075,Batch {0} of Item {1} is disabled.,項目{1}的批處理{0}已禁用。
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1079,Batch {0} of Item {1} is disabled.,項目{1}的批處理{0}已禁用。
 DocType: Leave Policy Detail,Annual Allocation,年度分配
 DocType: Travel Request,Address of Organizer,主辦單位地址
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +68,Select Healthcare Practitioner...,選擇醫療從業者......
@@ -4110,7 +4106,7 @@
 DocType: Supplier Scorecard Period,Calculations,計算
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,價值或數量
 DocType: Payment Terms Template,Payment Terms,付款條件
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +470,Productions Orders cannot be raised for:,製作訂單不能上調:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +485,Productions Orders cannot be raised for:,製作訂單不能上調:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,分鐘
 DocType: Purchase Invoice,Purchase Taxes and Charges,購置稅和費
 DocType: Chapter,Meetup Embed HTML,Meetup嵌入HTML
@@ -4133,7 +4129,7 @@
 DocType: Donor,Donor,捐贈者
 DocType: Global Defaults,Disable In Words,禁用詞
 apps/erpnext/erpnext/stock/doctype/item/item.py +70,Item Code is mandatory because Item is not automatically numbered,產品編號是強制性的,因為項目沒有自動編號
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Quotation {0} not of type {1},報價{0}非為{1}類型
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +103,Quotation {0} not of type {1},報價{0}非為{1}類型
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,維護計劃項目
 DocType: Sales Order,%  Delivered,%交付
 apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,請設置學生的電子郵件ID以發送付款請求
@@ -4143,7 +4139,7 @@
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +302,Sales Pipeline by Stage,按階段劃分的銷售渠道
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,製作工資單
 DocType: Currency Exchange,For Buying,為了購買
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +890,Add All Suppliers,添加所有供應商
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +897,Add All Suppliers,添加所有供應商
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +95,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,行#{0}:分配金額不能大於未結算金額。
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +84,Browse BOM,瀏覽BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Secured Loans,抵押貸款
@@ -4176,8 +4172,8 @@
 DocType: Patient Appointment,Patient Appointment,患者預約
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,審批角色作為角色的規則適用於不能相同
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,從該電子郵件摘要退訂
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +880,Get Suppliers By,獲得供應商
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +182,{0} not found for Item {1},找不到項目{1} {0}
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +887,Get Suppliers By,獲得供應商
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +187,{0} not found for Item {1},找不到項目{1} {0}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,去課程
 DocType: Accounts Settings,Show Inclusive Tax In Print,在打印中顯示包含稅
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +17,"Bank Account, From Date and To Date are Mandatory",銀行賬戶,從日期到日期是強制性的
@@ -4190,7 +4186,7 @@
 DocType: Stock Settings,Item Naming By,產品命名規則
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},另一個期末錄入{0}作出後{1}
 DocType: Work Order,Material Transferred for Manufacturing,物料轉倉用於製造
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Account {0} does not exists,帳戶{0}不存在
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +51,Account {0} does not exists,帳戶{0}不存在
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1604,Select Loyalty Program,選擇忠誠度計劃
 DocType: Project,Project Type,專案類型
 apps/erpnext/erpnext/projects/doctype/task/task.py +154,Child Task exists for this Task. You can not delete this Task.,子任務存在這個任務。你不能刪除這個任務。
@@ -4209,7 +4205,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +387,Work Order cannot be raised against a Item Template,工作訂單不能針對項目模板產生
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +101,Shipping rule only applicable for Buying,運費規則只適用於購買
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,手頭現金
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +142,Delivery warehouse required for stock item {0},需要的庫存項目交割倉庫{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +144,Delivery warehouse required for stock item {0},需要的庫存項目交割倉庫{0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),包裹的總重量。通常為淨重+包裝材料的重量。 (用於列印)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,具有此角色的用戶可以設置凍結帳戶,並新增/修改對凍結帳戶的會計分錄
 DocType: Vital Signs,Cuts,削減
@@ -4222,7 +4218,6 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",即使有更高優先級的多個定價規則,然後按照內部優先級應用:
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,植物分析標準
 DocType: Supplier,Supplier Details,供應商詳細資訊
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,請通過設置&gt;編號系列設置出席編號系列
 DocType: Setup Progress,Setup Progress,設置進度
 DocType: Expense Claim,Approval Status,審批狀態
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},來源值必須小於列{0}的值
@@ -4239,7 +4234,7 @@
 DocType: Payment Gateway Account,Default Payment Request Message,預設的付款請求訊息
 DocType: Retention Bonus,Bonus Amount,獎金金額
 DocType: Item Group,Check this if you want to show in website,勾選本項以顯示在網頁上
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +371,Balance ({0}),餘額({0})
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +378,Balance ({0}),餘額({0})
 DocType: Loyalty Point Entry,Redeem Against,兌換
 apps/erpnext/erpnext/config/accounts.py +157,Banking and Payments,銀行和支付
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +99,Please enter API Consumer Key,請輸入API使用者密鑰
@@ -4287,13 +4282,12 @@
 DocType: POS Profile,Write Off Account,核銷帳戶
 DocType: Patient Appointment,Get prescribed procedures,獲取規定的程序
 DocType: Sales Invoice,Redemption Account,贖回賬戶
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,借方票據
 DocType: Purchase Invoice Item,Discount Amount,折扣金額
 DocType: Purchase Invoice,Return Against Purchase Invoice,回到對採購發票
 DocType: Item,Warranty Period (in days),保修期限(天數)
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Failed to set defaults,無法設置默認值
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,與關係Guardian1
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +865,Please select BOM against item {0},請選擇物料{0}的物料清單
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +873,Please select BOM against item {0},請選擇物料{0}的物料清單
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js +18,Make Invoices,製作發票
 DocType: Shopping Cart Settings,Show Stock Quantity,顯示庫存數量
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +77,Net Cash from Operations,從運營的淨現金
@@ -4335,7 +4329,7 @@
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +43,Opportunities by lead source,鉛來源的機會
 DocType: Appraisal Goal,Weightage (%),權重(%)
 DocType: Bank Reconciliation Detail,Clearance Date,清拆日期
-apps/erpnext/erpnext/stock/doctype/item/item.py +729,"Asset is already exists against the item {0}, you cannot change the has serial no value",資產已針對商品{0}存在,您無法更改已連續編號的值
+apps/erpnext/erpnext/stock/doctype/item/item.py +738,"Asset is already exists against the item {0}, you cannot change the has serial no value",資產已針對商品{0}存在,您無法更改已連續編號的值
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +10,Assessment Report,評估報告
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +26,Get Employees,獲得員工
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Gross Purchase Amount is mandatory,總消費金額是強制性
@@ -4379,7 +4373,6 @@
 DocType: Production Plan,Sales Orders Detail,銷售訂單明細
 DocType: Bin,Requested Quantity,要求的數量
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-收費.YYYY.-
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,請在教育&gt;教育設置中設置教師命名系統
 DocType: Patient,Marital Status,婚姻狀況
 DocType: Stock Settings,Auto Material Request,自動物料需求
 DocType: Woocommerce Settings,API consumer secret,API消費者秘密
@@ -4519,7 +4512,7 @@
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,這是基於這名學生出席
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +179,No Students in,沒有學生
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +180,Add more items or open full form,添加更多項目或全開放形式
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +222,Delivery Notes {0} must be cancelled before cancelling this Sales Order,送貨單{0}必須先取消才能取消銷貨訂單
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Delivery Notes {0} must be cancelled before cancelling this Sales Order,送貨單{0}必須先取消才能取消銷貨訂單
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,轉到用戶
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Paid amount + Write Off Amount can not be greater than Grand Total,支付的金額+寫的抵銷金額不能大於總計
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0}不是對項目的有效批號{1}
@@ -4567,8 +4560,6 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},序列號{0}不屬於批次{1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,職責
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,此報價的有效期已經結束。
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","請刪除員工<a href=""#Form/Employee/{0}"">{0}</a> \以取消此文檔"
 DocType: Expense Claim Account,Expense Claim Account,報銷賬戶
 DocType: Account,Capital Work in Progress,資本工作正在進行中
 DocType: Accounts Settings,Allow Stale Exchange Rates,允許陳舊的匯率
@@ -4585,17 +4576,17 @@
 apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,為任務進度百分比不能超過100個。
 DocType: Stock Reconciliation Item,Before reconciliation,調整前
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),稅收和收費上架(公司貨幣)
-apps/erpnext/erpnext/stock/doctype/item/item.py +494,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,商品稅行{0}必須有帳戶類型稅或收入或支出或課稅的
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,商品稅行{0}必須有帳戶類型稅或收入或支出或課稅的
 DocType: Sales Order,Partly Billed,天色帳單
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +54,Item {0} must be a Fixed Asset Item,項{0}必須是固定資產項目
-apps/erpnext/erpnext/stock/doctype/item/item.js +421,Make Variants,變種
+apps/erpnext/erpnext/stock/doctype/item/item.js +427,Make Variants,變種
 DocType: Item,Default BOM,預設的BOM
 DocType: Project,Total Billed Amount (via Sales Invoices),總開票金額(通過銷售發票)
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,借方票據金額
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +107,"There are inconsistencies between the rate, no of shares and the amount calculated",費率,股份數量和計算的金額之間不一致
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +39,You are not present all day(s) between compensatory leave request days,您在補休請求日之間不是全天
 apps/erpnext/erpnext/setup/doctype/company/company.js +109,Please re-type company name to confirm,請確認重新輸入公司名稱
-apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +29,Total Outstanding Amt,總街貨量金額
+apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +50,Total Outstanding Amt,總街貨量金額
 DocType: Journal Entry,Printing Settings,列印設定
 DocType: Employee Advance,Advance Account,預付帳戶
 DocType: Job Offer,Job Offer Terms,招聘條款
@@ -4604,7 +4595,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,汽車
 DocType: Vehicle,Insurance Company,保險公司
 DocType: Asset Category Account,Fixed Asset Account,固定資產帳戶
-DocType: Salary Structure Assignment,Variable,變量
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +442,Variable,變量
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,從送貨單
 DocType: Chapter,Members,會員
 DocType: Student,Student Email Address,學生的電子郵件地址
@@ -4641,10 +4632,10 @@
 DocType: Subscription,Plans,計劃
 DocType: Salary Slip,Salary Structure,薪酬結構
 DocType: Account,Bank,銀行
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,發行材料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +886,Issue Material,發行材料
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,將Shopify與ERPNext連接
-DocType: Material Request Item,For Warehouse,對於倉庫
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,已更新交貨單{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1160,For Warehouse,對於倉庫
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +92,Delivery Notes {0} updated,已更新交貨單{0}
 DocType: Employee,Offer Date,到職日期
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,語錄
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,您在離線模式。您將無法重新加載,直到你有網絡。
@@ -4653,7 +4644,7 @@
 DocType: Purchase Invoice Item,Serial No,序列號
 apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,每月還款額不能超過貸款金額較大
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,請先輸入維護細節
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +59,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,行#{0}:預計交貨日期不能在採購訂單日期之前
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,行#{0}:預計交貨日期不能在採購訂單日期之前
 DocType: Purchase Invoice,Print Language,打印語言
 DocType: Salary Slip,Total Working Hours,總的工作時間
 DocType: Sales Invoice,Customer PO Details,客戶PO詳細信息
@@ -4662,9 +4653,9 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1979,Enter value must be positive,輸入值必須為正
 DocType: Asset,Finance Books,財務書籍
 DocType: Employee Tax Exemption Declaration Category,Employee Tax Exemption Declaration Category,員工免稅申報類別
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +448,All Territories,所有的領土
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +451,All Territories,所有的領土
 apps/erpnext/erpnext/hr/utils.py +216,Please set leave policy for employee {0} in Employee / Grade record,請在員工/成績記錄中為員工{0}設置休假政策
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1400,Invalid Blanket Order for the selected Customer and Item,所選客戶和物料的無效總訂單
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1466,Invalid Blanket Order for the selected Customer and Item,所選客戶和物料的無效總訂單
 apps/erpnext/erpnext/projects/doctype/task/task_tree.js +49,Add Multiple Tasks,添加多個任務
 DocType: Purchase Invoice,Items,項目
 apps/erpnext/erpnext/crm/doctype/contract/contract.py +38,End Date cannot be before Start Date.,結束日期不能在開始日期之前。
@@ -4675,7 +4666,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +108,PDC/LC Ref,PDC / LC參考
 DocType: Production Plan Item,Product Bundle Item,產品包項目
 DocType: Sales Partner,Sales Partner Name,銷售合作夥伴名稱
-apps/erpnext/erpnext/hooks.py +141,Request for Quotations,索取報價
+apps/erpnext/erpnext/hooks.py +148,Request for Quotations,索取報價
 DocType: Payment Reconciliation,Maximum Invoice Amount,最大發票額
 DocType: Normal Test Items,Normal Test Items,正常測試項目
 DocType: QuickBooks Migrator,Company Settings,公司設置
@@ -4691,12 +4682,12 @@
 DocType: Issue,Opening Time,開放時間
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +97,From and To dates required,需要起始和到達日期
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,證券及商品交易所
-apps/erpnext/erpnext/stock/doctype/item/item.py +747,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',測度變異的默認單位“{0}”必須是相同模板“{1}”
+apps/erpnext/erpnext/stock/doctype/item/item.py +756,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',測度變異的默認單位“{0}”必須是相同模板“{1}”
 DocType: Shipping Rule,Calculate Based On,計算的基礎上
 DocType: Contract,Unfulfilled,秕
 DocType: Delivery Note Item,From Warehouse,從倉庫
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,沒有僱員提到的標準
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,不與物料清單的項目,以製造
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1032,No Items with Bill of Materials to Manufacture,不與物料清單的項目,以製造
 DocType: Shopify Settings,Default Customer,默認客戶
 DocType: Sales Stage,Stage Name,藝名
 DocType: Assessment Plan,Supervisor Name,主管名稱
@@ -4729,7 +4720,7 @@
 DocType: Payroll Entry,Payroll Frequency,工資頻率
 DocType: Lab Test Template,Sensitivity,靈敏度
 apps/erpnext/erpnext/erpnext_integrations/doctype/amazon_mws_settings/amazon_methods.py +132,Sync has been temporarily disabled because maximum retries have been exceeded,暫時禁用了同步,因為已超出最大重試次數
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1007,Raw Material,原料
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1014,Raw Material,原料
 DocType: Leave Application,Follow via Email,透過電子郵件追蹤
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,廠房和機械設備
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,稅額折後金額
@@ -4783,19 +4774,19 @@
 apps/erpnext/erpnext/config/accounts.py +122,Accounting Statements,會計報表
 DocType: Drug Prescription,Hour,小時
 DocType: Restaurant Order Entry,Last Sales Invoice,上次銷售發票
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +867,Please select Qty against item {0},請選擇項目{0}的數量
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +875,Please select Qty against item {0},請選擇項目{0}的數量
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +33,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,新的序列號不能有倉庫。倉庫必須由存貨分錄或採購入庫單進行設定
 DocType: Lead,Lead Type,主導類型
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +183,You are not authorized to approve leaves on Block Dates,在限制的日期,您無權批准休假
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +405,All these items have already been invoiced,所有這些項目已開具發票
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +1017,Set New Release Date,設置新的發布日期
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +408,All these items have already been invoiced,所有這些項目已開具發票
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +1024,Set New Release Date,設置新的發布日期
 DocType: Company,Monthly Sales Target,每月銷售目標
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},可以通過{0}的批准
 DocType: Hotel Room,Hotel Room Type,酒店房間類型
 DocType: Leave Allocation,Leave Period,休假期間
 DocType: Item,Default Material Request Type,默認材料請求類型
 DocType: Supplier Scorecard,Evaluation Period,評估期
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1029,Work Order not created,工作訂單未創建
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1031,Work Order not created,工作訂單未創建
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +36,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}",已為組件{1}申請的金額{0},設置等於或大於{2}的金額
 DocType: Shipping Rule,Shipping Rule Conditions,送貨規則條件
@@ -4829,7 +4820,7 @@
 DocType: Job Opening,Job Title,職位
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py +89,"{0} indicates that {1} will not provide a quotation, but all items \
 					have been quoted. Updating the RFQ quote status.",{0}表示{1}不會提供報價,但所有項目都已被引用。更新詢價狀態。
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1290,Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}.,批次{1}和批次{3}中的項目{2}已保留最大樣本數量{0}。
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1294,Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}.,批次{1}和批次{3}中的項目{2}已保留最大樣本數量{0}。
 DocType: Manufacturing Settings,Update BOM Cost Automatically,自動更新BOM成本
 DocType: Lab Test,Test Name,測試名稱
 DocType: Healthcare Settings,Clinical Procedure Consumable Item,臨床程序消耗品
@@ -4842,7 +4833,7 @@
 DocType: Stock Entry,Update Rate and Availability,更新率和可用性
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,相對於訂單量允許接受或交付的變動百分比額度。例如:如果你下定100個單位量,而你的許可額度是10%,那麼你可以收到最多110個單位量。
 DocType: Loyalty Program,Customer Group,客戶群組
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +296,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order # {3}. Please update operation status via Time Logs,行#{0}:操作{1}未完成{2}工件訂單#{3}中成品的數量。請通過時間日誌更新操作狀態
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +300,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order # {3}. Please update operation status via Time Logs,行#{0}:操作{1}未完成{2}工件訂單#{3}中成品的數量。請通過時間日誌更新操作狀態
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +128,New Batch ID (Optional),新批號(可選)
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +128,New Batch ID (Optional),新批號(可選)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},交際費是強制性的項目{0}
@@ -4867,7 +4858,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,還沒有客戶!
 DocType: Healthcare Service Unit,Healthcare Service Unit,醫療服務單位
 apps/erpnext/erpnext/public/js/financial_statements.js +58,Cash Flow Statement,現金流量表
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +467,No material request created,沒有創建重要請求
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +374,No material request created,沒有創建重要請求
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},貸款額不能超過最高貸款額度{0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,執照
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +563,Please remove this Invoice {0} from C-Form {1},請刪除此發票{0}從C-表格{1}
@@ -4896,10 +4887,10 @@
 DocType: Vehicle,Chassis No,底盤無
 DocType: Payment Request,Initiated,啟動
 DocType: Production Plan Item,Planned Start Date,計劃開始日期
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +644,Please select a BOM,請選擇一個物料清單
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +649,Please select a BOM,請選擇一個物料清單
 DocType: Purchase Invoice,Availed ITC Integrated Tax,有效的ITC綜合稅收
 DocType: Purchase Order Item,Blanket Order Rate,一攬子訂單費率
-apps/erpnext/erpnext/hooks.py +157,Certification,證明
+apps/erpnext/erpnext/hooks.py +164,Certification,證明
 DocType: Bank Guarantee,Clauses and Conditions,條款和條件
 DocType: Serial No,Creation Document Type,創建文件類型
 DocType: Project Task,View Timesheet,查看時間表
@@ -4945,8 +4936,8 @@
 DocType: Project Update,Problematic/Stuck,問題/卡住
 DocType: Tax Rule,Billing State,計費狀態
 DocType: Share Transfer,Transfer,轉讓
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,在取消此銷售訂單之前,必須先取消工單{0}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),取得爆炸BOM(包括子組件)
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +264,Work Order {0} must be cancelled before cancelling this Sales Order,在取消此銷售訂單之前,必須先取消工單{0}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +1008,Fetch exploded BOM (including sub-assemblies),取得爆炸BOM(包括子組件)
 DocType: Authorization Rule,Applicable To (Employee),適用於(員工)
 apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,截止日期是強制性的
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,增量屬性{0}不能為0
@@ -4973,7 +4964,7 @@
 DocType: Student Attendance,Absent,缺席
 DocType: Staffing Plan,Staffing Plan Detail,人員配置計劃詳情
 DocType: Employee Promotion,Promotion Date,促銷日期
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +615,Product Bundle,產品包
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +622,Product Bundle,產品包
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,無法從{0}開始獲得分數。你需要有0到100的常規分數
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,Row {0}: Invalid reference {1},行{0}:無效參考{1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,採購稅負和費用模板
@@ -4988,7 +4979,7 @@
 DocType: Journal Entry,Write Off Based On,核銷的基礎上
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,使鉛
 DocType: Stock Settings,Show Barcode Field,顯示條形碼域
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +859,Send Supplier Emails,發送電子郵件供應商
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +866,Send Supplier Emails,發送電子郵件供應商
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +165,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",工資已經處理了與{0}和{1},留下申請期之間不能在此日期範圍內的時期。
 DocType: Fiscal Year,Auto Created,自動創建
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py +19,Submit this to create the Employee record,提交這個來創建員工記錄
@@ -5016,7 +5007,7 @@
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',請選擇“所有評估組”以外的評估組
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},行{0}:項目{1}需要費用中心
 DocType: Training Event Employee,Optional,可選的
-apps/erpnext/erpnext/stock/doctype/item/item.js +470,{0} variants created.,創建了{0}個變體。
+apps/erpnext/erpnext/stock/doctype/item/item.js +476,{0} variants created.,創建了{0}個變體。
 DocType: Amazon MWS Settings,Region,區域
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,可選。此設置將被應用於過濾各種交易進行。
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,負面評價率是不允許的
@@ -5033,7 +5024,7 @@
 apps/erpnext/erpnext/hr/report/employee_advance_summary/employee_advance_summary.py +15,No record found,沒有資料
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Cost of Scrapped Asset,報廢資產成本
 apps/erpnext/erpnext/controllers/stock_controller.py +240,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}:成本中心是強制性的項目{2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +736,Get Items from Product Bundle,從產品包取得項目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +743,Get Items from Product Bundle,從產品包取得項目
 DocType: Asset,Straight Line,直線
 DocType: Project User,Project User,項目用戶
 DocType: Employee Transfer,Re-allocate Leaves,重新分配葉子
@@ -5093,7 +5084,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +98,Make Material Request,製作材料要求
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},打開項目{0}
 DocType: Asset Finance Book,Written Down Value,寫下價值
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +232,Sales Invoice {0} must be cancelled before cancelling this Sales Order,銷售發票{0}必須早於此銷售訂單之前取消
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +234,Sales Invoice {0} must be cancelled before cancelling this Sales Order,銷售發票{0}必須早於此銷售訂單之前取消
 DocType: Clinical Procedure,Age,年齡
 DocType: Sales Invoice Timesheet,Billing Amount,開票金額
 DocType: Cash Flow Mapping,Select Maximum Of 1,選擇最多1個
@@ -5122,7 +5113,6 @@
 DocType: Bank Statement Transaction Settings Item,Bank Data,銀行數據
 DocType: Purchase Receipt Item,Sample Quantity,樣品數量
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",根據最新的估值/價格清單率/最近的原材料採購率,通過計劃程序自動更新BOM成本。
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,供應商&gt;供應商組
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},帳戶{0}:父帳戶{1}不屬於公司:{2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,成功刪除與該公司相關的所有交易!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +39,As on Date,隨著對日
@@ -5142,7 +5132,7 @@
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,學生活動
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,供應商編號
 DocType: Payment Request,Payment Gateway Details,支付網關細節
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +285,Quantity should be greater than 0,量應大於0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +290,Quantity should be greater than 0,量應大於0
 DocType: Journal Entry,Cash Entry,現金分錄
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,子節點可以在&#39;集團&#39;類型的節點上創建
 DocType: Academic Year,Academic Year Name,學年名稱
@@ -5229,13 +5219,13 @@
 DocType: Employee Onboarding,Job Offer,工作機會
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,研究所縮寫
 ,Item-wise Price List Rate,全部項目的價格表
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1149,Supplier Quotation,供應商報價
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1156,Supplier Quotation,供應商報價
 DocType: Quotation,In Words will be visible once you save the Quotation.,報價一被儲存,就會顯示出來。
 apps/erpnext/erpnext/utilities/transaction_base.py +169,Quantity ({0}) cannot be a fraction in row {1},數量({0})不能是行{1}中的分數
 apps/erpnext/erpnext/utilities/transaction_base.py +169,Quantity ({0}) cannot be a fraction in row {1},數量({0})不能是行{1}中的分數
 DocType: Contract,Unsigned,無符號
 DocType: Selling Settings,Each Transaction,每筆交易
-apps/erpnext/erpnext/stock/doctype/item/item.py +510,Barcode {0} already used in Item {1},條碼{0}已經用在項目{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +519,Barcode {0} already used in Item {1},條碼{0}已經用在項目{1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,增加運輸成本的規則。
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +72,Varaiance ,Varaiance
 DocType: Item,Opening Stock,打開股票
@@ -5262,7 +5252,7 @@
 DocType: Company,HRA Settings,HRA設置
 DocType: Employee Transfer,Transfer Date,轉移日期
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,標準銷售
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,至少要有一間倉庫
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +244,Atleast one warehouse is mandatory,至少要有一間倉庫
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.",配置項目字段,如UOM,項目組,描述和小時數。
 DocType: Certification Application,Certification Status,認證狀態
 DocType: Travel Itinerary,Travel Advance Required,需要旅行預付款
@@ -5314,7 +5304,7 @@
 DocType: Subscription,Taxes,稅
 DocType: Purchase Invoice,capital goods,資本貨物
 DocType: Purchase Invoice Item,Weight Per Unit,每單位重量
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +355,Paid and Not Delivered,支付和未送達
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +357,Paid and Not Delivered,支付和未送達
 DocType: QuickBooks Migrator,Default Cost Center,預設的成本中心
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,庫存交易明細
 DocType: Budget,Budget Accounts,預算科目
@@ -5345,8 +5335,8 @@
 ,Employee Information,僱員資料
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +242,Healthcare Practitioner not available on {0},醫療從業者在{0}上不可用
 DocType: Stock Entry Detail,Additional Cost,額外費用
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +56,"Can not filter based on Voucher No, if grouped by Voucher",是冷凍的帳戶。要禁止該帳戶創建/編輯事務,你需要角色
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +968,Make Supplier Quotation,讓供應商報價
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +59,"Can not filter based on Voucher No, if grouped by Voucher",是冷凍的帳戶。要禁止該帳戶創建/編輯事務,你需要角色
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +975,Make Supplier Quotation,讓供應商報價
 DocType: Quality Inspection,Incoming,來
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,銷售和採購的默認稅收模板被創建。
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,評估結果記錄{0}已經存在。
@@ -5360,7 +5350,7 @@
 DocType: Agriculture Task,End Day,結束的一天
 ,Delivery Note Trends,送貨單趨勢
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +120,This Week's Summary,本週的總結
-apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,庫存數量
+apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +24,In Stock Qty,庫存數量
 ,Daily Work Summary Replies,日常工作總結回复
 DocType: Delivery Trip,Calculate Estimated Arrival Times,計算預計到達時間
 apps/erpnext/erpnext/accounts/general_ledger.py +113,Account: {0} can only be updated via Stock Transactions,帳號:{0}只能通過股票的交易進行更新
@@ -5395,7 +5385,7 @@
 DocType: Share Balance,Is Company,是公司
 DocType: Stock Ledger Entry,Stock Ledger Entry,庫存總帳條目
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +190,{0} on Half day Leave on {1},半天{0}離開{1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Same item has been entered multiple times,同一項目已進入多次
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +88,Same item has been entered multiple times,同一項目已進入多次
 DocType: Department,Leave Block List,休假區塊清單
 DocType: Purchase Invoice,Tax ID,稅號
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Item {0} is not setup for Serial Nos. Column must be blank,項目{0}不是設定為序列號,此列必須為空白
@@ -5437,7 +5427,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +328,IGST Amount,IGST金額
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,未能成立公司
 DocType: Asset Repair,Asset Repair,資產修復
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +152,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},行{0}:BOM#的貨幣{1}應等於所選貨幣{2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +155,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},行{0}:BOM#的貨幣{1}應等於所選貨幣{2}
 DocType: Journal Entry Account,Exchange Rate,匯率
 DocType: Patient,Additional information regarding the patient,有關患者的其他信息
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +657,Sales Order {0} is not submitted,銷售訂單{0}未提交
@@ -5467,7 +5457,7 @@
 DocType: Payment Entry,Paid Amount,支付的金額
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,探索銷售週期
 DocType: Assessment Plan,Supervisor,監
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +944,Retention Stock Entry,保留股票入場
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +934,Retention Stock Entry,保留股票入場
 ,Available Stock for Packing Items,可用庫存包裝項目
 DocType: Item Variant,Item Variant,項目變
 ,Work Order Stock Report,工單庫存報表
@@ -5486,10 +5476,9 @@
 DocType: Employee,Health Insurance No,健康保險No
 DocType: Employee Tax Exemption Proof Submission,Tax Exemption Proofs,免稅證明
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},請輸入項目{0}的量
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,信用證
 apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,應納稅總額
 DocType: Employee External Work History,Employee External Work History,員工對外工作歷史
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +689,Job card {0} created,已創建作業卡{0}
+apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +691,Job card {0} created,已創建作業卡{0}
 DocType: Opening Invoice Creation Tool,Purchase,採購
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,餘額數量
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +20,Goals cannot be empty,目標不能為空
@@ -5522,7 +5511,7 @@
 DocType: Tax Rule,Sales Tax Template,銷售稅模板
 DocType: Employee Benefit Application Detail,Pay Against Benefit Claim,支付利益索賠
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +21,Update Cost Center Number,更新成本中心編號
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2522,Select items to save the invoice,選取要保存發票
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2524,Select items to save the invoice,選取要保存發票
 DocType: Employee,Encashment Date,兌現日期
 DocType: Training Event,Internet,互聯網
 DocType: Special Test Template,Special Test Template,特殊測試模板
@@ -5589,11 +5578,11 @@
 DocType: Crop,Produce,生產
 DocType: Hotel Settings,Default Taxes and Charges,默認稅費
 DocType: Account,Receivable,應收賬款
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +319,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,行#{0}:不能更改供應商的採購訂單已經存在
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +321,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,行#{0}:不能更改供應商的採購訂單已經存在
 DocType: Stock Entry,Material Consumption for Manufacture,材料消耗製造
 DocType: Item Alternative,Alternative Item Code,替代項目代碼
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,此角色是允許提交超過所設定信用額度的交易。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1065,Select Items to Manufacture,選擇項目,以製造
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1067,Select Items to Manufacture,選擇項目,以製造
 DocType: Delivery Stop,Delivery Stop,交貨停止
 apps/erpnext/erpnext/accounts/page/pos/pos.js +974,"Master data syncing, it might take some time",主數據同步,這可能需要一些時間
 DocType: Item,Material Issue,發料
@@ -5602,7 +5591,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,肥皂和洗滌劑
 DocType: BOM,Show Items,顯示項目
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,從時間不能超過結束時間大。
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,你想通過電子郵件通知所有的客戶?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +125,Do you want to notify all the customers by email?,你想通過電子郵件通知所有的客戶?
 DocType: Subscription Plan,Billing Interval,計費間隔
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,電影和視頻
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,已訂購
@@ -5655,7 +5644,7 @@
 apps/erpnext/erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py +130,Amount of TDS Deducted,扣除TDS的金額
 DocType: Production Plan,Include Subcontracted Items,包括轉包物料
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +81,Shortage Qty,短缺數量
-apps/erpnext/erpnext/stock/doctype/item/item.py +779,Item variant {0} exists with same attributes,項目變種{0}存在具有相同屬性
+apps/erpnext/erpnext/stock/doctype/item/item.py +788,Item variant {0} exists with same attributes,項目變種{0}存在具有相同屬性
 DocType: Loan,Repay from Salary,從工資償還
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +405,Requesting payment against {0} {1} for amount {2},請求對付款{0} {1}量{2}
 DocType: Additional Salary,Salary Slip,工資單
@@ -5680,7 +5669,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,評價結果詳細
 DocType: Employee Education,Employee Education,員工教育
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,在項目組表中找到重複的項目組
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1175,It is needed to fetch Item Details.,需要獲取項目細節。
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1241,It is needed to fetch Item Details.,需要獲取項目細節。
 DocType: Fertilizer,Fertilizer Name,肥料名稱
 DocType: Salary Slip,Net Pay,淨收費
 DocType: Cash Flow Mapping Accounts,Account,帳戶
@@ -5706,7 +5695,7 @@
 DocType: Bin,Reserved Qty for sub contract,分包合同的保留數量
 DocType: Patient Service Unit,Patinet Service Unit,Patinet服務單位
 DocType: Sales Invoice,Base Change Amount (Company Currency),基地漲跌額(公司幣種)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +309,No accounting entries for the following warehouses,沒有以下的倉庫會計分錄
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +310,No accounting entries for the following warehouses,沒有以下的倉庫會計分錄
 apps/erpnext/erpnext/projects/doctype/project/project.js +98,Save the document first.,首先保存文檔。
 apps/erpnext/erpnext/shopping_cart/cart.py +74,Only {0} in stock for item {1},物品{1}的庫存僅為{0}
 DocType: Account,Chargeable,收費
@@ -5720,19 +5709,19 @@
 DocType: Purchase Invoice Item,Service Stop Date,服務停止日期
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,最後訂單金額
 DocType: Cash Flow Mapper,e.g Adjustments for:,例如調整:
-apps/erpnext/erpnext/stock/doctype/item/item.py +291," {0} Retain Sample is based on batch, please check Has Batch No to retain sample of item","{0} 留樣品是基於批次, 請檢查是否有批次不保留專案的樣品"
+apps/erpnext/erpnext/stock/doctype/item/item.py +300," {0} Retain Sample is based on batch, please check Has Batch No to retain sample of item","{0} 留樣品是基於批次, 請檢查是否有批次不保留專案的樣品"
 DocType: Certification Application,Yet to appear,尚未出現
 DocType: Delivery Stop,Email Sent To,電子郵件發送給
 DocType: Job Card Item,Job Card Item,工作卡項目
 DocType: Accounts Settings,Allow Cost Center In Entry of Balance Sheet Account,允許成本中心輸入資產負債表科目
 apps/erpnext/erpnext/accounts/doctype/account/account.js +102,Merge with Existing Account,與現有帳戶合併
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +988,All items have already been transferred for this Work Order.,所有項目已經為此工作單轉移。
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +992,All items have already been transferred for this Work Order.,所有項目已經為此工作單轉移。
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",任何其他言論,值得一提的努力,應該在記錄中。
 DocType: Asset Maintenance,Manufacturing User,製造業用戶
 DocType: Purchase Invoice,Raw Materials Supplied,提供供應商原物料
 DocType: Subscription Plan,Payment Plan,付款計劃
 DocType: Shopping Cart Settings,Enable purchase of items via the website,通過網站啟用購買項目
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +291,Currency of the price list {0} must be {1} or {2},價目表{0}的貨幣必須是{1}或{2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +296,Currency of the price list {0} must be {1} or {2},價目表{0}的貨幣必須是{1}或{2}
 apps/erpnext/erpnext/config/accounts.py +532,Subscription Management,訂閱管理
 DocType: Appraisal,Appraisal Template,評估模板
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +255,To Pin Code,要密碼
@@ -5757,13 +5746,13 @@
 apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,添加了{0}個用戶
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent",在多層程序的情況下,客戶將根據其花費自動分配到相關層
 DocType: Appointment Type,Physician,醫師
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,一批項目的{0} {1}已過期。
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1076,Batch {0} of Item {1} has expired.,一批項目的{0} {1}已過期。
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +56,"Item Price appears multiple times based on Price List, Supplier/Customer, Currency, Item, UOM, Qty and Dates.",物料價格根據價格表,供應商/客戶,貨幣,物料,UOM,數量和日期多次出現。
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +203,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0}({1})不能大於計畫數量 {3} 在工作訂單中({2})
 DocType: Certification Application,Name of Applicant,申請人名稱
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,時間表製造。
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,小計
-apps/erpnext/erpnext/stock/doctype/item/item.py +718,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,股票交易後不能更改Variant屬性。你將不得不做一個新的項目來做到這一點。
+apps/erpnext/erpnext/stock/doctype/item/item.py +727,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,股票交易後不能更改Variant屬性。你將不得不做一個新的項目來做到這一點。
 apps/erpnext/erpnext/config/integrations.py +18,GoCardless SEPA Mandate,GoCardless SEPA授權
 DocType: Healthcare Practitioner,Charges,收費
 DocType: Production Plan,Get Items For Work Order,獲取工作訂單的物品
@@ -5798,7 +5787,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +72,Failed to create website,無法創建網站
 DocType: Soil Analysis,Mg/K,鎂/ K
 DocType: UOM Conversion Detail,UOM Conversion Detail,計量單位換算詳細
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +999,Retention Stock Entry already created or Sample Quantity not provided,已創建保留庫存條目或未提供“樣本數量”
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +989,Retention Stock Entry already created or Sample Quantity not provided,已創建保留庫存條目或未提供“樣本數量”
 DocType: Program,Program Abbreviation,計劃縮寫
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +407,Production Order cannot be raised against a Item Template,生產訂單不能對一個項目提出的模板
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,費用對在採購入庫單內的每個項目更新
@@ -5808,7 +5797,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +53,Account {0}: You can not assign itself as parent account,帳戶{0}:你不能指定自己為父帳戶
 DocType: Purchase Invoice Item,Price List Rate,價格列表費率
 apps/erpnext/erpnext/utilities/activation.py +72,Create customer quotes,創建客戶報價
-apps/erpnext/erpnext/public/js/controllers/transaction.js +813,Service Stop Date cannot be after Service End Date,服務停止日期不能在服務結束日期之後
+apps/erpnext/erpnext/public/js/controllers/transaction.js +879,Service Stop Date cannot be after Service End Date,服務停止日期不能在服務結束日期之後
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",基於倉庫內存貨的狀態顯示「有或」或「無貨」。
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),材料清單(BOM)
 DocType: Item,Average time taken by the supplier to deliver,採取供應商的平均時間交付
@@ -5817,7 +5806,7 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,小時
 DocType: Project,Expected Start Date,預計開始日期
 DocType: Purchase Invoice,04-Correction in Invoice,04-發票糾正
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1038,Work Order already created for all items with BOM,已經為包含物料清單的所有料品創建工單
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1040,Work Order already created for all items with BOM,已經為包含物料清單的所有料品創建工單
 DocType: Payment Request,Party Details,黨詳細
 apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant Details Report,變體詳細信息報告
 DocType: Setup Progress Action,Setup Progress Action,設置進度動作
@@ -5839,7 +5828,7 @@
 DocType: Asset,Disposal Date,處置日期
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",電子郵件將在指定的時間發送給公司的所有在職職工,如果他們沒有假期。回复摘要將在午夜被發送。
 DocType: Employee Leave Approver,Employee Leave Approver,員工請假審批
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}:一個重新排序條目已存在這個倉庫{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +537,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}:一個重新排序條目已存在這個倉庫{1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.",不能聲明為丟失,因為報價已經取得進展。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,CWIP Account,CWIP賬戶
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,培訓反饋
@@ -5850,7 +5839,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,無效的主名稱
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc的DocType
 DocType: Cash Flow Mapper,Section Footer,章節頁腳
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Add / Edit Prices,新增 / 編輯價格
+apps/erpnext/erpnext/stock/doctype/item/item.js +359,Add / Edit Prices,新增 / 編輯價格
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +19,Employee Promotion cannot be submitted before Promotion Date ,員工晉升不能在晉升日期前提交
 DocType: Salary Component,Is Flexible Benefit,是靈活的好處
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +85,Chart of Cost Centers,成本中心的圖
@@ -5866,7 +5855,7 @@
 apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,出事了!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +174,Warning: Leave application contains following block dates,警告:離開包含以下日期區塊的應用程式
 DocType: Bank Statement Settings,Transaction Data Mapping,交易數據映射
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +277,Sales Invoice {0} has already been submitted,銷售發票{0}已提交
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +280,Sales Invoice {0} has already been submitted,銷售發票{0}已提交
 DocType: Salary Component,Is Tax Applicable,是否適用稅務?
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,會計年度{0}不存在
 DocType: Purchase Invoice Item,Amount (Company Currency),金額(公司貨幣)
@@ -5888,7 +5877,7 @@
 DocType: Cost Center,Cost Center Name,成本中心名稱
 DocType: HR Settings,Max working hours against Timesheet,最大工作時間針對時間表
 DocType: Maintenance Schedule Detail,Scheduled Date,預定日期
-apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,Total Paid Amt,數金額金額
+apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +34,Total Paid Amt,數金額金額
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,大於160個字元的訊息將被分割成多個訊息送出
 DocType: Purchase Receipt Item,Received and Accepted,收貨及允收
 ,GST Itemised Sales Register,消費稅商品銷售登記冊
@@ -5911,10 +5900,10 @@
 DocType: Item,Has Serial No,有序列號
 DocType: Employee,Date of Issue,發行日期
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}",根據購買設置,如果需要購買記錄==“是”,則為了創建採購發票,用戶需要首先為項目{0}創建採購憑證
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},行#{0}:設置供應商項目{1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +174,Row #{0}: Set Supplier for item {1},行#{0}:設置供應商項目{1}
 DocType: Global Defaults,Default Distance Unit,默認距離單位
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,行{0}:小時值必須大於零。
-apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,網站圖像{0}附加到物品{1}無法找到
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Hours value must be greater than zero.,行{0}:小時值必須大於零。
+apps/erpnext/erpnext/stock/doctype/item/item.py +220,Website Image {0} attached to Item {1} cannot be found,網站圖像{0}附加到物品{1}無法找到
 DocType: Issue,Content Type,內容類型
 DocType: Asset,Assets,資產
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,電腦
@@ -5941,7 +5930,7 @@
 ,Average Commission Rate,平均佣金比率
 DocType: Share Balance,No of Shares,股份數目
 DocType: Taxable Salary Slab,To Amount,金額
-apps/erpnext/erpnext/stock/doctype/item/item.py +466,'Has Serial No' can not be 'Yes' for non-stock item,非庫存項目不能有序號
+apps/erpnext/erpnext/stock/doctype/item/item.py +475,'Has Serial No' can not be 'Yes' for non-stock item,非庫存項目不能有序號
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,選擇狀態
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance can not be marked for future dates,考勤不能標記為未來的日期
 DocType: Support Search Source,Post Description Key,發布說明密鑰
@@ -5981,9 +5970,9 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,關閉帳戶{0}的類型必須是負債/權益
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Salary Slip of employee {0} already created for time sheet {1},員工的工資單{0}已為時間表創建{1}
 DocType: Production Plan Item,Ordered Qty,訂購數量
-apps/erpnext/erpnext/stock/doctype/item/item.py +809,Item {0} is disabled,項目{0}無效
+apps/erpnext/erpnext/stock/doctype/item/item.py +818,Item {0} is disabled,項目{0}無效
 DocType: Stock Settings,Stock Frozen Upto,存貨凍結到...為止
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +1008,BOM does not contain any stock item,BOM不包含任何庫存項目
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +1021,BOM does not contain any stock item,BOM不包含任何庫存項目
 DocType: Chapter,Chapter Head,章主管
 DocType: Payment Term,Month(s) after the end of the invoice month,發票月份結束後的月份
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +66,Salary Structure should have flexible benefit component(s) to dispense benefit amount,薪酬結構應該有靈活的福利組成來分配福利金額
@@ -5993,7 +5982,7 @@
 DocType: Vehicle Log,Refuelling Details,加油詳情
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,實驗結果日期時間不能在測試日期時間之前
 DocType: POS Profile,Allow user to edit Discount,允許用戶編輯折扣
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,從中獲取客戶
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +65,Get customers from,從中獲取客戶
 DocType: Purchase Invoice Item,Include Exploded Items,包含爆炸物品
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,"Buying must be checked, if Applicable For is selected as {0}",採購必須進行檢查,如果適用於被選擇為{0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,折扣必須小於100
@@ -6003,7 +5992,7 @@
 DocType: Sales Invoice Timesheet,Billing Hours,結算時間
 DocType: Project,Total Sales Amount (via Sales Order),總銷售額(通過銷售訂單)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +529,Default BOM for {0} not found,默認BOM {0}未找到
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Row #{0}: Please set reorder quantity,行#{0}:請設置再訂購數量
+apps/erpnext/erpnext/stock/doctype/item/item.py +541,Row #{0}: Please set reorder quantity,行#{0}:請設置再訂購數量
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,點擊項目將其添加到此處
 DocType: Fees,Program Enrollment,招生計劃
 DocType: Share Transfer,To Folio No,對開本No
@@ -6029,7 +6018,6 @@
 DocType: Bank Statement Settings Item,Bank Header,銀行標題
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,查看實驗室測試
 DocType: Hub Users,Hub Users,Hub用戶
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,客戶&gt;客戶群&gt;地區
 DocType: Purchase Invoice,Y,ÿ
 DocType: Maintenance Visit,Maintenance Date,維修日期
 DocType: Purchase Invoice Item,Rejected Serial No,拒絕序列號
@@ -6040,12 +6028,12 @@
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","例如:ABCD ##### 
 如果串聯設定並且序列號沒有在交易中提到,然後自動序列號將在此基礎上創建的系列。如果你總是想明確提到序號為這個項目。留空。"
 DocType: Upload Attendance,Upload Attendance,上傳考勤
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +640,BOM and Manufacturing Quantity are required,BOM和生產量是必需的
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +645,BOM and Manufacturing Quantity are required,BOM和生產量是必需的
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +62,Ageing Range 2,老齡範圍2
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,安裝預置
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},沒有為客戶{}選擇送貨單
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +113,No Delivery Note selected for Customer {},沒有為客戶{}選擇送貨單
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,員工{0}沒有最大福利金額
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,根據交付日期選擇項目
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1210,Select Items based on Delivery Date,根據交付日期選擇項目
 DocType: Grant Application,Has any past Grant Record,有過去的贈款記錄嗎?
 ,Sales Analytics,銷售分析
 ,Prospects Engaged But Not Converted,展望未成熟
@@ -6069,7 +6057,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,酒店房間預訂
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,顧客服務
 DocType: BOM,Thumbnail,縮略圖
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,找不到與電子郵件ID的聯繫人。
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +383,No contacts with email IDs found.,找不到與電子郵件ID的聯繫人。
 DocType: Item Customer Detail,Item Customer Detail,項目客戶詳細
 DocType: Notification Control,Prompt for Email on Submission of,提示電子郵件的提交
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},員工{0}的最高福利金額超過{1}
@@ -6108,7 +6096,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise折扣
 apps/erpnext/erpnext/config/projects.py +46,Timesheet for tasks.,時間表的任務。
 DocType: Purchase Invoice,Against Expense Account,對費用帳戶
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +284,Installation Note {0} has already been submitted,安裝注意{0}已提交
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +287,Installation Note {0} has already been submitted,安裝注意{0}已提交
 DocType: Bank Reconciliation,Get Payment Entries,獲取付款項
 DocType: Quotation Item,Against Docname,對Docname
 DocType: SMS Center,All Employee (Active),所有員工(活動)
@@ -6148,7 +6136,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,庫存產品
 DocType: Sales Invoice,Update Billed Amount in Sales Order,更新銷售訂單中的結算金額
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",如果未選取,則該列表將被加到每個應被應用到的部門。
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +685,Posting date and posting time is mandatory,登錄日期和登錄時間是必需的
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +689,Posting date and posting time is mandatory,登錄日期和登錄時間是必需的
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,稅務模板購買交易。
 ,Item Prices,產品價格
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,採購訂單一被儲存,就會顯示出來。
@@ -6164,7 +6152,7 @@
 DocType: Company,Series for Asset Depreciation Entry (Journal Entry),資產折舊條目系列(期刊條目)
 DocType: Membership,Member Since,成員自
 DocType: Purchase Invoice,Advance Payments,預付款
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1748,Please select Healthcare Service,請選擇醫療保健服務
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1750,Please select Healthcare Service,請選擇醫療保健服務
 DocType: Purchase Taxes and Charges,On Net Total,在總淨
 apps/erpnext/erpnext/controllers/item_variant.py +92,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},為屬性{0}值必須的範圍內{1}到{2}中的增量{3}為項目{4}
 DocType: Restaurant Reservation,Waitlisted,輪候
@@ -6177,7 +6165,7 @@
 DocType: Subscription Plan,Based on price list,基於價格表
 DocType: Customer Group,Parent Customer Group,母客戶群組
 DocType: Vehicle Service,Change,更改
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +891,Subscription,訂閱
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +898,Subscription,訂閱
 DocType: Purchase Invoice,Contact Email,聯絡電郵
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,費用創作待定
 DocType: Appraisal Goal,Score Earned,得分
@@ -6203,7 +6191,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,應收/應付賬款
 DocType: Delivery Note Item,Against Sales Order Item,對銷售訂單項目
 DocType: Company,Company Logo,公司標誌
-apps/erpnext/erpnext/stock/doctype/item/item.py +774,Please specify Attribute Value for attribute {0},請指定屬性值的屬性{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +783,Please specify Attribute Value for attribute {0},請指定屬性值的屬性{0}
 DocType: QuickBooks Migrator,Default Warehouse,預設倉庫
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +55,Budget cannot be assigned against Group Account {0},不能指定預算給群組帳目{0}
 DocType: Shopping Cart Settings,Show Price,顯示價格
@@ -6217,9 +6205,9 @@
 DocType: Appraisal,Total Score (Out of 5),總分(滿分5分)
 DocType: Student Attendance Tool,Batch,批量
 DocType: Support Search Source,Query Route String,查詢路由字符串
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1165,Update rate as per last purchase,根據上次購買更新率
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1172,Update rate as per last purchase,根據上次購買更新率
 DocType: Donor,Donor Type,捐助者類型
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +703,Auto repeat document updated,自動重複文件更新
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Auto repeat document updated,自動重複文件更新
 apps/erpnext/erpnext/stock/doctype/item/item.js +29,Balance,餘額
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +66,Please select the Company,請選擇公司
 DocType: Room,Seating Capacity,座位數
@@ -6309,7 +6297,7 @@
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,餐廳訂單錄入項目
 DocType: Purchase Invoice,Rounded Total (Company Currency),整數總計(公司貨幣)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,不能隱蔽到組,因為帳戶類型選擇的。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} 已修改。請更新。
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +272,{0} {1} has been modified. Please refresh.,{0} {1} 已修改。請更新。
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,停止用戶在下面日期提出休假申請。
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.",如果忠誠度積分無限期到期,請將到期時間保持為空或0。
 DocType: Asset Maintenance Team,Maintenance Team Members,維護團隊成員
@@ -6319,7 +6307,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,供應商報價{0}創建
 apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,結束年份不能啟動年前
 DocType: Employee Benefit Application,Employee Benefits,員工福利
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},盒裝數量必須等於{1}列品項{0}的數量
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packed quantity must equal quantity for Item {0} in row {1},盒裝數量必須等於{1}列品項{0}的數量
 DocType: Work Order,Manufactured Qty,生產數量
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +79,The shares don't exist with the {0},這些份額不存在於{0}
 DocType: Sales Partner Type,Sales Partner Type,銷售夥伴類型
@@ -6330,7 +6318,6 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +302,Please set a default Holiday List for Employee {0} or Company {1},請設置一個默認的假日列表為員工{0}或公司{1}
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,選擇批號
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,客戶提出的賬單。
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,請在人力資源&gt;人力資源設置中設置員工命名系統
 DocType: Healthcare Settings,Invoice Appointments Automatically,自動發票約會
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,項目編號
 DocType: Salary Component,Variable Based On Taxable Salary,基於應納稅工資的變量
@@ -6407,7 +6394,7 @@
 DocType: Company,Date of Incorporation,註冊成立日期
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +121,Total Tax,總稅收
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +40,Last Purchase Price,上次購買價格
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +280,For Quantity (Manufactured Qty) is mandatory,對於數量(製造數量)是強制性的
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +284,For Quantity (Manufactured Qty) is mandatory,對於數量(製造數量)是強制性的
 DocType: Stock Entry,Default Target Warehouse,預設目標倉庫
 DocType: Purchase Invoice,Net Total (Company Currency),總淨值(公司貨幣)
 DocType: Delivery Note,Air,空氣
@@ -6447,9 +6434,9 @@
 DocType: Purchase Order,Advance Paid,提前支付
 DocType: Manufacturing Settings,Overproduction Percentage For Sales Order,銷售訂單超額生產百分比
 DocType: Item,Item Tax,產品稅
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +943,Material to Supplier,材料到供應商
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +950,Material to Supplier,材料到供應商
 DocType: Production Plan,Material Request Planning,物料請求計劃
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +700,Excise Invoice,消費稅發票
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +705,Excise Invoice,消費稅發票
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}出現%不止一次
 DocType: Expense Claim,Employees Email Id,員工的電子郵件ID
 DocType: Employee Attendance Tool,Marked Attendance,明顯考勤
@@ -6489,11 +6476,11 @@
 DocType: Customer,Commission Rate,佣金比率
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py +241,Successfully created payment entries,成功創建付款條目
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,為{1}創建{0}記分卡:
-apps/erpnext/erpnext/stock/doctype/item/item.js +584,Make Variant,在Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +590,Make Variant,在Variant
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +156,"Payment Type must be one of Receive, Pay and Internal Transfer",付款方式必須是接收之一,收費和內部轉賬
 DocType: Travel Itinerary,Preferred Area for Lodging,住宿的首選地區
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,車是空的
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +424,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",項目{0}沒有序列號只有serilialized items \可以根據序列號進行交付
 DocType: Work Order,Actual Operating Cost,實際運行成本
 DocType: Payment Entry,Cheque/Reference No,支票/參考編號
@@ -6518,7 +6505,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,沒什麼可改變的
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,請選擇一個csv文件
 DocType: Holiday List,Total Holidays,總假期
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,缺少發送的電子郵件模板。請在“傳遞設置”中設置一個。
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Missing email template for dispatch. Please set one in Delivery Settings.,缺少發送的電子郵件模板。請在“傳遞設置”中設置一個。
 DocType: Student Leave Application,Mark as Present,標記為現
 DocType: Supplier Scorecard,Indicator Color,指示燈顏色
 DocType: Purchase Order,To Receive and Bill,準備收料及接收發票
@@ -6546,7 +6533,7 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,讓學生批
 DocType: BOM Explosion Item,Allow Transfer for Manufacture,允許轉移製造
 DocType: Leave Type,Is Carry Forward,是弘揚
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +984,Get Items from BOM,從物料清單取得項目
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +997,Get Items from BOM,從物料清單取得項目
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,交貨期天
 DocType: Cash Flow Mapping,Is Income Tax Expense,是所得稅費用
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,您的訂單已發貨!
@@ -6556,10 +6543,10 @@
 ,Stock Summary,股票摘要
 apps/erpnext/erpnext/config/assets.py +62,Transfer an asset from one warehouse to another,從一個倉庫轉移資產到另一
 DocType: Employee Benefit Application,Remaining Benefits (Yearly),剩餘福利(每年)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +865,Bill of Materials,材料清單
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +873,Bill of Materials,材料清單
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Row {0}: Party Type and Party is required for Receivable / Payable account {1},行{0}:黨的類型和黨的需要應收/應付帳戶{1}
 DocType: Employee,Leave Policy,離開政策
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +858,Update Items,更新項目
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +865,Update Items,更新項目
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,參考日期
 DocType: Employee,Reason for Leaving,離職原因
 DocType: BOM Operation,Operating Cost(Company Currency),營業成本(公司貨幣)