[Translation] Updated Translations (#15518)

diff --git a/erpnext/translations/zh-TW.csv b/erpnext/translations/zh-TW.csv
index ee24c52..c27f201 100644
--- a/erpnext/translations/zh-TW.csv
+++ b/erpnext/translations/zh-TW.csv
@@ -11,7 +11,7 @@
 DocType: Item,Customer Items,客戶項目
 DocType: Project,Costing and Billing,成本核算和計費
 apps/erpnext/erpnext/hr/doctype/employee_advance/employee_advance.py +43,Advance account currency should be same as company currency {0},預付帳戶貨幣應與公司貨幣{0}相同
-apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} can not be a ledger,帳戶{0}:父帳戶{1}不能是總帳
+apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} can not be a ledger,帳戶{0}:父帳戶{1}不能是總帳
 DocType: Item,Publish Item to hub.erpnext.com,發布項目hub.erpnext.com
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +271,Cannot find active Leave Period,找不到有效的休假期
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +22,Evaluation,評估
@@ -22,7 +22,7 @@
 DocType: Patient Encounter,Investigations,調查
 DocType: Restaurant Order Entry,Click Enter To Add,點擊輸入要添加
 apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py +29,"Missing value for Password, API Key or Shopify URL",缺少密碼,API密鑰或Shopify網址的值
-apps/erpnext/erpnext/public/js/setup_wizard.js +231,All Accounts,所有帳戶
+apps/erpnext/erpnext/public/js/setup_wizard.js +243,All Accounts,所有帳戶
 apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +15,Cannot transfer Employee with status Left,無法轉移狀態為左的員工
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +216,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",停止生產訂單無法取消,首先Unstop它取消
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +317,Do you really want to scrap this asset?,難道你真的想放棄這項資產?
@@ -30,7 +30,7 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,選擇默認供應商
 apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +26,Show Employee,顯示員工
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,新匯率
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},價格表{0}需填入貨幣種類
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},價格表{0}需填入貨幣種類
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,*將被計算在該交易。
 DocType: Purchase Order,Customer Contact,客戶聯絡
 DocType: Patient Appointment,Check availability,檢查可用性
@@ -55,7 +55,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/accounts/doctype/sales_invoice/sales_invoice.js +1581,Service Stop Date cannot be before Service Start Date,服務停止日期不能早於服務開始日期
+apps/erpnext/erpnext/public/js/controllers/transaction.js +809,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 +62,Show open,公開顯示
@@ -102,12 +102,11 @@
 DocType: Lab Prescription,Lab Prescription,實驗室處方
 ,Delay Days,延遲天數
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,服務費用
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1010,Serial Number: {0} is already referenced in Sales Invoice: {1},序號:{0}已在銷售發票中引用:{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +993,Serial Number: {0} is already referenced in Sales Invoice: {1},序號:{0}已在銷售發票中引用:{1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,發票
 DocType: Purchase Invoice Item,Item Weight Details,項目重量細節
 DocType: Asset Maintenance Log,Periodicity,週期性
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,會計年度{0}是必需的
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Group,供應商>供應商組
 DocType: Crop Cycle,The minimum distance between rows of plants for optimum growth,植株之間的最小距離,以獲得最佳生長
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +21,Defense,防禦
 DocType: Salary Component,Abbr,縮寫
@@ -147,7 +146,6 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Appointment charges.,如果未在患者中設置預約費用,則使用默認應收帳戶。
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name",附加.csv文件有兩列,一為舊名稱,一個用於新名稱
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +192,From Address 2,來自地址2
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,商品代碼>商品分組>品牌
 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}
@@ -167,7 +165,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +617,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 +528,Stock cannot be updated against Delivery Note {0},送貨單{0}不能更新庫存
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +529,Stock cannot be updated against Delivery Note {0},送貨單{0}不能更新庫存
 apps/erpnext/erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py +122,Total Amount Credited,總金額
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},產品{0}
 apps/erpnext/erpnext/templates/generators/item_group.html +33,No items listed,沒有列出項目
@@ -181,7 +179,7 @@
 DocType: SMS Center,All Sales Person,所有的銷售人員
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,**月度分配**幫助你分配預算/目標跨越幾個月,如果你在你的業務有季節性。
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1770,Not items found,未找到項目
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +265,Salary Structure Missing,薪酬結構缺失
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +267,Salary Structure Missing,薪酬結構缺失
 DocType: Lead,Person Name,人姓名
 DocType: Sales Invoice Item,Sales Invoice Item,銷售發票項目
 DocType: Account,Credit,信用
@@ -202,7 +200,7 @@
 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 +1119,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 +1032,Select BOM,選擇BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1050,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}這個節日之間沒有從日期和結束日期
@@ -219,7 +217,7 @@
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,賬戶只需支付
 DocType: Loan,Repay Over Number of Periods,償還期的超過數
 DocType: Stock Entry,Additional Costs,額外費用
-apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Account with existing transaction can not be converted to group.,帳戶與現有的交易不能被轉換到群組。
+apps/erpnext/erpnext/accounts/doctype/account/account.py +145,Account with existing transaction can not be converted to group.,帳戶與現有的交易不能被轉換到群組。
 DocType: Lead,Product Enquiry,產品查詢
 DocType: Education Settings,Validate Batch for Students in Student Group,驗證學生組學生的批次
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +38,No leave record found for employee {0} for {1},未找到員工的假期記錄{0} {1}
@@ -272,7 +270,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +427,"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 +193,At least one mode of payment is required for POS invoice.,付款中的至少一個模式需要POS發票。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +194,At least one mode of payment is required for POS invoice.,付款中的至少一個模式需要POS發票。
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,銀行對賬單交易發票項目
 DocType: Products Settings,Show Products as a List,產品展示作為一個列表
 DocType: Salary Detail,Tax on flexible benefit,對靈活福利徵稅
@@ -282,7 +280,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,差異數量
 DocType: Production Plan,Material Request Detail,材料請求詳情
 DocType: Selling Settings,Default Quotation Validity Days,默認報價有效天數
-apps/erpnext/erpnext/controllers/accounts_controller.py +869,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",要包括稅款,行{0}項率,稅收行{1}也必須包括在內
+apps/erpnext/erpnext/controllers/accounts_controller.py +868,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",要包括稅款,行{0}項率,稅收行{1}也必須包括在內
 DocType: Payroll Entry,Validate Attendance,驗證出席
 DocType: Sales Invoice,Change Amount,漲跌額
 DocType: Party Tax Withholding Config,Certificate Received,已收到證書
@@ -333,6 +331,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},品項{0}的安裝日期不能早於交貨日期
 DocType: Pricing Rule,Discount on Price List Rate (%),折扣價目表率(%)
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,項目模板
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +213,Please set Naming Series for {0} via Setup > Settings > Naming Series,請通過設置>設置>命名系列為{0}設置命名系列
 DocType: Job Offer,Select Terms and Conditions,選擇條款和條件
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +80,Out Value,輸出值
 DocType: Bank Statement Settings Item,Bank Statement Settings Item,銀行對賬單設置項目
@@ -400,7 +399,7 @@
 ,Open Work Orders,打開工作訂單
 DocType: Healthcare Practitioner,Out Patient Consulting Charge Item,出患者諮詢費用項目
 DocType: Payment Term,Credit Months,信貸月份
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +492,Net Pay cannot be less than 0,淨工資不能低於0
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +494,Net Pay cannot be less than 0,淨工資不能低於0
 DocType: Contract,Fulfilled,達到
 DocType: Inpatient Record,Discharge Scheduled,出院預定
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Relieving Date must be greater than Date of Joining,解除日期必須大於加入的日期
@@ -477,10 +476,11 @@
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,電子郵件工資單員工根據員工選擇首選的電子郵件
 DocType: Tax Rule,Shipping County,航運縣
 apps/erpnext/erpnext/config/desktop.py +159,Learn,學習
