[Translation] Updated Translations (#14776)

diff --git a/erpnext/translations/zh-TW.csv b/erpnext/translations/zh-TW.csv
index ee965fa..fbe214e 100644
--- a/erpnext/translations/zh-TW.csv
+++ b/erpnext/translations/zh-TW.csv
@@ -18,6 +18,7 @@
 DocType: Consultation,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/hr/doctype/employee_transfer/employee_transfer.py +15,Cannot transfer Employee with status Left,無法轉移狀態為左的員工
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +309,Do you really want to scrap this asset?,難道你真的想放棄這項資產?
 DocType: Drug Prescription,Update Schedule,更新時間表
@@ -91,7 +92,7 @@
 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 +904,Serial Number: {0} is already referenced in Sales Invoice: {1},序號:{0}已在銷售發票中引用:{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +906,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,週期性
@@ -148,7 +149,7 @@
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},不允許{0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,Get items from,取得項目來源
 DocType: Price List,Price Not UOM Dependant,價格不依賴於UOM
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Stock cannot be updated against Delivery Note {0},送貨單{0}不能更新庫存
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Stock cannot be updated against Delivery Note {0},送貨單{0}不能更新庫存
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},產品{0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,沒有列出項目
 DocType: Asset Repair,Error Description,錯誤說明
@@ -162,7 +163,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 +1758,Not items found,未找到項目
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +247,Salary Structure Missing,薪酬結構缺失
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +252,Salary Structure Missing,薪酬結構缺失
 DocType: Sales Invoice Item,Sales Invoice Item,銷售發票項目
 DocType: Account,Credit,信用
 DocType: POS Profile,Write Off Cost Center,沖銷成本中心
@@ -170,7 +171,7 @@
 apps/erpnext/erpnext/config/stock.py +28,Stock Reports,庫存報告
 DocType: Warehouse,Warehouse Detail,倉庫的詳細資訊
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,該期限結束日期不能晚於學年年終日期到這個詞聯繫在一起(學年{})。請更正日期,然後再試一次。
-apps/erpnext/erpnext/stock/doctype/item/item.py +284,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",“是固定的資產”不能選中,作為資產記錄存在對項目
+apps/erpnext/erpnext/stock/doctype/item/item.py +285,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",“是固定的資產”不能選中,作為資產記錄存在對項目
 DocType: Delivery Trip,Departure Time,出發時間
 DocType: Vehicle Service,Brake Oil,剎車油
 DocType: Tax Rule,Tax Type,稅收類型
@@ -182,7 +183,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 +1105,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 +994,Select BOM,選擇BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1022,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 +38,The holiday on {0} is not between From Date and To Date,在{0}這個節日之間沒有從日期和結束日期
@@ -249,7 +250,7 @@
 					<br>Absent: {1}",你想更新考勤? <br>現任:{0} \ <br>缺席:{1}
 apps/erpnext/erpnext/controllers/buying_controller.py +404,Accepted + Rejected Qty must be equal to Received quantity for Item {0},品項{0}的允收+批退的數量必須等於收到量
 DocType: Item,Supply Raw Materials for Purchase,供應原料採購
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +156,At least one mode of payment is required for POS invoice.,付款中的至少一個模式需要POS發票。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +157,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,產品展示作為一個列表
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure/clinical_procedure.py +102,Item {0} is not active or end of life has been reached,項目{0}不活躍或生命的盡頭已經達到
@@ -259,6 +260,7 @@
 DocType: Production Plan,Material Request Detail,材料請求詳情
 DocType: Selling Settings,Default Quotation Validity Days,默認報價有效天數
 apps/erpnext/erpnext/controllers/accounts_controller.py +832,"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,已收到證書
 DocType: GST Settings,Set Invoice Value for B2C. B2CL and B2CS calculated based on this invoice value.,設置B2C的發票值。 B2CL和B2CS根據此發票值計算。
@@ -353,8 +355,6 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,對銷售發票項目
 DocType: Agriculture Analysis Criteria,Linked Doctype,鏈接的文檔類型
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Cash from Financing,從融資淨現金
-apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +65,"Please add the remainig benefits {0} to the application as \
-				pro-rata component",請以\ pro-rata組件的形式將應用程序的益處{0}添加到應用程序中
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2376,"LocalStorage is full , did not save",localStorage的滿了,沒救
 DocType: Lead,Address & Contact,地址及聯絡方式
 DocType: Leave Allocation,Add unused leaves from previous allocations,從以前的分配添加未使用的休假
@@ -374,7 +374,7 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,這是基於對這個項目產生的考勤表
 ,Open Work Orders,打開工作訂單
 DocType: Payment Term,Credit Months,信貸月份
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +472,Net Pay cannot be less than 0,淨工資不能低於0
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +477,Net Pay cannot be less than 0,淨工資不能低於0
 DocType: Contract,Fulfilled,達到
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Relieving Date must be greater than Date of Joining,解除日期必須大於加入的日期
 DocType: POS Closing Voucher,Cashier,出納員
@@ -386,7 +386,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,請設置學生組的學生
 DocType: Item Website Specification,Item Website Specification,項目網站規格
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +553,Leave Blocked,禁假的
-apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} has reached its end of life on {1},項{0}已達到其壽命結束於{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +776,Item {0} has reached its end of life on {1},項{0}已達到其壽命結束於{1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,銀行條目
 DocType: Customer,Is Internal Customer,是內部客戶
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,庫存調整項目
@@ -403,10 +403,10 @@
 DocType: Item,Publish in Hub,在發布中心
 DocType: Student Admission,Student Admission,學生入學
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +785,Item {0} is cancelled,項{0}將被取消
+apps/erpnext/erpnext/stock/doctype/item/item.py +798,Item {0} is cancelled,項{0}將被取消
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,折舊行{0}:折舊開始日期作為過去的日期輸入
 DocType: Contract Template,Fulfilment Terms and Conditions,履行條款和條件
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1069,Material Request,物料需求
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1088,Material Request,物料需求
 DocType: Bank Reconciliation,Update Clearance Date,更新日期間隙
 DocType: Item,Purchase Details,採購詳情
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},項目{0}未發現“原材料提供&#39;表中的採購訂單{1}
@@ -472,12 +472,12 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},請在{}上設置酒店房價
 DocType: Journal Entry,Multi Currency,多幣種
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,發票類型
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +957,Delivery Note,送貨單
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +976,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 +134,Cost of Sold Asset,出售資產的成本
+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 +352,Payment Entry has been modified after you pulled it. Please pull it again.,付款項被修改,你把它之後。請重新拉。
 DocType: Program Enrollment Tool,New Student Batch,新學生批次
-apps/erpnext/erpnext/stock/doctype/item/item.py +494,{0} entered twice in Item Tax,{0}輸入兩次項目稅
+apps/erpnext/erpnext/stock/doctype/item/item.py +495,{0} entered twice in Item Tax,{0}輸入兩次項目稅
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,Summary for this week and pending activities,本週和待活動總結
 DocType: Student Applicant,Admitted,錄取
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +89,Amount After Depreciation,折舊金額後
@@ -516,7 +516,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 +496,For quantity {0} should not be grater than work order quantity {1},數量{0}不應超過工單數量{1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +493,Please see attachment,請參閱附件
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +498,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,週末
@@ -581,7 +581,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 +1149,Company currencies of both the companies should match for Inter Company Transactions.,兩家公司的公司貨幣應該符合Inter公司交易。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1151,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,供應商名稱
@@ -611,7 +611,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,所有製造過程中的全域設定。
 DocType: Accounts Settings,Accounts Frozen Upto,帳戶被凍結到
 DocType: SMS Log,Sent On,發送於
-apps/erpnext/erpnext/stock/doctype/item/item.py +723,Attribute {0} selected multiple times in Attributes Table,屬性{0}多次選擇在屬性表
+apps/erpnext/erpnext/stock/doctype/item/item.py +736,Attribute {0} selected multiple times in Attributes Table,屬性{0}多次選擇在屬性表
 DocType: HR Settings,Employee record is created using selected field. ,使用所選欄位創建員工記錄。
 DocType: Sales Order,Not Applicable,不適用
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +85,Opening Invoice Item,打開發票項目
@@ -673,7 +673,7 @@
 DocType: Lab Test Template,Lab Routine,實驗室常規
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,化妝品
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +18,Please select Completion Date for Completed Asset Maintenance Log,請選擇已完成資產維護日誌的完成日期
-apps/erpnext/erpnext/stock/doctype/item/item.py +567,"To merge, following properties must be same for both items",若要合併,以下屬性必須為這兩個項目是相同的
+apps/erpnext/erpnext/stock/doctype/item/item.py +568,"To merge, following properties must be same for both items",若要合併,以下屬性必須為這兩個項目是相同的
 DocType: Supplier,Block Supplier,塊供應商
 DocType: Shipping Rule,Net Weight,淨重
 DocType: Job Opening,Planned number of Positions,計劃的職位數量
@@ -700,6 +700,7 @@
 DocType: Patient,Risk Factors,風險因素
 DocType: Patient,Occupational Hazards and Environmental Factors,職業危害與環境因素
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +283,Stock Entries already created for Work Order ,已為工單創建的庫存條目
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +169,Supplier &gt; Supplier Type,供應商&gt;供應商類型
 DocType: Vital Signs,Respiratory rate,呼吸頻率
 apps/erpnext/erpnext/config/stock.py +338,Managing Subcontracting,管理轉包
 DocType: Vital Signs,Body Temperature,體溫
@@ -719,7 +720,7 @@
 DocType: BOM,Operating Cost,營業成本
 DocType: Crop,Produced Items,生產物品
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,將交易與發票匹配
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Unblock Invoice,取消屏蔽發票
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +841,Unblock Invoice,取消屏蔽發票
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,增量不能為0
 DocType: Company,Delete Company Transactions,刪除公司事務
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +366,Reference No and Reference Date is mandatory for Bank transaction,參考編號和參考日期是強制性的銀行交易
@@ -746,7 +747,7 @@
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,所有供應商記分卡。
 DocType: Buying Settings,Purchase Receipt Required,需要採購入庫單
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +229,Target warehouse in row {0} must be same as Work Order,行{0}中的目標倉庫必須與工單相同
-apps/erpnext/erpnext/stock/doctype/item/item.py +169,Valuation Rate is mandatory if Opening Stock entered,估價費用是強制性的,如果打開股票進入
+apps/erpnext/erpnext/stock/doctype/item/item.py +170,Valuation Rate is mandatory if Opening Stock entered,估價費用是強制性的,如果打開股票進入
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +143,No records found in the Invoice table,沒有在發票表中找到記錄
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +36,Please select Company and Party Type first,請選擇公司和黨的第一型
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default",已經在用戶{1}的pos配置文件{0}中設置了默認值,請禁用默認值
@@ -756,7 +757,7 @@
 DocType: Shopify Settings,Customer Group will set to selected group while syncing customers from Shopify,客戶組將在同步Shopify客戶的同時設置為選定的組
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,POS Profile中需要領域
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,製作銷售訂單
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},從{0}到{1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +179,Salary Slip submitted for period from {0} to {1},從{0}到{1}
 DocType: Project Task,Project Task,項目任務
 ,Lead Id,潛在客戶標識
 DocType: C-Form Invoice Detail,Grand Total,累計
@@ -779,7 +780,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 +863,Sales Return,銷貨退回
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +882,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,總庫存總結
@@ -793,7 +794,7 @@
 apps/erpnext/erpnext/config/selling.py +28,Customer database.,客戶數據庫。
 DocType: Quotation,Quotation To,報價到
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),開啟(Cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +895,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,測度項目的默認單位{0}不能直接改變,因為你已經做了一些交易(S)與其他計量單位。您將需要創建一個新的項目,以使用不同的默認計量單位。
+apps/erpnext/erpnext/stock/doctype/item/item.py +908,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,測度項目的默認單位{0}不能直接改變,因為你已經做了一些交易(S)與其他計量單位。您將需要創建一個新的項目,以使用不同的默認計量單位。
 apps/erpnext/erpnext/accounts/utils.py +356,Allocated amount can not be negative,分配金額不能為負
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,請設定公司
 DocType: Share Balance,Share Balance,份額平衡
@@ -807,6 +808,7 @@
 DocType: Payroll Entry,Select Payment Account to make Bank Entry,選擇付款賬戶,使銀行進入
 DocType: Hotel Settings,Default Invoice Naming Series,默認發票命名系列
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll",建立員工檔案管理葉,報銷和工資
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +679,An error occurred during the update process,更新過程中發生錯誤
 DocType: Restaurant Reservation,Restaurant Reservation,餐廳預訂
 DocType: Land Unit,Land Unit Name,土地單位名稱
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +166,Proposal Writing,提案寫作
@@ -824,7 +826,7 @@
 apps/erpnext/erpnext/config/accounts.py +144,Update Bank Transaction Dates,更新銀行交易日期
 apps/erpnext/erpnext/config/projects.py +41,Time Tracking,時間跟踪
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,輸送機重複
-apps/erpnext/erpnext/hr/doctype/employee_advance/employee_advance.py +49,Row {0}# Paid Amount cannot be greater than requested advance amount,行{0}#付費金額不能大於請求的提前金額
+apps/erpnext/erpnext/hr/doctype/employee_advance/employee_advance.py +57,Row {0}# Paid Amount cannot be greater than requested advance amount,行{0}#付費金額不能大於請求的提前金額
 DocType: Fiscal Year Company,Fiscal Year Company,會計年度公司
 DocType: Packing Slip Item,DN Detail,DN詳細
 DocType: Training Event,Conference,會議
@@ -867,7 +869,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/work_order/work_order.py +386,Timesheet created:,創建時間表:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1054,Please set default Cash or Bank account in Mode of Payment {0},請設定現金或銀行帳戶的預設付款方式{0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1056,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}
@@ -893,7 +895,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,{0}: {1} not found in Invoice Details table,{0}:在發票明細表中找不到{1}
 DocType: Asset,Asset Owner Company,資產所有者公司
 DocType: Company,Round Off Cost Center,四捨五入成本中心
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +248,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,維護訪問{0}必須取消這個銷售訂單之前被取消
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +249,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,維護訪問{0}必須取消這個銷售訂單之前被取消
 DocType: Item,Material Transfer,物料轉倉
 DocType: Cost Center,Cost Center Number,成本中心編號
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,找不到路徑
@@ -910,7 +912,7 @@
 DocType: BOM Operation,Operation Time,操作時間
 DocType: Salary Structure Assignment,Base,基礎
 DocType: Timesheet,Total Billed Hours,帳單總時間
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1564,Write Off Amount,核銷金額
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1549,Write Off Amount,核銷金額
 DocType: Leave Block List Allow,Allow User,允許用戶
 DocType: Journal Entry,Bill No,帳單號碼
 DocType: Company,Gain/Loss Account on Asset Disposal,在資產處置收益/損失帳戶
@@ -926,7 +928,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,時間表
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,倒沖原物料基於
 DocType: Sales Invoice,Port Code,港口代碼
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +962,Reserve Warehouse,儲備倉庫
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +981,Reserve Warehouse,儲備倉庫
 DocType: Lead,Lead is an Organization,領導是一個組織
 DocType: Guardian Interest,Interest,利益
 DocType: Instructor Log,Other Details,其他詳細資訊
@@ -952,7 +954,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,只有在設置了“現金流量映射器”文檔時才能選擇
 DocType: Email Digest,Next email will be sent on:,接下來的電子郵件將被發送:
 DocType: Supplier Scorecard,Per Week,每個星期
-apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item has variants.,項目已變種。
+apps/erpnext/erpnext/stock/doctype/item/item.py +683,Item has variants.,項目已變種。
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,學生總數
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,項{0}未找到
 DocType: Bin,Stock Value,庫存價值
@@ -986,7 +988,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +134,{0} is not a stock Item,{0}不是庫存項目
 apps/erpnext/erpnext/hr/notification/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',請通過點擊“培訓反饋”,然後點擊“新建”
 DocType: Mode of Payment Account,Default Account,預設帳戶
-apps/erpnext/erpnext/stock/doctype/item/item.py +288,Please select Sample Retention Warehouse in Stock Settings first,請先在庫存設置中選擇樣品保留倉庫
+apps/erpnext/erpnext/stock/doctype/item/item.py +289,Please select Sample Retention Warehouse in Stock Settings first,請先在庫存設置中選擇樣品保留倉庫
 DocType: Payment Entry,Received Amount (Company Currency),收到的款項(公司幣種)
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,如果機會是由前導而來,前導必須被設定
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +136,Payment Cancelled. Please check your GoCardless Account for more details,付款已取消。請檢查您的GoCardless帳戶以了解更多詳情
@@ -999,15 +1001,14 @@
 DocType: Delivery Note,Customer's Purchase Order No,客戶的採購訂單編號
 DocType: Clinical Procedure,Consume Stock,消費股票
 DocType: Budget,Budget Against,反對財政預算案
-DocType: Employee,Cell Number,手機號碼
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +469,There's no employee for the given criteria. Check that Salary Slips have not already been created.,給定的標準沒有僱員。檢查工資單還沒有被創建。
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +516,There's no employee for the given criteria. Check that Salary Slips have not already been created.,給定的標準沒有僱員。檢查工資單還沒有被創建。
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,汽車材料的要求生成
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,丟失
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +184,You can not enter current voucher in 'Against Journal Entry' column,在您不能輸入電流券“對日記帳分錄”專欄
 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 +892,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 +894,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,細節
@@ -1092,7 +1093,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1207,Sample quantity {0} cannot be more than received quantity {1},採樣數量{0}不能超過接收數量{1}
 apps/erpnext/erpnext/stock/get_item_details.py +395,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}
+apps/erpnext/erpnext/stock/doctype/item/item.py +244,Warning: Invalid Attachment {0},警告:無效的附件{0}
 DocType: Item,Max Sample Quantity,最大樣品量
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +805,No Permission,無權限
 DocType: Contract Fulfilment Checklist,Contract Fulfilment Checklist,合同履行清單
@@ -1106,7 +1107,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,實驗室測試和重要標誌
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,銀行對帳詳細
 apps/erpnext/erpnext/controllers/accounts_controller.py +643,Row #{0}: Asset {1} must be submitted,行#{0}:資產{1}必須提交
-apps/erpnext/erpnext/hr/doctype/leave_period/leave_period.py +50,No employee found,無發現任何員工
+apps/erpnext/erpnext/hr/doctype/leave_period/leave_period.py +49,No employee found,無發現任何員工
 DocType: Item,If subcontracted to a vendor,如果分包給供應商
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,學生組已經更新。
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,學生組已經更新。
@@ -1124,7 +1125,7 @@
 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 +88,{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 +301,Timesheet {0} is already completed or cancelled,時間表{0}已完成或取消
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Timesheet {0} is already completed or cancelled,時間表{0}已完成或取消
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,沒有任務
 DocType: Item Variant Settings,Copy Fields to Variant,將字段複製到變式
 DocType: Asset,Opening Accumulated Depreciation,打開累計折舊
@@ -1173,7 +1174,6 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,開做
 DocType: Issue,Via Customer Portal,通過客戶門戶
 DocType: Notification Control,Delivery Note Message,送貨單留言
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,客戶&gt;客戶組&gt;地區
 DocType: Lab Test Template,Result Format,結果格式
 DocType: Expense Claim,Expenses,開支
 DocType: Item Variant Attribute,Item Variant Attribute,產品規格屬性
@@ -1223,7 +1223,7 @@
 DocType: Supplier Quotation,Is Subcontracted,轉包
 DocType: Item Attribute,Item Attribute Values,項目屬性值
 DocType: Examination Result,Examination Result,考試成績
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +872,Purchase Receipt,採購入庫單
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +891,Purchase Receipt,採購入庫單
 ,Received Items To Be Billed,待付款的收受品項
 apps/erpnext/erpnext/config/accounts.py +309,Currency exchange rate master.,貨幣匯率的主人。
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +210,Reference Doctype must be one of {0},參考文檔類型必須是一個{0}
@@ -1234,7 +1234,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be active,BOM {0}必須是積極的
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +423,No Items available for transfer,沒有可用於傳輸的項目
 DocType: Employee Boarding Activity,Activity Name,活動名稱
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Change Release Date,更改發布日期
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +836,Change Release Date,更改發布日期
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +238,Closing (Opening + Total),閉幕(開幕+總計)
 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,請先選擇文檔類型
@@ -1267,7 +1267,7 @@
 DocType: Support Search Source,Search Term Param Name,搜索字詞Param Name
 DocType: Item Barcode,Item Barcode,商品條碼
 DocType: Woocommerce Settings,Endpoints,端點
-apps/erpnext/erpnext/stock/doctype/item/item.py +677,Item Variants {0} updated,項目變種{0}更新
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item Variants {0} updated,項目變種{0}更新
 DocType: Quality Inspection Reading,Reading 6,6閱讀
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,無法{0} {1} {2}沒有任何負面的優秀發票
 DocType: Share Transfer,From Folio No,來自Folio No
@@ -1369,8 +1369,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 +483,Please enter Account for Change Amount,對於漲跌額請輸入帳號
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,請在教育&gt;教育設置中設置教師命名系統
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please enter Account for Change Amount,對於漲跌額請輸入帳號
 DocType: Program Enrollment Tool Student,Student Batch Name,學生批名
 DocType: Consultation,Doctor,醫生
 DocType: Holiday List,Holiday List Name,假日列表名稱
@@ -1380,6 +1379,7 @@
 DocType: Budget,Applicable on Material Request,適用於材料請求
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +217,Stock Options,股票期權
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,取消採購訂單中的上次採購詳細信息
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +584,No Items added to cart,沒有項目已添加到購物車
 DocType: Journal Entry Account,Expense Claim,報銷
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +323,Do you really want to restore this scrapped asset?,難道你真的想恢復這個報廢的資產?
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +420,Qty for {0},數量為{0}
@@ -1402,7 +1402,7 @@
 DocType: Delivery Note,Delivery To,交貨給
 apps/erpnext/erpnext/stock/doctype/item/item.js +446,Variant creation has been queued.,變體創建已經排隊。
 DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,列表中的第一個請假批准者將被設置為默認的批准批准者。
-apps/erpnext/erpnext/stock/doctype/item/item.py +719,Attribute table is mandatory,屬性表是強制性的
+apps/erpnext/erpnext/stock/doctype/item/item.py +732,Attribute table is mandatory,屬性表是強制性的
 DocType: Production Plan,Get Sales Orders,獲取銷售訂單
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +69,{0} can not be negative,{0}不能為負數
 DocType: Training Event,Self-Study,自習
@@ -1416,8 +1416,8 @@
 DocType: Agriculture Task,Urgent,緊急
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},請指定行{0}在表中的有效行ID {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,無法找到變量:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +817,Please select a field to edit from numpad,請選擇要從數字鍵盤編輯的字段
-apps/erpnext/erpnext/stock/doctype/item/item.py +279,Cannot be a fixed asset item as Stock Ledger is created.,不能成為股票分類賬創建的固定資產項目。
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +822,Please select a field to edit from numpad,請選擇要從數字鍵盤編輯的字段
+apps/erpnext/erpnext/stock/doctype/item/item.py +280,Cannot be a fixed asset item as Stock Ledger is created.,不能成為股票分類賬創建的固定資產項目。
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,轉到桌面和開始使用ERPNext
 DocType: Item,Manufacturer,生產廠家
 DocType: Landed Cost Item,Purchase Receipt Item,採購入庫項目
@@ -1444,22 +1444,23 @@
 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 +868,Delivery Trip,送貨之旅
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +887,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,銷售費用
 DocType: Consultation,Diagnosis,診斷
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,標準採購
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,客戶&gt;客戶組&gt;地區
 DocType: Attendance Request,Explanation,說明
 DocType: GL Entry,Against,針對
 DocType: Item Default,Sales Defaults,銷售默認值
 DocType: Sales Order Item,Work Order Qty,工作訂單數量
 DocType: Item Default,Default Selling Cost Center,預設銷售成本中心
-apps/erpnext/erpnext/public/js/pos/pos.html +85,Disc,圓盤
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +551,Disc,圓盤
 DocType: Buying Settings,Material Transferred for Subcontract,轉包材料轉讓
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1628,ZIP Code,郵政編碼
 apps/erpnext/erpnext/controllers/selling_controller.py +253,Sales Order {0} is {1},銷售訂單{0} {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +292,Select interest income account in loan {0},選擇貸款{0}中的利息收入帳戶
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +302,Select interest income account in loan {0},選擇貸款{0}中的利息收入帳戶
 DocType: Opportunity,Contact Info,聯絡方式
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,製作Stock條目
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,無法提升狀態為Left的員工
@@ -1551,7 +1552,7 @@
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,薪資單一被儲存,淨付款就會被顯示出來。
 DocType: Delivery Note,Is Return,退貨
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',開始日期大於任務“{0}”的結束日期
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +843,Return / Debit Note,返回/借記注
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +862,Return / Debit Note,返回/借記注
 DocType: Price List Country,Price List Country,價目表國家
 DocType: Item,UOMs,計量單位
 apps/erpnext/erpnext/stock/utils.py +238,{0} valid serial nos for Item {1},{0}項目{1}的有效的序號
@@ -1564,7 +1565,7 @@
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,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 +765,Cost Center For Item with Item Code ',成本中心與項目代碼“項目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +784,Cost Center For Item with Item Code ',成本中心與項目代碼“項目
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,總計家長教師會議
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2517,"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.,同一項目不能輸入多次。
@@ -1606,11 +1607,12 @@
 DocType: Maintenance Team Member,Maintenance Role,維護角色
 apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},重複的行{0}同{1}
 ,Trial Balance,試算表
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +462,Fiscal Year {0} not found,會計年度{0}未找到
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +509,Fiscal Year {0} not found,會計年度{0}未找到
 apps/erpnext/erpnext/config/hr.py +386,Setting up Employees,建立職工
 DocType: Hotel Room Reservation,Hotel Reservation User,酒店預訂用戶
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,請先選擇前綴稱號
 DocType: Subscription Settings,Subscription Settings,訂閱設置
+DocType: Purchase Invoice,Update Auto Repeat Reference,更新自動重複參考
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +281,Optional Holiday List not set for leave period {0},可選假期列表未設置為假期{0}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py +8,All Healthcare Service Unit,所有醫療服務單位
 DocType: Maintenance Visit Purpose,Work Done,工作完成
@@ -1620,9 +1622,9 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,查看總帳
 DocType: Grading Scale,Intervals,間隔
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,協調的事務
-apps/erpnext/erpnext/stock/doctype/item/item.py +541,"An Item Group exists with same name, please change the item name or rename the item group",具有具有相同名稱的項目群組存在,請更改項目名稱或重新命名該項目群組
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,"An Item Group exists with same name, please change the item name or rename the item group",具有具有相同名稱的項目群組存在,請更改項目名稱或重新命名該項目群組
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,學生手機號碼
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,世界其他地區
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +102,Rest Of The World,世界其他地區
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,該項目{0}不能有批
 DocType: Crop,Yield UOM,產量UOM
 ,Budget Variance Report,預算差異報告
@@ -1685,7 +1687,7 @@
 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 +493,Accounting Entry for Asset,資產會計分錄
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +828,Block Invoice,阻止發票
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,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 +798,Sync Master Data,同步主數據
 DocType: Asset Repair,Repair Cost,修理費用
@@ -1693,7 +1695,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,登錄失敗
 apps/erpnext/erpnext/controllers/buying_controller.py +600,Asset {0} created,資產{0}已創建
 DocType: Special Test Items,Special Test Items,特殊測試項目
-apps/erpnext/erpnext/stock/doctype/item/item.py +217,Website Image should be a public file or website URL,網站形象應該是一個公共文件或網站網址
+apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,網站形象應該是一個公共文件或網站網址
 DocType: Student Applicant,AP,美聯社
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,這是個根項目群組,且無法被編輯。
 DocType: Journal Entry Account,Purchase Order,採購訂單
@@ -1702,7 +1704,7 @@
 DocType: Payment Entry,Write Off Difference Amount,核銷金額差異
 DocType: Volunteer,Volunteer Name,志願者姓名
 DocType: Leave Period,Carry Forward Leaves,繼續離開
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +504,"{0}: Employee email not found, hence email not sent",{0}:未發現員工的電子郵件,因此,電子郵件未發
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +509,"{0}: Employee email not found, hence email not sent",{0}:未發現員工的電子郵件,因此,電子郵件未發
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +56,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,外貿詳細
@@ -1713,9 +1715,8 @@
 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/pricing_rule/pricing_rule.js +169,Supplier &gt; Supplier Type,供應商&gt;供應商類型
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,所有任務的權重合計應為1。請相應調整的所有項目任務重
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +593,Delivery Note {0} is not submitted,送貨單{0}未提交
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +595,Delivery Note {0} is not submitted,送貨單{0}未提交
 apps/erpnext/erpnext/stock/get_item_details.py +158,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.",基於“適用於”欄位是「項目」,「項目群組」或「品牌」,而選擇定價規則。
@@ -1726,7 +1727,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +135,Value missing,價值缺失
 DocType: Sales Invoice Item,Edit Description,編輯說明
 ,Team Updates,團隊更新
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +917,For Supplier,對供應商
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +936,For Supplier,對供應商
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,設置帳戶類型有助於在交易中選擇該帳戶。
 DocType: Purchase Invoice,Grand Total (Company Currency),總計(公司貨幣)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,創建打印格式
@@ -1760,6 +1761,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/manufacturing/doctype/blanket_order/blanket_order.js +27,Create Purchase Order,創建採購訂單
 DocType: Quality Inspection Reading,Reading 8,閱讀8
 DocType: Purchase Invoice,Taxes and Charges Calculation,稅費計算
@@ -1847,7 +1849,7 @@
 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 +590,cannot be greater than 100,不能大於100
-apps/erpnext/erpnext/stock/doctype/item/item.py +775,Item {0} is not a stock Item,項{0}不是缺貨登記
+apps/erpnext/erpnext/stock/doctype/item/item.py +788,Item {0} is not a stock Item,項{0}不是缺貨登記
 DocType: Maintenance Visit,Unscheduled,計劃外
 DocType: Employee,Owned,擁有的
 DocType: Salary Component,Depends on Leave Without Pay,依賴於無薪休假
@@ -1888,7 +1890,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,顯示未關閉的會計年度的盈虧平衡
 DocType: Item,Asset Naming Series,資產命名系列
 apps/erpnext/erpnext/public/js/hub/hub_form.js +336,Request a Quote,請求報價
-apps/erpnext/erpnext/regional/india/utils.py +170,House rented dates should be atleast 15 days apart,出租房屋的日期應至少相隔15天
+apps/erpnext/erpnext/regional/india/utils.py +177,House rented dates should be atleast 15 days apart,出租房屋的日期應至少相隔15天
 DocType: Clinical Procedure Template,Collection Details,收集細節
 DocType: POS Profile,Allow Print Before Pay,付款前允許打印
 DocType: Land Unit,Linked Soil Texture,連接的土壤紋理
@@ -1906,7 +1908,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,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 +873,Packing Slip,包裝單
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +892,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,通用名稱
@@ -1934,12 +1936,12 @@
 apps/erpnext/erpnext/config/stock.py +313,Item Variants,項目變體
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,服務
 DocType: HR Settings,Email Salary Slip to Employee,電子郵件工資單給員工
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1046,Select Possible Supplier,選擇潛在供應商
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1065,Select Possible Supplier,選擇潛在供應商
 DocType: Customer,"Select, to make the customer searchable with these fields",選擇,使客戶可以使用這些字段進行搜索
 DocType: Shopify Settings,Import Delivery Notes from Shopify on Shipment,在發貨時從Shopify導入交貨單
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,顯示關閉
 DocType: Leave Type,Is Leave Without Pay,是無薪休假
-apps/erpnext/erpnext/stock/doctype/item/item.py +276,Asset Category is mandatory for Fixed Asset item,資產類別是強制性的固定資產項目
+apps/erpnext/erpnext/stock/doctype/item/item.py +277,Asset Category is mandatory for Fixed Asset item,資產類別是強制性的固定資產項目
 DocType: Fee Validity,Fee Validity,費用有效期
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +146,No records found in the Payment table,沒有在支付表中找到記錄
 apps/erpnext/erpnext/education/utils.py +19,This {0} conflicts with {1} for {2} {3},此{0}衝突{1}在{2} {3}
@@ -2007,7 +2009,7 @@
 DocType: Purchase Receipt,Transporter Details,貨運公司細節
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},用戶{0}已分配給醫師{1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2701,Default warehouse is required for selected item,默認倉庫需要選中的項目
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Possible Supplier,可能的供應商
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1062,Possible Supplier,可能的供應商
 DocType: Budget,Monthly Distribution,月度分佈
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,收受方列表為空。請創建收受方列表
 apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),醫療保健(beta)
@@ -2063,22 +2065,25 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,請選擇至少一個域名。
 DocType: Dependent Task,Dependent Task,相關任務
 DocType: Shopify Settings,Shopify Tax Account,Shopify稅收帳戶
-apps/erpnext/erpnext/stock/doctype/item/item.py +459,Conversion factor for default Unit of Measure must be 1 in row {0},預設計量單位的轉換因子必須是1在行{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +460,Conversion factor for default Unit of Measure must be 1 in row {0},預設計量單位的轉換因子必須是1在行{0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +265,Leave of type {0} cannot be longer than {1},請假類型{0}不能長於{1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,嘗試提前X天規劃作業。
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +90,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",已為{3}的子公司計劃{2}的{0}空缺和{1}預算。 \根據母公司{3}的員工計劃{6},您只能計劃最多{4}個職位空缺和預算{5}。
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +239,Please set Default Payroll Payable Account in Company {0},請公司設定默認應付職工薪酬帳戶{0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +249,Please set Default Payroll Payable Account in Company {0},請公司設定默認應付職工薪酬帳戶{0}
 DocType: SMS Center,Receiver List,收受方列表
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1098,Search Item,搜索項目
 DocType: Payment Schedule,Payment Amount,付款金額
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +20,Half Day Date should be in between Work From Date and Work End Date,半天日期應在工作日期和工作結束日期之間
 DocType: Patient Appointment,Referring Physician,參考醫師
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +69,Net Change in Cash,現金淨變動
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,請通過設置&gt;設置&gt;命名系列為{0}設置命名系列
 DocType: Assessment Plan,Grading Scale,分級量表
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Unit of Measure {0} has been entered more than once in Conversion Factor Table,計量單位{0}已經進入不止一次在轉換係數表
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Unit of Measure {0} has been entered more than once in Conversion Factor Table,計量單位{0}已經進入不止一次在轉換係數表
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +696,Already completed,已經完成
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,庫存在手
+apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +65,"Please add the remaining benefits {0} to the application as \
+				pro-rata component",請將剩餘的權益{0}作為\ pro-rata組件添加到應用程序中
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,導入成功!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},付款申請已經存在{0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,發布項目成本
@@ -2128,7 +2133,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,您不能刪除會計年度{0}。會計年度{0}設置為默認的全局設置
 DocType: Share Transfer,Equity/Liability Account,股票/負債賬戶
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,一個同名的客戶已經存在
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +193,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,這將提交工資單,並創建權責發生製日記賬分錄。你想繼續嗎?
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +210,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,這將提交工資單,並創建權責發生製日記賬分錄。你想繼續嗎?
 DocType: Purchase Invoice,Total Net Weight,總淨重
 DocType: Purchase Order,Order Confirmation No,訂單確認號
 DocType: Purchase Invoice,Eligibility For ITC,適用於ITC的資格
@@ -2206,15 +2211,15 @@
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_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 +145,Please enter valid Financial Year Start and End Dates,請輸入有效的財政年度開始和結束日期
+apps/erpnext/erpnext/public/js/setup_wizard.js +146,Please enter valid Financial Year Start and End Dates,請輸入有效的財政年度開始和結束日期
 DocType: Employee,Date Of Retirement,退休日
 DocType: Upload Attendance,Get Template,獲取模板
 DocType: Additional Salary Component,Additional Salary Component,額外的薪資組件
 DocType: Material Request,Transferred,轉入
 DocType: Vehicle,Doors,門
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,ERPNext設定完成!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +114,ERPNext Setup Complete!,ERPNext設定完成!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,收取病人登記費
-apps/erpnext/erpnext/stock/doctype/item/item.py +694,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,股票交易後不能更改屬性。創建一個新項目並將庫存轉移到新項目
+apps/erpnext/erpnext/stock/doctype/item/item.py +695,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,股票交易後不能更改屬性。創建一個新項目並將庫存轉移到新項目
 DocType: Course Assessment Criteria,Weightage,權重
 DocType: Purchase Invoice,Tax Breakup,稅收分解
 DocType: Member,Non Profit Member,非盈利會員
@@ -2261,11 +2266,11 @@
 apps/erpnext/erpnext/controllers/status_updater.py +163,"For an item {0}, quantity must be negative number",對於商品{0},數量必須是負數
 DocType: Naming Series,Set prefix for numbering series on your transactions,為你的交易編號序列設置的前綴
 DocType: Employee Attendance Tool,Employees HTML,員工HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +473,Default BOM ({0}) must be active for this item or its template,預設BOM({0})必須是活動的這個項目或者其模板
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,Default BOM ({0}) must be active for this item or its template,預設BOM({0})必須是活動的這個項目或者其模板
 DocType: Employee,Leave Encashed?,離開兌現?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,機會從字段是強制性的
 DocType: Item,Variants,變種
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,製作採購訂單
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1196,Make Purchase Order,製作採購訂單
 DocType: SMS Center,Send To,發送到
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,There is not enough leave balance for Leave Type {0},沒有足夠的餘額休假請假類型{0}
 DocType: Payment Reconciliation Payment,Allocated amount,分配量
@@ -2279,7 +2284,7 @@
 DocType: Purchase Order Item,Warehouse and Reference,倉庫及參考
 DocType: Payroll Period Date,Payroll Period Date,工資期間日期
 DocType: Supplier,Statutory info and other general information about your Supplier,供應商的法定資訊和其他一般資料
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +539,You have to Deduct Tax for Unsubmitted Tax Exemption Proof and Unclaimed Employee Benefits in the last Salary Slip of Payroll Period,您必須在工資期末的最後一次工資單上扣除未提交的免稅證明和未領取的僱員福利稅
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +544,You have to Deduct Tax for Unsubmitted Tax Exemption Proof and Unclaimed Employee Benefits in the last Salary Slip of Payroll Period,您必須在工資期末的最後一次工資單上扣除未提交的免稅證明和未領取的僱員福利稅
 DocType: Item,Serial Nos and Batches,序列號和批號
 DocType: Item,Serial Nos and Batches,序列號和批號
 apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,學生群體力量
@@ -2297,7 +2302,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,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,使公司日記帳分錄
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +825,Discount amount cannot be greater than 100%,折扣金額不能大於100%
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +830,Discount amount cannot be greater than 100%,折扣金額不能大於100%
 DocType: Sales Order,To Deliver and Bill,準備交貨及開立發票
 DocType: Student Group,Instructors,教師
 DocType: GL Entry,Credit Amount in Account Currency,在賬戶幣金額
@@ -2315,7 +2320,7 @@
 DocType: Item,Will also apply for variants,同時將申請變種
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}",資產不能被取消,因為它已經是{0}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},員工{0}上半天{1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +51,Total working hours should not be greater than max working hours {0},總的工作時間不應超過最高工時更大{0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},總的工作時間不應超過最高工時更大{0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,開啟
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,在銷售時捆綁項目。
 DocType: Material Request Plan Item,Actual Qty,實際數量
@@ -2388,7 +2393,7 @@
 DocType: Bank Guarantee,Margin Money,保證金
 DocType: Budget,Budget,預算
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +80,Set Open,設置打開
-apps/erpnext/erpnext/stock/doctype/item/item.py +273,Fixed Asset Item must be a non-stock item.,固定資產項目必須是一個非庫存項目。
+apps/erpnext/erpnext/stock/doctype/item/item.py +274,Fixed Asset Item must be a non-stock item.,固定資產項目必須是一個非庫存項目。
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +52,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",財政預算案不能對{0}指定的,因為它不是一個收入或支出帳戶
 apps/erpnext/erpnext/hr/utils.py +227,Max exemption amount for {0} is {1},{0}的最大免除金額為{1}
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,已實現
@@ -2429,7 +2434,7 @@
 apps/erpnext/erpnext/accounts/party.py +320,Due Date cannot be before Posting Date,到期日不能在寄發日期之前
 DocType: Website Item Group,Website Item Group,網站項目群組
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +331,Added to Favourites,已添加到收藏夾
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +482,No salary slip found to submit for the above selected criteria OR salary slip already submitted,沒有發現提交上述選定標准或已提交工資單的工資單
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +529,No salary slip found to submit for the above selected criteria OR salary slip already submitted,沒有發現提交上述選定標准或已提交工資單的工資單
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,關稅和稅款
 DocType: Projects Settings,Projects Settings,項目設置
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +388,Please enter Reference date,參考日期請輸入
@@ -2489,15 +2494,15 @@
 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 +398,Please set the Date Of Joining for employee {0},請為員工{0}設置加入日期
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +398,Please set the Date Of Joining for employee {0},請為員工{0}設置加入日期
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +403,Please set the Date Of Joining for employee {0},請為員工{0}設置加入日期
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +403,Please set the Date Of Joining for employee {0},請為員工{0}設置加入日期
 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,重複客戶收入
 DocType: Bank Statement Settings,Mapped Items,映射項目
 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 +989,Select BOM and Qty for Production,選擇BOM和數量生產
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1017,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,針對帳戶
@@ -2523,7 +2528,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 +373,Debit To account must be a Receivable account,借方帳戶必須是應收帳款帳戶
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +375,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,添加客戶
@@ -2542,7 +2547,7 @@
 DocType: Program Enrollment,Self-Driving Vehicle,自駕車
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,供應商記分卡站立
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +445,Row {0}: Bill of Materials not found for the Item {1},行{0}:材料清單未找到項目{1}
-apps/erpnext/erpnext/hr/doctype/leave_period/leave_period.py +98,Leave Allocations {0} created,保留創建的分配{0}
+apps/erpnext/erpnext/hr/doctype/leave_period/leave_period.py +97,Leave Allocations {0} created,保留創建的分配{0}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +112,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,共分配葉{0}不能小於已經批准葉{1}期間
 DocType: Journal Entry,Accounts Receivable,應收帳款
 ,Supplier-Wise Sales Analytics,供應商相關的銷售分析
@@ -2623,8 +2628,8 @@
 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 +937,Quotation,報價
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +989,Cannot set a received RFQ to No Quote,無法將收到的詢價單設置為無報價
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +956,Quotation,報價
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1008,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,選擇一個賬戶以賬戶貨幣進行打印
 ,Production Analytics,生產Analytics(分析)
@@ -2635,14 +2640,14 @@
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,供應商記分卡設置
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,評估計劃名稱
 DocType: Work Order Operation,Work Order Operation,工作訂單操作
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,Warning: Invalid SSL certificate on attachment {0},警告:附件無效的SSL證書{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +249,Warning: Invalid SSL certificate on attachment {0},警告:附件無效的SSL證書{0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads",信息幫助你的業務,你所有的聯繫人和更添加為您的線索
 DocType: Work Order Operation,Actual Operation Time,實際操作時間
 DocType: Authorization Rule,Applicable To (User),適用於(用戶)
 DocType: Purchase Taxes and Charges,Deduct,扣除
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +219,Job Description,職位描述
 DocType: Student Applicant,Applied,應用的
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +879,Re-open,重新打開
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Re-open,重新打開
 DocType: Sales Invoice Item,Qty as per Stock UOM,數量按庫存計量單位
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2名稱
 DocType: Attendance,Attendance Request,出席請求
@@ -2664,7 +2669,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +241,Serial No {0} does not belong to any Warehouse,序列號{0}不屬於任何倉庫
 DocType: Grant Application,Email Notification Sent,電子郵件通知已發送
 DocType: Purchase Invoice,In Words (Company Currency),大寫(Company Currency)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1023,"Item Code, warehouse, quantity are required on row",在行上需要項目代碼,倉庫,數量
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1042,"Item Code, warehouse, quantity are required on row",在行上需要項目代碼,倉庫,數量
 DocType: Bank Guarantee,Supplier,供應商
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,顯示付款詳情
 DocType: Consultation,Consultation Time,諮詢時間
@@ -2680,7 +2685,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 +439,{0} is mandatory for Item {1},{0}是強制性的項目{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +441,{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),體重(公斤)
@@ -2689,7 +2694,7 @@
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +206,Please set GST Accounts in GST Settings,請在GST設置中設置GST帳戶
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +46,Type of Business,業務類型
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",請ATLEAST一行選擇分配金額,發票類型和發票號碼
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,新的採購成本
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +143,Cost of New Purchase,新的採購成本
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +99,Sales Order required for Item {0},所需的{0}項目銷售訂單
 DocType: Grant Application,Grant Description,授予說明
 DocType: Purchase Invoice Item,Rate (Company Currency),率(公司貨幣)
@@ -2722,7 +2727,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +396,{0} against Sales Order {1},{0}針對銷售訂單{1}
 DocType: Account,Fixed Asset,固定資產
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,序列化庫存
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1014,Invalid {0} for Inter Company Invoice.,Inter公司發票無效的{0}。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1016,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,帳戶信息
@@ -2765,7 +2770,7 @@
 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 +367,Debit To is required,借方是必填項
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Debit To is required,借方是必填項
 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/config/buying.py +155,Templates of supplier scorecard variables.,供應商記分卡變數模板。
@@ -2881,7 +2886,7 @@
 DocType: Normal Test Items,Require Result Value,需要結果值
 DocType: Item,Show a slideshow at the top of the page,顯示幻燈片在頁面頂部
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,物料清單
-apps/erpnext/erpnext/stock/doctype/item/item.py +177,Stores,商店
+apps/erpnext/erpnext/stock/doctype/item/item.py +178,Stores,商店
 DocType: Project Type,Projects Manager,項目經理
 DocType: Serial No,Delivery Time,交貨時間
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +39,Ageing Based On,老齡化基於
@@ -2889,7 +2894,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 +246,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 +251,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,現金流量映射模板細節
@@ -2897,13 +2902,13 @@
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,跟踪獨立收入和支出進行產品垂直或部門。
 DocType: Item Reorder,Item Reorder,項目重新排序
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,顯示工資單
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +898,Transfer Material,轉印材料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Transfer Material,轉印材料
 DocType: Fees,Send Payment Request,發送付款請求
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",指定作業、作業成本並給予該作業一個專屬的作業編號。
 DocType: Travel Request,Any other details,任何其他細節
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,這份文件是超過限制,通過{0} {1}項{4}。你在做另一個{3}對同一{2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1162,Please set recurring after saving,請設置保存後復發
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +774,Select change amount account,選擇變化量賬戶
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +776,Select change amount account,選擇變化量賬戶
 DocType: Purchase Invoice,Price List Currency,價格表之貨幣
 DocType: Naming Series,User must always select,用戶必須始終選擇
 DocType: Stock Settings,Allow Negative Stock,允許負庫存
@@ -2942,17 +2947,17 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +325,Are you sure you want to cancel this appointment?,你確定要取消這個預約嗎?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,酒店房間價格套餐
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,銷售渠道
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +199,Please set default account in Salary Component {0},請薪酬部分設置默認帳戶{0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},請薪酬部分設置默認帳戶{0}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},請行選擇BOM為項目{0}
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,獲取訂閱更新
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},帳戶{0}與帳戶模式{2}中的公司{1}不符
 apps/erpnext/erpnext/controllers/buying_controller.py +690,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 +238,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,維護時間表{0}必須取消早於取消這個銷售訂單
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +239,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,維護時間表{0}必須取消早於取消這個銷售訂單
 DocType: POS Profile,Applicable for Users,適用於用戶
 DocType: Notification Control,Expense Claim Approved,報銷批准
 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 +384,Salary Slip of employee {0} already created for this period,員工的工資單{0}已為這一時期創建
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +389,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,購買的物品成本
@@ -2971,7 +2976,7 @@
 DocType: Request for Quotation Supplier,No Quote,沒有報價
 DocType: Support Search Source,Post Title Key,帖子標題密鑰
 DocType: Payment Gateway Account,Payment Account,付款帳號
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +1053,Please specify Company to proceed,請註明公司以處理
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +1072,Please specify Company to proceed,請註明公司以處理
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +81,Net Change in Accounts Receivable,應收賬款淨額變化
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +91,Compensatory Off,補假
 DocType: Job Offer,Accepted,接受的
@@ -2991,7 +2996,7 @@
 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 +319,Raw Materials cannot be blank.,原材料不能為空。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +503,"Could not update stock, invoice contains drop shipping item.",無法更新庫存,發票包含下降航運項目。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +505,"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,允許重命名屬性值
@@ -3020,18 +3025,20 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,最新價格在所有BOM中更新
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,項目狀態
 DocType: UOM,Check this to disallow fractions. (for Nos),勾選此選項則禁止分數。 (對於NOS)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,供應商&gt;供應商集團
 DocType: Student Admission Program,Naming Series (for Student Applicant),命名系列(面向學生申請人)
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +16,Bonus Payment Date cannot be a past date,獎金支付日期不能是過去的日期
 DocType: Travel Request,Copy of Invitation/Announcement,邀請/公告的副本
 DocType: Delivery Note,Transporter Name,貨運公司名稱
 DocType: Authorization Rule,Authorized Value,授權值
 DocType: BOM,Show Operations,顯示操作
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,請在教育&gt;教育設置中設置教師命名系統
 ,Minutes to First Response for Opportunity,分鐘的機會第一個反應
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1016,Item or Warehouse for row {0} does not match Material Request,行{0}的項目或倉庫不符合物料需求
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,計量單位
 DocType: Fiscal Year,Year End Date,年結結束日期
 DocType: Task Depends On,Task Depends On,任務取決於
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1031,Opportunity,機會
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1050,Opportunity,機會
 DocType: Operation,Default Workstation,預設工作站
 DocType: Notification Control,Expense Claim Approved Message,報銷批准的訊息
 DocType: Payment Entry,Deductions or Loss,扣除或損失
@@ -3063,15 +3070,15 @@
 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 +309,Leave Without Pay does not match with approved Leave Application records,停薪留職不批准請假的記錄相匹配
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +314,Leave Without Pay does not match with approved Leave Application records,停薪留職不批准請假的記錄相匹配
 DocType: Campaign,Campaign-.####,運動 - ## # #
 DocType: Travel Request,Domestic,國內
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +801,Please supply the specified items at the best possible rates,請在提供最好的利率規定的項目
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +820,Please supply the specified items at the best possible rates,請在提供最好的利率規定的項目
 apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +19,Employee Transfer cannot be submitted before Transfer Date ,員工轉移無法在轉移日期前提交
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,製作發票
 DocType: Selling Settings,Auto close Opportunity after 15 days,15天之後自動關閉商機
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +87,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,由於{1}的記分卡,{0}不允許採購訂單。
-apps/erpnext/erpnext/stock/doctype/item/item.py +513,Barcode {0} is not a valid {1} code,條形碼{0}不是有效的{1}代碼
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Barcode {0} is not a valid {1} code,條形碼{0}不是有效的{1}代碼
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js +25,End Year,結束年份
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,報價/鉛%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,報價/鉛%
@@ -3137,7 +3144,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,到貨數量
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +65,Fee Records Created - {0},費紀錄創造 -  {0}
 DocType: Asset Category Account,Asset Category Account,資產類別的帳戶
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +919,Row #{0} (Payment Table): Amount must be positive,行#{0}(付款表):金額必須為正值
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +921,Row #{0} (Payment Table): Amount must be positive,行#{0}(付款表):金額必須為正值
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +139,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,簽發文件的原因
@@ -3223,7 +3230,7 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Receipt document must be submitted,收到文件必須提交
 DocType: Purchase Invoice Item,Received Qty,到貨數量
 DocType: Stock Entry Detail,Serial No / Batch,序列號/批次
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +346,Not Paid and Not Delivered,沒有支付,未送達
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +347,Not Paid and Not Delivered,沒有支付,未送達
 DocType: Product Bundle,Parent Item,父項目
 DocType: Account,Account Type,帳戶類型
 DocType: Shopify Settings,Webhooks Details,Webhooks詳細信息
@@ -3242,17 +3249,17 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,請輸入有效的電子郵件地址
 DocType: Volunteer Skill,Volunteer Skill,志願者技能
 DocType: Purchase Invoice,Inter Company Invoice Reference,Inter公司發票參考
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select an item in the cart,請在購物車中選擇一個項目
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +812,Please select an item in the cart,請在購物車中選擇一個項目
 DocType: Landed Cost Voucher,Purchase Receipt Items,採購入庫項目
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,自定義表單
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +158,Depreciation Amount during the period,期間折舊額
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Depreciation Amount during the period,期間折舊額
 DocType: Sales Invoice,Is Return (Credit Note),是退貨(信用票據)
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},資產{0}需要序列號
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,殘疾人模板必須不能默認模板
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,對於行{0}:輸入計劃的數量
 DocType: Account,Income Account,收入帳戶
 DocType: Payment Request,Amount in customer's currency,量客戶的貨幣
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +847,Delivery,交貨
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +866,Delivery,交貨
 DocType: Stock Reconciliation Item,Current Qty,目前數量
 DocType: Restaurant Menu,Restaurant Menu,餐廳菜單
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,上一頁
@@ -3289,7 +3296,7 @@
 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 +1263,Please enter Item Code to get batch no,請輸入產品編號,以取得批號
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},請選擇一個值{0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +914,Please select a value for {0} quotation_to {1},請選擇一個值{0} quotation_to {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +428,No Items selected for transfer,沒有選擇轉移項目
 DocType: Company,Stock Settings,庫存設定
 apps/erpnext/erpnext/accounts/doctype/account/account.py +185,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",合併是唯一可能的,如果以下屬性中均有記載相同。是集團,根型,公司
@@ -3297,7 +3304,7 @@
 DocType: Task,% Progress,%進展
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Gain/Loss on Asset Disposal,在資產處置收益/損失
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",下表中將只選擇狀態為“已批准”的學生申請人。
-apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,帳戶{0}的帳戶號碼不可用。 <br>請正確設置您的會計科目表。
+apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +118,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,帳戶{0}的帳戶號碼不可用。 <br>請正確設置您的會計科目表。
 DocType: Task,Depends on Tasks,取決於任務
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,管理客戶群組樹。
 DocType: Normal Test Items,Result Value,結果值
@@ -3363,7 +3370,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +161,Quotation {0} is cancelled,{0}報價被取消
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,未償還總額
 DocType: Sales Partner,Targets,目標
-apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,請在公司信息文件中註冊SIREN號碼
+apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +40,Please register the SIREN number in the company information file,請在公司信息文件中註冊SIREN號碼
 DocType: Price List,Price List Master,價格表主檔
 DocType: GST Account,CESS Account,CESS帳戶
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,所有的銷售交易,可以用來標記針對多個**銷售**的人,這樣你可以設置和監控目標。
@@ -3419,7 +3426,7 @@
 DocType: Project,Copied From,複製自
 DocType: Project,Copied From,複製自
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,發票已在所有結算時間創建
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +159,Name error: {0},名稱錯誤:{0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,Name error: {0},名稱錯誤:{0}
 DocType: Cash Flow Mapping,Is Finance Cost,財務成本
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,員工{0}的考勤已標記
 DocType: Packing Slip,If more than one package of the same type (for print),如果不止一個相同類型的包裹(用於列印)
@@ -3433,7 +3440,7 @@
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),時間(分鐘)
 DocType: Project Task,Working,工作的
 DocType: Stock Ledger Entry,Stock Queue (FIFO),庫存序列(先進先出)
-apps/erpnext/erpnext/public/js/setup_wizard.js +127,Financial Year,財政年度
+apps/erpnext/erpnext/public/js/setup_wizard.js +128,Financial Year,財政年度
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,{0} does not belong to Company {1},{0}不屬於公司{1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,無法解決{0}的標準分數函數。確保公式有效。
 DocType: Healthcare Settings,Out Patient Settings,出患者設置
@@ -3484,9 +3491,9 @@
 DocType: Lab Test,LabTest Approver,LabTest審批者
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,您已經評估了評估標準{}。
 DocType: Vehicle Service,Engine Oil,機油
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},創建的工單:{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Work Orders Created: {0},創建的工單:{0}
 DocType: Sales Invoice,Sales Team1,銷售團隊1
-apps/erpnext/erpnext/stock/doctype/item/item.py +562,Item {0} does not exist,項目{0}不存在
+apps/erpnext/erpnext/stock/doctype/item/item.py +563,Item {0} does not exist,項目{0}不存在
 DocType: Sales Invoice,Customer Address,客戶地址
 DocType: Loan,Loan Details,貸款詳情
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +61,Failed to setup post company fixtures,未能設置公司固定裝置
@@ -3512,7 +3519,7 @@
 DocType: Purchase Invoice Item,Quality Inspection,品質檢驗
 DocType: Company,Standard Template,標準模板
 DocType: Training Event,Theory,理論
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +844,Warning: Material Requested Qty is less than Minimum Order Qty,警告:物料需求的數量低於最少訂購量
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +863,Warning: Material Requested Qty is less than Minimum Order Qty,警告:物料需求的數量低於最少訂購量
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,帳戶{0}被凍結
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,法人/子公司與帳戶的獨立走勢屬於該組織。
 DocType: Payment Request,Mute Email,靜音電子郵件
@@ -3571,6 +3578,7 @@
 DocType: Fee Validity,Visited yet,已訪問
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +134,Warehouses with existing transaction can not be converted to group.,與現有的交易倉庫不能轉換為組。
 DocType: Assessment Result Tool,Result HTML,結果HTML
+DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,項目和公司應根據銷售交易多久更新一次。
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,新增學生
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},請選擇{0}
 DocType: C-Form,C-Form No,C-表格編號
@@ -3578,6 +3586,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,列出您所購買或出售的產品或服務。
 DocType: Water Analysis,Storage Temperature,儲存溫度
 DocType: Employee Attendance Tool,Unmarked Attendance,無標記考勤
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +254,Creating Payment Entries......,創建支付條目......
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Researcher,研究員
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,計劃註冊學生工具
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},開始日期應該小於任務{0}的結束日期
@@ -3599,7 +3608,7 @@
 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名稱
 apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,無法檢索{0}的信息。
-apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +134,Opening Entry Journal,開幕詞報
+apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +138,Opening Entry Journal,開幕詞報
 DocType: Contract,Fulfilment Terms,履行條款
 DocType: Sales Invoice,Time Sheet List,時間表列表
 DocType: Employee,You can enter any date manually,您可以手動輸入任何日期
@@ -3623,6 +3632,7 @@
 DocType: Item,Inspection Required before Delivery,分娩前檢查所需
 DocType: Item,Inspection Required before Purchase,購買前檢查所需
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,待活動
+apps/erpnext/erpnext/public/js/setup_wizard.js +126,View Chart of Accounts,查看會計科目表
 DocType: Chapter Member,Chapter Member,章會員
 DocType: Material Request Plan Item,Minimum Order Quantity,最小起訂量
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,你的組織
@@ -3716,8 +3726,6 @@
 apps/erpnext/erpnext/accounts/party.py +329,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),註:由於/參考日期由{0}天超過了允許客戶的信用天數(S)
 apps/erpnext/erpnext/education/doctype/program/program.js +8,Student Applicant,學生申請
 DocType: Asset Category Account,Accumulated Depreciation Account,累計折舊科目
-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: Certified Consultant,Discuss ID,討論ID
 DocType: Stock Settings,Freeze Stock Entries,凍結庫存項目
 DocType: Program Enrollment,Boarding Student,寄宿學生
@@ -3742,7 +3750,7 @@
 DocType: Fee Schedule Program,Total Students,學生總數
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},考勤記錄{0}存在針對學生{1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,Reference #{0} dated {1},參考# {0}於{1}
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,折舊淘汰因處置資產
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +179,Depreciation Eliminated due to disposal of assets,折舊淘汰因處置資產
 DocType: Employee Transfer,New Employee ID,新員工ID
 DocType: Loan,Member,會員
 DocType: Work Order Item,Work Order Item,工作訂單項目
@@ -3801,7 +3809,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 +449,Customer {0} does not belong to project {1},客戶{0}不屬於項目{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,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,客戶採購訂單
@@ -3822,14 +3830,14 @@
 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 +533,"Start and end dates not in a valid Payroll Period, cannot calculate {0}.",開始日期和結束日期不在有效的工資核算期間內,無法計算{0}。
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +538,"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}
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,價格上漲率與貼現率的折扣(%)
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,價格上漲率與貼現率的折扣(%)
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,所有倉庫
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1144,No {0} found for Inter Company Transactions.,Inter公司沒有找到{0}。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1146,No {0} found for Inter Company Transactions.,Inter公司沒有找到{0}。
 DocType: Travel Itinerary,Rented Car,租車
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +131,Credit To account must be a Balance Sheet account,信用帳戶必須是資產負債表科目
 DocType: Donor,Donor,捐贈者
@@ -3844,7 +3852,7 @@
 DocType: Physician Schedule,Schedule Name,計劃名稱
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,製作工資單
 DocType: Currency Exchange,For Buying,為了購買
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +845,Add All Suppliers,添加所有供應商
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +864,Add All Suppliers,添加所有供應商
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +95,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,行#{0}:分配金額不能大於未結算金額。
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +84,Browse BOM,瀏覽BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Secured Loans,抵押貸款
@@ -3873,7 +3881,7 @@
 DocType: Patient Appointment,Patient Appointment,患者預約
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,審批角色作為角色的規則適用於不能相同
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,從該電子郵件摘要退訂
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +835,Get Suppliers By,獲得供應商
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +854,Get Suppliers By,獲得供應商
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},找不到項目{1} {0}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,去課程
 DocType: Accounts Settings,Show Inclusive Tax In Print,在打印中顯示包含稅
@@ -3914,7 +3922,6 @@
 DocType: Student Group,Group Based On,基於組
 DocType: Journal Entry,Bill Date,帳單日期
 DocType: Healthcare Settings,Laboratory SMS Alerts,實驗室短信
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +234,Creating Bank Entries......,創建銀行分錄......
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required",服務項目,類型,頻率和消費金額要求
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",即使有更高優先級的多個定價規則,然後按照內部優先級應用:
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,植物分析標準
@@ -3952,7 +3959,6 @@
 DocType: Purchase Order Item Supplied,Stock UOM,庫存計量單位
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +249,Purchase Order {0} is not submitted,採購訂單{0}未提交
 DocType: Account,Expenses Included In Asset Valuation,資產評估中包含的費用
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,請通過設置&gt;設置&gt;命名系列為{0}設置命名系列
 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,稅則號
 DocType: Work Order Item,Available Qty at WIP Warehouse,在WIP倉庫可用的數量
@@ -3988,7 +3994,7 @@
 DocType: Item,Warranty Period (in days),保修期限(天數)
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Failed to set defaults,無法設置默認值
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,與關係Guardian1
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +795,Please select BOM against item {0},請選擇物料{0}的物料清單
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +797,Please select BOM against item {0},請選擇物料{0}的物料清單
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js +18,Make Invoices,製作發票
 DocType: Shopping Cart Settings,Show Stock Quantity,顯示庫存數量
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +77,Net Cash from Operations,從運營的淨現金
@@ -4027,6 +4033,7 @@
 DocType: Pricing Rule,Margin,餘量
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,新客戶
 DocType: Appraisal Goal,Weightage (%),權重(%)
+apps/erpnext/erpnext/stock/doctype/item/item.py +700,"Asset is already exists against the item {0}, you cannot change the has serial no value",資產已針對商品{0}存在,您無法更改已連續編號的值
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,評估報告
 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,公司名稱不一樣
@@ -4200,7 +4207,7 @@
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,這是基於這名學生出席
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,沒有學生
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +179,Add more items or open full form,添加更多項目或全開放形式
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +218,Delivery Notes {0} must be cancelled before cancelling this Sales Order,送貨單{0}必須先取消才能取消銷貨訂單
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +219,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 +101,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}
@@ -4262,7 +4269,7 @@
 apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,為任務進度百分比不能超過100個。
 DocType: Stock Reconciliation Item,Before reconciliation,調整前
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),稅收和收費上架(公司貨幣)
-apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,商品稅行{0}必須有帳戶類型稅或收入或支出或課稅的
+apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,商品稅行{0}必須有帳戶類型稅或收入或支出或課稅的
 DocType: Sales Order,Partly Billed,天色帳單
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +54,Item {0} must be a Fixed Asset Item,項{0}必須是固定資產項目
 apps/erpnext/erpnext/stock/doctype/item/item.js +403,Make Variants,變種
@@ -4275,6 +4282,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,總街貨量金額
 DocType: Journal Entry,Printing Settings,列印設定
 DocType: Employee Advance,Advance Account,預付帳戶
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,請通過設置&gt;編號系列設置考勤編號系列
 DocType: Job Offer,Job Offer Terms,招聘條款
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Total Debit must be equal to Total Credit. The difference is {0},借方總額必須等於貸方總額。差額為{0}
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,汽車
@@ -4316,7 +4324,7 @@
 DocType: Subscription,Plans,計劃
 DocType: Salary Slip,Salary Structure,薪酬結構
 DocType: Account,Bank,銀行
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +902,Issue Material,發行材料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +921,Issue Material,發行材料
 apps/erpnext/erpnext/config/erpnext_integrations.py +32,Connect Shopify with ERPNext,將Shopify與ERPNext連接
 DocType: Material Request Item,For Warehouse,對於倉庫
 DocType: Employee,Offer Date,到職日期
@@ -4343,7 +4351,7 @@
 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 +34,Student is already enrolled.,學生已經註冊。
 DocType: Fiscal Year,Year Name,年結名稱
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,There are more holidays than working days this month.,還有比這個月工作日更多的假期。
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,There are more holidays than working days this month.,還有比這個月工作日更多的假期。
 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,銷售合作夥伴名稱
@@ -4362,11 +4370,11 @@
 DocType: Issue,Opening Time,開放時間
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +97,From and To dates required,需要起始和到達日期
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,證券及商品交易所
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',測度變異的默認單位“{0}”必須是相同模板“{1}”
+apps/erpnext/erpnext/stock/doctype/item/item.py +718,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',測度變異的默認單位“{0}”必須是相同模板“{1}”
 DocType: Shipping Rule,Calculate Based On,計算的基礎上
 DocType: Delivery Note Item,From Warehouse,從倉庫
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,沒有僱員提到的標準
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,不與物料清單的項目,以製造
+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 +1002,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,不要確認是否在同一天創建約會
@@ -4387,6 +4395,7 @@
 DocType: Manufacturer,Limited to 12 characters,限12個字符
 DocType: Journal Entry,Print Heading,列印標題
 apps/erpnext/erpnext/config/stock.py +150,Delivery Trip service tours to customers.,送貨服務遊覽給顧客。
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,項目代碼&gt;項目組&gt;品牌
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +57,Total cannot be zero,總計不能為零
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,“自從最後訂購日”必須大於或等於零
 DocType: Plant Analysis Criteria,Maximum Permissible Value,最大允許值
@@ -4397,7 +4406,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,廠房和機械設備
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,稅額折後金額
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,每日工作總結設置
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1139,Selected Price List should have buying and selling fields checked.,選定價目表應該有買入和賣出的字段。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1141,Selected Price List should have buying and selling fields checked.,選定價目表應該有買入和賣出的字段。
 apps/erpnext/erpnext/controllers/buying_controller.py +664,Please enter Reqd by Date,請輸入按日期請求
 DocType: Payment Entry,Internal Transfer,內部轉賬
 DocType: Asset Maintenance,Maintenance Tasks,維護任務
@@ -4440,19 +4449,19 @@
 apps/erpnext/erpnext/config/accounts.py +105,Accounting Statements,會計報表
 DocType: Drug Prescription,Hour,小時
 DocType: Restaurant Order Entry,Last Sales Invoice,上次銷售發票
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +797,Please select Qty against item {0},請選擇項目{0}的數量
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +799,Please select Qty against item {0},請選擇項目{0}的數量
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +31,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,新的序列號不能有倉庫。倉庫必須由存貨分錄或採購入庫單進行設定
 DocType: Lead,Lead Type,主導類型
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,You are not authorized to approve leaves on Block Dates,在限制的日期,您無權批准休假
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +396,All these items have already been invoiced,所有這些項目已開具發票
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +968,Set New Release Date,設置新的發布日期
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +987,Set New Release Date,設置新的發布日期
 DocType: Company,Monthly Sales Target,每月銷售目標
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},可以通過{0}的批准
 DocType: Hotel Room,Hotel Room Type,酒店房間類型
 DocType: Leave Allocation,Leave Period,休假期間
 DocType: Item,Default Material Request Type,默認材料請求類型
 DocType: Supplier Scorecard,Evaluation Period,評估期
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +973,Work Order not created,工作訂單未創建
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1001,Work Order not created,工作訂單未創建
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +33,"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,送貨規則條件
@@ -4504,12 +4513,10 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,請取消採購發票{0}第一
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",電子郵件地址必須是唯一的,已經存在了{0}
 DocType: Serial No,AMC Expiry Date,AMC到期時間
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,供應商&gt;供應商集團
 DocType: Asset,Receipt,收據
 ,Sales Register,銷售登記
 DocType: Daily Work Summary Group,Send Emails At,發送電子郵件在
 DocType: Quotation,Quotation Lost Reason,報價遺失原因
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,項目代碼&gt;項目組&gt;品牌
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +383,Transaction reference no {0} dated {1},交易參考編號{0}日{1}
 apps/erpnext/erpnext/setup/doctype/supplier_group/supplier_group.js +5,There is nothing to edit.,無內容可供編輯
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,表單視圖
@@ -4524,7 +4531,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +458,No material request created,沒有創建重要請求
 apps/erpnext/erpnext/hr/doctype/loan_application/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 +496,Please remove this Invoice {0} from C-Form {1},請刪除此發票{0}從C-表格{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,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: Physician,Phone (R),電話(R)
@@ -4540,7 +4547,7 @@
 DocType: Hotel Room,Hotel Room,旅館房間
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +49,Account {0} does not belongs to company {1},帳戶{0}不屬於公司{1}
 DocType: Leave Type,Rounding,四捨五入
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +889,Serial Numbers in row {0} does not match with Delivery Note,行{0}中的序列號與交貨單不匹配
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +891,Serial Numbers in row {0} does not match with Delivery Note,行{0}中的序列號與交貨單不匹配
 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,衛詳細
 DocType: Agriculture Task,Start Day,開始日
@@ -4573,7 +4580,7 @@
 DocType: Item Alternative,Alternative Item Name,替代項目名稱
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,父項{0}不能是庫存產品
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +187,Website Listing,網站列表
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +485,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +532,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",無法提交任何薪資單<br> \可能的原因: <br> \ 1.淨工資小於0。 <br> \ 2.員工主數據中指定的公司電子郵件地址無效。 <br>
@@ -4590,7 +4597,7 @@
 DocType: Opening Invoice Creation Tool,Sales,銷售
 DocType: Stock Entry Detail,Basic Amount,基本金額
 DocType: Training Event,Exam,考試
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Warehouse required for stock Item {0},倉庫需要現貨產品{0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,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,所有部門
 DocType: Patient,Alcohol Past Use,酒精過去使用
@@ -4598,8 +4605,8 @@
 DocType: Project Update,Problematic/Stuck,問題/卡住
 DocType: Tax Rule,Billing State,計費狀態
 DocType: Share Transfer,Transfer,轉讓
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +258,Work Order {0} must be cancelled before cancelling this Sales Order,在取消此銷售訂單之前,必須先取消工單{0}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +966,Fetch exploded BOM (including sub-assemblies),取得爆炸BOM(包括子組件)
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,Work Order {0} must be cancelled before cancelling this Sales Order,在取消此銷售訂單之前,必須先取消工單{0}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +985,Fetch exploded BOM (including sub-assemblies),取得爆炸BOM(包括子組件)
 DocType: Authorization Rule,Applicable To (Employee),適用於(員工)
 apps/erpnext/erpnext/controllers/accounts_controller.py +160,Due Date is mandatory,截止日期是強制性的
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,增量屬性{0}不能為0
@@ -4639,7 +4646,7 @@
 DocType: Journal Entry,Write Off Based On,核銷的基礎上
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,使鉛
 DocType: Stock Settings,Show Barcode Field,顯示條形碼域
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +814,Send Supplier Emails,發送電子郵件供應商
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +833,Send Supplier Emails,發送電子郵件供應商
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +172,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",工資已經處理了與{0}和{1},留下申請期之間不能在此日期範圍內的時期。
 DocType: Fiscal Year,Auto Created,自動創建
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py +19,Submit this to create the Employee record,提交這個來創建員工記錄
@@ -4659,7 +4666,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html +9,Used Leaves,使用的葉子
 DocType: Job Offer,Awaiting Response,正在等待回應
 DocType: Support Search Source,Link Options,鏈接選項
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1500,Total Amount {0},總金額{0}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1485,Total Amount {0},總金額{0}
 apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},無效的屬性{0} {1}
 DocType: Supplier,Mention if non-standard payable account,如果非標準應付賬款提到
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',請選擇“所有評估組”以外的評估組
@@ -4681,9 +4688,9 @@
 DocType: Patient,Other Risk Factors,其他風險因素
 DocType: Sales Invoice,Product Bundle Help,產品包幫助
 apps/erpnext/erpnext/hr/report/employee_advance_summary/employee_advance_summary.py +15,No record found,沒有資料
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,報廢資產成本
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Cost of Scrapped Asset,報廢資產成本
 apps/erpnext/erpnext/controllers/stock_controller.py +240,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}:成本中心是強制性的項目{2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +691,Get Items from Product Bundle,從產品包取得項目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Get Items from Product Bundle,從產品包取得項目
 DocType: Asset,Straight Line,直線
 DocType: Project User,Project User,項目用戶
 DocType: Employee Transfer,Re-allocate Leaves,重新分配葉子
@@ -4742,12 +4749,13 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +98,Make Material Request,製作材料要求
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},打開項目{0}
 DocType: Asset Finance Book,Written Down Value,寫下價值
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +228,Sales Invoice {0} must be cancelled before cancelling this Sales Order,銷售發票{0}必須早於此銷售訂單之前取消
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +229,Sales Invoice {0} must be cancelled before cancelling this Sales Order,銷售發票{0}必須早於此銷售訂單之前取消
 DocType: Clinical Procedure,Age,年齡
 DocType: Sales Invoice Timesheet,Billing Amount,開票金額
 DocType: Cash Flow Mapping,Select Maximum Of 1,選擇最多1個
 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 +1110,Search Item (Ctrl + i),搜索項目(Ctrl + i)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +166,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,法律費用
@@ -4776,7 +4784,7 @@
 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 +833,Return / Credit Note,返回/信用票據
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +852,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: Work Order Item,Transferred Qty,轉讓數量
@@ -4792,7 +4800,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 +1023,{0} not allowed to transact with {1}. Please change the Company.,不允許{0}與{1}進行交易。請更改公司。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1025,{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}
@@ -4847,12 +4855,12 @@
 DocType: Program,Courses,培訓班
 DocType: Monthly Distribution Percentage,Percentage Allocation,百分比分配
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Secretary,秘書
-apps/erpnext/erpnext/regional/india/utils.py +168,House rented dates required for exemption calculation,房子租用日期計算免責
+apps/erpnext/erpnext/regional/india/utils.py +175,House rented dates required for exemption calculation,房子租用日期計算免責
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction",如果禁用“,在詞”字段不會在任何交易可見
 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 +1329,Please set Company,請設公司
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1348,Please set Company,請設公司
 DocType: Pricing Rule,Buying,採購
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,疾病與肥料
 DocType: HR Settings,Employee Records to be created by,員工紀錄的創造者
@@ -4868,12 +4876,13 @@
 DocType: Employee Onboarding,Job Offer,工作機會
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,研究所縮寫
 ,Item-wise Price List Rate,全部項目的價格表
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1087,Supplier Quotation,供應商報價
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1106,Supplier Quotation,供應商報價
 DocType: Quotation,In Words will be visible once you save the Quotation.,報價一被儲存,就會顯示出來。
 apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},數量({0})不能是行{1}中的分數
 apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},數量({0})不能是行{1}中的分數
 DocType: Contract,Unsigned,無符號