+DocType: Purchase Invoice Item,Enable Deferred Expense,啟用延期費用
 DocType: Asset,Next Depreciation Date,接下來折舊日期
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,每個員工活動費用
 DocType: Accounts Settings,Settings for Accounts,設置帳戶
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +756,Supplier Invoice No exists in Purchase Invoice {0},供應商發票不存在採購發票{0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +760,Supplier Invoice No exists in Purchase Invoice {0},供應商發票不存在採購發票{0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,管理銷售人員樹。
 DocType: Job Applicant,Cover Letter,求職信
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,傑出的支票及存款清除
@@ -507,7 +507,7 @@
 DocType: Journal Entry,Multi Currency,多幣種
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,發票類型
 DocType: Employee Benefit Claim,Expense Proof,費用證明
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +971,Delivery Note,送貨單
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +989,Delivery Note,送貨單
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,建立稅
 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.,付款項被修改,你把它之後。請重新拉。
@@ -551,7 +551,7 @@
 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 +538,For quantity {0} should not be grater than work order quantity {1},數量{0}不應超過工單數量{1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +522,Please see attachment,請參閱附件
+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,創建挺起胸
 DocType: Volunteer,Weekends,週末
@@ -598,7 +598,7 @@
 DocType: Purchase Receipt,Vehicle Date,車日期
 DocType: Student Log,Medical,醫療
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,原因丟失
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1765,Please select Drug,請選擇藥物
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1750,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
@@ -617,7 +617,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,數量和速率
 DocType: Delivery Note,% Installed,%已安裝
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,教室/實驗室等在那裡的演講可以預定。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1406,Company currencies of both the companies should match for Inter Company Transactions.,兩家公司的公司貨幣應該符合Inter公司交易。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1292,Company currencies of both the companies should match for Inter Company Transactions.,兩家公司的公司貨幣應該符合Inter公司交易。
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,請先輸入公司名稱
 DocType: Travel Itinerary,Non-Vegetarian,非素食主義者
 DocType: Purchase Invoice,Supplier Name,供應商名稱
@@ -690,7 +690,7 @@
 DocType: Journal Entry,Accounts Payable,應付帳款
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +55,The amount of {0} set in this payment request is different from the calculated amount of all payment plans: {1}. Make sure this is correct before submitting the document.,此付款申請中設置的{0}金額與所有付款計劃的計算金額不同:{1}。在提交文檔之前確保這是正確的。
 DocType: Patient,Allergies,過敏
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +36,The selected BOMs are not for the same item,所選的材料清單並不同樣項目
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +43,The selected BOMs are not for the same item,所選的材料清單並不同樣項目
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +32,Change Item Code,更改物料代碼
 DocType: Vital Signs,Blood Pressure (systolic),血壓(收縮期)
 DocType: Item Price,Valid Upto,到...為止有效
@@ -701,7 +701,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,足夠的配件組裝
 DocType: POS Profile User,POS Profile User,POS配置文件用戶
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,行{0}:折舊開始日期是必需的
-DocType: Sales Invoice Item,Service Start Date,服務開始日期
+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,約會時間
@@ -753,6 +753,8 @@
 apps/erpnext/erpnext/config/stock.py +337,Managing Subcontracting,管理轉包
 DocType: Vital Signs,Body Temperature,體溫
 DocType: Project,Project will be accessible on the website to these users,項目將在網站向這些用戶上訪問
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +292,Cannot cancel {0} {1} because Serial No {2} does not belong to the warehouse {3},無法取消{0} {1},因為序列號{2}不屬於倉庫{3}
+DocType: Company,Default Deferred Expense Account,默認遞延費用帳戶
 apps/erpnext/erpnext/config/projects.py +29,Define Project type.,定義項目類型。
 DocType: Supplier Scorecard,Weighting Function,加權函數
 DocType: Healthcare Practitioner,OP Consulting Charge,OP諮詢費
@@ -834,7 +836,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 +878,Sales Return,銷貨退回
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +896,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,總庫存總結
@@ -870,7 +872,7 @@
 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,通過電子郵件通知客戶
 DocType: Item,Batch Number Series,批號系列
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,另外銷售人員{0}存在具有相同員工ID
+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,聲明金額
 DocType: Travel Itinerary,Departure Datetime,離開日期時間
 DocType: Travel Request Costing,Travel Request Costing,旅行請求成本計算
@@ -912,7 +914,7 @@
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,與關係Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +112,Manager,經理
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +185,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},新的信用額度小於當前餘額為客戶著想。信用額度是ATLEAST {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +439,Please set account in Warehouse {0},請在倉庫{0}中設置帳戶
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +443,Please set account in Warehouse {0},請在倉庫{0}中設置帳戶
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,“根據”和“分組依據”不能相同
 DocType: Sales Person,Sales Person Targets,銷售人員目標
 DocType: Work Order Operation,In minutes,在幾分鐘內
@@ -921,7 +923,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +56,Select Property,選擇屬性
 DocType: Fee Validity,Max number of visit,最大訪問次數
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,創建時間表:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Please set default Cash or Bank account in Mode of Payment {0},請設定現金或銀行帳戶的預設付款方式{0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1197,Please set default Cash or Bank account in Mode of Payment {0},請設定現金或銀行帳戶的預設付款方式{0}
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,註冊
 DocType: GST Settings,GST Settings,GST設置
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},貨幣應與價目表貨幣相同:{0}
@@ -959,6 +961,7 @@
 DocType: Loan,Total Interest Payable,合計應付利息
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,到岸成本稅費
 DocType: Work Order Operation,Actual Start Time,實際開始時間
+DocType: Purchase Invoice Item,Deferred Expense Account,遞延費用帳戶
 DocType: BOM Operation,Operation Time,操作時間
 DocType: Salary Structure Assignment,Base,基礎
 DocType: Timesheet,Total Billed Hours,帳單總時間
@@ -1009,8 +1012,6 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,只有在設置了“現金流量映射器”文檔時才能選擇
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +186,From Address 1,來自地址1
 DocType: Email Digest,Next email will be sent on:,接下來的電子郵件將被發送:
-apps/erpnext/erpnext/controllers/buying_controller.py +756,"Following item {items} {verb} marked as {message} item.\
-			You can enable them as {message} item from its Item master",以下項{item} {verb}標記為{message}項。\您可以從其項目主文件中將其作為{message}項啟用
 DocType: Supplier Scorecard,Per Week,每個星期
 apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item has variants.,項目已變種。
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,學生總數
@@ -1054,7 +1055,7 @@
 DocType: Inpatient Record,O Negative,O負面
 DocType: Work Order Operation,Planned End Time,計劃結束時間
 ,Sales Person Target Variance Item Group-Wise,銷售人員跨項目群組間的目標差異
-apps/erpnext/erpnext/accounts/doctype/account/account.py +95,Account with existing transaction cannot be converted to ledger,帳戶與現有的交易不能被轉換為總賬
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Account with existing transaction cannot be converted to ledger,帳戶與現有的交易不能被轉換為總賬
 apps/erpnext/erpnext/config/non_profit.py +33,Memebership Type Details,Memebership類型詳細信息
 DocType: Delivery Note,Customer's Purchase Order No,客戶的採購訂單編號
 DocType: Clinical Procedure,Consume Stock,消費股票
@@ -1065,13 +1066,13 @@
 DocType: Employee Benefit Application Detail,Max Benefit Amount,最大福利金額
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,預留製造
 DocType: Opportunity,Opportunity From,機會從
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +998,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,行{0}:{1}項目{2}所需的序列號。你已經提供{3}。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +981,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,行{0}:{1}項目{2}所需的序列號。你已經提供{3}。
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,請選擇一張桌子
 DocType: BOM,Website Specifications,網站規格
 DocType: Special Test Items,Particulars,細節
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}:從{0}類型{1}
 apps/erpnext/erpnext/controllers/buying_controller.py +386,Row {0}: Conversion Factor is mandatory,列#{0}:轉換係數是強制性的
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +351,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",海報價格規則,同樣的標準存在,請通過分配優先解決衝突。價格規則:{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 +532,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,請選擇公司和發布日期以獲取條目
@@ -1145,6 +1146,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1125,"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/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>重疊"
 DocType: Shopify Settings,Update Price from Shopify To ERPNext Price List,將Shopify更新到ERPNext價目表
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,設置電子郵件帳戶
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,請先輸入品項
@@ -1155,7 +1157,7 @@
 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 +1291,Sample quantity {0} cannot be more than received quantity {1},採樣數量{0}不能超過接收數量{1}
-apps/erpnext/erpnext/stock/get_item_details.py +519,Price List not selected,未選擇價格列表
+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 +243,Warning: Invalid Attachment {0},警告:無效的附件{0}
 DocType: Item,Max Sample Quantity,最大樣品量
@@ -1189,8 +1191,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +112,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}:成本中心{2}不屬於公司{3}
 apps/erpnext/erpnext/utilities/user_progress.py +92,Upload your letter head (Keep it web friendly as 900px by 100px),上傳你的信頭(保持網頁友好,900px乘100px)
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +89,{0} {1}: Account {2} cannot be a Group,{0} {1}帳戶{2}不能是一個組
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,項目行的{idx} {文檔類型} {} DOCNAME上面不存在&#39;{}的文檔類型“表
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Timesheet {0} is already completed or cancelled,時間表{0}已完成或取消
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Timesheet {0} is already completed or cancelled,時間表{0}已完成或取消
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,沒有任務
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +81,Sales Invoice {0} created as paid,銷售發票{0}已創建為已付款
 DocType: Item Variant Settings,Copy Fields to Variant,將字段複製到變式
@@ -1215,7 +1216,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_period/leave_period.py +73,Allocating leaves...,分配葉子......
 DocType: Program Enrollment,Vehicle/Bus Number,車輛/巴士號碼
 apps/erpnext/erpnext/education/doctype/course/course.js +17,Course Schedule,課程表
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +568,"You have to Deduct Tax for Unsubmitted Tax Exemption Proof and Unclaimed \
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +570,"You have to Deduct Tax for Unsubmitted Tax Exemption Proof and Unclaimed \
 					Employee Benefits in the last Salary Slip of Payroll Period",您必須在工資核算期的最後一個工資單上扣除未提交的免稅證明和無人認領的\員工福利稅
 DocType: Request for Quotation Supplier,Quote Status,報價狀態
 DocType: Maintenance Visit,Completion Status,完成狀態
@@ -1253,12 +1254,10 @@
 DocType: Vehicle Service,Brake Pad,剎車片
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +331,Research & Development,研究與發展
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,帳單數額
-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>重疊"
 DocType: Company,Registration Details,註冊細節
 DocType: Timesheet,Total Billed Amount,總開單金額
 DocType: Item Reorder,Re-Order Qty,重新排序數量
 DocType: Leave Block List Date,Leave Block List Date,休假區塊清單日期表
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,請在教育&gt;教育設置中設置教師命名系統
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +101,BOM #{0}: Raw material cannot be same as main Item,物料清單#{0}:原始材料與主要項目不能相同
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,在外購入庫單項目表總的相關費用必須是相同的總稅費
 DocType: Sales Team,Incentives,獎勵
@@ -1271,7 +1270,7 @@
 apps/erpnext/erpnext/config/selling.py +332,Point-of-Sale,銷售點
 DocType: Fee Schedule,Fee Creation Status,費用創建狀態
 DocType: Vehicle Log,Odometer Reading,里程表讀數
-apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",帳戶餘額已歸為信用帳戶,不允許設為借方帳戶
+apps/erpnext/erpnext/accounts/doctype/account/account.py +123,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",帳戶餘額已歸為信用帳戶,不允許設為借方帳戶
 DocType: Account,Balance must be,餘額必須
 DocType: Notification Control,Expense Claim Rejected Message,報銷回絕訊息
 ,Available Qty,可用數量
@@ -1282,7 +1281,7 @@
 DocType: Healthcare Settings,Manage Customer,管理客戶
 DocType: Amazon MWS Settings,Always synch your products from Amazon MWS before synching the Orders details,在同步訂單詳細信息之前,始終從亞馬遜MWS同步您的產品
 DocType: Delivery Trip,Delivery Stops,交貨停止
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Cannot change Service Stop Date for item in row {0},無法更改行{0}中項目的服務停止日期
+apps/erpnext/erpnext/accounts/deferred_revenue.py +33,Cannot change Service Stop Date for item in row {0},無法更改行{0}中項目的服務停止日期
 DocType: Serial No,Incoming Rate,傳入速率
 DocType: Leave Type,Encashment Threshold Days,封存閾值天數
 ,Final Assessment Grades,最終評估等級
@@ -1313,7 +1312,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +250,Closing (Opening + Total),閉幕(開幕+總計)
 DocType: Payroll Entry,Number Of Employees,在職員工人數
 DocType: Journal Entry,Depreciation Entry,折舊分錄
-apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Please select the document type first,請先選擇文檔類型
+apps/erpnext/erpnext/selling/report/sales_person_commission_summary/sales_person_commission_summary.py +31,Please select the document type first,請先選擇文檔類型
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,取消取消此保養訪問之前,材質訪問{0}
 DocType: Pricing Rule,Rate or Discount,價格或折扣
 DocType: Vital Signs,One Sided,單面
@@ -1333,7 +1332,7 @@
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +102,Please save before assigning task.,在分配任務之前請保存。
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +82,Balance Value,餘額
 DocType: Lab Test,Lab Technician,實驗室技術員
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,銷售價格表
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Sales Price List,銷售價格表
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.",如果選中,將創建一個客戶,映射到患者。將針對該客戶創建病人發票。您也可以在創建患者時選擇現有客戶。
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.py +63,Customer isn't enrolled in any Loyalty Program,客戶未加入任何忠誠度計劃
@@ -1386,14 +1385,15 @@
 DocType: Support Settings,Get Started Sections,入門部分
 DocType: Loan,Sanctioned,制裁
 apps/erpnext/erpnext/accounts/page/pos/pos.js +78, is mandatory. Maybe Currency Exchange record is not created for ,是強制性的。也許外幣兌換記錄沒有創建
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +8,Total Contribution Amount: {0},總貢獻金額:{0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Please specify Serial No for Item {1},列#{0}:請為項目{1}指定序號
 DocType: Payroll Entry,Salary Slips Submitted,提交工資單
 DocType: Crop Cycle,Crop Cycle,作物週期
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",對於“產品包”的物品,倉庫,序列號和批號將被從“裝箱單”表考慮。如果倉庫和批次號是相同的任何“產品包”項目的所有包裝物品,這些值可以在主項表中輸入,值將被複製到“裝箱單”表。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +678,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",對於“產品包”的物品,倉庫,序列號和批號將被從“裝箱單”表考慮。如果倉庫和批次號是相同的任何“產品包”項目的所有包裝物品,這些值可以在主項表中輸入,值將被複製到“裝箱單”表。
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +198,From Place,從地方
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +458,Net Pay cannnot be negative,淨薪酬不能為負
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +460,Net Pay cannnot be negative,淨薪酬不能為負
 DocType: Student Admission,Publish on website,發布在網站上
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +734,Supplier Invoice Date cannot be greater than Posting Date,供應商發票的日期不能超過過帳日期更大
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +738,Supplier Invoice Date cannot be greater than Posting Date,供應商發票的日期不能超過過帳日期更大
 DocType: Purchase Invoice Item,Purchase Order Item,採購訂單項目
 DocType: Agriculture Task,Agriculture Task,農業任務
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Indirect Income,間接收入
@@ -1441,7 +1441,6 @@
 DocType: Purchase Invoice,Get Advances Paid,獲取有償進展
 DocType: Item,Automatically Create New Batch,自動創建新批
 DocType: Item,Automatically Create New Batch,自動創建新批
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +71,Make ,使
 DocType: Student Admission,Admission Start Date,入學開始日期
 DocType: Journal Entry,Total Amount in Words,總金額大寫
 apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,新員工
@@ -1451,7 +1450,7 @@
 DocType: Lead,Next Contact Date,下次聯絡日期
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,開放數量
 DocType: Healthcare Settings,Appointment Reminder,預約提醒
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +539,Please enter Account for Change Amount,對於漲跌額請輸入帳號
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +540,Please enter Account for Change Amount,對於漲跌額請輸入帳號
 DocType: Program Enrollment Tool Student,Student Batch Name,學生批名
 DocType: Holiday List,Holiday List Name,假日列表名稱
 DocType: Repayment Schedule,Balance Loan Amount,平衡貸款額
@@ -1467,7 +1466,7 @@
 DocType: Patient,Patient Relation,患者關係
 DocType: Item,Hub Category to Publish,集線器類別發布
 DocType: Leave Block List,Leave Block List Dates,休假區塊清單日期表
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +291,"Sales Order {0} has reservation for item {1}, you can
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +297,"Sales Order {0} has reservation for item {1}, you can
 		only deliver reserved {1} against {0}. Serial No {2} cannot
 		be delivered",銷售訂單{0}對項目{1}有預留,您只能對{0}提供保留的{1}。序列號{2}無法發送
 DocType: Sales Invoice,Billing Address GSTIN,帳單地址GSTIN
@@ -1490,6 +1489,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +69,{0} can not be negative,{0}不能為負數
 DocType: Training Event,Self-Study,自習
 DocType: POS Closing Voucher,Period End Date,期末結束日期
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {0}: {1} is required to create the Opening {2} Invoices,行{0}:{1}是創建開始{2}發票所必需的
 DocType: Asset,Total Number of Depreciations,折舊總數
 DocType: Sales Invoice Item,Rate With Margin,利率保證金
 DocType: Sales Invoice Item,Rate With Margin,利率保證金
@@ -1531,7 +1531,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 +883,Delivery Trip,送貨之旅
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +901,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,銷售費用
@@ -1596,8 +1596,8 @@
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +22,There isn't any item variant for the selected item,所選項目沒有任何項目變體
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-表 發票詳細資訊
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,付款發票對帳
-apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution %,貢獻%
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +239,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}",根據購買設置,如果需要採購訂單==&#39;是&#39;,那麼為了創建採購發票,用戶需要首先為項目{0}創建採購訂單
+apps/erpnext/erpnext/selling/report/sales_person_commission_summary/sales_person_commission_summary.py +75,Contribution %,貢獻%
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +243,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}",根據購買設置,如果需要採購訂單==&#39;是&#39;,那麼為了創建採購發票,用戶需要首先為項目{0}創建採購訂單
 ,HSN-wise-summary of outward supplies,HSN明智的向外供應摘要
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,公司註冊號碼,供大家參考。稅務號碼等
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +258,To State,國家
@@ -1655,7 +1655,7 @@
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +415,You cannot restart a Subscription that is not cancelled.,您無法重新啟動未取消的訂閱。
 DocType: Account,Balance Sheet,資產負債表
 DocType: Leave Type,Is Earned Leave,獲得休假
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Cost Center For Item with Item Code ',成本中心與項目代碼“項目
+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 +2529,"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.,同一項目不能輸入多次。
@@ -1725,7 +1725,7 @@
 ,Budget Variance Report,預算差異報告
 DocType: Salary Slip,Gross Pay,工資總額
 DocType: Item,Is Item from Hub,是來自Hub的Item
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1652,Get Items from Healthcare Services,從醫療保健服務獲取項目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1637,Get Items from Healthcare Services,從醫療保健服務獲取項目
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,行{0}:活動類型是強制性的。
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +39,Accounting Ledger,會計總帳
 DocType: Asset Value Adjustment,Difference Amount,差額