-apps/erpnext/erpnext/stock/doctype/item/item.py +507,Barcode {0} already used in Item {1},條碼{0}已經用在項目{1}
+DocType: Selling Settings,Each Transaction,每筆交易
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Barcode {0} already used in Item {1},條碼{0}已經用在項目{1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,增加運輸成本的規則。
 DocType: Item,Opening Stock,打開股票
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,客戶是必需的
@@ -4891,7 +4900,7 @@
 DocType: Customer,From Lead,從鉛
 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 +572,POS Profile required to make POS Entry,所需的POS資料,使POS進入
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,POS Profile required to make POS Entry,所需的POS資料,使POS進入
 DocType: Company,HRA Settings,HRA設置
 DocType: Employee Transfer,Transfer Date,轉移日期
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,標準銷售
@@ -4906,6 +4915,7 @@
 DocType: Antibiotic,Laboratory User,實驗室用戶
 DocType: Request for Quotation Item,Project Name,專案名稱
 DocType: Customer,Mention if non-standard receivable account,提到如果不規範應收賬款
+apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +60,Please add the remaining benefits {0} to any of the existing component,請將其餘好處{0}添加到任何現有組件
 DocType: Journal Entry Account,If Income or Expense,如果收入或支出
 DocType: Bank Statement Transaction Entry,Matching Invoices,匹配發票
 DocType: Stock Ledger Entry,Stock Value Difference,庫存價值差異
@@ -4914,7 +4924,7 @@
 DocType: Disease,Treatment Task,治療任務
 DocType: Purchase Order Item,Blanket Order,總訂單
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,所得稅資產
-apps/erpnext/erpnext/regional/india/utils.py +177,House rent paid days overlap with {0},房租支付天數與{0}重疊
+apps/erpnext/erpnext/regional/india/utils.py +184,House rent paid days overlap with {0},房租支付天數與{0}重疊
 DocType: BOM Item,BOM No,BOM No.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Journal Entry {0} does not have account {1} or already matched against other voucher,日記條目{0}沒有帳號{1}或已經匹配其他憑證
 DocType: Item,Moving Average,移動平均線
@@ -4937,7 +4947,7 @@
 DocType: Subscription,Taxes,稅
 DocType: Purchase Invoice,capital goods,資本貨物
 DocType: Purchase Invoice Item,Weight Per Unit,每單位重量
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +350,Paid and Not Delivered,支付和未送達
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +351,Paid and Not Delivered,支付和未送達
 DocType: Project,Default Cost Center,預設的成本中心
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,庫存交易明細
 DocType: Budget,Budget Accounts,預算科目
@@ -4955,7 +4965,7 @@
 DocType: Item Attribute,From Range,從範圍
 DocType: BOM,Set rate of sub-assembly item based on BOM,基於BOM設置子組合項目的速率
 DocType: Hotel Room Reservation,Invoiced,已開發票
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +161,Syntax error in formula or condition: {0},式或條件語法錯誤:{0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +169,Syntax error in formula or condition: {0},式或條件語法錯誤:{0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,每日工作總結公司的設置
 apps/erpnext/erpnext/stock/utils.py +151,Item {0} ignored since it is not a stock item,項目{0}被忽略,因為它不是一個庫存項目
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",要在一個特定的交易不適用於定價規則,所有適用的定價規則應該被禁用。
@@ -4968,7 +4978,7 @@
 ,Employee Information,僱員資料
 DocType: Stock Entry Detail,Additional Cost,額外費用
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +56,"Can not filter based on Voucher No, if grouped by Voucher",是冷凍的帳戶。要禁止該帳戶創建/編輯事務,你需要角色
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +923,Make Supplier Quotation,讓供應商報價
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +942,Make Supplier Quotation,讓供應商報價
 DocType: Quality Inspection,Incoming,來
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,銷售和採購的默認稅收模板被創建。
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,評估結果記錄{0}已經存在。
@@ -5057,11 +5067,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +143,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 +590,Sales Order {0} is not submitted,銷售訂單{0}未提交
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +592,Sales Order {0} is not submitted,銷售訂單{0}未提交
 DocType: Homepage,Tag Line,標語
 DocType: Fee Component,Fee Component,收費組件
 apps/erpnext/erpnext/config/hr.py +278,Fleet Management,車隊的管理
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1085,Add items from,新增項目從
+apps/erpnext/erpnext/hr/doctype/employee_advance/employee_advance.py +43,Advance account currency should be same as company curreny {0},預付款帳戶幣種應與公司現金{0}相同
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1104,Add items from,新增項目從
 DocType: Fertilizer,Density (if liquid),密度(如果液體)
 apps/erpnext/erpnext/education/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,所有評估標準的權重總數要達到100%
 DocType: Purchase Order Item,Last Purchase Rate,最後預訂價
@@ -5085,7 +5096,7 @@
 DocType: Payment Entry,Paid Amount,支付的金額
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,探索銷售週期
 DocType: Assessment Plan,Supervisor,監
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +891,Retention Stock Entry,保留股票入場
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +918,Retention Stock Entry,保留股票入場
 ,Available Stock for Packing Items,可用庫存包裝項目
 DocType: Item Variant,Item Variant,項目變
 ,Work Order Stock Report,工單庫存報表
@@ -5124,7 +5135,6 @@
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,允許零估值
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,允許零估值
 DocType: Training Event Employee,Invited,邀請
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +241,Multiple active Salary Structures found for employee {0} for the given dates,發現員工{0}對於給定的日期多個活動薪金結構
 apps/erpnext/erpnext/config/accounts.py +314,Setup Gateway accounts.,設置網關帳戶。
 DocType: Employee,Employment Type,就業類型
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,固定資產
@@ -5178,13 +5188,13 @@
 DocType: Work Order Item,Available Qty at Source Warehouse,源倉庫可用數量
 apps/erpnext/erpnext/config/support.py +22,Warranty,保證
 DocType: Purchase Invoice,Debit Note Issued,借記發行說明
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1111,"Search by item code, serial number, batch no or barcode",按項目代碼,序列號,批號或條碼進行搜索
 DocType: Work Order,Warehouses,倉庫
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +19,{0} asset cannot be transferred,{0}資產不得轉讓
 DocType: Hotel Room Pricing,Hotel Room Pricing,酒店房間價格
 apps/erpnext/erpnext/stock/doctype/item/item.js +82,This Item is a Variant of {0} (Template).,此項目是{0}(模板)的變體。
 DocType: Workstation,per hour,每小時
 DocType: Blanket Order,Purchasing,購買
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,請在人力資源&gt;人力資源設置中設置員工命名系統
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +107,Customer LPO,客戶LPO
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.",對於基於批次的學生組,學生批次將由課程註冊中的每位學生進行驗證。
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,這個倉庫不能被刪除,因為庫存分錄帳尚存在。
@@ -5197,15 +5207,15 @@
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},{0}和{1}之間的得分重疊
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +321,Dispatch,調度
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +75,Max discount allowed for item: {0} is {1}%,{0}允許的最大折扣:{1}%
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,淨資產值作為
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +191,Net Asset value as on,淨資產值作為
 DocType: Crop,Produce,生產
 DocType: Hotel Settings,Default Taxes and Charges,默認稅費
 DocType: Account,Receivable,應收賬款
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,行#{0}:不能更改供應商的採購訂單已經存在
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +315,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,行#{0}:不能更改供應商的採購訂單已經存在
 DocType: Stock Entry,Material Consumption for Manufacture,材料消耗製造
 DocType: Item Alternative,Alternative Item Code,替代項目代碼
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,此角色是允許提交超過所設定信用額度的交易。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,選擇項目,以製造
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1037,Select Items to Manufacture,選擇項目,以製造
 DocType: Delivery Stop,Delivery Stop,交貨停止
 apps/erpnext/erpnext/accounts/page/pos/pos.js +967,"Master data syncing, it might take some time",主數據同步,這可能需要一些時間
 DocType: Item,Material Issue,發料
@@ -5222,10 +5232,9 @@
 DocType: Hub Settings,Hub Username,Hub用戶名
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,行{0}:{1}必須大於0
 DocType: Assessment Criteria,Assessment Criteria Group,評估標準組
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Accrual Journal Entry for salaries from {0} to {1},從{0}到{1}的薪金的應計日記帳分錄
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +266,Accrual Journal Entry for salaries from {0} to {1},從{0}到{1}的薪金的應計日記帳分錄
 DocType: Sales Invoice Item,Enable Deferred Revenue,啟用延期收入
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},打開累計折舊必須小於等於{0}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,請通過設置&gt;編號系列設置考勤編號系列
 DocType: Warehouse,Warehouse Name,倉庫名稱
 DocType: Naming Series,Select Transaction,選擇交易
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,請輸入核准角色或審批用戶
@@ -5238,7 +5247,6 @@
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc",在這裡,你可以保持身高,體重,過敏,醫療問題等
 DocType: Leave Block List,Applies to Company,適用於公司
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +240,Cannot cancel because submitted Stock Entry {0} exists,不能取消,因為提交股票輸入{0}存在
-apps/erpnext/erpnext/hr/report/daily_work_summary_replies/daily_work_summary_replies.py +23,Reply Count,回復計數
 DocType: BOM Update Tool,Update latest price in all BOMs,更新所有BOM的最新價格
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,醫療記錄
 DocType: Vehicle,Vehicle,車輛
@@ -5250,7 +5258,6 @@
 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,請在會計科目表中添加一個臨時開戶賬戶
 DocType: Customer,Customer Primary Contact,客戶主要聯繫人
-apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,期間結束日誌
 DocType: Project Task,View Task,查看任務
 DocType: Bank Guarantee,Bank Account Info,銀行賬戶信息
 DocType: Bank Guarantee,Bank Guarantee Type,銀行擔保類型
@@ -5262,7 +5269,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",要設定這個財政年度為預設值,點擊“設為預設”
 DocType: Production Plan,Include Subcontracted Items,包括轉包物料
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,短缺數量
-apps/erpnext/erpnext/stock/doctype/item/item.py +737,Item variant {0} exists with same attributes,項目變種{0}存在具有相同屬性
+apps/erpnext/erpnext/stock/doctype/item/item.py +750,Item variant {0} exists with same attributes,項目變種{0}存在具有相同屬性
 DocType: Loan,Repay from Salary,從工資償還
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},請求對付款{0} {1}量{2}
 DocType: Employee Benefit Claim,Salary Slip,工資單