@@ -1786,7 +1786,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,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 +502,Accounting Entry for Asset,資產會計分錄
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +506,Accounting Entry for Asset,資產會計分錄
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +808,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 +803,Sync Master Data,同步主數據
@@ -1805,7 +1805,8 @@
 DocType: Warehouse,Warehouse Contact Info,倉庫聯絡方式
 DocType: Payment Entry,Write Off Difference Amount,核銷金額差異
 DocType: Volunteer,Volunteer Name,志願者姓名
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +533,"{0}: Employee email not found, hence email not sent",{0}:未發現員工的電子郵件,因此,電子郵件未發
+apps/erpnext/erpnext/controllers/accounts_controller.py +775,Rows with duplicate due dates in other rows were found: {0},發現其他行中具有重複截止日期的行:{0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent",{0}:未發現員工的電子郵件,因此,電子郵件未發
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},給定日期{1}的員工{0}沒有分配薪金結構
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},運費規則不適用於國家/地區{0}
 DocType: Item,Foreign Trade Details,外貿詳細
@@ -1816,7 +1817,7 @@
 DocType: Student Group Student,Group Roll Number,組卷編號
 DocType: Student Group Student,Group Roll Number,組卷編號
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +177,"For {0}, only credit accounts can be linked against another debit entry",{0},只有貸方帳戶可以連接另一個借方分錄
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +667,Delivery Note {0} is not submitted,送貨單{0}未提交
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +650,Delivery Note {0} is not submitted,送貨單{0}未提交
 apps/erpnext/erpnext/stock/get_item_details.py +167,Item {0} must be a Sub-contracted Item,項{0}必須是一個小項目簽約
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,資本設備
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",基於“適用於”欄位是「項目」,「項目群組」或「品牌」,而選擇定價規則。
@@ -1835,6 +1836,7 @@
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,創建打印格式
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +5,Fee Created,創建費用
 apps/erpnext/erpnext/utilities/bot.py +39,Did not find any item called {0},沒有找到所謂的任何項目{0}
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.js +8,Items Filter,物品過濾
 DocType: Supplier Scorecard Criteria,Criteria Formula,標準配方
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,出貨總計
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +39,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",只能有一個運輸規則條件為0或空值“ To值”
@@ -1865,7 +1867,7 @@
 {total_score} (the total score from that period),
 {period_number} (the number of periods to present day)
 ",可以使用記分卡變量,以及:{total_score}(該期間的總分數),{period_number}(到當前時間段的數量)
-apps/erpnext/erpnext/public/js/setup_wizard.js +242,Collapse All,全部收縮
+apps/erpnext/erpnext/public/js/setup_wizard.js +254,Collapse All,全部收縮
 apps/erpnext/erpnext/manufacturing/doctype/blanket_order/blanket_order.js +27,Create Purchase Order,創建採購訂單
 DocType: Quality Inspection Reading,Reading 8,閱讀8
 DocType: Inpatient Record,Discharge Note,卸貨說明
@@ -1880,7 +1882,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +95,Privilege Leave,特權休假
 DocType: Purchase Invoice,Supplier Invoice Date,供應商發票日期
 DocType: Asset Settings,This value is used for pro-rata temporis calculation,該值用於按比例計算
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,您需要啟用購物車
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +91,You need to enable Shopping Cart,您需要啟用購物車
 DocType: Payment Entry,Writeoff,註銷
 DocType: Stock Settings,Naming Series Prefix,命名系列前綴
 DocType: Appraisal Template Goal,Appraisal Template Goal,考核目標模板
@@ -1896,7 +1898,6 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +69,Ageing Range 3,老齡範圍3
 DocType: POS Closing Voucher Details,POS Closing Voucher Details,POS關閉憑證詳細信息
 DocType: Shopify Log,Shopify Log,Shopify日誌
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +213,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,請通過設置&gt;設置&gt;命名系列為{0}設置命名系列
 DocType: Inpatient Occupancy,Check In,報到
 DocType: Maintenance Schedule Item,No of Visits,沒有訪問量的
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},針對{1}存在維護計劃{0}
@@ -1943,7 +1944,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,在固定資產淨變動
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,需要數量
 DocType: Leave Control Panel,Leave blank if considered for all designations,離開,如果考慮所有指定空白
-apps/erpnext/erpnext/controllers/accounts_controller.py +875,Charge of type 'Actual' in row {0} cannot be included in Item Rate,類型'實際'行{0}的計費,不能被包含在項目單價
+apps/erpnext/erpnext/controllers/accounts_controller.py +874,Charge of type 'Actual' in row {0} cannot be included in Item Rate,類型'實際'行{0}的計費,不能被包含在項目單價
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},最大數量:{0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,從日期時間
 DocType: Shopify Settings,For Company,對於公司
@@ -1955,7 +1956,7 @@
 DocType: Material Request,Terms and Conditions Content,條款及細則內容
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,創建課程表時出現錯誤
 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 +602,cannot be greater than 100,不能大於100
+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 +97,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 +810,Item {0} is not a stock Item,項{0}不是缺貨登記
 DocType: Maintenance Visit,Unscheduled,計劃外
@@ -1981,7 +1982,7 @@
 DocType: HR Settings,Employee Settings,員工設置
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,加載支付系統
 ,Batch-Wise Balance History,間歇式平衡歷史
-apps/erpnext/erpnext/controllers/accounts_controller.py +1063,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,行#{0}:如果金額大於項目{1}的開帳單金額,則無法設置費率。
+apps/erpnext/erpnext/controllers/accounts_controller.py +1062,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,行#{0}:如果金額大於項目{1}的開帳單金額,則無法設置費率。
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,打印設置在相應的打印格式更新
 DocType: Package Code,Package Code,封裝代碼
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,學徒
@@ -2013,6 +2014,7 @@
 DocType: Bank Statement Transaction Entry,Bank Transaction Entries,銀行交易分錄
 DocType: Quality Inspection,Readings,閱讀
 DocType: Stock Entry,Total Additional Costs,總額外費用
+apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +47,No of Interactions,沒有相互作用
 DocType: BOM,Scrap Material Cost(Company Currency),廢料成本(公司貨幣)
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +69,Sub Assemblies,子組件
 DocType: Asset,Asset Name,資產名稱
@@ -2022,7 +2024,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +254,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 +888,Packing Slip,包裝單
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +906,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,通用名稱
@@ -2061,8 +2063,6 @@
 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}
 DocType: Student Attendance Tool,Students HTML,學生HTML
-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: POS Profile,Apply Discount,應用折扣
 DocType: GST HSN Code,GST HSN Code,GST HSN代碼
 DocType: Employee External Work History,Total Experience,總經驗
@@ -2113,7 +2113,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Please set User ID field in an Employee record to set Employee Role,請在員工記錄設定員工角色設置用戶ID字段
 DocType: UOM,UOM Name,計量單位名稱
 DocType: GST HSN Code,HSN Code,HSN代碼
-apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +40,Contribution Amount,貢獻金額
+apps/erpnext/erpnext/selling/report/sales_person_commission_summary/sales_person_commission_summary.py +87,Contribution Amount,貢獻金額
 DocType: Purchase Invoice,Shipping Address,送貨地址
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,此工具可幫助您更新或修復系統中的庫存數量和價值。它通常被用於同步系統值和實際存在於您的倉庫。
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,送貨單一被儲存,就會顯示出來。
@@ -2177,7 +2177,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Employee Referral,員工推薦
 DocType: Student Group,Set 0 for no limit,為不限制設為0
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +191,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,這一天(S)對你所申請休假的假期。你不需要申請許可。
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,需要行{idx}:{field}才能創建開票{invoice_type}發票
 DocType: Customer,Primary Address and Contact Detail,主要地址和聯繫人詳情
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +21,Resend Payment Email,重新發送付款電子郵件
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,新任務
@@ -2224,13 +2223,13 @@
 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,供應商零件編號
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +132,Conversion rate cannot be 0 or 1,轉化率不能為0或1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +136,Conversion rate cannot be 0 or 1,轉化率不能為0或1
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py +27,All the mandatory Task for employee creation hasn't been done yet.,所有員工創建的強制性任務尚未完成。
 DocType: Accounts Settings,Credit Controller,信用控制器
 DocType: Loan,Applicant Type,申請人類型
 DocType: Purchase Invoice,03-Deficiency in services,03-服務不足
 DocType: Healthcare Settings,Default Medical Code Standard,默認醫療代碼標準
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +261,Purchase Receipt {0} is not submitted,採購入庫單{0}未提交
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +265,Purchase Receipt {0} is not submitted,採購入庫單{0}未提交
 DocType: Company,Default Payable Account,預設應付賬款
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.",設定線上購物車,如航運規則,價格表等
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}%已開立帳單
@@ -2252,7 +2251,7 @@
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +46,"Job Openings for designation {0} already open \
 					or hiring completed as per Staffing Plan {1}",指定{0}的職位空缺已根據人員配置計劃{1}已打開或正在招聘
 DocType: Vital Signs,Constipated,大便乾燥
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +114,Against Supplier Invoice {0} dated {1},對供應商發票{0}日期{1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},對供應商發票{0}日期{1}
 DocType: Customer,Default Price List,預設價格表
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,資產運動記錄{0}創建
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,未找到任何項目。
@@ -2266,7 +2265,7 @@
 DocType: Journal Entry,Entry Type,條目類型
 ,Customer Credit Balance,客戶信用平衡
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +82,Net Change in Accounts Payable,應付賬款淨額變化
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +256,Credit limit has been crossed for customer {0} ({1}/{2}),客戶{0}({1} / {2})的信用額度已超過
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +257,Credit limit has been crossed for customer {0} ({1}/{2}),客戶{0}({1} / {2})的信用額度已超過
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',需要' Customerwise折扣“客戶
 apps/erpnext/erpnext/config/accounts.py +163,Update bank payment dates with journals.,更新與日記帳之銀行付款日期。
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,價錢
@@ -2345,9 +2344,10 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +24,Appointment Duration (mins),預約時間(分鐘)
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,為每股份轉移做會計分錄
 DocType: Leave Allocation,Total Leaves Allocated,已安排的休假總計
-apps/erpnext/erpnext/public/js/setup_wizard.js +146,Please enter valid Financial Year Start and End Dates,請輸入有效的財政年度開始和結束日期
+apps/erpnext/erpnext/public/js/setup_wizard.js +178,Please enter valid Financial Year Start and End Dates,請輸入有效的財政年度開始和結束日期
 DocType: Employee,Date Of Retirement,退休日
 DocType: Upload Attendance,Get Template,獲取模板