@@ -5306,6 +5313,7 @@
 DocType: Delivery Note,Billing Address Name,帳單地址名稱
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +22,Department Stores,百貨
 ,Item Delivery Date,物品交貨日期
+DocType: Selling Settings,Sales Update Frequency,銷售更新頻率
 DocType: Warehouse,PIN,銷
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +116,Error '{0}' occured. Arguments {1}.,發生錯誤“{0}”。參數{1}。
 DocType: Bin,Reserved Qty for sub contract,分包合同的保留數量
@@ -5324,7 +5332,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +30,Credit Days cannot be a negative number,信用日不能是負數
 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}保留樣品基於批次,請檢查有批次否保留樣品
+apps/erpnext/erpnext/stock/doctype/item/item.py +291," {0} Retain Sample is based on batch, please check Has Batch No to retain sample of item",{0}保留樣品基於批次,請檢查有批次否保留樣品
 DocType: Certification Application,Yet to appear,尚未出現
 DocType: Delivery Stop,Email Sent To,電子郵件發送給
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +107,Are you sure you want to unregister?,你確定要取消註冊?
@@ -5357,7 +5365,7 @@
 DocType: Certification Application,Name of Applicant,申請人名稱
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,時間表製造。
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,小計
-apps/erpnext/erpnext/stock/doctype/item/item.py +688,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,股票交易後不能更改Variant屬性。你將不得不做一個新的項目來做到這一點。
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,股票交易後不能更改Variant屬性。你將不得不做一個新的項目來做到這一點。
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,GoCardless SEPA授權
 DocType: Physician,Charges,收費
 DocType: Production Plan,Get Items For Work Order,獲取工作訂單的物品
@@ -5372,6 +5380,7 @@
 apps/erpnext/erpnext/config/healthcare.py +45,Laboratory,實驗室
 DocType: UOM Category,UOM Category,UOM類別
 DocType: Clinical Procedure Item,Actual Qty (at source/target),實際的數量(於 來源/目標)
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,請在人力資源&gt;人力資源設置中設置員工命名系統
 DocType: Item Customer Detail,Ref Code,參考代碼
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,POS Profile中需要客戶組
 DocType: HR Settings,Payroll Settings,薪資設置
@@ -5383,7 +5392,7 @@
 apps/erpnext/erpnext/public/js/stock_analytics.js +54,Select Brand...,選擇品牌...
 apps/erpnext/erpnext/public/js/setup_wizard.js +32,Non Profit (beta),非營利(測試版)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,培訓活動/結果
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +152,Accumulated Depreciation as on,作為累計折舊
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +167,Accumulated Depreciation as on,作為累計折舊
 DocType: Employee Tax Exemption Category,Employee Tax Exemption Category,員工免稅類別
 DocType: Sales Invoice,C-Form Applicable,C-表格適用
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +466,Operation Time must be greater than 0 for Operation {0},運行時間必須大於0的操作{0}
@@ -5392,7 +5401,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +72,Failed to create website,無法創建網站
 DocType: Soil Analysis,Mg/K,鎂/ K
 DocType: UOM Conversion Detail,UOM Conversion Detail,計量單位換算詳細
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +946,Retention Stock Entry already created or Sample Quantity not provided,已創建保留庫存條目或未提供“樣本數量”
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +973,Retention Stock Entry already created or Sample Quantity not provided,已創建保留庫存條目或未提供“樣本數量”
 DocType: Program,Program Abbreviation,計劃縮寫
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,費用對在採購入庫單內的每個項目更新
 DocType: Warranty Claim,Resolved By,議決