+,Sales Person Commission Summary,銷售人員委員會摘要
 DocType: Additional Salary Component,Additional Salary Component,額外的薪資組件
 DocType: Material Request,Transferred,轉入
 DocType: Vehicle,Doors,門
@@ -2400,6 +2400,7 @@
 DocType: Grant Application,Assessment  Mark (Out of 10),評估標記(滿分10分)
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2手機號碼
 apps/erpnext/erpnext/setup/doctype/company/company.py +263,Main,主頁
+apps/erpnext/erpnext/controllers/buying_controller.py +761,Following item {0} is not marked as {1} item. You can enable them as {1} item from its Item master,項目{0}之後未標記為{1}項目。您可以從項目主文件中將它們作為{1}項啟用
 apps/erpnext/erpnext/stock/doctype/item/item.js +74,Variant,變種
 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,為你的交易編號序列設置的前綴
@@ -2408,7 +2409,7 @@
 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 +1208,Make Purchase Order,製作採購訂單
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1226,Make Purchase Order,製作採購訂單
 DocType: SMS Center,Send To,發送到
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +202,There is not enough leave balance for Leave Type {0},沒有足夠的餘額休假請假類型{0}
 DocType: Payment Reconciliation Payment,Allocated amount,分配量
@@ -2436,6 +2437,7 @@
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,為運輸規則的條件
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +175,Please enter ,請輸入
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +64,Maintenance Log,維護日誌
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,供應商&gt;供應商組
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +242,Please set filter based on Item or Warehouse,根據項目或倉庫請設置過濾器
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),淨重這個包。 (當項目的淨重量總和自動計算)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +43,Make Inter Company Journal Entry,使公司日記帳分錄
@@ -2636,8 +2638,8 @@
 DocType: Employee,Resignation Letter Date,辭退信日期
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,定價規則進一步過濾基於數量。
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +115,Not Set,沒有設置
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,Please set the Date Of Joining for employee {0},請為員工{0}設置加入日期
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,Please set the Date Of Joining for employee {0},請為員工{0}設置加入日期
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +417,Please set the Date Of Joining for employee {0},請為員工{0}設置加入日期
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +417,Please set the Date Of Joining for employee {0},請為員工{0}設置加入日期
 DocType: Inpatient Record,Discharge,卸貨
 DocType: Task,Total Billing Amount (via Time Sheet),總開票金額(通過時間表)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,重複客戶收入
@@ -2645,13 +2647,13 @@
 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 +1027,Select BOM and Qty for Production,選擇BOM和數量生產
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1045,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,針對帳戶
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Half Day Date should be between From Date and To Date,半天時間應該是從之間的日期和終止日期
 DocType: Maintenance Schedule Detail,Actual Date,實際日期
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,請在{0}公司中設置默認成本中心。
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +135,Please set the Default Cost Center in {0} company.,請在{0}公司中設置默認成本中心。
 DocType: Item,Has Batch No,有批號
 apps/erpnext/erpnext/public/js/utils.js +107,Annual Billing: {0},年度結算:{0}
 DocType: Shopify Webhook Detail,Shopify Webhook Detail,Shopify Webhook詳細信息
@@ -2670,7 +2672,7 @@
 ,Quotation Trends,報價趨勢
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +166,Item Group not mentioned in item master for item {0},項目{0}之項目主檔未提及之項目群組
 DocType: GoCardless Mandate,GoCardless Mandate,GoCardless任務
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Debit To account must be a Receivable account,借方帳戶必須是應收帳款帳戶
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +430,Debit To account must be a Receivable account,借方帳戶必須是應收帳款帳戶
 DocType: Shipping Rule,Shipping Amount,航運量
 DocType: Supplier Scorecard Period,Period Score,期間得分
 apps/erpnext/erpnext/utilities/user_progress.py +66,Add Customers,添加客戶
@@ -2712,7 +2714,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,PDC/LC Amount,PDC / LC金額
 DocType: Shareholder,Shareholder,股東
 DocType: Purchase Invoice,Additional Discount Amount,額外的折扣金額
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1811,Get Items from Prescriptions,從Prescriptions獲取物品
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1796,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\
@@ -2725,7 +2727,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,體育
 DocType: Loan Type,Loan Name,貸款名稱
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +66,Total Actual,實際總計
-DocType: Lab Test UOM,Test UOM,測試UOM
 DocType: Student Siblings,Student Siblings,學生兄弟姐妹
 DocType: Subscription Plan Detail,Subscription Plan Detail,訂閱計劃詳情
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,單位
@@ -2763,7 +2764,7 @@
 DocType: Item,Retain Sample,保留樣品
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +109,Row {0}: From Time and To Time is mandatory.,行{0}:從時間和時間是強制性的。
 DocType: Stock Reconciliation Item,Amount Difference,金額差異
-apps/erpnext/erpnext/stock/get_item_details.py +412,Item Price added for {0} in Price List {1},加入項目價格為{0}價格表{1}
+apps/erpnext/erpnext/stock/get_item_details.py +416,Item Price added for {0} in Price List {1},加入項目價格為{0}價格表{1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,請輸入這個銷售人員的員工標識
 DocType: Territory,Classification of Customers by region,客戶按區域分類
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,在生產中
@@ -2773,7 +2774,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,計算的銀行對賬單餘額
 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 +951,Quotation,報價
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +969,Quotation,報價
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +971,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,選擇一個賬戶以賬戶貨幣進行打印
@@ -2820,13 +2821,14 @@
 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,顯示付款詳情
+apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +53,Duration in Days,持續時間天數
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Miscellaneous Expenses,雜項開支
 DocType: Global Defaults,Default Company,預設公司
 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 +1200,Leave the field empty to make purchase orders for all suppliers,將該字段留空以為所有供應商下達採購訂單
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1218,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,總休假天數
@@ -2836,7 +2838,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +107,Item Variant Settings,項目變式設置
 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 +495,{0} is mandatory for Item {1},{0}是強制性的項目{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +496,{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}產生的數量,
 DocType: Currency Exchange,From Currency,從貨幣
 DocType: Vital Signs,Weight (In Kilogram),體重(公斤)
@@ -2882,7 +2884,7 @@
 DocType: Account,Fixed Asset,固定資產
 DocType: Amazon MWS Settings,After Date,日期之後
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,序列化庫存
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1271,Invalid {0} for Inter Company Invoice.,Inter公司發票無效的{0}。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1157,Invalid {0} for Inter Company Invoice.,Inter公司發票無效的{0}。
 ,Department Analytics,部門分析
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,在默認聯繫人中找不到電子郵件
 DocType: Loan,Account Info,帳戶信息
@@ -2928,10 +2930,10 @@
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_confirmation.html +13,Payment Confirmation,付款確認
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,價格將不會顯示如果沒有設置價格
 DocType: Stock Entry,Total Incoming Value,總收入值
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,Debit To is required,借方是必填項
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,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/stock/report/item_prices/item_prices.py +40,Purchase Price List,採購價格表
+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,要約期限
 DocType: Asset,Quality Manager,質量經理
@@ -2951,7 +2953,7 @@
 DocType: Cashier Closing,To Time,要時間
 apps/erpnext/erpnext/hr/utils.py +201,) for {0},)為{0}
 DocType: Authorization Rule,Approving Role (above authorized value),批准角色(上述授權值)
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +142,Credit To account must be a Payable account,信用帳戶必須是應付賬款
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +146,Credit To account must be a Payable account,信用帳戶必須是應付賬款
 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,請選擇付費學生申請者必須入學的學生
@@ -3006,6 +3008,7 @@
 DocType: Purchase Invoice,E-commerce GSTIN,電子商務GSTIN
 ,Bank Clearance Summary,銀行結算摘要
 apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.",建立和管理每日,每週和每月的電子郵件摘要。
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_dashboard.py +6,This is based on transactions against this Sales Person. See timeline below for details,這是基於針對此銷售人員的交易。請參閱下面的時間表了解詳情
 DocType: Appraisal Goal,Appraisal Goal,考核目標
 DocType: Stock Reconciliation Item,Current Amount,電流量
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.py +24,Tax Declaration of {0} for period {1} already submitted.,已提交期間{1}的稅務申報{0}。
@@ -3053,7 +3056,7 @@
 DocType: Item,End of Life,壽命結束
 apps/erpnext/erpnext/demo/setup/setup_data.py +325,Travel,旅遊
 DocType: Student Report Generation Tool,Include All Assessment Group,包括所有評估小組
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,No active or default Salary Structure found for employee {0} for the given dates,發現員工{0}對於給定的日期沒有活動或默認的薪酬結構
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,No active or default Salary Structure found for employee {0} for the given dates,發現員工{0}對於給定的日期沒有活動或默認的薪酬結構
 DocType: Leave Block List,Allow Users,允許用戶
 DocType: Purchase Order,Customer Mobile No,客戶手機號碼
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,現金流量映射模板細節
@@ -3066,8 +3069,8 @@
 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 +1189,Please set recurring after saving,請設置保存後復發
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +879,Select change amount account,選擇變化量賬戶
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1221,Please set recurring after saving,請設置保存後復發
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +862,Select change amount account,選擇變化量賬戶
 DocType: Purchase Invoice,Price List Currency,價格表之貨幣
 DocType: Naming Series,User must always select,用戶必須始終選擇
 DocType: Stock Settings,Allow Negative Stock,允許負庫存
@@ -3112,11 +3115,12 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +706,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/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,請在人力資源&gt;人力資源設置中設置員工命名系統
 DocType: POS Profile,Applicable for Users,適用於用戶
 DocType: Notification Control,Expense Claim Approved,報銷批准
 DocType: Purchase Invoice,Set Advances and Allocate (FIFO),設置進度和分配(FIFO)
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,沒有創建工作訂單
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +401,Salary Slip of employee {0} already created for this period,員工的工資單{0}已為這一時期創建
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +403,Salary Slip of employee {0} already created for this period,員工的工資單{0}已為這一時期創建
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,Pharmaceutical,製藥
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +24,You can only submit Leave Encashment for a valid encashment amount,您只能提交離開封存以獲得有效的兌換金額
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,購買的物品成本
@@ -3124,6 +3128,7 @@
 DocType: Selling Settings,Sales Order Required,銷售訂單需求
 apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,成為賣家
 DocType: Purchase Invoice,Credit To,信貸
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,商品代碼&gt;商品分組&gt;品牌
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,有效訊息/客戶
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,維護計劃細節
 DocType: Supplier Scorecard,Warn for new Purchase Orders,警告新的採購訂單
@@ -3136,8 +3141,9 @@
 DocType: Request for Quotation Supplier,No Quote,沒有報價
 DocType: Support Search Source,Post Title Key,帖子標題密鑰
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +232,For Job Card,對於工作卡
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1533,Prescriptions,處方
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1551,Prescriptions,處方
 DocType: Payment Gateway Account,Payment Account,付款帳號
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +169,Supplier &gt; Supplier Type,供應商&gt;供應商類型
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +1041,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,補假
@@ -3161,8 +3167,8 @@
 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/accounts/doctype/sales_invoice/sales_invoice.py +1030,Row #{0} (Payment Table): Amount must be negative,行#{0}(付款表):金額必須為負數
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +559,"Could not update stock, invoice contains drop shipping item.",無法更新庫存,發票包含下降航運項目。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1013,Row #{0} (Payment Table): Amount must be negative,行#{0}(付款表):金額必須為負數
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +560,"Could not update stock, invoice contains drop shipping item.",無法更新庫存,發票包含下降航運項目。
 DocType: Contract,Fulfilment Status,履行狀態
 DocType: Lab Test Sample,Lab Test Sample,實驗室測試樣品
 DocType: Item Variant Settings,Allow Rename Attribute Value,允許重命名屬性值
@@ -3239,7 +3245,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,批准用戶作為用戶的規則適用於不能相同
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),基本速率(按庫存計量單位)
 DocType: SMS Log,No of Requested SMS,無的請求短信
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +326,Leave Without Pay does not match with approved Leave Application records,停薪留職不批准請假的記錄相匹配
+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 +783,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 ,員工轉移無法在轉移日期前提交
@@ -3311,7 +3317,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,到貨數量
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},費紀錄創造 -  {0}
 DocType: Asset Category Account,Asset Category Account,資產類別的帳戶
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1025,Row #{0} (Payment Table): Amount must be positive,行#{0}(付款表):金額必須為正值
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1008,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 +422,Select Attribute Values,選擇屬性值
 DocType: Purchase Invoice,Reason For Issuing document,簽發文件的原因