@@ -5408,7 +5417,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 +982,Work Order already created for all items with BOM,已經為包含物料清單的所有料品創建工單
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1010,Work Order already created for all items with BOM,已經為包含物料清單的所有料品創建工單
 apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant Details Report,變體詳細信息報告
 DocType: Setup Progress Action,Setup Progress Action,設置進度動作
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,買價格表
@@ -5428,7 +5437,7 @@
 DocType: Asset,Disposal Date,處置日期
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",電子郵件將在指定的時間發送給公司的所有在職職工,如果他們沒有假期。回复摘要將在午夜被發送。
 DocType: Employee Leave Approver,Employee Leave Approver,員工請假審批
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}:一個重新排序條目已存在這個倉庫{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +526,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}:一個重新排序條目已存在這個倉庫{1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.",不能聲明為丟失,因為報價已經取得進展。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,CWIP Account,CWIP賬戶
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,培訓反饋
@@ -5463,14 +5472,14 @@
 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,倉庫中不提供開始操作的庫存數量。你想記錄股票轉移嗎?
 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 +237,"Company, Payment Account, From Date and To Date is mandatory",公司,付款帳戶,從日期和日期是強制性的
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +257,"Company, Payment Account, From Date and To Date is mandatory",公司,付款帳戶,從日期和日期是強制性的
 DocType: Company,Budget Detail,預算案詳情
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,在發送前,請填寫留言
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,供應商重複
 DocType: Email Digest,Pending Quotations,待語錄
 apps/erpnext/erpnext/config/accounts.py +324,Point-of-Sale Profile,簡介銷售點的
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0}應該是0到100之間的一個值
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +350,Payment of {0} from {1} to {2},從{1}到{2}的{0}付款
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +365,Payment of {0} from {1} to {2},從{1}到{2}的{0}付款
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,無抵押貸款
 DocType: Cost Center,Cost Center Name,成本中心名稱
 DocType: HR Settings,Max working hours against Timesheet,最大工作時間針對時間表
@@ -5488,7 +5497,7 @@
 DocType: Naming Series,Help HTML,HTML幫助
 DocType: Student Group Creation Tool,Student Group Creation Tool,學生組創建工具
 DocType: Item,Variant Based On,基於變異對
-apps/erpnext/erpnext/hr/doctype/leave_period/leave_period.py +71,Employee {0} already have Leave Allocation {1} for this period,在此期間,員工{0}已經有離職分配{1}
+apps/erpnext/erpnext/hr/doctype/leave_period/leave_period.py +67,Employee {0} already have Leave Allocation {1} for this period,在此期間,員工{0}已經有離職分配{1}
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},分配的總權重應為100 % 。這是{0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,您的供應商
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,不能設置為失落的銷售訂單而成。
@@ -5501,7 +5510,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +238,"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 +169,Row #{0}: Set Supplier for item {1},行#{0}:設置供應商項目{1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,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}無法找到
+apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,網站圖像{0}附加到物品{1}無法找到
 DocType: Issue,Content Type,內容類型
 DocType: Asset,Assets,資產
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,電腦
@@ -5527,7 +5536,7 @@
 ,Average Commission Rate,平均佣金比率
 DocType: Share Balance,No of Shares,股份數目
 DocType: Taxable Salary Slab,To Amount,金額
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,'Has Serial No' can not be 'Yes' for non-stock item,非庫存項目不能有序號
+apps/erpnext/erpnext/stock/doctype/item/item.py +464,'Has Serial No' can not be 'Yes' for non-stock item,非庫存項目不能有序號
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,選擇狀態
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance can not be marked for future dates,考勤不能標記為未來的日期
 DocType: Support Search Source,Post Description Key,發布說明密鑰
@@ -5548,7 +5557,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +232,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 +370,Debit To account must be a Balance Sheet account,借方帳戶必須是資產負債表科目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +372,Debit To account must be a Balance Sheet account,借方帳戶必須是資產負債表科目
 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設置
 DocType: Leave Block List,Leave Block List Name,休假區塊清單名稱
@@ -5564,11 +5573,11 @@
 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 +388,Salary Slip of employee {0} already created for time sheet {1},員工的工資單{0}已為時間表創建{1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +393,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 +767,Item {0} is disabled,項目{0}無效
+apps/erpnext/erpnext/stock/doctype/item/item.py +780,Item {0} is disabled,項目{0}無效
 DocType: Stock Settings,Stock Frozen Upto,存貨凍結到...為止
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +979,BOM does not contain any stock item,BOM不包含任何庫存項目
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +998,BOM does not contain any stock item,BOM不包含任何庫存項目
 DocType: Payment Term,Month(s) after the end of the invoice month,發票月份結束後的月份
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +47,Salary Structure should have flexible benefit component(s) to dispense benefit amount,薪酬結構應該有靈活的福利組成來分配福利金額
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,專案活動/任務。
@@ -5584,7 +5593,7 @@
 DocType: Sales Invoice Timesheet,Billing Hours,結算時間
 DocType: Project,Total Sales Amount (via Sales Order),總銷售額(通過銷售訂單)
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +603,Default BOM for {0} not found,默認BOM {0}未找到
-apps/erpnext/erpnext/stock/doctype/item/item.py +529,Row #{0}: Please set reorder quantity,行#{0}:請設置再訂購數量
+apps/erpnext/erpnext/stock/doctype/item/item.py +530,Row #{0}: Please set reorder quantity,行#{0}:請設置再訂購數量
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,點擊項目將其添加到此處
 DocType: Fees,Program Enrollment,招生計劃
 DocType: Share Transfer,To Folio No,對開本No
@@ -5626,7 +5635,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,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/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,BOM取代
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,根據交付日期選擇項目
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1100,Select Items based on Delivery Date,根據交付日期選擇項目
 DocType: Grant Application,Has any past Grant Record,有過去的贈款記錄嗎?
 ,Sales Analytics,銷售分析
 DocType: Manufacturing Settings,Manufacturing Settings,製造設定
@@ -5714,7 +5723,7 @@
 DocType: Exchange Rate Revaluation Account,Current Exchange Rate,當前匯率
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,捐助者類型信息。
 DocType: Request for Quotation,Supplier Detail,供應商詳細
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +163,Error in formula or condition: {0},誤差在式或條件:{0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,Error in formula or condition: {0},誤差在式或條件:{0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,發票金額
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,標準重量必須達100%
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,出勤
@@ -5745,7 +5754,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,諮詢
 DocType: Customer Group,Parent Customer Group,母客戶群組
 DocType: Vehicle Service,Change,更改
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +848,Subscription,訂閱
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +867,Subscription,訂閱
 DocType: Purchase Invoice,Contact Email,聯絡電郵
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,費用創作待定
 DocType: Appraisal Goal,Score Earned,得分
@@ -5770,7 +5779,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,應收/應付賬款
 DocType: Delivery Note Item,Against Sales Order Item,對銷售訂單項目
 DocType: Hub Settings,Company Logo,公司標誌
-apps/erpnext/erpnext/stock/doctype/item/item.py +732,Please specify Attribute Value for attribute {0},請指定屬性值的屬性{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Please specify Attribute Value for attribute {0},請指定屬性值的屬性{0}
 DocType: Item Default,Default Warehouse,預設倉庫
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Budget cannot be assigned against Group Account {0},不能指定預算給群組帳目{0}
 DocType: Shopping Cart Settings,Show Price,顯示價格
@@ -5785,11 +5794,11 @@
 DocType: Student Attendance Tool,Batch,批量
 DocType: Support Search Source,Query Route String,查詢路由字符串
 DocType: Donor,Donor Type,捐助者類型
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +677,Auto repeat document updated,自動重複文件更新
 apps/erpnext/erpnext/stock/doctype/item/item.js +29,Balance,餘額
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +66,Please select the Company,請選擇公司
 DocType: Room,Seating Capacity,座位數
 DocType: Lab Test Groups,Lab Test Groups,實驗室測試組
-apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +60,Please add the remainig benefits {0} to any of the existing component,請將這些優點{0}添加到任何現有的組件中
 apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py +151,Party Type and Party is mandatory for {0} account,{0}帳戶必須使用派對類型和派對
 DocType: Project,Total Expense Claim (via Expense Claims),總費用報銷(通過費用報銷)
 DocType: GST Settings,GST Summary,消費稅總結
@@ -5871,7 +5880,7 @@
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,餐廳訂單錄入項目
 DocType: Purchase Invoice,Rounded Total (Company Currency),整數總計(公司貨幣)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Cannot covert to Group because Account Type is selected.,不能隱蔽到組,因為帳戶類型選擇的。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +266,{0} {1} has been modified. Please refresh.,{0} {1} 已修改。請更新。
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +267,{0} {1} has been modified. Please refresh.,{0} {1} 已修改。請更新。
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,停止用戶在下面日期提出休假申請。
 DocType: Asset Maintenance Team,Maintenance Team Members,維護團隊成員
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +71,Purchase Amount,購買金額
@@ -5882,6 +5891,8 @@
 DocType: Work Order,Manufactured Qty,生產數量
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +79,The shares don't exist with the {0},這些份額不存在於{0}
 DocType: Sales Partner Type,Sales Partner Type,銷售夥伴類型
+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> \以取消此文檔"
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,已創建發票
 DocType: Asset,Out of Order,亂序
 DocType: Purchase Receipt Item,Accepted Quantity,允收數量
@@ -5901,13 +5912,13 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1721,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 +330,Employee relieved on {0} must be set as 'Left',員工解除對{0}必須設定為“左”
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Employee relieved on {0} must be set as 'Left',員工解除對{0}必須設定為“左”
 DocType: Hub Settings,Last Sync On,上次同步開啟
 DocType: Guardian,Guardian,監護人
 DocType: Item Alternative,Item Alternative,項目選擇
 DocType: Opening Invoice Creation Tool,Create missing customer or supplier.,創建缺少的客戶或供應商。
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,鑑定{0}為員工在給定日期範圍{1}創建
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Del,刪除
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +551,Del,刪除
 DocType: Selling Settings,Campaign Naming By,活動命名由
 DocType: Employee,Current Address Is,當前地址是
 apps/erpnext/erpnext/utilities/user_progress.py +51,Monthly Sales Target (,每月銷售目標(
@@ -5924,7 +5935,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 +1016,Invalid Company for Inter Company Invoice.,公司發票無效公司。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1018,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,員工晉升
@@ -5981,6 +5992,7 @@
 DocType: Physician,Phone (Office),電話(辦公室)
 apps/erpnext/erpnext/controllers/buying_controller.py +740,"Following item {items} {verb} not marked as {message} item.\
 			You can enable them as {message} item from its Item master",以下項目{項目} {動詞}未標記為{消息}項目\您可以將其作為項目主項目中的{消息}項目啟用
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +22,"Cannot Submit, Employees left to mark attendance",無法提交,僱員留下來標記出席
 apps/erpnext/erpnext/hooks.py +151,Admission,入場
 apps/erpnext/erpnext/config/accounts.py +263,"Seasonality for setting budgets, targets etc.",季節性設置預算,目標等。
 DocType: Supplier Scorecard Scoring Variable,Variable Name,變量名
@@ -5991,7 +6003,7 @@
 DocType: Purchase Order,Advance Paid,提前支付
 DocType: Manufacturing Settings,Overproduction Percentage For Sales Order,銷售訂單超額生產百分比
 DocType: Item,Item Tax,產品稅
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Material to Supplier,材料到供應商
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +907,Material to Supplier,材料到供應商
 DocType: Production Plan,Material Request Planning,物料請求計劃
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +700,Excise Invoice,消費稅發票
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}出現%不止一次
@@ -6004,14 +6016,13 @@
 DocType: Program,Program Name,程序名稱
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,考慮稅收或收費
 DocType: Driver,Driving License Category,駕駛執照類別
-apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +158,No Reference,沒有參考
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,實際數量是強制性
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +93,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0}目前擁有{1}供應商記分卡,而採購訂單應謹慎提供給供應商。
 DocType: Asset Maintenance Team,Asset Maintenance Team,資產維護團隊
 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 +781,Syntax error in condition: {0},條件中的語法錯誤:{0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +779,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/hr/doctype/salary_structure/salary_structure.py +44,"Total flexible benefit component amount {0} should not be less \
@@ -6031,7 +6042,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +56,Attach Logo,附加標誌
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +51,Stock Levels,庫存水平
 DocType: Customer,Commission Rate,佣金比率
-apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py +234,Successfully created payment entries,成功創建付款條目
+apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py +239,Successfully created payment entries,成功創建付款條目
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,為{1}創建{0}記分卡:
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +156,"Payment Type must be one of Receive, Pay and Internal Transfer",付款方式必須是接收之一,收費和內部轉賬
 DocType: Travel Itinerary,Preferred Area for Lodging,住宿的首選地區
@@ -6053,7 +6064,7 @@
 DocType: Company,Existing Company,現有的公司
 DocType: Healthcare Settings,Result Emailed,電子郵件結果
 apps/erpnext/erpnext/controllers/buying_controller.py +92,"Tax Category has been changed to ""Total"" because all the Items are non-stock items",稅項類別已更改為“合計”,因為所有物品均為非庫存物品
-apps/erpnext/erpnext/hr/doctype/leave_period/leave_period.py +76,To date can not be equal or less than from date,迄今為止不能等於或少於日期
+apps/erpnext/erpnext/hr/doctype/leave_period/leave_period.py +72,To date can not be equal or less than from date,迄今為止不能等於或少於日期
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,沒什麼可改變的
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,請選擇一個csv文件
 DocType: Student Leave Application,Mark as Present,標記為現
@@ -6082,7 +6093,7 @@
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,請選擇患者以獲得實驗室測試
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,讓學生批
 DocType: Leave Type,Is Carry Forward,是弘揚
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +890,Get Items from BOM,從物料清單取得項目
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +909,Get Items from BOM,從物料清單取得項目
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,交貨期天
 DocType: Cash Flow Mapping,Is Income Tax Expense,是所得稅費用
 apps/erpnext/erpnext/controllers/accounts_controller.py +650,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},行#{0}:過帳日期必須是相同的購買日期{1}資產的{2}
@@ -6090,6 +6101,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,請在上表中輸入銷售訂單
 ,Stock Summary,股票摘要
 apps/erpnext/erpnext/config/assets.py +62,Transfer an asset from one warehouse to another,從一個倉庫轉移資產到另一
+DocType: Employee Benefit Application,Remaining Benefits (Yearly),剩餘福利(每年)
 apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,材料清單
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Row {0}: Party Type and Party is required for Receivable / Payable account {1},行{0}:黨的類型和黨的需要應收/應付帳戶{1}
 DocType: Employee,Leave Policy,離開政策