@@ -3431,7 +3437,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,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 +861,Delivery,交貨
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +879,Delivery,交貨
 DocType: Stock Reconciliation Item,Current Qty,目前數量
 DocType: Restaurant Menu,Restaurant Menu,餐廳菜單
 DocType: Loyalty Program,Help Section,幫助科
@@ -3473,11 +3479,11 @@
 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 +1290,Please enter Item Code to get batch no,請輸入產品編號,以取得批號
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +910,Please select a value for {0} quotation_to {1},請選擇一個值{0} quotation_to {1}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1322,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 +432,No Items selected for transfer,沒有選擇轉移項目
 DocType: Company,Stock Settings,庫存設定
-apps/erpnext/erpnext/accounts/doctype/account/account.py +239,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",合併是唯一可能的,如果以下屬性中均有記載相同。是集團,根型,公司
+apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",合併是唯一可能的,如果以下屬性中均有記載相同。是集團,根型,公司
 DocType: Vehicle,Electric,電動
 DocType: Task,% Progress,%進展
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Gain/Loss on Asset Disposal,在資產處置收益/損失
@@ -3645,12 +3651,12 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,Atleast one item should be entered with negative quantity in return document,ATLEAST一個項目應該負數量回報文檔中輸入
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",操作{0}比任何可用的工作時間更長工作站{1},分解成運行多個操作
 DocType: Membership,Membership Status,成員身份
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +117,No Remarks,暫無產品說明
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +121,No Remarks,暫無產品說明
 DocType: Asset,In Maintenance,在維護中
 DocType: Amazon MWS Settings,Click this button to pull your Sales Order data from Amazon MWS.,單擊此按鈕可從亞馬遜MWS中提取銷售訂單數據。
 DocType: Purchase Invoice,Overdue,過期的
 DocType: Account,Stock Received But Not Billed,庫存接收,但不付款
-apps/erpnext/erpnext/accounts/doctype/account/account.py +86,Root Account must be a group,根帳戶必須是一組
+apps/erpnext/erpnext/accounts/doctype/account/account.py +91,Root Account must be a group,根帳戶必須是一組
 DocType: Drug Prescription,Drug Prescription,藥物處方
 DocType: Loan,Repaid/Closed,償還/關閉
 DocType: Item,Total Projected Qty,預計總數量
@@ -3674,11 +3680,11 @@
 DocType: Purchase Invoice,Deemed Export,被視為出口
 DocType: Stock Entry,Material Transfer for Manufacture,物料轉倉用於製造
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,折扣百分比可以應用於單一價目表或所有價目表。
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +418,Accounting Entry for Stock,存貨的會計分錄
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +422,Accounting Entry for Stock,存貨的會計分錄
 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 +1063,Work Orders Created: {0},創建的工單:{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1081,Work Orders Created: {0},創建的工單:{0}
 DocType: Sales Invoice,Sales Team1,銷售團隊1
 apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item {0} does not exist,項目{0}不存在
 DocType: Sales Invoice,Customer Address,客戶地址
@@ -3751,7 +3757,7 @@
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,更改代碼
 DocType: Purchase Invoice Item,Valuation Rate,估值率
 DocType: Vehicle,Diesel,柴油機
-apps/erpnext/erpnext/stock/get_item_details.py +542,Price List Currency not selected,尚未選擇價格表之貨幣
+apps/erpnext/erpnext/stock/get_item_details.py +546,Price List Currency not selected,尚未選擇價格表之貨幣
 DocType: Purchase Invoice,Availed ITC Cess,採用ITC Cess
 ,Student Monthly Attendance Sheet,學生每月考勤表
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,運費規則僅適用於銷售
@@ -3761,6 +3767,8 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,學生組或課程表是強制性的
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,學生組或課程表是強制性的
 DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,維護發票時間和工作時間的時間表相同
+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: Maintenance Visit Purpose,Against Document No,對文件編號
 DocType: BOM,Scrap,廢料
 apps/erpnext/erpnext/utilities/user_progress.py +217,Go to Instructors,去教練
@@ -3789,14 +3797,14 @@
 DocType: Shopify Settings,Delivery Note Series,送貨單系列
 DocType: Purchase Order Item,Returned Qty,返回的數量
 DocType: Student,Exit,出口
-apps/erpnext/erpnext/accounts/doctype/account/account.py +158,Root Type is mandatory,root類型是強制性的
+apps/erpnext/erpnext/accounts/doctype/account/account.py +163,Root Type is mandatory,root類型是強制性的
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +29,Failed to install presets,無法安裝預設
 DocType: Healthcare Service Unit Type,UOM Conversion in Hours,UOM按小時轉換
 DocType: Contract,Signee Details,簽名詳情
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.",{0}目前擁有{1}供應商記分卡,並且謹慎地向該供應商發出詢價。
 DocType: Certified Consultant,Non Profit Manager,非營利經理
 DocType: BOM,Total Cost(Company Currency),總成本(公司貨幣)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +392,Serial No {0} created,序列號{0}創建
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +398,Serial No {0} created,序列號{0}創建
 DocType: Homepage,Company Description for website homepage,公司介紹了網站的首頁
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",為方便客戶,這些代碼可以在列印格式,如發票和送貨單使用
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Suplier名稱
@@ -3847,9 +3855,9 @@
 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}啟用更新庫存
-apps/erpnext/erpnext/stock/get_item_details.py +401,Item Price updated for {0} in Price List {1},項目價格更新{0}價格表{1}
+apps/erpnext/erpnext/stock/get_item_details.py +405,Item Price updated for {0} in Price List {1},項目價格更新{0}價格表{1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,工資分手基於盈利和演繹。
-apps/erpnext/erpnext/accounts/doctype/account/account.py +130,Account with child nodes cannot be converted to ledger,有子節點的帳不能轉換到總帳
+apps/erpnext/erpnext/accounts/doctype/account/account.py +135,Account with child nodes cannot be converted to ledger,有子節點的帳不能轉換到總帳
 DocType: Purchase Invoice Item,Accepted Warehouse,收料倉庫
 DocType: Bank Reconciliation Detail,Posting Date,發布日期
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +30,One customer can be part of only single Loyalty Program.,一個客戶只能參與一個忠誠度計劃。
@@ -3922,7 +3930,7 @@
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,模板條款或合同。
 DocType: Bank Account,Address and Contact,地址和聯絡方式
 DocType: Cheque Print Template,Is Account Payable,為應付賬款
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +300,Stock cannot be updated against Purchase Receipt {0},股票不能對外購入庫單進行更新{0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +304,Stock cannot be updated against Purchase Receipt {0},股票不能對外購入庫單進行更新{0}
 DocType: Support Settings,Auto close Issue after 7 days,7天之後自動關閉問題
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +85,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",假,不是之前分配{0},因為休假餘額已經結轉轉發在未來的假期分配記錄{1}
 apps/erpnext/erpnext/accounts/party.py +350,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),註:由於/參考日期由{0}天超過了允許客戶的信用天數(S)
@@ -3950,7 +3958,6 @@
 DocType: Asset,Calculate Depreciation,計算折舊
 DocType: Delivery Note,Track this Delivery Note against any Project,跟踪此送貨單反對任何項目
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Cash from Investing,從投資淨現金
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,客戶&gt;客戶群&gt;地區
 DocType: Work Order,Work-in-Progress Warehouse,在製品倉庫
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +115,Asset {0} must be submitted,資產{0}必須提交
 DocType: Fee Schedule Program,Total Students,學生總數
@@ -3992,6 +3999,7 @@
 DocType: Amazon MWS Settings,Synch Products,同步產品
 DocType: Loyalty Point Entry,Loyalty Program,忠誠計劃
 DocType: Student Guardian,Father,父親
+apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,支持門票
 apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,"""更新庫存"" 無法檢查固定資產銷售"
 DocType: Bank Reconciliation,Bank Reconciliation,銀行對帳
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,獲取更新
@@ -4022,7 +4030,7 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},無法改變地位的學生{0}與學生申請鏈接{1}
 DocType: Asset,Fully Depreciated,已提足折舊
 ,Stock Projected Qty,存貨預計數量
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +505,Customer {0} does not belong to project {1},客戶{0}不屬於項目{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +506,Customer {0} does not belong to project {1},客戶{0}不屬於項目{1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,顯著的考勤HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers",語錄是建議,你已經發送到你的客戶提高出價
 DocType: Sales Invoice,Customer's Purchase Order,客戶採購訂單
@@ -4043,7 +4051,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,去供應商
 DocType: POS Closing Voucher Taxes,POS Closing Voucher Taxes,POS關閉憑證稅
 ,Qty to Receive,未到貨量
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +562,"Start and end dates not in a valid Payroll Period, cannot calculate {0}.",開始日期和結束日期不在有效的工資核算期間內,無法計算{0}。
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +564,"Start and end dates not in a valid Payroll Period, cannot calculate {0}.",開始日期和結束日期不在有效的工資核算期間內,無法計算{0}。
 DocType: Leave Block List,Leave Block List Allowed,准許的休假區塊清單
 DocType: Grading Scale Interval,Grading Scale Interval,分級分度值
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},報銷車輛登錄{0}
@@ -4051,10 +4059,10 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,價格上漲率與貼現率的折扣(%)
 DocType: Healthcare Service Unit Type,Rate / UOM,費率/ UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,所有倉庫
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1401,No {0} found for Inter Company Transactions.,Inter公司沒有找到{0}。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1287,No {0} found for Inter Company Transactions.,Inter公司沒有找到{0}。
 DocType: Travel Itinerary,Rented Car,租車
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,關於貴公司
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +139,Credit To account must be a Balance Sheet account,信用帳戶必須是資產負債表科目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +143,Credit To account must be a Balance Sheet account,信用帳戶必須是資產負債表科目
 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,產品編號是強制性的,因為項目沒有自動編號
@@ -4105,7 +4113,7 @@
 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",銀行賬戶,從日期到日期是強制性的
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +29,Message Sent,發送訊息
-apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Account with child nodes cannot be set as ledger,帳戶與子節點不能被設置為分類帳
+apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with child nodes cannot be set as ledger,帳戶與子節點不能被設置為分類帳
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,價目表貨幣被換算成客戶基礎貨幣的匯率
 DocType: Purchase Invoice Item,Net Amount (Company Currency),淨金額(公司貨幣)
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +222,Total advance amount cannot be greater than total sanctioned amount,總預付金額不得超過全部認可金額
@@ -4114,10 +4122,10 @@
 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/doctype/sales_invoice/sales_invoice.js +1618,Select Loyalty Program,選擇忠誠度計劃
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1603,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.,子任務存在這個任務。你不能刪除這個任務。
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,無論是數量目標或目標量是強制性的。
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +17,Either target qty or target amount is mandatory.,無論是數量目標或目標量是強制性的。
 apps/erpnext/erpnext/config/projects.py +56,Cost of various activities,各種活動的費用
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}",設置活動為{0},因為附連到下面的銷售者的僱員不具有用戶ID {1}
 DocType: Timesheet,Billing Details,結算明細
@@ -4176,7 +4184,7 @@
 DocType: Employee Tax Exemption Declaration,Declarations,聲明
 apps/erpnext/erpnext/education/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,製作費用表
 DocType: Purchase Order Item Supplied,Stock UOM,庫存計量單位
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +257,Purchase Order {0} is not submitted,採購訂單{0}未提交
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +261,Purchase Order {0} is not submitted,採購訂單{0}未提交
 DocType: Account,Expenses Included In Asset Valuation,資產評估中包含的費用
 DocType: Vital Signs,Normal reference range for an adult is 16–20 breaths/minute (RCP 2012),成人的正常參考範圍是16-20次呼吸/分鐘(RCP 2012)
 DocType: Customs Tariff Number,Tariff Number,稅則號
@@ -4201,7 +4209,6 @@
 DocType: Employee Grade,Default Leave Policy,默認離開政策
 DocType: Shopify Settings,Shop URL,商店網址
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,尚未新增聯絡人。
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,請通過設置&gt;編號系列設置出席編號系列
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,到岸成本憑證金額
 ,Item Balance (Simple),物品餘額(簡單)
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,由供應商提出的帳單。
@@ -4238,7 +4245,7 @@
 ,Payment Period Based On Invoice Date,基於發票日的付款期
 DocType: Sample Collection,No. of print,打印數量
 DocType: Hotel Room Reservation Item,Hotel Room Reservation Item,酒店房間預訂項目
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},缺少貨幣匯率{0}
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +59,Missing Currency Exchange Rates for {0},缺少貨幣匯率{0}
 DocType: Employee Health Insurance,Health Insurance Name,健康保險名稱
 DocType: Assessment Plan,Examiner,檢查員
 DocType: Journal Entry,Stock Entry,存貨分錄
@@ -4260,7 +4267,6 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Gross Purchase Amount is mandatory,總消費金額是強制性
 apps/erpnext/erpnext/setup/doctype/company/company.js +115,Company name not same,公司名稱不一樣
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +114,Party is mandatory,黨是強制性
-apps/erpnext/erpnext/controllers/accounts_controller.py +775,Rows with duplicate due dates in other rows were found: {list},在其他行中找到具有重複到期日的行:{list}
 DocType: Topic,Topic Name,主題名稱
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +312,Please set default template for Leave Approval Notification in HR Settings.,請在人力資源設置中為離職審批通知設置默認模板。
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +38,Atleast one of the Selling or Buying must be selected,至少需選擇銷售或購買
@@ -4303,7 +4309,7 @@
 DocType: Woocommerce Settings,API consumer secret,API消費者秘密
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,在從倉庫可用的批次數量
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,工資總額 - 扣除總額 - 貸款還款
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +32,Current BOM and New BOM can not be same,當前BOM和新BOM不能相同
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +39,Current BOM and New BOM can not be same,當前BOM和新BOM不能相同
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,工資單編號
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +128,Date Of Retirement must be greater than Date of Joining,日期退休必須大於加入的日期
 apps/erpnext/erpnext/stock/doctype/item/item.js +70,Multiple Variants,多種變體
@@ -4331,7 +4337,7 @@
 DocType: POS Profile,Update Stock,庫存更新
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,不同計量單位的項目會導致不正確的(總)淨重值。確保每個項目的淨重是在同一個計量單位。
 DocType: Certification Application,Payment Details,付款詳情
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,BOM率
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,BOM Rate,BOM率
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +249,"Stopped Work Order cannot be cancelled, Unstop it first to cancel",停止的工作訂單不能取消,先取消它
 DocType: Asset,Journal Entry for Scrap,日記帳分錄報廢
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,請送貨單拉項目
@@ -4357,7 +4363,7 @@
 DocType: Asset Maintenance Log,Task,任務
 DocType: Purchase Taxes and Charges,Reference Row #,參考列#
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},批號是強制性的項目{0}
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,您可以通過選擇備份頻率啟動和\
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +22,This is a root sales person and cannot be edited.,您可以通過選擇備份頻率啟動和\
 DocType: Salary Component,"If selected, the value specified or calculated in this component will not contribute to the earnings or deductions. However, it's value can be referenced by other components that can be added or deducted. ",如果選擇此項,則在此組件中指定或計算的值不會對收入或扣除貢獻。但是,它的值可以被添加或扣除的其他組件引用。
 DocType: Salary Component,"If selected, the value specified or calculated in this component will not contribute to the earnings or deductions. However, it's value can be referenced by other components that can be added or deducted. ",如果選擇此項,則在此組件中指定或計算的值不會對收入或扣除貢獻。但是,它的值可以被添加或扣除的其他組件引用。
 DocType: Asset Settings,Number of Days in Fiscal Year,會計年度的天數
@@ -4391,7 +4397,7 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.",系統用戶(登錄)的標識。如果設定,這將成為的所有人力資源的預設形式。
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +86,Enter depreciation details,輸入折舊明細
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}:從{1}
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +71,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,排隊更新所有材料清單中的最新價格。可能需要幾分鐘。
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +78,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,排隊更新所有材料清單中的最新價格。可能需要幾分鐘。
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,新帳戶的名稱。注:請不要創建帳戶的客戶和供應商
 DocType: POS Profile,Display Items In Stock,顯示庫存商品
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,依據國家別啟發式的預設地址模板
@@ -4427,7 +4433,7 @@
 DocType: Purchase Order,Order Confirmation Date,訂單確認日期
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,使維護訪問
 DocType: Employee Transfer,Employee Transfer Details,員工轉移詳情
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +262,Please contact to the user who have Sales Master Manager {0} role,請聯絡,誰擁有碩士學位的銷售經理{0}角色的用戶
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +263,Please contact to the user who have Sales Master Manager {0} role,請聯絡,誰擁有碩士學位的銷售經理{0}角色的用戶
 DocType: Company,Default Cash Account,預設的現金帳戶
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,公司(不是客戶或供應商)的主人。
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,這是基於這名學生出席
@@ -4435,7 +4441,7 @@
 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/utilities/user_progress.py +259,Go to Users,轉到用戶
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Paid amount + Write Off Amount can not be greater than Grand Total,支付的金額+寫的抵銷金額不能大於總計
+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}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +199,Note: There is not enough leave balance for Leave Type {0},注:沒有足夠的休假餘額請假類型{0}
 apps/erpnext/erpnext/regional/india/utils.py +19,Invalid GSTIN or Enter NA for Unregistered,無效的GSTIN或輸入NA未註冊
@@ -4526,14 +4532,14 @@
 DocType: Notification Control,Custom Message,自定義訊息
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +33,Investment Banking,投資銀行業務
 DocType: Purchase Invoice,input,輸入
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Cash or Bank Account is mandatory for making payment entry,製作付款分錄時,現金或銀行帳戶是強制性輸入的欄位。
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Cash or Bank Account is mandatory for making payment entry,製作付款分錄時,現金或銀行帳戶是強制性輸入的欄位。
 DocType: Loyalty Program,Multiple Tier Program,多層計劃
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,學生地址
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,學生地址
 DocType: Purchase Invoice,Price List Exchange Rate,價目表匯率
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +116,All Supplier Groups,所有供應商組織
 DocType: Employee Boarding Activity,Required for Employee Creation,員工創建需要
-apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account Number {0} already used in account {1},已在帳戶{1}中使用的帳號{0}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +214,Account Number {0} already used in account {1},已在帳戶{1}中使用的帳號{0}
 DocType: POS Profile,POS Profile Name,POS配置文件名稱
 DocType: Hotel Room Reservation,Booked,預訂
 DocType: Detected Disease,Tasks Created,創建的任務
@@ -4575,13 +4581,15 @@
 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/hr/utils.py +215,Please set leave policy for employee {0} in Employee / Grade record,請在員工/成績記錄中為員工{0}設置休假政策
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1373,Invalid Blanket Order for the selected Customer and Item,所選客戶和物料的無效總訂單
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1405,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.,結束日期不能在開始日期之前。
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +33,Student is already enrolled.,學生已經註冊。
 DocType: Fiscal Year,Year Name,年結名稱
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,There are more holidays than working days this month.,還有比這個月工作日更多的假期。
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,There are more holidays than working days this month.,還有比這個月工作日更多的假期。
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,請通過設置&gt;編號系列設置出席編號系列
+apps/erpnext/erpnext/controllers/buying_controller.py +759,Following items {0} are not marked as {1} item. You can enable them as {1} item from its Item master,以下項{0}未標記為{1}項。您可以從項目主文件中將它們作為{1}項啟用
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +101,PDC/LC Ref,PDC / LC參考
 DocType: Production Plan Item,Product Bundle Item,產品包項目
 DocType: Sales Partner,Sales Partner Name,銷售合作夥伴名稱
@@ -4604,7 +4612,7 @@
 DocType: Shipping Rule,Calculate Based On,計算的基礎上
 DocType: Delivery Note Item,From Warehouse,從倉庫
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,沒有僱員提到的標準
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1012,No Items with Bill of Materials to Manufacture,不與物料清單的項目,以製造
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,不與物料清單的項目,以製造
 DocType: Shopify Settings,Default Customer,默認客戶
 DocType: Assessment Plan,Supervisor Name,主管名稱
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,不要確認是否在同一天創建約會
@@ -4641,7 +4649,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,稅額折後金額
 DocType: Patient,Inpatient Status,住院狀況
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,每日工作總結設置
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1396,Selected Price List should have buying and selling fields checked.,選定價目表應該有買入和賣出的字段。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1282,Selected Price List should have buying and selling fields checked.,選定價目表應該有買入和賣出的字段。
 apps/erpnext/erpnext/controllers/buying_controller.py +680,Please enter Reqd by Date,請輸入按日期請求
 DocType: Payment Entry,Internal Transfer,內部轉賬
 DocType: Asset Maintenance,Maintenance Tasks,維護任務
@@ -4662,7 +4670,7 @@
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,最後溝通
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,最後溝通
 ,TDS Payable Monthly,TDS應付月度
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +66,Queued for replacing the BOM. It may take a few minutes.,排隊等待更換BOM。可能需要幾分鐘時間。
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +73,Queued for replacing the BOM. It may take a few minutes.,排隊等待更換BOM。可能需要幾分鐘時間。
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +385,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',不能抵扣當類別為“估值”或“估值及總'
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +286,Serial Nos Required for Serialized Item {0},序列號為必填項序列為{0}
 apps/erpnext/erpnext/config/accounts.py +167,Match Payments with Invoices,付款與發票對照
@@ -4700,7 +4708,7 @@
 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 +1011,Work Order not created,工作訂單未創建
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1029,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,送貨規則條件
@@ -4750,7 +4758,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +304,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 +225,Expense account is mandatory for item {0},交際費是強制性的項目{0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +229,Expense account is mandatory for item {0},交際費是強制性的項目{0}
 DocType: BOM,Website Description,網站簡介
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,在淨資產收益變化
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,請取消採購發票{0}第一
@@ -4775,14 +4783,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +467,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 +552,Please remove this Invoice {0} from C-Form {1},請刪除此發票{0}從C-表格{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +553,Please remove this Invoice {0} from C-Form {1},請刪除此發票{0}從C-表格{1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,請選擇結轉,如果你還需要包括上一會計年度的資產負債葉本財年
 DocType: GL Entry,Against Voucher Type,對憑證類型
 DocType: Healthcare Practitioner,Phone (R),電話(R)
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +104,Time slots added,添加時隙
 DocType: Item,Attributes,屬性
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +36,Enable Template,啟用模板
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +250,Please enter Write Off Account,請輸入核銷帳戶
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +254,Please enter Write Off Account,請輸入核銷帳戶
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,最後訂購日期
 DocType: Salary Component,Is Payable,應付
 DocType: Inpatient Record,B Negative,B負面
@@ -4793,7 +4801,7 @@
 DocType: Hotel Room,Hotel Room,旅館房間
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},帳戶{0}不屬於公司{1}
 DocType: Leave Type,Rounding,四捨五入
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +995,Serial Numbers in row {0} does not match with Delivery Note,行{0}中的序列號與交貨單不匹配
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +978,Serial Numbers in row {0} does not match with Delivery Note,行{0}中的序列號與交貨單不匹配
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),分配金額(按比例分配)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.",然後根據客戶,客戶組,地區,供應商,供應商組織,市場活動,銷售合作夥伴等篩選定價規則。
 DocType: Student,Guardian Details,衛詳細
@@ -4841,10 +4849,9 @@
 DocType: Stock Entry Detail,Basic Amount,基本金額
 DocType: Training Event,Exam,考試
 apps/erpnext/erpnext/public/js/hub/hub_call.js +46,Marketplace Error,市場錯誤
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +523,Warehouse required for stock Item {0},倉庫需要現貨產品{0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +524,Warehouse required for stock Item {0},倉庫需要現貨產品{0}
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,進行還款分錄
 apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,所有部門
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +169,Supplier &gt; Supplier Type,供應商&gt;供應商類型
 DocType: Patient,Alcohol Past Use,酒精過去使用
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +248,Cr,鉻
 DocType: Project Update,Problematic/Stuck,問題/卡住
@@ -4859,6 +4866,7 @@
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,客房預訂
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +57,Ends On date cannot be before Next Contact Date.,結束日期不能在下一次聯繫日期之前。
 DocType: Journal Entry,Pay To / Recd From,支付/ 接收
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,客戶&gt;客戶群&gt;地區
 DocType: Naming Series,Setup Series,設置系列
 DocType: Payment Reconciliation,To Invoice Date,要發票日期
 DocType: Bank Account,Contact HTML,聯繫HTML
@@ -4956,7 +4964,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py +33,Access token or Shopify URL missing,訪問令牌或Shopify網址丟失
 DocType: Location,Latitude,緯度
 DocType: Work Order,Scrap Warehouse,廢料倉庫
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}",在第{0}行,需要倉庫,請為公司{2}的物料{1}設置默認倉庫
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}",在第{0}行,需要倉庫,請為公司{2}的物料{1}設置默認倉庫
 DocType: Work Order,Check if material transfer entry is not required,檢查是否不需要材料轉移條目
 DocType: Work Order,Check if material transfer entry is not required,檢查是否不需要材料轉移條目
 DocType: Program Enrollment Tool,Get Students From,讓學生從
@@ -4998,7 +5006,6 @@
 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/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,請在人力資源&gt;人力資源設置中設置員工命名系統
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +232,Sales Invoice {0} must be cancelled before cancelling this Sales Order,銷售發票{0}必須早於此銷售訂單之前取消
 DocType: Clinical Procedure,Age,年齡
 DocType: Sales Invoice Timesheet,Billing Amount,開票金額
@@ -5006,7 +5013,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,為項目指定了無效的數量{0} 。量應大於0 。
 DocType: Company,Default Employee Advance Account,默認員工高級帳戶
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1181,Search Item (Ctrl + i),搜索項目(Ctrl + i)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +166,Account with existing transaction can not be deleted,帳戶與現有的交易不能被刪除
+apps/erpnext/erpnext/accounts/doctype/account/account.py +171,Account with existing transaction can not be deleted,帳戶與現有的交易不能被刪除
 DocType: Vehicle,Last Carbon Check,最後檢查炭
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Legal Expenses,法律費用
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +147,Please select quantity on row ,請選擇行數量
@@ -5023,18 +5030,18 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,新客戶收入
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Travel Expenses,差旅費
 DocType: Maintenance Visit,Breakdown,展開
-apps/erpnext/erpnext/controllers/accounts_controller.py +890,Account: {0} with currency: {1} can not be selected,帳號:{0}幣種:{1}不能選擇
+apps/erpnext/erpnext/controllers/accounts_controller.py +889,Account: {0} with currency: {1} can not be selected,帳號:{0}幣種:{1}不能選擇
 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/account/account.py +52,Account {0}: Parent account {1} does not belong to company: {2},帳戶{0}:父帳戶{1}不屬於公司:{2}
+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,隨著對日
 DocType: Program Enrollment,Enrollment Date,報名日期
 DocType: Healthcare Settings,Out Patient SMS Alerts,輸出病人短信
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Probation,緩刑
 DocType: Program Enrollment Tool,New Academic Year,新學年
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +847,Return / Credit Note,返回/信用票據
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Return / Credit Note,返回/信用票據
 DocType: Stock Settings,Auto insert Price List rate if missing,自動插入價目表率,如果丟失
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,總支付金額
 DocType: Job Card,Transferred Qty,轉讓數量
@@ -5050,7 +5057,7 @@
 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,學年名稱
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1280,{0} not allowed to transact with {1}. Please change the Company.,不允許{0}與{1}進行交易。請更改公司。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1166,{0} not allowed to transact with {1}. Please change the Company.,不允許{0}與{1}進行交易。請更改公司。
 DocType: Sales Partner,Contact Desc,聯絡倒序
 DocType: Email Digest,Send regular summary reports via Email.,使用電子郵件發送定期匯總報告。
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +288,Please set default account in Expense Claim Type {0},請報銷類型設置默認帳戶{0}
@@ -5078,7 +5085,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,不允許因為{0}超出範圍
 DocType: Serial No,Asset Status,資產狀態
 DocType: Hotel Room,Hotel Manager,酒店經理
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,購物車稅收規則設定
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,購物車稅收規則設定
 DocType: Purchase Invoice,Taxes and Charges Added,稅費上架
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,折舊行{0}:下一個折舊日期不能在可供使用的日期之前
 ,Sales Funnel,銷售漏斗
@@ -5092,10 +5099,10 @@
 ,Territory Target Variance Item Group-Wise,地域內跨項目群組間的目標差異
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,所有客戶群組
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,每月累計
-apps/erpnext/erpnext/controllers/accounts_controller.py +847,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}是強制性的。也許外幣兌換記錄為{1}到{2}尚未建立。
+apps/erpnext/erpnext/controllers/accounts_controller.py +846,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}是強制性的。也許外幣兌換記錄為{1}到{2}尚未建立。
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},已存在人員配置計劃{0}以用於指定{1}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,稅務模板是強制性的。
-apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: Parent account {1} does not exist,帳戶{0}:父帳戶{1}不存在
+apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,帳戶{0}:父帳戶{1}不存在
 DocType: POS Closing Voucher,Period Start Date,期間開始日期
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),價格列表費率(公司貨幣)
 DocType: Products Settings,Products Settings,產品設置
@@ -5115,7 +5122,7 @@
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,此操作將停止未來的結算。您確定要取消此訂閱嗎?
 DocType: Serial No,Distinct unit of an Item,一個項目的不同的單元
 DocType: Supplier Scorecard Criteria,Criteria Name,標準名稱
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1368,Please set Company,請設公司
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1386,Please set Company,請設公司
 DocType: Procedure Prescription,Procedure Created,程序已創建
 DocType: Pricing Rule,Buying,採購
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,疾病與肥料
@@ -5159,7 +5166,7 @@
 DocType: Amazon MWS Settings,Synch Orders,同步訂單
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,發布生產訂單。
 apps/erpnext/erpnext/public/js/account_tree_grid.js +65,Select Fiscal Year...,選擇會計年度...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,POS Profile required to make POS Entry,所需的POS資料,使POS進入
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,POS Profile required to make POS Entry,所需的POS資料,使POS進入
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +15,"Loyalty Points will be calculated from the spent done (via the Sales Invoice), based on collection factor mentioned.",忠誠度積分將根據所花費的完成量(通過銷售發票)計算得出。
 DocType: Company,HRA Settings,HRA設置
 DocType: Employee Transfer,Transfer Date,轉移日期
@@ -5182,6 +5189,7 @@
 DocType: Bank Statement Transaction Entry,Matching Invoices,匹配發票
 DocType: Work Order,Required Items,所需物品
 DocType: Stock Ledger Entry,Stock Value Difference,庫存價值差異
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: {1} {2} does not exist in above '{1}' table,項目行{0}:{1} {2}在上面的“{1}”表格中不存在
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,人力資源
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,付款方式付款對賬
 DocType: Disease,Treatment Task,治療任務
@@ -5300,7 +5308,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,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 +197,Item {0} is not setup for Serial Nos. Column must be blank,項目{0}不是設定為序列號,此列必須為空白
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Item {0} is not setup for Serial Nos. Column must be blank,項目{0}不是設定為序列號,此列必須為空白
 DocType: Accounts Settings,Accounts Settings,帳戶設定
 DocType: Loyalty Program,Customer Territory,客戶地區
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix",新帳號的數量,將作為前綴包含在帳號名稱中
@@ -5323,7 +5331,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,學到更多
 DocType: Cheque Print Template,Distance from top edge,從頂邊的距離
 DocType: POS Closing Voucher Invoices,Quantity of Items,項目數量
-apps/erpnext/erpnext/stock/get_item_details.py +517,Price List {0} is disabled or does not exist,價格表{0}禁用或不存在
+apps/erpnext/erpnext/stock/get_item_details.py +521,Price List {0} is disabled or does not exist,價格表{0}禁用或不存在
 DocType: Purchase Invoice,Return,退貨
 DocType: Pricing Rule,Disable,關閉
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +184,Mode of payment is required to make a payment,付款方式需要進行付款
@@ -5341,7 +5349,7 @@
 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}
 DocType: Journal Entry Account,Exchange Rate,匯率
 DocType: Patient,Additional information regarding the patient,有關患者的其他信息
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +664,Sales Order {0} is not submitted,銷售訂單{0}未提交
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +647,Sales Order {0} is not submitted,銷售訂單{0}未提交
 DocType: Homepage,Tag Line,標語
 DocType: Fee Component,Fee Component,收費組件
 apps/erpnext/erpnext/config/hr.py +286,Fleet Management,車隊的管理
@@ -5378,7 +5386,7 @@
 DocType: Leave Policy Detail,Leave Policy Detail,退出政策細節
 DocType: BOM Scrap Item,BOM Scrap Item,BOM項目廢料
 apps/erpnext/erpnext/accounts/page/pos/pos.js +908,Submitted orders can not be deleted,提交的訂單不能被刪除
-apps/erpnext/erpnext/accounts/doctype/account/account.py +116,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",帳戶餘額已歸為借方帳戶,不允許設為信用帳戶
+apps/erpnext/erpnext/accounts/doctype/account/account.py +121,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",帳戶餘額已歸為借方帳戶,不允許設為信用帳戶
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +330,Quality Management,品質管理
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +52,Item {0} has been disabled,項{0}已被禁用
 DocType: Project,Total Billable Amount (via Timesheets),總計費用金額(通過時間表)
@@ -5403,7 +5411,7 @@
 DocType: Linked Plant Analysis,Linked Plant Analysis,鏈接的工廠分析
 DocType: Delivery Note,Transporter ID,運輸商ID
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,供應商貨幣被換算成公司基礎貨幣的匯率
-DocType: Sales Invoice Item,Service End Date,服務結束日期
+DocType: Purchase Invoice Item,Service End Date,服務結束日期
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},行#{0}:與排時序衝突{1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,允許零估值
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,允許零估值
@@ -5433,7 +5441,7 @@
 apps/erpnext/erpnext/config/accounts.py +505,List of all share transactions,所有股份交易清單
 DocType: Shopify Settings,Import Sales Invoice from Shopify if Payment is marked,如果付款已標記,則從Shopify導入銷售發票
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,必須設置試用期開始日期和試用期結束日期
-apps/erpnext/erpnext/controllers/accounts_controller.py +791,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,支付計劃中的總付款金額必須等於大/圓
+apps/erpnext/erpnext/controllers/accounts_controller.py +790,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,支付計劃中的總付款金額必須等於大/圓
 DocType: Subscription Plan Detail,Plan,計劃
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,銀行對賬單餘額按總帳
 DocType: Job Applicant,Applicant Name,申請人名稱
@@ -5490,7 +5498,7 @@
 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 +1047,Select Items to Manufacture,選擇項目,以製造
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1065,Select Items to Manufacture,選擇項目,以製造
 DocType: Delivery Stop,Delivery Stop,交貨停止
 apps/erpnext/erpnext/accounts/page/pos/pos.js +976,"Master data syncing, it might take some time",主數據同步,這可能需要一些時間
 DocType: Item,Material Issue,發料
@@ -5534,7 +5542,7 @@
 DocType: POS Profile,Item Groups,項目組
 DocType: Sales Order Item,For Production,對於生產
 DocType: Exchange Rate Revaluation Account,Balance In Account Currency,賬戶貨幣餘額
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,請在會計科目表中添加一個臨時開戶賬戶
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +188,Please add a Temporary Opening account in Chart of Accounts,請在會計科目表中添加一個臨時開戶賬戶
 DocType: Customer,Customer Primary Contact,客戶主要聯繫人
 DocType: Project Task,View Task,查看任務
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
@@ -5576,7 +5584,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 +1148,It is needed to fetch Item Details.,需要獲取項目細節。
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1180,It is needed to fetch Item Details.,需要獲取項目細節。
 DocType: Fertilizer,Fertilizer Name,肥料名稱
 DocType: Salary Slip,Net Pay,淨收費
 DocType: Cash Flow Mapping Accounts,Account,帳戶
@@ -5612,7 +5620,7 @@
 DocType: Item,No of Months,沒有幾個月
 DocType: Item,Max Discount (%),最大折讓(%)
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +30,Credit Days cannot be a negative number,信用日不能是負數
-DocType: Sales Invoice Item,Service Stop Date,服務停止日期
+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 +290," {0} Retain Sample is based on batch, please check Has Batch No to retain sample of item","{0} 留樣品是基於批次, 請檢查是否有批次不保留專案的樣品"
@@ -5652,6 +5660,7 @@
 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 +1080,Batch {0} of Item {1} has expired.,一批項目的{0} {1}已過期。
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,請在教育&gt;教育設置中設置教師命名系統
 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,申請人名稱
@@ -5667,7 +5676,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`凍結股票早於`應該是少於%d天。
 DocType: Tax Rule,Purchase Tax Template,購置稅模板
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,為您的公司設定您想要實現的銷售目標。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1530,Healthcare Services,醫療服務
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1548,Healthcare Services,醫療服務
 ,Project wise Stock Tracking,項目明智的庫存跟踪
 DocType: GST HSN Code,Regional,區域性
 DocType: Delivery Note,Transport Mode,運輸方式
@@ -5700,10 +5709,10 @@
 DocType: Warranty Claim,Resolved By,議決
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js +32,Schedule Discharge,附表卸貨
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,支票及存款不正確清除
-apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: You can not assign itself as parent account,帳戶{0}:你不能指定自己為父帳戶
+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/accounts/doctype/sales_invoice/sales_invoice.js +1584,Service Stop Date cannot be after Service End Date,服務停止日期不能在服務結束日期之後
+apps/erpnext/erpnext/public/js/controllers/transaction.js +812,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,採取供應商的平均時間交付
@@ -5712,7 +5721,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 +1020,Work Order already created for all items with BOM,已經為包含物料清單的所有料品創建工單
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1038,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,設置進度動作
@@ -5767,7 +5776,7 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +382,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} {1}在需要{2}在{3} {4}:{5}來完成這一交易單位。
 DocType: Fee Schedule,Student Category,學生組
 DocType: Announcement,Student,學生
-apps/erpnext/erpnext/healthcare/doctype/clinical_procedure/clinical_procedure.js +91,Stock quantity to start procedure is not available in the warehouse. Do you want to record a Stock Transfer,倉庫中不提供開始操作的庫存數量。你想記錄股票轉移嗎?
+apps/erpnext/erpnext/healthcare/doctype/clinical_procedure/clinical_procedure.js +98,Stock quantity to start procedure is not available in the warehouse. Do you want to record a Stock Transfer,倉庫中不提供開始操作的庫存數量。你想記錄股票轉移嗎?
 DocType: Shipping Rule,Shipping Rule Type,運輸規則類型
 apps/erpnext/erpnext/utilities/user_progress.py +239,Go to Rooms,去房間
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +259,"Company, Payment Account, From Date and To Date is mandatory",公司,付款帳戶,從日期和日期是強制性的
@@ -5805,7 +5814,7 @@
 DocType: Lead,Converted,轉換
 DocType: Item,Has Serial No,有序列號
 DocType: Employee,Date of Issue,發行日期
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +246,"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/accounts/doctype/purchase_invoice/purchase_invoice.py +250,"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/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,行{0}:小時值必須大於零。
 apps/erpnext/erpnext/stock/doctype/item/item.py +210,Website Image {0} attached to Item {1} cannot be found,網站圖像{0}附加到物品{1}無法找到
@@ -5818,7 +5827,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,請在“銷售設置”中設置默認客戶組和領域
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +355,Please check Multi Currency option to allow accounts with other currency,請檢查多幣種選項,允許帳戶與其他貨幣
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,項:{0}不存在於系統中
-apps/erpnext/erpnext/accounts/doctype/account/account.py +108,You are not authorized to set Frozen value,您無權設定值凍結
+apps/erpnext/erpnext/accounts/doctype/account/account.py +113,You are not authorized to set Frozen value,您無權設定值凍結
 DocType: Payment Reconciliation,Get Unreconciled Entries,獲取未調節項
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,Employee {0} is on Leave on {1},員工{0}暫停{1}
 apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,沒有為日記帳分錄選擇還款
@@ -5848,7 +5857,7 @@
 DocType: Stock Entry,Total Value Difference (Out - In),總價值差(輸出 - )
 DocType: Grant Application,Requested Amount,請求金額
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Row {0}: Exchange Rate is mandatory,行{0}:匯率是必須的
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},用戶ID不為員工設置{0}
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +46,User ID not set for Employee {0},用戶ID不為員工設置{0}
 DocType: Vehicle,Vehicle Value,汽車衡
 DocType: Crop Cycle,Detected Diseases,檢測到的疾病
 DocType: Stock Entry,Default Source Warehouse,預設來源倉庫
@@ -5856,7 +5865,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Birthday Reminder for {0},生日提醒{0}
 DocType: Asset Maintenance Task,Last Completion Date,最後完成日期
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,天自上次訂購
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +426,Debit To account must be a Balance Sheet account,借方帳戶必須是資產負債表科目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +427,Debit To account must be a Balance Sheet account,借方帳戶必須是資產負債表科目
 DocType: Vital Signs,Coated,塗
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,行{0}:使用壽命後的預期值必須小於總採購額
 DocType: GoCardless Settings,GoCardless Settings,GoCardless設置
@@ -5873,7 +5882,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,送貨單{0}不能提交
 DocType: Notification Control,Sales Invoice Message,銷售發票訊息
 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 +405,Salary Slip of employee {0} already created for time sheet {1},員工的工資單{0}已為時間表創建{1}
+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 +802,Item {0} is disabled,項目{0}無效
 DocType: Stock Settings,Stock Frozen Upto,存貨凍結到...為止
@@ -5938,7 +5947,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,安裝預置
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +103,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 +1110,Select Items based on Delivery Date,根據交付日期選擇項目
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,根據交付日期選擇項目
 DocType: Grant Application,Has any past Grant Record,有過去的贈款記錄嗎?
 ,Sales Analytics,銷售分析
 ,Prospects Engaged But Not Converted,展望未成熟
@@ -5946,7 +5955,7 @@
 DocType: Manufacturing Settings,Manufacturing Settings,製造設定
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,設定電子郵件
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1手機號碼
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +130,Please enter default currency in Company Master,請在公司主檔輸入預設貨幣
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +134,Please enter default currency in Company Master,請在公司主檔輸入預設貨幣
 DocType: Stock Entry Detail,Stock Entry Detail,存貨分錄明細
 apps/erpnext/erpnext/templates/pages/help.html +56,See all open tickets,查看所有打開的門票
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js +21,Healthcare Service Unit Tree,醫療服務單位樹
@@ -5990,7 +5999,7 @@
 DocType: Employee Tax Exemption Category,Max Amount,最大金額
 DocType: Journal Entry,Total Amount Currency,總金額幣種
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,搜索子組件
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +195,Item Code required at Row No {0},於列{0}需要產品編號
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Item Code required at Row No {0},於列{0}需要產品編號
 DocType: GST Account,SGST Account,SGST賬戶
 apps/erpnext/erpnext/utilities/user_progress.py +154,Go to Items,轉到項目
 DocType: Sales Partner,Partner Type,合作夥伴類型
@@ -6012,7 +6021,7 @@
 DocType: Employee,Applicable Holiday List,適用假期表
 DocType: Training Event,Employee Emails,員工電子郵件
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +67,Series Updated,系列更新
-apps/erpnext/erpnext/accounts/doctype/account/account.py +161,Report Type is mandatory,報告類型是強制性的
+apps/erpnext/erpnext/accounts/doctype/account/account.py +166,Report Type is mandatory,報告類型是強制性的
 DocType: Item,Serial Number Series,序列號系列
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},倉庫是強制性的股票項目{0}行{1}
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +45,Retail & Wholesale,零售及批發
@@ -6054,12 +6063,12 @@
 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 +1762,Please select Healthcare Service,請選擇醫療保健服務
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1747,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,輪候
 DocType: Employee Tax Exemption Declaration Category,Exemption Category,豁免類別
-apps/erpnext/erpnext/accounts/doctype/account/account.py +126,Currency can not be changed after making entries using some other currency,貨幣不能使用其他貨幣進行輸入後更改
+apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Currency can not be changed after making entries using some other currency,貨幣不能使用其他貨幣進行輸入後更改
 DocType: Vehicle Service,Clutch Plate,離合器壓盤
 DocType: Company,Round Off Account,四捨五入賬戶
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Administrative Expenses,行政開支
@@ -6121,7 +6130,7 @@
 DocType: Assessment Result,Total Score,總得分
 DocType: Crop Cycle,ISO 8601 standard,ISO 8601標準
 DocType: Journal Entry,Debit Note,繳費單
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1494,You can only redeem max {0} points in this order.,您只能按此順序兌換最多{0}個積分。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1512,You can only redeem max {0} points in this order.,您只能按此順序兌換最多{0}個積分。
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +102,Please enter API Consumer Secret,請輸入API消費者密碼
 DocType: Stock Entry,As per Stock UOM,按庫存計量單位
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,沒有過期
@@ -6195,7 +6204,7 @@
 DocType: Additional Salary,Employee Name,員工姓名
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,餐廳訂單錄入項目
 DocType: Purchase Invoice,Rounded Total (Company Currency),整數總計(公司貨幣)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Cannot covert to Group because Account Type is selected.,不能隱蔽到組,因為帳戶類型選擇的。
+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} 已修改。請更新。
 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。
@@ -6231,7 +6240,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1733,Price List not found or disabled,價格表未找到或被禁用
 DocType: Student Applicant,Approved,批准
 apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +15,Price,價格
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +347,Employee relieved on {0} must be set as 'Left',員工解除對{0}必須設定為“左”
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +349,Employee relieved on {0} must be set as 'Left',員工解除對{0}必須設定為“左”
 DocType: Marketplace Settings,Last Sync On,上次同步開啟
 DocType: Guardian,Guardian,監護人
 apps/erpnext/erpnext/support/doctype/issue/issue.js +48,All communications including and above this shall be moved into the new Issue,包括及以上的所有通信均應移至新發行中
@@ -6259,7 +6268,7 @@
 apps/erpnext/erpnext/hr/doctype/attendance_request/attendance_request.py +52,Attendance not submitted for {0} as it is a Holiday.,由於是假期,因此未出席{0}的考勤。
 DocType: POS Profile,Account for Change Amount,帳戶漲跌額
 DocType: Exchange Rate Revaluation,Total Gain/Loss,總收益/損失
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1273,Invalid Company for Inter Company Invoice.,公司發票無效公司。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1159,Invalid Company for Inter Company Invoice.,公司發票無效公司。
 DocType: Purchase Invoice,input service,輸入服務
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},行{0}:甲方/客戶不與匹配{1} / {2} {3} {4}
 DocType: Employee Promotion,Employee Promotion,員工晉升
@@ -6321,6 +6330,7 @@
 apps/erpnext/erpnext/config/accounts.py +285,"Seasonality for setting budgets, targets etc.",季節性設置預算,目標等。
 DocType: Supplier Scorecard Scoring Variable,Variable Name,變量名
 apps/erpnext/erpnext/stock/get_item_details.py +163,"Item {0} is a template, please select one of its variants",項目{0}是一個模板,請選擇它的一個變體
+DocType: Purchase Invoice Item,Deferred Expense,遞延費用
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +26,From Date {0} cannot be before employee's joining Date {1},起始日期{0}不能在員工加入日期之前{1}
 DocType: Asset,Asset Category,資產類別
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +32,Net pay cannot be negative,淨工資不能為負
@@ -6346,9 +6356,9 @@
 DocType: Loan,Loan Type,貸款類型
 DocType: Scheduling Tool,Scheduling Tool,調度工具
 DocType: BOM,Item to be manufactured or repacked,產品被製造或重新包裝
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +764,Syntax error in condition: {0},條件中的語法錯誤:{0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +766,Syntax error in condition: {0},條件中的語法錯誤:{0}
 DocType: Employee Education,Major/Optional Subjects,大/選修課
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +125,Please Set Supplier Group in Buying Settings.,請設置供應商組購買設置。
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +121,Please Set Supplier Group in Buying Settings.,請設置供應商組購買設置。
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +56,"Total flexible benefit component amount {0} should not be less \
 				than max benefits {1}",靈活福利組件總額{0}不應低於最大福利{1}
 DocType: Sales Invoice Item,Drop Ship,直接發運給客戶
@@ -6377,7 +6387,7 @@
 						can have delivery based on Serial No",項目{0}沒有序列號只有serilialized items \可以根據序列號進行交付
 DocType: Work Order,Actual Operating Cost,實際運行成本
 DocType: Payment Entry,Cheque/Reference No,支票/參考編號
-apps/erpnext/erpnext/accounts/doctype/account/account.py +83,Root cannot be edited.,root不能被編輯。
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root cannot be edited.,root不能被編輯。
 DocType: Item,Units of Measure,測量的單位
 DocType: Supplier,Default Tax Withholding Config,預設稅款預扣配置
 DocType: Manufacturing Settings,Allow Production on Holidays,允許假日生產
@@ -6406,7 +6416,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,設計師
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,條款及細則範本
 DocType: Serial No,Delivery Details,交貨細節
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +574,Cost Center is required in row {0} in Taxes table for type {1},成本中心是必需的行{0}稅表型{1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +578,Cost Center is required in row {0} in Taxes table for type {1},成本中心是必需的行{0}稅表型{1}
 DocType: Program,Program Code,程序代碼
 DocType: Terms and Conditions,Terms and Conditions Help,條款和條件幫助
 ,Item-wise Purchase Register,項目明智的購買登記
@@ -6446,7 +6456,7 @@
 DocType: Department,Expense Approvers,費用審批人
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +228,Row {0}: Debit entry can not be linked with a {1},行{0}:借方條目不能與{1}連接
 DocType: Journal Entry,Subscription Section,認購科
-apps/erpnext/erpnext/accounts/doctype/account/account.py +233,Account {0} does not exist,帳戶{0}不存在
+apps/erpnext/erpnext/accounts/doctype/account/account.py +238,Account {0} does not exist,帳戶{0}不存在
 DocType: Training Event,Training Program,培訓計劃
 DocType: Account,Cash,現金
 DocType: Employee,Short biography for website and other publications.,網站和其他出版物的短的傳記。