[Translation] Updated Translations (#10047)
diff --git a/erpnext/translations/zh-TW.csv b/erpnext/translations/zh-TW.csv
index 55322f9..9803227 100644
--- a/erpnext/translations/zh-TW.csv
+++ b/erpnext/translations/zh-TW.csv
@@ -14,7 +14,7 @@
DocType: Employee,Leave Approvers,休假審批人
DocType: Sales Partner,Dealer,零售商
DocType: POS Profile,Applicable for User,適用於用戶
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",停止生產訂單無法取消，首先Unstop它取消
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",停止生產訂單無法取消，首先Unstop它取消
apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,難道你真的想放棄這項資產？
apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,選擇默認供應商
apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},價格表{0}需填入貨幣種類
@@ -31,13 +31,13 @@
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),匯率必須一致{0} {1}（{2}）
DocType: Sales Invoice,Customer Name,客戶名稱
DocType: Vehicle,Natural Gas,天然氣
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},銀行賬戶不能命名為{0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},銀行賬戶不能命名為{0}
DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,頭（或組）針對其會計分錄是由和平衡得以維持。
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),傑出的{0}不能小於零（ {1} ）
DocType: Manufacturing Settings,Default 10 mins,預設為10分鐘
DocType: Leave Type,Leave Type Name,休假類型名稱
apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,公開顯示
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural日記帳分錄提交
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural日記帳分錄提交
DocType: Pricing Rule,Apply On,適用於
DocType: Item Price,Multiple Item prices.,多個項目的價格。
,Purchase Order Items To Be Received,未到貨的採購訂單項目
@@ -52,7 +52,7 @@
DocType: Mode of Payment Account,Mode of Payment Account,支付帳戶模式
apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,顯示變體
DocType: Academic Term,Academic Term,學期
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +677,Quantity,數量
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +670,Quantity,數量
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,賬表不能為空。
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),借款（負債）
DocType: Employee Education,Year of Passing,路過的一年
@@ -64,16 +64,15 @@
apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,保健
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),延遲支付（天）
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,服務費用
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +846,Serial Number: {0} is already referenced in Sales Invoice: {1},序號：{0}已在銷售發票中引用：{1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +816,Invoice,發票
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +860,Serial Number: {0} is already referenced in Sales Invoice: {1},序號：{0}已在銷售發票中引用：{1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +809,Invoice,發票
DocType: Maintenance Schedule Item,Periodicity,週期性
apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,會計年度{0}是必需的
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,Expected Delivery Date is be before Sales Order Date,預計交貨日期是之前銷售訂單日期
apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,防禦
DocType: Salary Component,Abbr,縮寫
DocType: Timesheet,Total Costing Amount,總成本計算金額
DocType: Delivery Note,Vehicle No,車輛牌照號碼
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +153,Please select Price List,請選擇價格表
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +154,Please select Price List,請選擇價格表
apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,列＃{0}：付款單據才能完成trasaction
DocType: Production Order Operation,Work In Progress,在製品
apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,請選擇日期
@@ -97,7 +96,7 @@
apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1}不以任何活性會計年度。
DocType: Packed Item,Parent Detail docname,家長可採用DocName細節
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",參考：{0}，商品編號：{1}和顧客：{2}
-apps/erpnext/erpnext/public/js/setup_wizard.js +297,Kg,公斤
+apps/erpnext/erpnext/public/js/setup_wizard.js +308,Kg,公斤
DocType: Student Log,Log,日誌
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,開放的工作。
apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,選擇倉庫...
@@ -105,7 +104,7 @@
apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,同一家公司進入不止一次
apps/erpnext/erpnext/accounts/party.py +43,Not permitted for {0},不允許{0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,取得項目來源
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,Stock cannot be updated against Delivery Note {0},送貨單{0}不能更新庫存
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +445,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: Payment Reconciliation,Reconcile,調和
@@ -116,7 +115,7 @@
apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,接下來折舊日期不能購買日期之前
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 +1767,Not items found,未找到項目
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1672,Not items found,未找到項目
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,薪酬結構缺失
DocType: Sales Invoice Item,Sales Invoice Item,銷售發票項目
DocType: Account,Credit,信用
@@ -129,12 +128,12 @@
apps/erpnext/erpnext/stock/doctype/item/item.py +466,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",“是固定的資產”不能選中，作為資產記錄存在對項目
DocType: Vehicle Service,Brake Oil,剎車油
DocType: Tax Rule,Tax Type,稅收類型
-apps/erpnext/erpnext/accounts/page/pos/pos.js +685,Taxable Amount,應稅金額
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +540,Taxable Amount,應稅金額
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},你無權添加或更新{0}之前的條目
DocType: BOM,Item Image (if not slideshow),產品圖片（如果不是幻燈片）
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,一個客戶存在具有相同名稱
DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,（工時率/ 60）*實際操作時間
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +875,Select BOM,選擇BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +881,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}這個節日之間沒有從日期和結束日期
@@ -154,13 +153,13 @@
DocType: School Settings,Validate Batch for Students in Student Group,驗證學生組學生的批次
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},未找到員工的假期記錄{0} {1}
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,請先輸入公司
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,Please select Company first,請首先選擇公司
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +340,Please select Company first,請首先選擇公司
DocType: Employee Education,Under Graduate,根據研究生
apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,目標在
DocType: BOM,Total Cost,總成本
DocType: Journal Entry Account,Employee Loan,員工貸款
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +89,Activity Log:,活動日誌：
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,Item {0} does not exist in the system or has expired,項目{0}不存在於系統中或已過期
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,活動日誌：
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +234,Item {0} does not exist in the system or has expired,項目{0}不存在於系統中或已過期
apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,房地產
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,帳戶狀態
apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,製藥
@@ -169,16 +168,15 @@
DocType: Expense Claim Detail,Claim Amount,索賠金額
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,在CUTOMER組表中找到重複的客戶群
apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,供應商類型/供應商
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup > Settings > Naming Series,請通過設置>設置>命名系列為{0}設置命名系列
DocType: Upload Attendance,Import Log,導入日誌
DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,拉根據上述標準型的製造材料要求
DocType: Training Result Employee,Grade,年級
DocType: Sales Invoice Item,Delivered By Supplier,交付供應商
DocType: SMS Center,All Contact,所有聯絡
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +863,Production Order already created for all items with BOM,生產訂單已經與BOM的所有項目創建
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order already created for all items with BOM,生產訂單已經與BOM的所有項目創建
DocType: Daily Work Summary,Daily Work Summary,每日工作總結
DocType: Period Closing Voucher,Closing Fiscal Year,截止會計年度
-apps/erpnext/erpnext/accounts/party.py +352,{0} {1} is frozen,{0} {1}被凍結
+apps/erpnext/erpnext/accounts/party.py +354,{0} {1} is frozen,{0} {1}被凍結
apps/erpnext/erpnext/setup/doctype/company/company.py +139,Please select Existing Company for creating Chart of Accounts,請選擇現有的公司創建會計科目表
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,庫存費用
apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,選擇目標倉庫
@@ -192,14 +190,14 @@
<br>Absent: {1}",你想更新考勤？ <br>現任：{0} \ <br>缺席：{1}
apps/erpnext/erpnext/controllers/buying_controller.py +321,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 +144,At least one mode of payment is required for POS invoice.,付款中的至少一個模式需要POS發票。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +147,At least one mode of payment is required for POS invoice.,付款中的至少一個模式需要POS發票。
DocType: Products Settings,Show Products as a List,產品展示作為一個列表
DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
All dates and employee combination in the selected period will come in the template, with existing attendance records","下載模板，填寫相應的數據，並附加了修改過的文件。
在選定時間段內所有時間和員工的組合會在模板中，與現有的考勤記錄"
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,項目{0}不活躍或生命的盡頭已經達到
-apps/erpnext/erpnext/public/js/setup_wizard.js +331,Example: Basic Mathematics,例如：基礎數學
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",要包括稅款，行{0}項率，稅收行{1}也必須包括在內
+apps/erpnext/erpnext/public/js/setup_wizard.js +344,Example: Basic Mathematics,例如：基礎數學
+apps/erpnext/erpnext/controllers/accounts_controller.py +670,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",要包括稅款，行{0}項率，稅收行{1}也必須包括在內
apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,設定人力資源模塊
DocType: Sales Invoice,Change Amount,漲跌額
DocType: BOM Replace Tool,New BOM,新的物料清單
@@ -228,7 +226,7 @@
apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},品項{0}的安裝日期不能早於交貨日期
DocType: Pricing Rule,Discount on Price List Rate (%),折扣價目表率（％）
DocType: Offer Letter,Select Terms and Conditions,選擇條款和條件
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,輸出值
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,輸出值
DocType: Production Planning Tool,Sales Orders,銷售訂單
DocType: Purchase Taxes and Charges,Valuation,計價
,Purchase Order Trends,採購訂單趨勢
@@ -252,20 +250,20 @@
DocType: Sales Invoice,Is Opening Entry,是開放登錄
DocType: Customer Group,Mention if non-standard receivable account applicable,何況，如果不規範應收賬款適用
DocType: Course Schedule,Instructor Name,導師姓名
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,對於倉庫之前，需要提交
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,For Warehouse is required before Submit,對於倉庫之前，需要提交
DocType: Sales Partner,Reseller,經銷商
DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.",如果選中，將包括材料要求非庫存物品。
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,請輸入公司名稱
DocType: Delivery Note Item,Against Sales Invoice Item,對銷售發票項目
,Production Orders in Progress,進行中生產訂單
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,從融資淨現金
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2350,"LocalStorage is full , did not save",localStorage的滿了，沒救
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2251,"LocalStorage is full , did not save",localStorage的滿了，沒救
DocType: Lead,Address & Contact,地址及聯絡方式
DocType: Leave Allocation,Add unused leaves from previous allocations,從以前的分配添加未使用的休假
apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},下一循環{0}將上創建{1}
DocType: Sales Partner,Partner website,合作夥伴網站
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,新增項目
-apps/erpnext/erpnext/public/js/setup_wizard.js +254,Contact Name,聯絡人姓名
+apps/erpnext/erpnext/public/js/setup_wizard.js +265,Contact Name,聯絡人姓名
DocType: Course Assessment Criteria,Course Assessment Criteria,課程評價標準
DocType: Process Payroll,Creates salary slip for above mentioned criteria.,建立工資單上面提到的標準。
DocType: POS Customer Group,POS Customer Group,POS客戶群
@@ -289,7 +287,7 @@
DocType: Material Request Item,Min Order Qty,最小訂貨量
DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,學生組創建工具課程
DocType: Lead,Do Not Contact,不要聯絡
-apps/erpnext/erpnext/public/js/setup_wizard.js +346,People who teach at your organisation,誰在您的組織教人
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,People who teach at your organisation,誰在您的組織教人
DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,唯一ID來跟踪所有的經常性發票。它是在提交生成的。
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Software Developer,軟件開發人員
DocType: Item,Minimum Order Qty,最低起訂量
@@ -301,7 +299,7 @@
DocType: Student Admission,Student Admission,學生入學
,Terretory,Terretory
apps/erpnext/erpnext/stock/doctype/item/item.py +692,Item {0} is cancelled,項{0}將被取消
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Material Request,物料需求
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +883,Material Request,物料需求
DocType: Bank Reconciliation,Update Clearance Date,更新日期間隙
DocType: Item,Purchase Details,採購詳情
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},項目{0}未發現“原材料提供'表中的採購訂單{1}
@@ -338,7 +336,7 @@
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},行＃{0}：{1}不能為負值對項{2}
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Wrong Password,密碼錯誤
DocType: Item,Variant Of,變種
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +363,Completed Qty can not be greater than 'Qty to Manufacture',完成數量不能大於“數量來製造”
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',完成數量不能大於“數量來製造”
DocType: Period Closing Voucher,Closing Account Head,關閉帳戶頭
DocType: Employee,External Work History,外部工作經歷
apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,循環引用錯誤
@@ -348,10 +346,11 @@
apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} [{1}]的單位（＃窗體/項目/ {1}）在[{2}]研究發現（＃窗體/倉儲/ {2}）
DocType: Lead,Industry,行業
DocType: Employee,Job Profile,工作簡介
+apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,這是基於對本公司的交易。有關詳情，請參閱下面的時間表
DocType: Stock Settings,Notify by Email on creation of automatic Material Request,在建立自動材料需求時以電子郵件通知
DocType: Journal Entry,Multi Currency,多幣種
DocType: Payment Reconciliation Invoice,Invoice Type,發票類型
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +824,Delivery Note,送貨單
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +844,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 +131,Cost of Sold Asset,出售資產的成本
apps/erpnext/erpnext/accounts/utils.py +351,Payment Entry has been modified after you pulled it. Please pull it again.,付款項被修改，你把它之後。請重新拉。
@@ -373,10 +372,10 @@
apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,請輸入「重複月內的一天」欄位值
DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,公司貨幣被換算成客戶基礎貨幣的匯率
DocType: Course Scheduling Tool,Course Scheduling Tool,排課工具
-apps/erpnext/erpnext/controllers/accounts_controller.py +570,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},行＃{0}：採購發票不能對現有資產進行{1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +571,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},行＃{0}：採購發票不能對現有資產進行{1}
DocType: Item Tax,Tax Rate,稅率
apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0}已分配給員工{1}週期為{2}到{3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Select Item,選擇項目
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +850,Select Item,選擇項目
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,Purchase Invoice {0} is already submitted,採購發票{0}已經提交
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},行＃{0}：批號必須與{1} {2}
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,轉換為非集團
@@ -414,7 +413,7 @@
DocType: Request for Quotation,Request for Quotation,詢價
DocType: Salary Slip Timesheet,Working Hours,工作時間
DocType: Naming Series,Change the starting / current sequence number of an existing series.,更改現有系列的開始/當前的序列號。
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,Create a new Customer,創建一個新的客戶
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1455,Create a new Customer,創建一個新的客戶
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",如果有多個定價規則繼續有效，用戶將被要求手動設定優先順序來解決衝突。
apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,創建採購訂單
,Purchase Register,購買註冊
@@ -436,7 +435,7 @@
DocType: Assessment Plan,Examiner Name,考官名稱
DocType: Purchase Invoice Item,Quantity and Rate,數量和速率
DocType: Delivery Note,% Installed,％已安裝
-apps/erpnext/erpnext/public/js/setup_wizard.js +361,Classrooms/ Laboratories etc where lectures can be scheduled.,教室/實驗室等在那裡的演講可以預定。
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Classrooms/ Laboratories etc where lectures can be scheduled.,教室/實驗室等在那裡的演講可以預定。
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,請先輸入公司名稱
DocType: Purchase Invoice,Supplier Name,供應商名稱
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,閱讀ERPNext手冊
@@ -453,7 +452,7 @@
apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,必修課 - 學年
apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,必修課 - 學年
DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,自定義去作為郵件的一部分的介紹文字。每筆交易都有一個單獨的介紹性文字。
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},請為公司{0}設置預設應付賬款
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Please set default payable account for the company {0},請為公司{0}設置預設應付賬款
apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,所有製造過程中的全域設定。
DocType: Accounts Settings,Accounts Frozen Upto,帳戶被凍結到
DocType: SMS Log,Sent On,發送於
@@ -489,14 +488,14 @@
DocType: Journal Entry,Accounts Payable,應付帳款
apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,所選的材料清單並不同樣項目
DocType: Pricing Rule,Valid Upto,到...為止有效
-apps/erpnext/erpnext/public/js/setup_wizard.js +244,List a few of your customers. They could be organizations or individuals.,列出一些你的客戶。他們可以是組織或個人。
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,List a few of your customers. They could be organizations or individuals.,列出一些你的客戶。他們可以是組織或個人。
apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,足夠的配件組裝
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,直接收入
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account",7 。總計：累積總數達到了這一點。
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Administrative Officer,政務主任
apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +21,Please select Course,請選擇課程
DocType: Timesheet Detail,Hrs,小時
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,請選擇公司
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +324,Please select Company,請選擇公司
DocType: Stock Entry Detail,Difference Account,差異帳戶
DocType: Purchase Invoice,Supplier GSTIN,供應商GSTIN
apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,不能因為其依賴的任務{0}沒有關閉關閉任務。
@@ -513,7 +512,7 @@
apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,請定義等級為閾值0％
DocType: Sales Order,To Deliver,為了提供
DocType: Purchase Invoice Item,Item,項目
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2522,Serial no item cannot be a fraction,序號項目不能是一個分數
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2423,Serial no item cannot be a fraction,序號項目不能是一個分數
DocType: Journal Entry,Difference (Dr - Cr),差異（Dr - Cr）
DocType: Account,Profit and Loss,損益
apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,管理轉包
@@ -536,7 +535,7 @@
DocType: Serial No,Warranty Period (Days),保修期限（天數）
DocType: Installation Note Item,Installation Note Item,安裝注意項
DocType: Production Plan Item,Pending Qty,待定數量
-apps/erpnext/erpnext/accounts/party.py +356,{0} {1} is not active,{0} {1}是不活動
+apps/erpnext/erpnext/accounts/party.py +358,{0} {1} is not active,{0} {1}是不活動
apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},短信發送至以下號碼：{0}
apps/erpnext/erpnext/config/accounts.py +279,Setup cheque dimensions for printing,設置檢查尺寸打印
DocType: Salary Slip,Salary Slip Timesheet,工資單時間表
@@ -633,8 +632,8 @@
DocType: Sales Person,Sales Person Targets,銷售人員目標
DocType: Production Order Operation,In minutes,在幾分鐘內
DocType: Issue,Resolution Date,決議日期
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,Timesheet created:,創建時間表：
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +866,Please set default Cash or Bank account in Mode of Payment {0},請設定現金或銀行帳戶的預設付款方式{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,創建時間表：
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +880,Please set default Cash or Bank account in Mode of Payment {0},請設定現金或銀行帳戶的預設付款方式{0}
apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,註冊
DocType: GST Settings,GST Settings,GST設置
DocType: Selling Settings,Customer Naming By,客戶命名由
@@ -652,7 +651,7 @@
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,消費
apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +157,{0}: {1} not found in Invoice Details table,{0}：在發票明細表中找不到{1}
DocType: Company,Round Off Cost Center,四捨五入成本中心
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +219,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,維護訪問{0}必須取消這個銷售訂單之前被取消
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +227,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,維護訪問{0}必須取消這個銷售訂單之前被取消
DocType: Item,Material Transfer,物料轉倉
apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +211,Opening (Dr),開啟（Dr）
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},登錄時間戳記必須晚於{0}
@@ -684,7 +683,7 @@
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Marketing,市場營銷
apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,已創建付款輸入
DocType: Purchase Receipt Item Supplied,Current Stock,當前庫存
-apps/erpnext/erpnext/controllers/accounts_controller.py +557,Row #{0}: Asset {1} does not linked to Item {2},行＃{0}：資產{1}不掛項目{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +558,Row #{0}: Asset {1} does not linked to Item {2},行＃{0}：資產{1}不掛項目{2}
apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,預覽工資單
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,帳戶{0}已多次輸入
DocType: Account,Expenses Included In Valuation,支出計入估值
@@ -707,7 +706,7 @@
DocType: Journal Entry,Credit Card Entry,信用卡進入
apps/erpnext/erpnext/config/accounts.py +51,Company and Accounts,公司與賬戶
apps/erpnext/erpnext/config/stock.py +22,Goods received from Suppliers.,從供應商收貨。
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,在數值
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +58,In Value,在數值
DocType: Lead,Campaign Name,活動名稱
DocType: Selling Settings,Close Opportunity After Days,關閉機會後日
DocType: Purchase Order,Supply Raw Materials,供應原料
@@ -730,15 +729,16 @@
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,預留製造
DocType: Opportunity,Opportunity From,機會從
apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,月薪聲明。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +848,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,行{0}：{1}項目{2}所需的序列號。你已經提供{3}。
DocType: BOM,Website Specifications,網站規格
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}：從{0}類型{1}
apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,列#{0}：轉換係數是強制性的
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +325,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",海報價格規則，同樣的標準存在，請通過分配優先解決衝突。價格規則：{0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +467,Cannot deactivate or cancel BOM as it is linked with other BOMs,無法關閉或取消BOM，因為它是與其他材料明細表鏈接
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +468,Cannot deactivate or cancel BOM as it is linked with other BOMs,無法關閉或取消BOM，因為它是與其他材料明細表鏈接
DocType: Opportunity,Maintenance,維護
DocType: Item Attribute Value,Item Attribute Value,項目屬性值
apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,銷售活動。
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +110,Make Timesheet,製作時間表
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Make Timesheet,製作時間表
DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
#### Note
@@ -790,7 +790,7 @@
apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,設置電子郵件帳戶
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,請先輸入品項
DocType: Account,Liability,責任
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,制裁金額不能大於索賠額行{0}。
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +182,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,制裁金額不能大於索賠額行{0}。
DocType: Company,Default Cost of Goods Sold Account,銷貨帳戶的預設成本
apps/erpnext/erpnext/stock/get_item_details.py +309,Price List not selected,未選擇價格列表
DocType: Request for Quotation Supplier,Send Email,發送電子郵件
@@ -800,10 +800,10 @@
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",要根據黨的篩選，選擇黨第一類型
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},不能勾選`更新庫存'，因為項目未交付{0}
DocType: Vehicle,Acquisition Date,採集日期
-apps/erpnext/erpnext/public/js/setup_wizard.js +297,Nos,NOS
+apps/erpnext/erpnext/public/js/setup_wizard.js +308,Nos,NOS
DocType: Item,Items with higher weightage will be shown higher,具有較高權重的項目將顯示更高的可
DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,銀行對帳詳細
-apps/erpnext/erpnext/controllers/accounts_controller.py +561,Row #{0}: Asset {1} must be submitted,行＃{0}：資產{1}必須提交
+apps/erpnext/erpnext/controllers/accounts_controller.py +562,Row #{0}: Asset {1} must be submitted,行＃{0}：資產{1}必須提交
apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,無發現任何員工
DocType: Supplier Quotation,Stopped,停止
DocType: Item,If subcontracted to a vendor,如果分包給供應商
@@ -820,7 +820,7 @@
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}：成本中心{2}不屬於公司{3}
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 +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,項目行的{idx} {文檔類型} {} DOCNAME上面不存在'{}的文檔類型“表
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +275,Timesheet {0} is already completed or cancelled,時間表{0}已完成或取消
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +278,Timesheet {0} is already completed or cancelled,時間表{0}已完成或取消
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,沒有任務
DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",該月的一天，在這汽車的發票將產生如05，28等
DocType: Asset,Opening Accumulated Depreciation,打開累計折舊
@@ -875,7 +875,7 @@
DocType: SMS Log,Requested Numbers,請求號碼
apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,績效考核。
apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",作為啟用的購物車已啟用“使用購物車”，而應該有購物車至少有一個稅務規則
-apps/erpnext/erpnext/controllers/accounts_controller.py +359,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",付款輸入{0}對訂單{1}，檢查它是否應該被拉到作為預先在該發票聯。
+apps/erpnext/erpnext/controllers/accounts_controller.py +360,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",付款輸入{0}對訂單{1}，檢查它是否應該被拉到作為預先在該發票聯。
DocType: Sales Invoice Item,Stock Details,庫存詳細訊息
apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,專案值
apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,銷售點
@@ -894,15 +894,15 @@
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 +803,Purchase Receipt,採購入庫單
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +796,Purchase Receipt,採購入庫單
,Received Items To Be Billed,待付款的收受品項
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,提交工資單
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Submitted Salary Slips,提交工資單
apps/erpnext/erpnext/config/accounts.py +305,Currency exchange rate master.,貨幣匯率的主人。
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +192,Reference Doctype must be one of {0},參考文檔類型必須是一個{0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +298,Unable to find Time Slot in the next {0} days for Operation {1},找不到時隙在未來{0}天操作{1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},找不到時隙在未來{0}天操作{1}
DocType: Production Order,Plan material for sub-assemblies,計劃材料為子組件
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,銷售合作夥伴和地區
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +546,BOM {0} must be active,BOM {0}必須是積極的
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +547,BOM {0} must be active,BOM {0}必須是積極的
DocType: Journal Entry,Depreciation Entry,折舊分錄
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,請先選擇文檔類型
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,取消取消此保養訪問之前，材質訪問{0}
@@ -912,7 +912,7 @@
DocType: Bank Reconciliation,Total Amount,總金額
apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,互聯網出版
DocType: Production Planning Tool,Production Orders,生產訂單
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,餘額
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +62,Balance Value,餘額
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,銷售價格表
apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,發布同步項目
DocType: Bank Reconciliation,Account Currency,賬戶幣種
@@ -934,18 +934,18 @@
DocType: Item,Is Purchase Item,是購買項目
DocType: Asset,Purchase Invoice,採購發票
DocType: Stock Ledger Entry,Voucher Detail No,券詳細說明暫無
-apps/erpnext/erpnext/accounts/page/pos/pos.js +825,New Sales Invoice,新的銷售發票
+apps/erpnext/erpnext/accounts/page/pos/pos.js +730,New Sales Invoice,新的銷售發票
DocType: Stock Entry,Total Outgoing Value,出貨總計值
apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,開幕日期和截止日期應在同一會計年度
DocType: Lead,Request for Information,索取資料
-apps/erpnext/erpnext/accounts/page/pos/pos.js +838,Sync Offline Invoices,同步離線發票
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,同步離線發票
DocType: Payment Request,Paid,付費
DocType: Program Fee,Program Fee,課程費用
DocType: Salary Slip,Total in words,總計大寫
DocType: Material Request Item,Lead Time Date,交貨時間日期
DocType: Guardian,Guardian Name,監護人姓名
DocType: Cheque Print Template,Has Print Format,擁有打印格式
-apps/erpnext/erpnext/accounts/page/pos/pos.js +72, is mandatory. Maybe Currency Exchange record is not created for ,是強制性的。也許外幣兌換記錄沒有創建
+apps/erpnext/erpnext/accounts/page/pos/pos.js +71, is mandatory. Maybe Currency Exchange record is not created for ,是強制性的。也許外幣兌換記錄沒有創建
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},列#{0}：請為項目{1}指定序號
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +622,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",對於“產品包”的物品，倉庫，序列號和批號將被從“裝箱單”表考慮。如果倉庫和批次號是相同的任何“產品包”項目的所有包裝物品，這些值可以在主項表中輸入，值將被複製到“裝箱單”表。
DocType: Job Opening,Publish on website,發布在網站上
@@ -957,7 +957,7 @@
DocType: Cheque Print Template,Date Settings,日期設定
,Company Name,公司名稱
DocType: SMS Center,Total Message(s),訊息總和（s ）
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +855,Select Item for Transfer,對於轉讓項目選擇
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +848,Select Item for Transfer,對於轉讓項目選擇
DocType: Purchase Invoice,Additional Discount Percentage,額外折扣百分比
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,查看所有幫助影片名單
DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,選取支票存入該銀行帳戶的頭。
@@ -972,7 +972,7 @@
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +731,All items have already been transferred for this Production Order.,所有項目都已經被轉移為這個生產訂單。
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},行＃{0}：速率不能大於{1} {2}中使用的速率
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},行＃{0}：速率不能大於{1} {2}中使用的速率
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Meter,儀表
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Meter,儀表
DocType: Workstation,Electricity Cost,電力成本
DocType: HR Settings,Don't send Employee Birthday Reminders,不要送員工生日提醒
DocType: Item,Inspection Criteria,檢驗標準
@@ -992,7 +992,7 @@
apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},訂單類型必須是一個{0}
DocType: Lead,Next Contact Date,下次聯絡日期
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,開放數量
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please enter Account for Change Amount,對於漲跌額請輸入帳號
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Please enter Account for Change Amount,對於漲跌額請輸入帳號
DocType: Student Batch Name,Student Batch Name,學生批名
DocType: Holiday List,Holiday List Name,假日列表名稱
DocType: Repayment Schedule,Balance Loan Amount,平衡貸款額
@@ -1000,7 +1000,7 @@
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Stock Options,股票期權
DocType: Journal Entry Account,Expense Claim,報銷
apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,難道你真的想恢復這個報廢的資產？
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Qty for {0},數量為{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Qty for {0},數量為{0}
DocType: Leave Application,Leave Application,休假申請
apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,排假工具
DocType: Leave Block List,Leave Block List Dates,休假區塊清單日期表
@@ -1047,7 +1047,7 @@
DocType: GL Entry,Against,針對
DocType: Item,Default Selling Cost Center,預設銷售成本中心
DocType: Sales Partner,Implementation Partner,實施合作夥伴
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1640,ZIP Code,郵政編碼
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1545,ZIP Code,郵政編碼
apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},銷售訂單{0} {1}
DocType: Opportunity,Contact Info,聯絡方式
apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,製作Stock條目
@@ -1065,14 +1065,14 @@
DocType: School Settings,Attendance Freeze Date,出勤凍結日期
DocType: School Settings,Attendance Freeze Date,出勤凍結日期
DocType: Opportunity,Your sales person who will contact the customer in future,你的銷售人員會在未來聯絡客戶
-apps/erpnext/erpnext/public/js/setup_wizard.js +264,List a few of your suppliers. They could be organizations or individuals.,列出一些你的供應商。他們可以是組織或個人。
+apps/erpnext/erpnext/public/js/setup_wizard.js +275,List a few of your suppliers. They could be organizations or individuals.,列出一些你的供應商。他們可以是組織或個人。
apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,查看所有產品
apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),最低鉛年齡（天）
apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),最低鉛年齡（天）
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,所有的材料明細表
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +61,All BOMs,所有的材料明細表
DocType: Company,Default Currency,預設貨幣
DocType: Expense Claim,From Employee,從員工
-apps/erpnext/erpnext/controllers/accounts_controller.py +419,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告： {0} {1}為零，系統將不檢查超收因為金額項目
+apps/erpnext/erpnext/controllers/accounts_controller.py +420,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告： {0} {1}為零，系統將不檢查超收因為金額項目
DocType: Journal Entry,Make Difference Entry,使不同入口
DocType: Appraisal Template Goal,Key Performance Area,關鍵績效區
DocType: Program Enrollment,Transportation,運輸
@@ -1088,7 +1088,7 @@
DocType: Company,Company registration numbers for your reference. Tax numbers etc.,公司註冊號碼，供大家參考。稅務號碼等
DocType: Sales Partner,Distributor,經銷商
DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,購物車運輸規則
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +225,Production Order {0} must be cancelled before cancelling this Sales Order,{0}生產單必須早於售貨單前取消
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +233,Production Order {0} must be cancelled before cancelling this Sales Order,{0}生產單必須早於售貨單前取消
apps/erpnext/erpnext/public/js/controllers/transaction.js +67,Please set 'Apply Additional Discount On',請設置“收取額外折扣”
,Ordered Items To Be Billed,預付款的訂購物品
apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,從範圍必須小於要範圍
@@ -1096,10 +1096,10 @@
apps/erpnext/erpnext/projects/doctype/project/project.py +210,Project Collaboration Invitation,項目合作邀請
DocType: Salary Slip,Deductions,扣除
apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,開始年份
-apps/erpnext/erpnext/regional/india/utils.py +23,First 2 digits of GSTIN should match with State number {0},GSTIN的前2位數字應與狀態號{0}匹配
+apps/erpnext/erpnext/regional/india/utils.py +24,First 2 digits of GSTIN should match with State number {0},GSTIN的前2位數字應與狀態號{0}匹配
DocType: Purchase Invoice,Start date of current invoice's period,當前發票期間內的開始日期
DocType: Salary Slip,Leave Without Pay,無薪假
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +342,Capacity Planning Error,產能規劃錯誤
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,產能規劃錯誤
,Trial Balance for Party,試算表的派對
DocType: Lead,Consultant,顧問
DocType: Salary Slip,Earnings,收益
@@ -1115,7 +1115,7 @@
DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""",這將追加到變異的項目代碼。例如，如果你的英文縮寫為“SM”，而該項目的代碼是“T-SHIRT”，該變種的項目代碼將是“T-SHIRT-SM”
DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,薪資單一被儲存，淨付款就會被顯示出來。
DocType: Purchase Invoice,Is Return,退貨
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +779,Return / Debit Note,返回/借記注
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +772,Return / Debit Note,返回/借記注
DocType: Price List Country,Price List Country,價目表國家
DocType: Item,UOMs,計量單位
apps/erpnext/erpnext/stock/utils.py +205,{0} valid serial nos for Item {1},{0}項目{1}的有效的序號
@@ -1127,7 +1127,7 @@
apps/erpnext/erpnext/config/buying.py +38,Supplier database.,供應商數據庫。
DocType: Account,Balance Sheet,資產負債表
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,Cost Center For Item with Item Code ',成本中心與項目代碼“項目
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2483,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",付款方式未配置。請檢查是否帳戶已就付款方式或POS機配置文件中設置。
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2384,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",付款方式未配置。請檢查是否帳戶已就付款方式或POS機配置文件中設置。
DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,您的銷售人員將在此日期被提醒去聯絡客戶
apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,同一項目不能輸入多次。
apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups",進一步帳戶可以根據組進行，但條目可針對非組進行
@@ -1157,7 +1157,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,“分錄”不能是空的
apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},重複的行{0}同{1}
,Trial Balance,試算表
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +416,Fiscal Year {0} not found,會計年度{0}未找到
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +432,Fiscal Year {0} not found,會計年度{0}未找到
apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,建立職工
apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +157,Please select prefix first,請先選擇前綴稱號
DocType: Maintenance Visit Purpose,Work Done,工作完成
@@ -1168,11 +1168,11 @@
DocType: Grading Scale,Intervals,間隔
apps/erpnext/erpnext/stock/doctype/item/item.py +504,"An Item Group exists with same name, please change the item name or rename the item group",具有具有相同名稱的項目群組存在，請更改項目名稱或重新命名該項目群組
apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,學生手機號碼
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +489,Rest Of The World,世界其他地區
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +487,Rest Of The World,世界其他地區
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,該項目{0}不能有批
,Budget Variance Report,預算差異報告
DocType: Salary Slip,Gross Pay,工資總額
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Activity Type is mandatory.,行{0}：活動類型是強制性的。
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,Row {0}: Activity Type is mandatory.,行{0}：活動類型是強制性的。
apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,會計總帳
DocType: Stock Reconciliation,Difference Amount,差額
DocType: Vehicle Log,Service Detail,服務細節
@@ -1191,18 +1191,18 @@
,Employee Leave Balance,員工休假餘額
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},帳戶{0}的餘額必須始終為{1}
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +178,Valuation Rate required for Item in row {0},行對項目所需的估值速率{0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +316,Example: Masters in Computer Science,舉例：碩士計算機科學
+apps/erpnext/erpnext/public/js/setup_wizard.js +329,Example: Masters in Computer Science,舉例：碩士計算機科學
DocType: Purchase Invoice,Rejected Warehouse,拒絕倉庫
DocType: GL Entry,Against Voucher,對傳票
DocType: Item,Default Buying Cost Center,預設採購成本中心
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.",為得到最好的 ERPNext 教學，我們建議您花一些時間和觀看這些說明影片。
-apps/erpnext/erpnext/accounts/page/pos/pos.js +73, to ,到
+apps/erpnext/erpnext/accounts/page/pos/pos.js +72, to ,到
DocType: Supplier Quotation Item,Lead Time in days,在天交貨期
apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +58,Accounts Payable Summary,應付帳款摘要
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},從{0}工資支付{1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +326,Payment of salary from {0} to {1},從{0}工資支付{1}
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},無權修改凍結帳戶{0}
DocType: Journal Entry,Get Outstanding Invoices,獲取未付發票
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +66,Sales Order {0} is not valid,銷售訂單{0}無效
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,銷售訂單{0}無效
apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,採購訂單幫助您規劃和跟進您的購買
apps/erpnext/erpnext/setup/doctype/company/company.py +225,"Sorry, companies cannot be merged",對不起，企業不能合併
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1} \
@@ -1221,8 +1221,8 @@
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,間接費用
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,列#{0}：數量是強制性的
apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,農業
-apps/erpnext/erpnext/accounts/page/pos/pos.js +830,Sync Master Data,同步主數據
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,您的產品或服務
+apps/erpnext/erpnext/accounts/page/pos/pos.js +735,Sync Master Data,同步主數據
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Your Products or Services,您的產品或服務
apps/erpnext/erpnext/stock/doctype/item/item.py +177,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.,這是個根項目群組，且無法被編輯。
@@ -1239,18 +1239,18 @@
DocType: Student Group Student,Group Roll Number,組卷編號
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",{0}，只有貸方帳戶可以連接另一個借方分錄
apps/erpnext/erpnext/projects/doctype/project/project.py +73,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 +563,Delivery Note {0} is not submitted,送貨單{0}未提交
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +566,Delivery Note {0} is not submitted,送貨單{0}未提交
apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,項{0}必須是一個小項目簽約
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,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.",基於“適用於”欄位是「項目」，「項目群組」或「品牌」，而選擇定價規則。
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +216,Please set the Item Code first,請先設定商品代碼
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +215,Please set the Item Code first,請先設定商品代碼
DocType: Hub Settings,Seller Website,賣家網站
DocType: Item,ITEM-,項目-
apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,對於銷售團隊總分配比例應為100
DocType: Appraisal Goal,Goal,目標
DocType: Sales Invoice Item,Edit Description,編輯說明
,Team Updates,團隊更新
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +790,For Supplier,對供應商
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +783,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,創建打印格式
@@ -1263,12 +1263,12 @@
DocType: Purchase Invoice,Total (Company Currency),總計（公司貨幣）
apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,序號{0}多次輸入
DocType: Depreciation Schedule,Journal Entry,日記帳分錄
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,{0} items in progress,正在進行{0}項目
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,{0} items in progress,正在進行{0}項目
DocType: Workstation,Workstation Name,工作站名稱
DocType: Grading Scale Interval,Grade Code,等級代碼
DocType: POS Item Group,POS Item Group,POS項目組
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,電子郵件摘要：
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +552,BOM {0} does not belong to Item {1},BOM {0}不屬於項目{1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +553,BOM {0} does not belong to Item {1},BOM {0}不屬於項目{1}
DocType: Sales Partner,Target Distribution,目標分佈
DocType: Salary Slip,Bank Account No.,銀行賬號
DocType: Naming Series,This is the number of the last created transaction with this prefix,這就是以這個前綴的最後一個創建的事務數
@@ -1318,7 +1318,7 @@
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,平均每日傳出
DocType: POS Profile,Campaign,競賽
DocType: Supplier,Name and Type,名稱和類型
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',審批狀態必須被“批准”或“拒絕”
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,Approval Status must be 'Approved' or 'Rejected',審批狀態必須被“批准”或“拒絕”
DocType: Purchase Invoice,Contact Person,聯絡人
apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',“預計開始日期”不能大於“預計結束日期'
DocType: Course Scheduling Tool,Course End Date,課程結束日期
@@ -1329,8 +1329,8 @@
DocType: Employee,Prefered Email,首選電子郵件
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,在固定資產淨變動
DocType: Leave Control Panel,Leave blank if considered for all designations,離開，如果考慮所有指定空白
-apps/erpnext/erpnext/controllers/accounts_controller.py +675,Charge of type 'Actual' in row {0} cannot be included in Item Rate,類型'實際'行{0}的計費，不能被包含在項目單價
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +351,Max: {0},最大數量：{0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Charge of type 'Actual' in row {0} cannot be included in Item Rate,類型'實際'行{0}的計費，不能被包含在項目單價
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +350,Max: {0},最大數量：{0}
apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,從日期時間
DocType: Email Digest,For Company,對於公司
apps/erpnext/erpnext/config/support.py +17,Communication log.,通信日誌。
@@ -1367,7 +1367,7 @@
DocType: Journal Entry Account,Account Balance,帳戶餘額
apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,稅收規則進行的交易。
DocType: Rename Tool,Type of document to rename.,的文件類型進行重命名。
-apps/erpnext/erpnext/public/js/setup_wizard.js +301,We buy this Item,我們買這個項目
+apps/erpnext/erpnext/public/js/setup_wizard.js +314,We buy this Item,我們買這個項目
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +53,{0} {1}: Customer is required against Receivable account {2},{0} {1}：需要客戶對應收賬款{2}
DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),總稅費和費用（公司貨幣）
apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,顯示未關閉的會計年度的盈虧平衡
@@ -1377,7 +1377,7 @@
DocType: Quality Inspection,Readings,閱讀
DocType: Stock Entry,Total Additional Costs,總額外費用
DocType: BOM,Scrap Material Cost(Company Currency),廢料成本（公司貨幣）
-apps/erpnext/erpnext/public/js/setup_wizard.js +294,Sub Assemblies,子組件
+apps/erpnext/erpnext/public/js/setup_wizard.js +305,Sub Assemblies,子組件
DocType: Asset,Asset Name,資產名稱
DocType: Project,Task Weight,任務重
DocType: Asset Movement,Stock Manager,庫存管理
@@ -1402,7 +1402,7 @@
apps/erpnext/erpnext/config/stock.py +300,Item Variants,項目變體
DocType: Company,Services,服務
DocType: HR Settings,Email Salary Slip to Employee,電子郵件工資單給員工
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +884,Select Possible Supplier,選擇潛在供應商
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +877,Select Possible Supplier,選擇潛在供應商
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 +235,Asset Category is mandatory for Fixed Asset item,資產類別是強制性的固定資產項目
@@ -1413,7 +1413,7 @@
DocType: GST HSN Code,GST HSN Code,GST HSN代碼
DocType: Employee External Work History,Total Experience,總經驗
apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,打開項目
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +285,Packing Slip(s) cancelled,包裝單（ S）已取消
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,Packing Slip(s) cancelled,包裝單（ S）已取消
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,從投資現金流
DocType: Program Course,Program Course,課程計劃
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,貨運代理費
@@ -1452,8 +1452,8 @@
DocType: Program Enrollment Tool,Program Enrollments,計劃擴招
DocType: Sales Invoice Item,Brand Name,商標名稱
DocType: Purchase Receipt,Transporter Details,貨運公司細節
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2667,Default warehouse is required for selected item,默認倉庫需要選中的項目
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +881,Possible Supplier,可能的供應商
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2568,Default warehouse is required for selected item,默認倉庫需要選中的項目
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +874,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,收受方列表為空。請創建收受方列表
DocType: Production Plan Sales Order,Production Plan Sales Order,生產計劃銷售訂單
@@ -1482,7 +1482,7 @@
apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students",學生在系統的心臟，添加所有的學生
apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},行＃{0}：清除日期{1}無法支票日期前{2}
DocType: Company,Default Holiday List,預設假日表列
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},行{0}：從時間和結束時間{1}是具有重疊{2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +186,Row {0}: From Time and To Time of {1} is overlapping with {2},行{0}：從時間和結束時間{1}是具有重疊{2}
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,現貨負債
DocType: Purchase Invoice,Supplier Warehouse,供應商倉庫
DocType: Opportunity,Contact Mobile No,聯絡手機號碼
@@ -1497,17 +1497,17 @@
apps/erpnext/erpnext/stock/doctype/item/item.py +401,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 +208,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/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},請公司設定默認應付職工薪酬帳戶{0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},請公司設定默認應付職工薪酬帳戶{0}
DocType: SMS Center,Receiver List,收受方列表
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1154,Search Item,搜索項目
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1059,Search Item,搜索項目
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,現金淨變動
DocType: Assessment Plan,Grading Scale,分級量表
apps/erpnext/erpnext/stock/doctype/item/item.py +396,Unit of Measure {0} has been entered more than once in Conversion Factor Table,計量單位{0}已經進入不止一次在轉換係數表
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +599,Already completed,已經完成
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +603,Already completed,已經完成
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,庫存在手
apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,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,發布項目成本
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +354,Quantity must not be more than {0},數量必須不超過{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +353,Quantity must not be more than {0},數量必須不超過{0}
apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,上一財政年度未關閉
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),時間（天）
DocType: Quotation Item,Quotation Item,產品報價
@@ -1520,6 +1520,7 @@
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,Conversion rate cannot be 0 or 1,轉化率不能為0或1
DocType: Sales Invoice,Reference Document,參考文獻
DocType: Accounts Settings,Credit Controller,信用控制器
+DocType: Sales Order,Final Delivery Date,最終交貨日期
DocType: Delivery Note,Vehicle Dispatch Date,車輛調度日期
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +230,Purchase Receipt {0} is not submitted,採購入庫單{0}未提交
DocType: Company,Default Payable Account,預設應付賬款
@@ -1606,9 +1607,9 @@
DocType: Upload Attendance,Get Template,獲取模板
DocType: Material Request,Transferred,轉入
DocType: Vehicle,Doors,門
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +205,ERPNext Setup Complete!,ERPNext設定完成！
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +206,ERPNext Setup Complete!,ERPNext設定完成！
DocType: Course Assessment Criteria,Weightage,權重
-DocType: Sales Invoice,Tax Breakup,稅收分解
+DocType: Purchase Invoice,Tax Breakup,稅收分解
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}：需要的損益“賬戶成本中心{2}。請設置為公司默認的成本中心。
apps/erpnext/erpnext/selling/doctype/customer/customer.py +115,A Customer Group exists with same name please change the Customer name or rename the Customer Group,客戶群組存在相同名稱，請更改客戶名稱或重新命名客戶群組
apps/erpnext/erpnext/public/js/templates/contact_list.html +37,New Contact,新建聯絡人
@@ -1619,14 +1620,14 @@
DocType: Announcement,Instructor,講師
DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.",如果此項目已變種，那麼它不能在銷售訂單等選擇
DocType: Lead,Next Contact By,下一個聯絡人由
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +281,Quantity required for Item {0} in row {1},列{1}項目{0}必須有數量
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Quantity required for Item {0} in row {1},列{1}項目{0}必須有數量
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},倉庫{0} 不能被刪除因為項目{1}還有庫存
DocType: Quotation,Order Type,訂單類型
DocType: Purchase Invoice,Notification Email Address,通知電子郵件地址
,Item-wise Sales Register,項目明智的銷售登記
DocType: Asset,Gross Purchase Amount,總購買金額
DocType: Asset,Depreciation Method,折舊方法
-apps/erpnext/erpnext/accounts/page/pos/pos.js +793,Offline,離線
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,離線
DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,包括在基本速率此稅？
apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,總目標
DocType: Job Applicant,Applicant for a Job,申請人作業
@@ -1647,14 +1648,14 @@
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 +984,Make Purchase Order,製作採購訂單
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1052,Make Purchase Order,製作採購訂單
DocType: SMS Center,Send To,發送到
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},沒有足夠的餘額休假請假類型{0}
DocType: Sales Team,Contribution to Net Total,貢獻淨合計
DocType: Sales Invoice Item,Customer's Item Code,客戶的產品編號
DocType: Stock Reconciliation,Stock Reconciliation,庫存調整
DocType: Territory,Territory Name,地區名稱
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,提交之前，需要填入在製品倉庫
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Work-in-Progress Warehouse is required before Submit,提交之前，需要填入在製品倉庫
apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,申請職位
DocType: Purchase Order Item,Warehouse and Reference,倉庫及參考
DocType: Supplier,Statutory info and other general information about your Supplier,供應商的法定資訊和其他一般資料
@@ -1667,13 +1668,13 @@
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},重複的序列號輸入的項目{0}
DocType: Shipping Rule Condition,A condition for a Shipping Rule,為運輸規則的條件
apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,請輸入
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings",行不能overbill為項目{0} {1}超過{2}。要允許對帳單，請在購買設置中設置
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +189,Please set filter based on Item or Warehouse,根據項目或倉庫請設置過濾器
+apps/erpnext/erpnext/controllers/accounts_controller.py +436,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings",行不能overbill為項目{0} {1}超過{2}。要允許對帳單，請在購買設置中設置
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +212,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),淨重這個包。 （當項目的淨重量總和自動計算）
DocType: Sales Order,To Deliver and Bill,準備交貨及開立發票
DocType: Student Group,Instructors,教師
DocType: GL Entry,Credit Amount in Account Currency,在賬戶幣金額
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +549,BOM {0} must be submitted,BOM {0}必須提交
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +550,BOM {0} must be submitted,BOM {0}必須提交
DocType: Authorization Control,Authorization Control,授權控制
apps/erpnext/erpnext/controllers/buying_controller.py +304,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},行＃{0}：拒絕倉庫是強制性的反對否決項{1}
apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in the warehouse record or set default inventory account in company {1}.",倉庫{0}未與任何帳戶關聯，請在倉庫記錄中提及該帳戶，或在公司{1}中設置默認庫存帳戶。
@@ -1691,12 +1692,13 @@
DocType: Quotation Item,Actual Qty,實際數量
DocType: Sales Invoice Item,References,參考
DocType: Quality Inspection Reading,Reading 10,閱讀10
-apps/erpnext/erpnext/public/js/setup_wizard.js +284,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",列出您售出或購買的產品或服務，並請確認品項群駔、單位與其它屬性。
+apps/erpnext/erpnext/public/js/setup_wizard.js +295,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",列出您售出或購買的產品或服務，並請確認品項群駔、單位與其它屬性。
DocType: Hub Settings,Hub Node,樞紐節點
apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,您輸入重複的項目。請糾正，然後再試一次。
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,Associate,關聯
+DocType: Company,Sales Target,銷售目標
DocType: Asset Movement,Asset Movement,資產運動
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2201,New Cart,新的車
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2102,New Cart,新的車
apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,項{0}不是一個序列化的項目
DocType: SMS Center,Create Receiver List,創建接收器列表
DocType: Vehicle,Wheels,車輪
@@ -1737,6 +1739,7 @@
DocType: Supplier,Supplier of Goods or Services.,供應商的商品或服務。
DocType: Budget,Fiscal Year,財政年度
DocType: Vehicle Log,Fuel Price,燃油價格
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,請通過設置>編號系列設置出勤編號系列
DocType: Budget,Budget,預算
apps/erpnext/erpnext/stock/doctype/item/item.py +232,Fixed Asset Item must be a non-stock item.,固定資產項目必須是一個非庫存項目。
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",財政預算案不能對{0}指定的，因為它不是一個收入或支出帳戶
@@ -1750,11 +1753,11 @@
apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,項目群組的樹狀結構
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,項目{0}的序列號未設定，請檢查項目主檔
DocType: Maintenance Visit,Maintenance Time,維護時間
-apps/erpnext/erpnext/public/js/setup_wizard.js +291,A Product or Service,產品或服務
+apps/erpnext/erpnext/public/js/setup_wizard.js +302,A Product or Service,產品或服務
apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,這個詞開始日期不能超過哪個術語鏈接學年的開學日期較早（學年{}）。請更正日期，然後再試一次。
DocType: Guardian,Guardian Interests,守護興趣
DocType: Naming Series,Current Value,當前值
-apps/erpnext/erpnext/controllers/accounts_controller.py +252,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,多個會計年度的日期{0}存在。請設置公司財年
+apps/erpnext/erpnext/controllers/accounts_controller.py +253,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,多個會計年度的日期{0}存在。請設置公司財年
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0}已新增
DocType: Delivery Note Item,Against Sales Order,對銷售訂單
,Serial No Status,序列號狀態
@@ -1768,7 +1771,7 @@
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +366,Amount {0} {1} deducted against {2},金額{0} {1}抵扣{2}
DocType: Employee,Salary Information,薪資資訊
DocType: Sales Person,Name and Employee ID,姓名和僱員ID
-apps/erpnext/erpnext/accounts/party.py +298,Due Date cannot be before Posting Date,到期日不能在寄發日期之前
+apps/erpnext/erpnext/accounts/party.py +300,Due Date cannot be before Posting Date,到期日不能在寄發日期之前
DocType: Website Item Group,Website Item Group,網站項目群組
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,關稅和稅款
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,參考日期請輸入
@@ -1819,9 +1822,9 @@
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,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,重複客戶收入
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} ({1}) 必須有“支出審批”權限
-apps/erpnext/erpnext/public/js/setup_wizard.js +297,Pair,對
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,Select BOM and Qty for Production,選擇BOM和數量生產
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +171,{0} ({1}) must have role 'Expense Approver',{0} ({1}) 必須有“支出審批”權限
+apps/erpnext/erpnext/public/js/setup_wizard.js +308,Pair,對
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +876,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,針對帳戶
@@ -1831,7 +1834,7 @@
apps/erpnext/erpnext/public/js/utils.js +96,Annual Billing: {0},年度結算：{0}
apps/erpnext/erpnext/config/accounts.py +202,Goods and Services Tax (GST India),商品和服務稅（印度消費稅）
DocType: Delivery Note,Excise Page Number,消費頁碼
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +138,"Company, From Date and To Date is mandatory",公司，從日期和結束日期是必須
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory",公司，從日期和結束日期是必須
DocType: Asset,Purchase Date,購買日期
DocType: Employee,Personal Details,個人資料
apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},請設置在公司的資產折舊成本中心“{0}
@@ -1840,9 +1843,9 @@
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +361,Amount {0} {1} against {2} {3},量{0} {1}對{2} {3}
,Quotation Trends,報價趨勢
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},項目{0}之項目主檔未提及之項目群組
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +343,Debit To account must be a Receivable account,借方帳戶必須是應收帳款帳戶
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +346,Debit To account must be a Receivable account,借方帳戶必須是應收帳款帳戶
DocType: Shipping Rule Condition,Shipping Amount,航運量
-apps/erpnext/erpnext/public/js/setup_wizard.js +243,Add Customers,添加客戶
+apps/erpnext/erpnext/public/js/setup_wizard.js +254,Add Customers,添加客戶
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,待審核金額
DocType: Purchase Invoice Item,Conversion Factor,轉換因子
DocType: Purchase Order,Delivered,交付
@@ -1865,7 +1868,6 @@
DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)",家長課程（如果不是家長課程的一部分，請留空）
DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)",家長課程（如果不是家長課程的一部分，請留空）
DocType: Leave Control Panel,Leave blank if considered for all employee types,保持空白如果考慮到所有的員工類型
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,客戶>客戶群>領土
DocType: Landed Cost Voucher,Distribute Charges Based On,分銷費基於
apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,時間表
DocType: HR Settings,HR Settings,人力資源設置
@@ -1873,7 +1875,7 @@
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +130,Expense Claim is pending approval. Only the Expense Approver can update status.,使項目所需的質量保證和質量保證在沒有採購入庫單
DocType: Email Digest,New Expenses,新的費用
DocType: Purchase Invoice,Additional Discount Amount,額外的折扣金額
-apps/erpnext/erpnext/controllers/accounts_controller.py +543,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",行＃{0}：訂購數量必須是1，因為項目是固定資產。請使用單獨的行多數量。
+apps/erpnext/erpnext/controllers/accounts_controller.py +544,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",行＃{0}：訂購數量必須是1，因為項目是固定資產。請使用單獨的行多數量。
DocType: Leave Block List Allow,Leave Block List Allow,休假區塊清單准許
apps/erpnext/erpnext/setup/doctype/company/company.py +289,Abbr can not be blank or space,縮寫不能為空或空間
apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,集團以非組
@@ -1881,7 +1883,7 @@
DocType: Loan Type,Loan Name,貸款名稱
apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,實際總計
DocType: Student Siblings,Student Siblings,學生兄弟姐妹
-apps/erpnext/erpnext/public/js/setup_wizard.js +297,Unit,單位
+apps/erpnext/erpnext/public/js/setup_wizard.js +308,Unit,單位
apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,請註明公司
,Customer Acquisition and Loyalty,客戶取得和忠誠度
DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,你維護退貨庫存的倉庫
@@ -1898,11 +1900,11 @@
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},在批量庫存餘額{0}將成為負{1}的在倉庫項目{2} {3}
apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,下列資料的要求已自動根據項目的重新排序水平的提高
DocType: Email Digest,Pending Sales Orders,待完成銷售訂單
-apps/erpnext/erpnext/controllers/accounts_controller.py +291,Account {0} is invalid. Account Currency must be {1},帳戶{0}是無效的。帳戶貨幣必須是{1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +292,Account {0} is invalid. Account Currency must be {1},帳戶{0}是無效的。帳戶貨幣必須是{1}
apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},計量單位換算係數是必需的行{0}
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1014,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",行＃{0}：參考文件類型必須是銷售訂單之一，銷售發票或日記帳分錄
DocType: Salary Component,Deduction,扣除
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,行{0}：從時間和時間是強制性的。
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +111,Row {0}: From Time and To Time is mandatory.,行{0}：從時間和時間是強制性的。
DocType: Stock Reconciliation Item,Amount Difference,金額差異
apps/erpnext/erpnext/stock/get_item_details.py +296,Item Price added for {0} in Price List {1},加入項目價格為{0}價格表{1}
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,請輸入這個銷售人員的員工標識
@@ -1911,7 +1913,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,請先輸入生產項目
apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,計算的銀行對賬單餘額
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,禁用的用戶
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +756,Quotation,報價
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +749,Quotation,報價
DocType: Salary Slip,Total Deduction,扣除總額
,Production Analytics,生產Analytics（分析）
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,項{0}已被退回
@@ -1953,16 +1955,17 @@
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,選擇公司...
DocType: Leave Control Panel,Leave blank if considered for all departments,保持空白如果考慮到全部部門
apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).",就業（永久，合同，實習生等）的類型。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +409,{0} is mandatory for Item {1},{0}是強制性的項目{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +412,{0} is mandatory for Item {1},{0}是強制性的項目{1}
DocType: Currency Exchange,From Currency,從貨幣
apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"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 +125,Cost of New Purchase,新的採購成本
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +96,Sales Order required for Item {0},所需的{0}項目銷售訂單
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +97,Sales Order required for Item {0},所需的{0}項目銷售訂單
DocType: Purchase Invoice Item,Rate (Company Currency),率（公司貨幣）
DocType: Payment Entry,Unallocated Amount,未分配金額
apps/erpnext/erpnext/templates/includes/product_page.js +71,Cannot find a matching Item. Please select some other value for {0}.,無法找到匹配的項目。請選擇其他值{0}。
DocType: POS Profile,Taxes and Charges,稅收和收費
DocType: Item,"A Product or a Service that is bought, sold or kept in stock.",產品或服務已購買，出售或持有的股票。
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,商品編號>商品組>品牌
apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,沒有更多的更新
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +154,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,不能選擇充電式為'在上一行量'或'在上一行總'的第一行
apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,子項不應該是一個產品包。請刪除項目`{0}`和保存
@@ -1990,7 +1993,7 @@
DocType: Sales Invoice,Total Billing Amount,總結算金額
apps/erpnext/erpnext/hr/doctype/daily_work_summary_settings/daily_work_summary_settings.py +17,There must be a default incoming Email Account enabled for this to work. Please setup a default incoming Email Account (POP/IMAP) and try again.,必須有這個工作，啟用默認進入的電子郵件帳戶。請設置一個默認的傳入電子郵件帳戶（POP / IMAP），然後再試一次。
apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +75,Receivable Account,應收賬款
-apps/erpnext/erpnext/controllers/accounts_controller.py +565,Row #{0}: Asset {1} is already {2},行＃{0}：資產{1}已經是{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Asset {1} is already {2},行＃{0}：資產{1}已經是{2}
DocType: Quotation Item,Stock Balance,庫存餘額
apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,銷售訂單到付款
DocType: Expense Claim Detail,Expense Claim Detail,報銷詳情
@@ -2013,10 +2016,11 @@
DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.",如果您已經創建了銷售稅和費模板標準模板，選擇一個，然後點擊下面的按鈕。
DocType: BOM Scrap Item,Basic Amount (Company Currency),基本金額（公司幣種）
DocType: Student,Guardians,守護者
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,供應商>供應商類型
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,價格將不會顯示如果沒有設置價格
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,請指定一個國家的這種運輸規則或檢查全世界運輸
DocType: Stock Entry,Total Incoming Value,總收入值
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +337,Debit To is required,借方是必填項
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +340,Debit To is required,借方是必填項
apps/erpnext/erpnext/utilities/activation.py +107,"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 +39,Purchase Price List,採購價格表
DocType: Offer Letter Term,Offer Term,要約期限
@@ -2035,11 +2039,11 @@
DocType: Timesheet Detail,To Time,要時間
DocType: Authorization Rule,Approving Role (above authorized value),批准角色（上述授權值）
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +111,Credit To account must be a Payable account,信用帳戶必須是應付賬款
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,BOM recursion: {0} cannot be parent or child of {2},BOM遞歸： {0}不能父母或兒童{2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +306,BOM recursion: {0} cannot be parent or child of {2},BOM遞歸： {0}不能父母或兒童{2}
DocType: Production Order Operation,Completed Qty,完成數量
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry",{0}，只有借方帳戶可以連接另一個貸方分錄
apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,價格表{0}被禁用
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty cannot be more than {1} for operation {2},行{0}：已完成的數量不能超過{1}操作{2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +123,Row {0}: Completed Qty cannot be more than {1} for operation {2},行{0}：已完成的數量不能超過{1}操作{2}
DocType: Manufacturing Settings,Allow Overtime,允許加班
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",序列化項目{0}無法使用庫存調節更新，請使用庫存條目
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",序列化項目{0}無法使用庫存調節更新，請使用庫存條目
@@ -2055,9 +2059,10 @@
apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',請指定一個有效的“從案號”
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,進一步的成本中心可以根據組進行，但項可以對非組進行
apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,用戶和權限
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +903,Production Orders Created: {0},生產訂單創建：{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +909,Production Orders Created: {0},生產訂單創建：{0}
DocType: Branch,Branch,分支機構
DocType: Guardian,Mobile Number,手機號碼
+DocType: Company,Total Monthly Sales,每月銷售總額
DocType: Bin,Actual Quantity,實際數量
DocType: Shipping Rule,example: Next Day Shipping,例如：次日發貨
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,序列號{0}未找到
@@ -2086,7 +2091,7 @@
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,軟件
apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,接下來跟日期不能過去
DocType: Company,For Reference Only.,僅供參考。
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2548,Select Batch No,選擇批號
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2449,Select Batch No,選擇批號
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},無效的{0}：{1}
DocType: Sales Invoice Advance,Advance Amount,提前量
DocType: Manufacturing Settings,Capacity Planning,產能規劃
@@ -2097,7 +2102,7 @@
apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Barcode {0},沒有條碼{0}的品項
apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,案號不能為0
DocType: Item,Show a slideshow at the top of the page,顯示幻燈片在頁面頂部
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +480,Boms,物料清單
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +481,Boms,物料清單
apps/erpnext/erpnext/stock/doctype/item/item.py +136,Stores,商店
DocType: Serial No,Delivery Time,交貨時間
apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,老齡化基於
@@ -2109,16 +2114,16 @@
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 +446,Show Salary Slip,顯示工資單
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +801,Transfer Material,轉印材料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +794,Transfer Material,轉印材料
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",指定作業、作業成本並給予該作業一個專屬的作業編號。
apps/erpnext/erpnext/controllers/status_updater.py +201,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 +984,Please set recurring after saving,請設置保存後復發
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +742,Select change amount account,選擇變化量賬戶
+apps/erpnext/erpnext/public/js/controllers/transaction.js +982,Please set recurring after saving,請設置保存後復發
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +745,Select change amount account,選擇變化量賬戶
DocType: Purchase Invoice,Price List Currency,價格表之貨幣
DocType: Naming Series,User must always select,用戶必須始終選擇
DocType: Stock Settings,Allow Negative Stock,允許負庫存
DocType: Installation Note,Installation Note,安裝注意事項
-apps/erpnext/erpnext/public/js/setup_wizard.js +224,Add Taxes,添加稅賦
+apps/erpnext/erpnext/public/js/setup_wizard.js +235,Add Taxes,添加稅賦
DocType: Topic,Topic,話題
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,從融資現金流
DocType: Budget Account,Budget Account,預算科目
@@ -2131,7 +2136,8 @@
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),資金來源（負債）
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +381,Quantity in row {0} ({1}) must be same as manufactured quantity {2},列{0}的數量（{1}）必須與生產量{2}相同
DocType: Appraisal,Employee,僱員
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +229,Select Batch,選擇批次
+DocType: Company,Sales Monthly History,銷售月曆
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +183,Select Batch,選擇批次
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1}}已開票
DocType: Training Event,End Time,結束時間
apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +62,Active Salary Structure {0} found for employee {1} for the given dates,主動薪酬結構找到{0}員工{1}對於給定的日期
@@ -2139,13 +2145,12 @@
apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,銷售或採購的標準合同條款。
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,集團透過券
apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,銷售渠道
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Please set default account in Salary Component {0},請薪酬部分設置默認帳戶{0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},請薪酬部分設置默認帳戶{0}
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},請行選擇BOM為項目{0}
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 +266,Specified BOM {0} does not exist for Item {1},指定BOM {0}的項目不存在{1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +213,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,維護時間表{0}必須取消早於取消這個銷售訂單
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,維護時間表{0}必須取消早於取消這個銷售訂單
DocType: Notification Control,Expense Claim Approved,報銷批准
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,請通過設置>編號系列設置出勤編號系列
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +316,Salary Slip of employee {0} already created for this period,員工的工資單{0}已為這一時期創建
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +124,Pharmaceutical,製藥
apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,購買的物品成本
@@ -2160,7 +2165,7 @@
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM編號為成品產品
DocType: Upload Attendance,Attendance To Date,出席會議日期
DocType: Payment Gateway Account,Payment Account,付款帳號
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +866,Please specify Company to proceed,請註明公司以處理
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +859,Please specify Company to proceed,請註明公司以處理
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,應收賬款淨額變化
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Compensatory Off,補假
DocType: Offer Letter,Accepted,接受的
@@ -2170,13 +2175,13 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +52,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,請確保你真的要刪除這家公司的所有交易。主數據將保持原樣。這個動作不能撤消。
DocType: Room,Room Number,房間號
apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},無效的參考{0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},"{0} ({1})不能大於計劃數量
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},"{0} ({1})不能大於計劃數量
({2})生產訂單的 {3}"
DocType: Shipping Rule,Shipping Rule Label,送貨規則標籤
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,用戶論壇
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +275,Raw Materials cannot be blank.,原材料不能為空。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +473,"Could not update stock, invoice contains drop shipping item.",無法更新庫存，發票包含下降航運項目。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,快速日記帳分錄
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +276,Raw Materials cannot be blank.,原材料不能為空。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +476,"Could not update stock, invoice contains drop shipping item.",無法更新庫存，發票包含下降航運項目。
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +466,Quick Journal Entry,快速日記帳分錄
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +165,You can not change rate if BOM mentioned agianst any item,你不能改變速度，如果BOM中提到反對的任何項目
DocType: Employee,Previous Work Experience,以前的工作經驗
DocType: Stock Entry,For Quantity,對於數量
@@ -2226,7 +2231,7 @@
DocType: SMS Log,No of Requested SMS,無的請求短信
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,停薪留職不批准請假的記錄相匹配
DocType: Campaign,Campaign-.####,運動 - ＃＃ ＃ ＃
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +761,Please supply the specified items at the best possible rates,請在提供最好的利率規定的項目
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +754,Please supply the specified items at the best possible rates,請在提供最好的利率規定的項目
DocType: Selling Settings,Auto close Opportunity after 15 days,15天之後自動關閉商機
apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,結束年份
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,報價/鉛％
@@ -2283,7 +2288,7 @@
DocType: Purchase Receipt Item,Recd Quantity,到貨數量
apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},費紀錄創造 - {0}
DocType: Asset Category Account,Asset Category Account,資產類別的帳戶
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Cannot produce more Item {0} than Sales Order quantity {1},無法產生更多的項目{0}不是銷售訂單數量{1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +117,Cannot produce more Item {0} than Sales Order quantity {1},無法產生更多的項目{0}不是銷售訂單數量{1}
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,股票輸入{0}不提交
DocType: Payment Reconciliation,Bank / Cash Account,銀行／現金帳戶
apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,接著聯繫到不能相同鉛郵箱地址
@@ -2319,7 +2324,7 @@
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +228,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,行＃{0}：日記條目{1}沒有帳戶{2}或已經對另一憑證匹配
DocType: Buying Settings,Default Buying Price List,預設採購價格表
DocType: Process Payroll,Salary Slip Based on Timesheet,基於時間表工資單
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,No employee for the above selected criteria OR salary slip already created,已創建的任何僱員對上述選擇標準或工資單
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +113,No employee for the above selected criteria OR salary slip already created,已創建的任何僱員對上述選擇標準或工資單
DocType: Notification Control,Sales Order Message,銷售訂單訊息
apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",設定預設值如公司，貨幣，當前財政年度等
DocType: Payment Entry,Payment Type,付款類型
@@ -2344,7 +2349,7 @@
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,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 +312,Not Paid and Not Delivered,沒有支付，未送達
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +320,Not Paid and Not Delivered,沒有支付，未送達
DocType: Product Bundle,Parent Item,父項目
DocType: Account,Account Type,帳戶類型
apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,沒有考勤表
@@ -2373,8 +2378,8 @@
DocType: Payment Entry,Total Allocated Amount,總撥款額
apps/erpnext/erpnext/setup/doctype/company/company.py +150,Set default inventory account for perpetual inventory,設置永久庫存的默認庫存帳戶
DocType: Item Reorder,Material Request Type,材料需求類型
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural日記條目從{0}薪金{1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +883,"LocalStorage is full, did not save",localStorage的是滿的，沒救
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +267,Accural Journal Entry for salaries from {0} to {1},Accural日記條目從{0}薪金{1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save",localStorage的是滿的，沒救
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,行{0}：計量單位轉換係數是必需的
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,參考
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,憑證＃
@@ -2390,7 +2395,7 @@
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.",如果選擇的定價規則是由為'價格'，它將覆蓋價目表。定價規則價格是最終價格，所以沒有進一步的折扣應適用。因此，在像銷售訂單，採購訂單等交易，這將是“速度”字段進賬，而不是“價格單率”字段。
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,以行業類型追蹤訊息。
DocType: Item Supplier,Item Supplier,產品供應商
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1085,Please enter Item Code to get batch no,請輸入產品編號，以取得批號
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1083,Please enter Item Code to get batch no,請輸入產品編號，以取得批號
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +782,Please select a value for {0} quotation_to {1},請選擇一個值{0} quotation_to {1}
DocType: Company,Stock Settings,庫存設定
apps/erpnext/erpnext/accounts/doctype/account/account.py +199,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",合併是唯一可能的，如果以下屬性中均有記載相同。是集團，根型，公司
@@ -2415,7 +2420,7 @@
apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},沒有找到之間的工資單{0}和{1}
,Pending SO Items For Purchase Request,待處理的SO項目對於採購申請
apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,學生入學
-apps/erpnext/erpnext/accounts/party.py +348,{0} {1} is disabled,{0} {1}被禁用
+apps/erpnext/erpnext/accounts/party.py +350,{0} {1} is disabled,{0} {1}被禁用
DocType: Supplier,Billing Currency,結算貨幣
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +169,Extra Large,特大號
apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Leaves,葉總
@@ -2443,7 +2448,7 @@
DocType: Student Applicant,Application Status,應用現狀
DocType: Fees,Fees,費用
DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,指定的匯率將一種貨幣兌換成另一種
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Quotation {0} is cancelled,{0}報價被取消
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +158,Quotation {0} is cancelled,{0}報價被取消
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Outstanding Amount,未償還總額
DocType: Sales Partner,Targets,目標
DocType: Price List,Price List Master,價格表主檔
@@ -2459,7 +2464,7 @@
DocType: Employee Education,Graduate,畢業生
DocType: Leave Block List,Block Days,封鎖天數
DocType: Journal Entry,Excise Entry,海關入境
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +70,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},警告：銷售訂單{0}已經存在針對客戶的採購訂單{1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +64,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},警告：銷售訂單{0}已經存在針對客戶的採購訂單{1}
DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
Examples:
@@ -2497,7 +2502,7 @@
,Salary Register,薪酬註冊
DocType: Warehouse,Parent Warehouse,家長倉庫
DocType: C-Form Invoice Detail,Net Total,總淨值
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},項目{0}和項目{1}找不到默認BOM
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +497,Default BOM not found for Item {0} and Project {1},項目{0}和項目{1}找不到默認BOM
apps/erpnext/erpnext/config/hr.py +163,Define various loan types,定義不同的貸款類型
DocType: Payment Reconciliation Invoice,Outstanding Amount,未償還的金額
apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),時間（分鐘）
@@ -2530,7 +2535,7 @@
apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,管理領地樹。
DocType: Journal Entry Account,Sales Invoice,銷售發票
DocType: Journal Entry Account,Party Balance,黨平衡
-apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,請選擇適用的折扣
+apps/erpnext/erpnext/accounts/page/pos/pos.js +462,Please select Apply Discount On,請選擇適用的折扣
DocType: Company,Default Receivable Account,預設應收帳款
DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,對支付上述選擇條件的薪資總額新增銀行分錄
DocType: Stock Entry,Material Transfer for Manufacture,物料轉倉用於製造
@@ -2544,7 +2549,7 @@
DocType: Sales Invoice,Customer Address,客戶地址
DocType: Employee Loan,Loan Details,貸款詳情
DocType: Company,Default Inventory Account,默認庫存帳戶
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,行{0}：已完成數量必須大於零。
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +120,Row {0}: Completed Qty must be greater than zero.,行{0}：已完成數量必須大於零。
DocType: Purchase Invoice,Apply Additional Discount On,收取額外折扣
DocType: Account,Root Type,root類型
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +132,Row # {0}: Cannot return more than {1} for Item {2},行＃{0}：無法返回超過{1}項{2}
@@ -2559,7 +2564,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 +769,Warning: Material Requested Qty is less than Minimum Order Qty,警告：物料需求的數量低於最少訂購量
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +762,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,靜音電子郵件
@@ -2583,7 +2588,7 @@
apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,詢價。
apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",請選擇項，其中“正股項”是“否”和“是銷售物品”是“是”，沒有其他產品捆綁
DocType: Student Log,Academic,學術的
-apps/erpnext/erpnext/controllers/accounts_controller.py +488,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),總的超前（{0}）對二階{1}不能大於總計（{2}）
+apps/erpnext/erpnext/controllers/accounts_controller.py +489,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),總的超前（{0}）對二階{1}不能大於總計（{2}）
DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,選擇按月分佈橫跨幾個月不均勻分佈的目標。
DocType: Stock Reconciliation,SR/,序號 /
DocType: Vehicle,Diesel,柴油機
@@ -2644,6 +2649,7 @@
DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,輸入活動的名稱，如果查詢來源是運動
apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,報紙出版商
apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,選擇財政年度
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +112,Expected Delivery Date should be after Sales Order Date,預計交貨日期應在銷售訂單日期之後
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,重新排序級別
DocType: Company,Chart Of Accounts Template,圖表帳戶模板
apps/erpnext/erpnext/stock/get_item_details.py +292,Item Price updated for {0} in Price List {1},項目價格更新{0}價格表{1}
@@ -2671,7 +2677,7 @@
DocType: Payment Reconciliation Invoice,Invoice Number,發票號碼
DocType: Shopping Cart Settings,Orders,訂單
DocType: Employee Leave Approver,Leave Approver,休假審批人
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +297,Please select a batch,請選擇一個批次
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +251,Please select a batch,請選擇一個批次
DocType: Assessment Group,Assessment Group Name,評估小組名稱
DocType: Manufacturing Settings,Material Transferred for Manufacture,轉移至製造的物料
DocType: Expense Claim,"A user with ""Expense Approver"" role",與“費用審批人”角色的用戶
@@ -2706,7 +2712,7 @@
DocType: Supplier,Last Day of the Next Month,下個月的最後一天
DocType: Support Settings,Auto close Issue after 7 days,7天之後自動關閉問題
apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",假，不是之前分配{0}，因為休假餘額已經結轉轉發在未來的假期分配記錄{1}
-apps/erpnext/erpnext/accounts/party.py +307,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),註：由於/參考日期由{0}天超過了允許客戶的信用天數（S）
+apps/erpnext/erpnext/accounts/party.py +309,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),註：由於/參考日期由{0}天超過了允許客戶的信用天數（S）
apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,學生申請
DocType: Asset Category Account,Accumulated Depreciation Account,累計折舊科目
DocType: Stock Settings,Freeze Stock Entries,凍結庫存項目
@@ -2754,14 +2760,14 @@
DocType: Sales Invoice Item,Available Qty at Warehouse,有貨數量在倉庫
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,帳單金額
DocType: Asset,Double Declining Balance,雙倍餘額遞減
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +171,Closed order cannot be cancelled. Unclose to cancel.,關閉的定單不能被取消。 Unclose取消。
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +179,Closed order cannot be cancelled. Unclose to cancel.,關閉的定單不能被取消。 Unclose取消。
DocType: Student Guardian,Father,父親
-apps/erpnext/erpnext/controllers/accounts_controller.py +574,'Update Stock' cannot be checked for fixed asset sale,“更新股票'不能檢查固定資產出售
+apps/erpnext/erpnext/controllers/accounts_controller.py +575,'Update Stock' cannot be checked for fixed asset sale,“更新股票'不能檢查固定資產出售
DocType: Bank Reconciliation,Bank Reconciliation,銀行對帳
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,獲取更新
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}帳戶{2}不屬於公司{3}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +134,Material Request {0} is cancelled or stopped,材料需求{0}被取消或停止
-apps/erpnext/erpnext/public/js/setup_wizard.js +380,Add a few sample records,增加了一些樣本記錄
+apps/erpnext/erpnext/public/js/setup_wizard.js +393,Add a few sample records,增加了一些樣本記錄
apps/erpnext/erpnext/config/hr.py +301,Leave Management,離開管理
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,以帳戶分群組
DocType: Lead,Lower Income,較低的收入
@@ -2769,12 +2775,12 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",差異帳戶必須是資產/負債類型的帳戶，因為此庫存調整是一個開始分錄
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},支付額不能超過貸款金額較大的{0}
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},所需物品{0}的採購訂單號
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +854,Production Order not created,生產訂單未創建
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +860,Production Order not created,生產訂單未創建
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',“起始日期”必須經過'終止日期'
apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,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 +419,Customer {0} does not belong to project {1},客戶{0}不屬於項目{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,Customer {0} does not belong to project {1},客戶{0}不屬於項目{1}
DocType: Employee Attendance Tool,Marked Attendance HTML,顯著的考勤HTML
apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers",語錄是建議，你已經發送到你的客戶提高出價
DocType: Sales Order,Customer's Purchase Order,客戶採購訂單
@@ -2784,7 +2790,7 @@
apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,請設置折舊數預訂
apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,價值或數量
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,製作訂單不能上調：
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Minute,分鐘
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Minute,分鐘
DocType: Purchase Invoice,Purchase Taxes and Charges,購置稅和費
,Qty to Receive,未到貨量
DocType: Leave Block List,Leave Block List Allowed,准許的休假區塊清單
@@ -2797,7 +2803,7 @@
apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,所有供應商類型
DocType: Global Defaults,Disable In Words,禁用詞
apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,產品編號是強制性的，因為項目沒有自動編號
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +102,Quotation {0} not of type {1},報價{0}非為{1}類型
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},報價{0}非為{1}類型
DocType: Maintenance Schedule Item,Maintenance Schedule Item,維護計劃項目
DocType: Sales Order,% Delivered,％交付
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,銀行透支戶口
@@ -2817,7 +2823,7 @@
DocType: Hub Settings,Seller Email,賣家電子郵件
DocType: Project,Total Purchase Cost (via Purchase Invoice),總購買成本（通過採購發票）
DocType: Training Event,Start Time,開始時間
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +369,Select Quantity,選擇數量
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +368,Select Quantity,選擇數量
DocType: Customs Tariff Number,Customs Tariff Number,海關稅則號
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,從該電子郵件摘要退訂
@@ -2840,7 +2846,7 @@
DocType: Purchase Invoice Item,PR Detail,詳細新聞稿
DocType: Sales Order,Fully Billed,完全開票
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,手頭現金
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +128,Delivery warehouse required for stock item {0},需要的庫存項目交割倉庫{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +136,Delivery warehouse required for stock item {0},需要的庫存項目交割倉庫{0}
DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),包裹的總重量。通常為淨重+包裝材料的重量。 （用於列印）
DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,具有此角色的用戶可以設置凍結帳戶，並新增/修改對凍結帳戶的會計分錄
DocType: Serial No,Is Cancelled,被註銷
@@ -2849,7 +2855,7 @@
DocType: Journal Entry,Bill Date,帳單日期
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:",即使有更高優先級的多個定價規則，然後按照內部優先級應用：
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},難道你真的想從提交{0}所有的工資單{1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +128,Do you really want to Submit all Salary Slip from {0} to {1},難道你真的想從提交{0}所有的工資單{1}
DocType: Supplier,Supplier Details,供應商詳細資訊
DocType: Expense Claim,Approval Status,審批狀態
DocType: Hub Settings,Publish Items to Hub,發布項目到集線器
@@ -2899,14 +2905,14 @@
DocType: Item,Warranty Period (in days),保修期限（天數）
apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,與關係Guardian1
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,從運營的淨現金
-apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. VAT,例如增值稅
+apps/erpnext/erpnext/public/js/setup_wizard.js +243,e.g. VAT,例如增值稅
apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,項目4
DocType: Student Admission,Admission End Date,錄取結束日期
DocType: Journal Entry Account,Journal Entry Account,日記帳分錄帳號
apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,學生組
DocType: Shopping Cart Settings,Quotation Series,報價系列
apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item",具有相同名稱的項目存在（ {0} ） ，請更改項目群組名或重新命名該項目
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2039,Please select customer,請選擇客戶
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1944,Please select customer,請選擇客戶
DocType: C-Form,I,一世
DocType: Company,Asset Depreciation Cost Center,資產折舊成本中心
DocType: Sales Order Item,Sales Order Date,銷售訂單日期
@@ -2916,6 +2922,7 @@
,Payment Period Based On Invoice Date,基於發票日的付款期
apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},缺少貨幣匯率{0}
DocType: Assessment Plan,Examiner,檢查員
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup > Settings > Naming Series,請通過設置>設置>命名系列為{0}設置命名系列
DocType: Journal Entry,Stock Entry,存貨分錄
DocType: Payment Entry,Payment References,付款參考
DocType: Vehicle,Insurance Details,保險詳情
@@ -2934,7 +2941,7 @@
apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,生產作業於此進行。
DocType: Asset Movement,Source Warehouse,來源倉庫
DocType: Installation Note,Installation Date,安裝日期
-apps/erpnext/erpnext/controllers/accounts_controller.py +553,Row #{0}: Asset {1} does not belong to company {2},行＃{0}：資產{1}不屬於公司{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +554,Row #{0}: Asset {1} does not belong to company {2},行＃{0}：資產{1}不屬於公司{2}
DocType: Employee,Confirmation Date,確認日期
DocType: C-Form,Total Invoiced Amount,發票總金額
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +49,Min Qty can not be greater than Max Qty,最小數量不能大於最大數量
@@ -3005,7 +3012,7 @@
DocType: Purchase Order,Get Items from Open Material Requests,從開放狀態的物料需求取得項目
DocType: Item,Standard Selling Rate,標準銷售率
DocType: Account,Rate at which this tax is applied,此稅適用的匯率
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,再訂購數量
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +65,Reorder Qty,再訂購數量
apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,當前職位空缺
DocType: Company,Stock Adjustment Account,庫存調整帳戶
apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,註銷項款
@@ -3017,7 +3024,7 @@
DocType: Sales Order Item,Supplier delivers to Customer,供應商提供給客戶
apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}]（＃窗體/項目/ {0}）缺貨
apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,下一個日期必須大於過帳日期更大
-apps/erpnext/erpnext/accounts/party.py +310,Due / Reference Date cannot be after {0},由於/參考日期不能後{0}
+apps/erpnext/erpnext/accounts/party.py +312,Due / Reference Date cannot be after {0},由於/參考日期不能後{0}
apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,資料輸入和輸出
apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,沒有發現學生
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,發票發布日期
@@ -3038,12 +3045,11 @@
apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,這是基於這名學生出席
apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,沒有學生
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,添加更多項目或全開放形式
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +109,Please enter 'Expected Delivery Date',請輸入「預定交付日」
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +198,Delivery Notes {0} must be cancelled before cancelling this Sales Order,送貨單{0}必須先取消才能取消銷貨訂單
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,送貨單{0}必須先取消才能取消銷貨訂單
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +78,Paid amount + Write Off Amount can not be greater than Grand Total,支付的金額+寫的抵銷金額不能大於總計
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0}不是對項目的有效批號{1}
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Note: There is not enough leave balance for Leave Type {0},注：沒有足夠的休假餘額請假類型{0}
-apps/erpnext/erpnext/regional/india/utils.py +14,Invalid GSTIN or Enter NA for Unregistered,無效的GSTIN或輸入NA未註冊
+apps/erpnext/erpnext/regional/india/utils.py +15,Invalid GSTIN or Enter NA for Unregistered,無效的GSTIN或輸入NA未註冊
DocType: Training Event,Seminar,研討會
DocType: Program Enrollment Fee,Program Enrollment Fee,計劃註冊費
DocType: Item,Supplier Items,供應商項目
@@ -3105,7 +3111,7 @@
DocType: Purchase Invoice,Price List Exchange Rate,價目表匯率
DocType: Purchase Invoice Item,Rate,單價
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Intern,實習生
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1611,Address Name,地址名稱
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1516,Address Name,地址名稱
DocType: Stock Entry,From BOM,從BOM
DocType: Assessment Code,Assessment Code,評估準則
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +42,Basic,基本的
@@ -3117,20 +3123,20 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date of Joining must be greater than Date of Birth,加入日期必須大於出生日期
DocType: Salary Slip,Salary Structure,薪酬結構
DocType: Account,Bank,銀行
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +805,Issue Material,發行材料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +798,Issue Material,發行材料
DocType: Material Request Item,For Warehouse,對於倉庫
DocType: Employee,Offer Date,到職日期
apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,語錄
-apps/erpnext/erpnext/accounts/page/pos/pos.js +772,You are in offline mode. You will not be able to reload until you have network.,您在離線模式。您將無法重新加載，直到你有網絡。
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,您在離線模式。您將無法重新加載，直到你有網絡。
apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,沒有學生團體創建的。
DocType: Purchase Invoice Item,Serial No,序列號
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,每月還款額不能超過貸款金額較大
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,請先輸入維護細節
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,行＃{0}：預計交貨日期不能在採購訂單日期之前
DocType: Purchase Invoice,Print Language,打印語言
DocType: Salary Slip,Total Working Hours,總的工作時間
DocType: Stock Entry,Including items for sub assemblies,包括子組件項目
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1968,Enter value must be positive,輸入值必須為正
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,商品編號>商品組>品牌
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1873,Enter value must be positive,輸入值必須為正
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,All Territories,所有的領土
DocType: Purchase Invoice,Items,項目
apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,學生已經註冊。
@@ -3153,7 +3159,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.py +624,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/selling/doctype/sales_order/sales_order.js +855,No Items with Bill of Materials to Manufacture,不與物料清單的項目，以製造
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +861,No Items with Bill of Materials to Manufacture,不與物料清單的項目，以製造
DocType: Assessment Plan,Supervisor Name,主管名稱
DocType: Program Enrollment Course,Program Enrollment Course,課程註冊課程
DocType: Program Enrollment Course,Program Enrollment Course,課程註冊課程
@@ -3172,27 +3178,28 @@
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,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/manufacturing/doctype/bom/bom.py +246,Currency of the price list {0} is not similar with the selected currency {1},價格表{0}的貨幣不與所選貨幣類似{1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +247,Currency of the price list {0} is not similar with the selected currency {1},價格表{0}的貨幣不與所選貨幣類似{1}
DocType: Payment Entry,Internal Transfer,內部轉賬
apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,此帳戶存在子帳戶。您無法刪除此帳戶。
apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,無論是數量目標或目標量是必需的
apps/erpnext/erpnext/stock/get_item_details.py +526,No default BOM exists for Item {0},項目{0}不存在預設的的BOM
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,請選擇發布日期第一
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +341,Please select Posting Date first,請選擇發布日期第一
apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,開業日期應該是截止日期之前，
DocType: Leave Control Panel,Carry Forward,發揚
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,與現有的交易成本中心，不能轉換為總賬
DocType: Department,Days for which Holidays are blocked for this department.,天的假期被封鎖這個部門。
,Produced,生產
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +121,Created Salary Slips,創建工資單
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +118,Created Salary Slips,創建工資單
DocType: Item,Item Code for Suppliers,對於供應商產品編號
DocType: Issue,Raised By (Email),由（電子郵件）提出
DocType: Training Event,Trainer Name,培訓師姓名
apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,最後溝通
apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,最後溝通
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +355,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',不能抵扣當類別為“估值”或“估值及總'
-apps/erpnext/erpnext/public/js/setup_wizard.js +225,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.",列出你的租稅名稱（如增值稅，關稅等，它們應該具有唯一的名稱）及其標準費率。這將建立一個可以編輯和增加的標準模板。
+apps/erpnext/erpnext/public/js/setup_wizard.js +236,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.",列出你的租稅名稱（如增值稅，關稅等，它們應該具有唯一的名稱）及其標準費率。這將建立一個可以編輯和增加的標準模板。
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +234,Serial Nos Required for Serialized Item {0},序列號為必填項序列為{0}
apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,匹配付款與發票
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Row #{0}: Please enter Delivery Date against item {1},行＃{0}：請輸入項目{1}的交貨日期
DocType: Journal Entry,Bank Entry,銀行分錄
DocType: Authorization Rule,Applicable To (Designation),適用於（指定）
apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,添加到購物車
@@ -3206,16 +3213,17 @@
apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,建立員工檔案
apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,總現
apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,會計報表
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Hour,小時
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Hour,小時
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,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 +133,You are not authorized to approve leaves on Block Dates,在限制的日期，您無權批准休假
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +382,All these items have already been invoiced,所有這些項目已開具發票
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +383,All these items have already been invoiced,所有這些項目已開具發票
+apps/erpnext/erpnext/public/js/setup_wizard.js +226,Monthly Sales Target,每月銷售目標
apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},可以通過{0}的批准
DocType: Item,Default Material Request Type,默認材料請求類型
DocType: Shipping Rule,Shipping Rule Conditions,送貨規則條件
DocType: BOM Replace Tool,The new BOM after replacement,更換後的新物料清單
-apps/erpnext/erpnext/accounts/page/pos/pos.js +739,Point of Sale,銷售點
+apps/erpnext/erpnext/accounts/page/pos/pos.js +644,Point of Sale,銷售點
DocType: Payment Entry,Received Amount,收金額
DocType: GST Settings,GSTIN Email Sent On,發送GSTIN電子郵件
DocType: Program Enrollment,Pick/Drop by Guardian,由守護者選擇
@@ -3231,7 +3239,7 @@
DocType: Batch,Source Document Name,源文檔名稱
DocType: Job Opening,Job Title,職位
apps/erpnext/erpnext/utilities/activation.py +97,Create Users,創建用戶
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,量生產必須大於0。
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,量生產必須大於0。
apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,訪問報告維修電話。
DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,相對於訂單量允許接受或交付的變動百分比額度。例如：如果你下定100個單位量，而你的許可額度是10%，那麼你可以收到最多110個單位量。
DocType: POS Customer Group,Customer Group,客戶群組
@@ -3243,7 +3251,7 @@
apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,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/buying/doctype/purchase_order/purchase_order.js +807,Receipt,收據
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +800,Receipt,收據
,Sales Register,銷售登記
DocType: Daily Work Summary Settings Company,Send Emails At,發送電子郵件在
DocType: Quotation,Quotation Lost Reason,報價遺失原因
@@ -3256,14 +3264,14 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,現金流量表
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},貸款額不能超過最高貸款額度{0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,執照
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +466,Please remove this Invoice {0} from C-Form {1},請刪除此發票{0}從C-表格{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,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: Item,Attributes,屬性
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,Please enter Write Off Account,請輸入核銷帳戶
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,最後訂購日期
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},帳戶{0}不屬於公司{1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +835,Serial Numbers in row {0} does not match with Delivery Note,行{0}中的序列號與交貨單不匹配
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +845,Serial Numbers in row {0} does not match with Delivery Note,行{0}中的序列號與交貨單不匹配
DocType: Student,Guardian Details,衛詳細
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,馬克出席了多個員工
DocType: Vehicle,Chassis No,底盤無
@@ -3294,16 +3302,17 @@
DocType: Tax Rule,Sales,銷售
DocType: Stock Entry Detail,Basic Amount,基本金額
DocType: Training Event,Exam,考試
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Warehouse required for stock Item {0},倉庫需要現貨產品{0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Warehouse required for stock Item {0},倉庫需要現貨產品{0}
DocType: Leave Allocation,Unused leaves,未使用的休假
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,鉻
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +161,Cr,鉻
DocType: Tax Rule,Billing State,計費狀態
apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,轉讓
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,{0} {1} does not associated with Party Account {2},{0} {1}未連結夥伴帳戶{2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),取得爆炸BOM（包括子組件）
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +862,Fetch exploded BOM (including sub-assemblies),取得爆炸BOM（包括子組件）
DocType: Authorization Rule,Applicable To (Employee),適用於（員工）
apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,截止日期是強制性的
apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,增量屬性{0}不能為0
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,客戶>客戶群>領土
DocType: Journal Entry,Pay To / Recd From,支付/ 接收
DocType: Naming Series,Setup Series,設置系列
DocType: Payment Reconciliation,To Invoice Date,要發票日期
@@ -3325,7 +3334,7 @@
DocType: Journal Entry,Write Off Based On,核銷的基礎上
apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,使鉛
DocType: Stock Settings,Show Barcode Field,顯示條形碼域
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +774,Send Supplier Emails,發送電子郵件供應商
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +767,Send Supplier Emails,發送電子郵件供應商
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",工資已經處理了與{0}和{1}，留下申請期之間不能在此日期範圍內的時期。
apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,對於一個序列號安裝記錄
DocType: Guardian Interest,Guardian Interest,衛利息
@@ -3338,7 +3347,7 @@
DocType: Offer Letter,Awaiting Response,正在等待回應
apps/erpnext/erpnext/controllers/item_variant.py +216,Invalid attribute {0} {1},無效的屬性{0} {1}
DocType: Supplier,Mention if non-standard payable account,如果非標準應付賬款提到
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +291,Same item has been entered multiple times. {list},相同的物品已被多次輸入。 {}名單
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +292,Same item has been entered multiple times. {list},相同的物品已被多次輸入。 {}名單
apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',請選擇“所有評估組”以外的評估組
DocType: Salary Slip,Earning & Deduction,收入及扣除
apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,可選。此設置將被應用於過濾各種交易進行。
@@ -3355,7 +3364,7 @@
apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +19,No record found,沒有資料
apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,報廢資產成本
apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}：成本中心是強制性的項目{2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +666,Get Items from Product Bundle,從產品包取得項目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,從產品包取得項目
DocType: Asset,Straight Line,直線
DocType: Project User,Project User,項目用戶
DocType: GL Entry,Is Advance,為進
@@ -3368,6 +3377,7 @@
DocType: Production Order,Scrap Warehouse,廢料倉庫
DocType: Production Order,Check if material transfer entry is not required,檢查是否不需要材料轉移條目
DocType: Production Order,Check if material transfer entry is not required,檢查是否不需要材料轉移條目
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource > HR Settings,請在人力資源>人力資源設置中設置員工命名系統
DocType: Program Enrollment Tool,Get Students From,讓學生從
DocType: Hub Settings,Seller Country,賣家國家
apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,公佈於網頁上的項目
@@ -3383,18 +3393,18 @@
DocType: Shipping Rule,Specify conditions to calculate shipping amount,指定條件來計算運費金額
DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,允許設定凍結帳戶和編輯凍結分錄的角色
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,不能成本中心轉換為總賬，因為它有子節點
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,開度值
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +56,Opening Value,開度值
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,序列號
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,銷售佣金
DocType: Offer Letter Term,Value / Description,值/說明
-apps/erpnext/erpnext/controllers/accounts_controller.py +577,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",行＃{0}：資產{1}無法提交，這已經是{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +578,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",行＃{0}：資產{1}無法提交，這已經是{2}
DocType: Tax Rule,Billing Country,結算國家
DocType: Purchase Order Item,Expected Delivery Date,預計交貨日期
apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,借貸{0}＃不等於{1}。區別是{2}。
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,娛樂費用
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,製作材料要求
apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},打開項目{0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Sales Invoice {0} must be cancelled before cancelling this Sales Order,銷售發票{0}必須早於此銷售訂單之前取消
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Sales Invoice {0} must be cancelled before cancelling this Sales Order,銷售發票{0}必須早於此銷售訂單之前取消
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +60,Age,年齡
DocType: Sales Invoice Timesheet,Billing Amount,開票金額
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 。
@@ -3417,7 +3427,7 @@
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,新客戶收入
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,差旅費
DocType: Maintenance Visit,Breakdown,展開
-apps/erpnext/erpnext/controllers/accounts_controller.py +689,Account: {0} with currency: {1} can not be selected,帳號：{0}幣種：{1}不能選擇
+apps/erpnext/erpnext/controllers/accounts_controller.py +690,Account: {0} with currency: {1} can not be selected,帳號：{0}幣種：{1}不能選擇
apps/erpnext/erpnext/accounts/doctype/account/account.py +54,Account {0}: Parent account {1} does not belong to company: {2},帳戶{0}：父帳戶{1}不屬於公司：{2}
DocType: Program Enrollment Tool,Student Applicants,學生申請
apps/erpnext/erpnext/setup/doctype/company/company.js +67,Successfully deleted all transactions related to this company!,成功刪除與該公司相關的所有交易！
@@ -3435,28 +3445,29 @@
DocType: Material Request,Issued,發行
apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +14,Student Activity,學生活動
DocType: Project,Total Billing Amount (via Time Logs),總結算金額（經由時間日誌）
-apps/erpnext/erpnext/public/js/setup_wizard.js +300,We sell this Item,我們賣這種產品
+apps/erpnext/erpnext/public/js/setup_wizard.js +312,We sell this Item,我們賣這種產品
apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,供應商編號
DocType: Payment Request,Payment Gateway Details,支付網關細節
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +241,Quantity should be greater than 0,量應大於0
-apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sample Data,樣品數據
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +242,Quantity should be greater than 0,量應大於0
+apps/erpnext/erpnext/public/js/setup_wizard.js +390,Sample Data,樣品數據
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,子節點可以在'集團'類型的節點上創建
DocType: Academic Year,Academic Year Name,學年名稱
DocType: Sales Partner,Contact Desc,聯絡倒序
apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.",葉似漫不經心，生病等類型
DocType: Email Digest,Send regular summary reports via Email.,使用電子郵件發送定期匯總報告。
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},請報銷類型設置默認帳戶{0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +250,Please set default account in Expense Claim Type {0},請報銷類型設置默認帳戶{0}
DocType: Assessment Result,Student Name,學生姓名
DocType: Brand,Item Manager,項目經理
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,應付職工薪酬
DocType: Buying Settings,Default Supplier Type,預設的供應商類別
DocType: Production Order,Total Operating Cost,總營運成本
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +170,Note: Item {0} entered multiple times,注：項目{0}多次輸入
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,注：項目{0}多次輸入
apps/erpnext/erpnext/config/selling.py +41,All Contacts.,所有聯絡人。
+apps/erpnext/erpnext/public/js/setup_wizard.js +223,Set your Target,設定您的目標
apps/erpnext/erpnext/public/js/setup_wizard.js +60,Company Abbreviation,公司縮寫
apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} does not exist,用戶{0}不存在
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +94,Raw material cannot be same as main Item,原料不能同主品相
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +95,Raw material cannot be same as main Item,原料不能同主品相
DocType: Item Attribute Value,Abbreviation,縮寫
apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +171,Payment Entry already exists,付款項目已存在
apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,不允許因為{0}超出範圍
@@ -3474,7 +3485,7 @@
,Territory Target Variance Item Group-Wise,地域內跨項目群組間的目標差異
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,All Customer Groups,所有客戶群組
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,每月累計
-apps/erpnext/erpnext/controllers/accounts_controller.py +650,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}是強制性的。也許外幣兌換記錄為{1}到{2}尚未建立。
+apps/erpnext/erpnext/controllers/accounts_controller.py +651,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}是強制性的。也許外幣兌換記錄為{1}到{2}尚未建立。
apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +39,Tax Template is mandatory.,稅務模板是強制性的。
apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,帳戶{0}：父帳戶{1}不存在
DocType: Purchase Invoice Item,Price List Rate (Company Currency),價格列表費率（公司貨幣）
@@ -3484,7 +3495,7 @@
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Secretary,秘書
DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction",如果禁用“，在詞”字段不會在任何交易可見
DocType: Serial No,Distinct unit of an Item,一個項目的不同的單元
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1214,Please set Company,請設公司
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1209,Please set Company,請設公司
DocType: Pricing Rule,Buying,採購
DocType: HR Settings,Employee Records to be created by,員工紀錄的創造者
DocType: POS Profile,Apply Discount On,申請折扣
@@ -3494,7 +3505,7 @@
DocType: Purchase Taxes and Charges,Item Wise Tax Detail,項目智者稅制明細
apps/erpnext/erpnext/public/js/setup_wizard.js +60,Institute Abbreviation,研究所縮寫
,Item-wise Price List Rate,全部項目的價格表
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +908,Supplier Quotation,供應商報價
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +901,Supplier Quotation,供應商報價
DocType: Quotation,In Words will be visible once you save the Quotation.,報價一被儲存，就會顯示出來。
apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},數量（{0}）不能是行{1}中的分數
apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},數量（{0}）不能是行{1}中的分數
@@ -3515,7 +3526,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 +66,Select Fiscal Year...,選擇會計年度...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +542,POS Profile required to make POS Entry,所需的POS資料，使POS進入
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +545,POS Profile required to make POS Entry,所需的POS資料，使POS進入
DocType: Hub Settings,Name Token,名令牌
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,標準銷售
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,至少要有一間倉庫
@@ -3529,7 +3540,7 @@
apps/erpnext/erpnext/config/learn.py +234,Human Resource,人力資源
DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,付款方式付款對賬
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,所得稅資產
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +613,Production Order has been {0},生產訂單已經{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +617,Production Order has been {0},生產訂單已經{0}
DocType: BOM Item,BOM No,BOM No.
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,日記條目{0}沒有帳號{1}或已經匹配其他憑證
DocType: Item,Moving Average,移動平均線
@@ -3541,7 +3552,7 @@
apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,優秀的金額
DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,為此銷售人員設定跨項目群組間的目標。
DocType: Stock Settings,Freeze Stocks Older Than [Days],凍結早於[Days]的庫存
-apps/erpnext/erpnext/controllers/accounts_controller.py +547,Row #{0}: Asset is mandatory for fixed asset purchase/sale,行＃{0}：資產是必須的固定資產購買/銷售
+apps/erpnext/erpnext/controllers/accounts_controller.py +548,Row #{0}: Asset is mandatory for fixed asset purchase/sale,行＃{0}：資產是必須的固定資產購買/銷售
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.",如果兩個或更多的定價規則是基於上述條件發現，優先級被應用。優先權是一個介於0到20，而預設值是零（空）。數字越大，意味著其將優先考慮是否有與相同條件下多個定價規則。
apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,會計年度：{0}不存在
DocType: Currency Exchange,To Currency,到貨幣
@@ -3550,7 +3561,7 @@
apps/erpnext/erpnext/controllers/selling_controller.py +173,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},項目{0}的銷售價格低於其{1}。售價應至少為{2}
apps/erpnext/erpnext/controllers/selling_controller.py +173,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},項目{0}的銷售價格低於其{1}。售價應至少為{2}
DocType: Item,Taxes,稅
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +316,Paid and Not Delivered,支付和未送達
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,支付和未送達
DocType: Project,Default Cost Center,預設的成本中心
DocType: Bank Guarantee,End Date,結束日期
apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,庫存交易明細
@@ -3566,7 +3577,7 @@
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,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 +123,Item {0} ignored since it is not a stock item,項目{0}被忽略，因為它不是一個庫存項目
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +102,Submit this Production Order for further processing.,提交此生產訂單進行進一步的處理。
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +101,Submit this Production Order for further processing.,提交此生產訂單進行進一步的處理。
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.",要在一個特定的交易不適用於定價規則，所有適用的定價規則應該被禁用。
DocType: Assessment Group,Parent Assessment Group,家長評估小組
,Sales Order Trends,銷售訂單趨勢
@@ -3575,7 +3586,7 @@
,Employee Information,僱員資料
DocType: Stock Entry Detail,Additional Cost,額外費用
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher",是冷凍的帳戶。要禁止該帳戶創建/編輯事務，你需要角色
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +796,Make Supplier Quotation,讓供應商報價
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +789,Make Supplier Quotation,讓供應商報價
DocType: Quality Inspection,Incoming,來
DocType: BOM,Materials Required (Exploded),所需材料（分解）
apps/erpnext/erpnext/public/js/setup_wizard.js +197,"Add users to your organization, other than yourself",將用戶添加到您的組織，除了自己
@@ -3588,7 +3599,7 @@
apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,帳號：{0}只能通過股票的交易進行更新
DocType: Student Group Creation Tool,Get Courses,獲取課程
DocType: GL Entry,Party,黨
-DocType: Sales Order,Delivery Date,交貨日期
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +964,Delivery Date,交貨日期
DocType: Opportunity,Opportunity Date,機會日期
DocType: Purchase Receipt,Return Against Purchase Receipt,採購入庫的退貨
DocType: Request for Quotation Item,Request for Quotation Item,詢價項目
@@ -3602,7 +3613,7 @@
DocType: Employee,History In Company,公司歷史
apps/erpnext/erpnext/config/learn.py +107,Newsletters,簡訊
DocType: Stock Ledger Entry,Stock Ledger Entry,庫存總帳條目
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +88,Same item has been entered multiple times,同一項目已進入多次
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +82,Same item has been entered multiple times,同一項目已進入多次
DocType: Department,Leave Block List,休假區塊清單
DocType: Sales Invoice,Tax ID,稅號
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,項目{0}不是設定為序列號，此列必須為空白
@@ -3615,25 +3626,25 @@
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,臨時帳戶
DocType: BOM Explosion Item,BOM Explosion Item,BOM展開項目
DocType: Account,Auditor,核數師
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +125,{0} items produced,生產{0}項目
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +124,{0} items produced,生產{0}項目
DocType: Cheque Print Template,Distance from top edge,從頂邊的距離
apps/erpnext/erpnext/stock/get_item_details.py +307,Price List {0} is disabled or does not exist,價格表{0}禁用或不存在
DocType: Purchase Invoice,Return,退貨
DocType: Production Order Operation,Production Order Operation,生產訂單操作
DocType: Pricing Rule,Disable,關閉
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,付款方式需要進行付款
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +157,Mode of payment is required to make a payment,付款方式需要進行付款
DocType: Project Task,Pending Review,待審核
apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +38,{0} - {1} is not enrolled in the Batch {2},{0} - {1}未註冊批次{2}
apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}",資產{0}不能被廢棄，因為它已經是{1}
DocType: Task,Total Expense Claim (via Expense Claim),總費用報銷（通過費用報銷）
apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,馬克缺席
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +138,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},行{0}：BOM＃的貨幣{1}應等於所選貨幣{2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,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,匯率
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +560,Sales Order {0} is not submitted,銷售訂單{0}未提交
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +563,Sales Order {0} is not submitted,銷售訂單{0}未提交
DocType: Homepage,Tag Line,標語
DocType: Fee Component,Fee Component,收費組件
apps/erpnext/erpnext/config/hr.py +195,Fleet Management,車隊的管理
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +906,Add items from,新增項目從
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +899,Add items from,新增項目從
apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,所有評估標準的權重總數要達到100％
DocType: BOM,Last Purchase Rate,最後預訂價
DocType: Account,Asset,財富
@@ -3653,12 +3664,12 @@
DocType: SMS Settings,Enter url parameter for receiver nos,輸入URL參數的接收器號
DocType: Payment Entry,Paid Amount,支付的金額
DocType: Assessment Plan,Supervisor,監
-apps/erpnext/erpnext/accounts/page/pos/pos.js +799,Online,線上
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,線上
,Available Stock for Packing Items,可用庫存包裝項目
DocType: Item Variant,Item Variant,項目變
DocType: Assessment Result Tool,Assessment Result Tool,評價結果工具
DocType: BOM Scrap Item,BOM Scrap Item,BOM項目廢料
-apps/erpnext/erpnext/accounts/page/pos/pos.js +960,Submitted orders can not be deleted,提交的訂單不能被刪除
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,提交的訂單不能被刪除
apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",帳戶餘額已歸為借方帳戶，不允許設為信用帳戶
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Quality Management,品質管理
apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,項{0}已被禁用
@@ -3688,7 +3699,7 @@
DocType: Item Group,Default Expense Account,預設費用帳戶
apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,學生的電子郵件ID
DocType: Tax Rule,Sales Tax Template,銷售稅模板
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2477,Select items to save the invoice,選取要保存發票
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Select items to save the invoice,選取要保存發票
DocType: Employee,Encashment Date,兌現日期
DocType: Training Event,Internet,互聯網
DocType: Account,Stock Adjustment,庫存調整
@@ -3733,10 +3744,10 @@
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +73,Max discount allowed for item: {0} is {1}%,{0}允許的最大折扣：{1}％
apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,淨資產值作為
DocType: Account,Receivable,應收賬款
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +280,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,行＃{0}：不能更改供應商的採購訂單已經存在
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,行＃{0}：不能更改供應商的採購訂單已經存在
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 +887,Select Items to Manufacture,選擇項目，以製造
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1024,"Master data syncing, it might take some time",主數據同步，這可能需要一些時間
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +893,Select Items to Manufacture,選擇項目，以製造
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time",主數據同步，這可能需要一些時間
DocType: Item,Material Issue,發料
DocType: Hub Settings,Seller Description,賣家描述
DocType: Employee Education,Qualification,合格
@@ -3755,11 +3766,10 @@
DocType: BOM,Rate Of Materials Based On,材料成本基於
apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,支援分析
DocType: POS Profile,Terms and Conditions,條款和條件
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource > HR Settings,請在人力資源>人力資源設置中設置員工命名系統
apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},日期應該是在財政年度內。假設終止日期= {0}
DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc",在這裡，你可以保持身高，體重，過敏，醫療問題等
DocType: Leave Block List,Applies to Company,適用於公司
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,不能取消，因為提交股票輸入{0}存在
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,不能取消，因為提交股票輸入{0}存在
DocType: Vehicle,Vehicle,車輛
DocType: Purchase Invoice,In Words,大寫
DocType: POS Profile,Item Groups,項目組
@@ -3790,7 +3800,7 @@
DocType: Assessment Result Detail,Assessment Result Detail,評價結果詳細
DocType: Employee Education,Employee Education,員工教育
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,在項目組表中找到重複的項目組
-apps/erpnext/erpnext/public/js/controllers/transaction.js +943,It is needed to fetch Item Details.,需要獲取項目細節。
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,It is needed to fetch Item Details.,需要獲取項目細節。
DocType: Salary Slip,Net Pay,淨收費
DocType: Account,Account,帳戶
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,已收到序號{0}
@@ -3798,7 +3808,7 @@
DocType: Expense Claim,Vehicle Log,車輛登錄
DocType: Purchase Invoice,Recurring Id,經常性標識
DocType: Customer,Sales Team Details,銷售團隊詳細
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1406,Delete permanently?,永久刪除？
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1311,Delete permanently?,永久刪除？
DocType: Expense Claim,Total Claimed Amount,總索賠額
apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,潛在的銷售機會。
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},無效的{0}
@@ -3809,7 +3819,7 @@
apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,設置你的ERPNext學校
DocType: Sales Invoice,Base Change Amount (Company Currency),基地漲跌額（公司幣種）
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +309,No accounting entries for the following warehouses,沒有以下的倉庫會計分錄
-apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,首先保存文檔。
+apps/erpnext/erpnext/projects/doctype/project/project.js +109,Save the document first.,首先保存文檔。
DocType: Account,Chargeable,收費
DocType: Company,Change Abbreviation,更改縮寫
DocType: Expense Claim Detail,Expense Date,犧牲日期
@@ -3820,7 +3830,6 @@
DocType: BOM,Manufacturing User,製造業用戶
DocType: Purchase Invoice,Raw Materials Supplied,提供供應商原物料
DocType: Purchase Invoice,Recurring Print Format,經常列印格式
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Expected Delivery Date cannot be before Purchase Order Date,預計交貨日期不能早於採購訂單日期
DocType: Appraisal,Appraisal Template,評估模板
DocType: Item Group,Item Classification,項目分類
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Business Development Manager,業務發展經理
@@ -3856,12 +3865,12 @@
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 +149,Accumulated Depreciation as on,作為累計折舊
DocType: Sales Invoice,C-Form Applicable,C-表格適用
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},運行時間必須大於0的操作{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},運行時間必須大於0的操作{0}
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,倉庫是強制性的
DocType: Supplier,Address and Contacts,地址和聯絡方式
DocType: UOM Conversion Detail,UOM Conversion Detail,計量單位換算詳細
DocType: Program,Program Abbreviation,計劃縮寫
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,生產訂單不能對一個項目提出的模板
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,生產訂單不能對一個項目提出的模板
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,費用對在採購入庫單內的每個項目更新
DocType: Warranty Claim,Resolved By,議決
DocType: Bank Guarantee,Start Date,開始日期
@@ -3895,6 +3904,7 @@
apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,培訓反饋
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,生產訂單{0}必須提交
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},請選擇項目{0}的開始日期和結束日期
+apps/erpnext/erpnext/public/js/setup_wizard.js +224,Set a sales target you'd like to achieve.,設定您想要實現的銷售目標。
apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},當然是行強制性{0}
apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,無效的主名稱
apps/erpnext/erpnext/stock/doctype/item/item.js +258,Add / Edit Prices,新增 / 編輯價格
@@ -3909,7 +3919,7 @@
DocType: Industry Type,Industry Type,行業類型
apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,出事了！
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,警告：離開包含以下日期區塊的應用程式
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Sales Invoice {0} has already been submitted,銷售發票{0}已提交
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Sales Invoice {0} has already been submitted,銷售發票{0}已提交
apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,會計年度{0}不存在
DocType: Purchase Invoice Item,Amount (Company Currency),金額（公司貨幣）
apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} {1}在需要{2}在{3} {4}：{5}來完成這一交易單位。
@@ -3936,7 +3946,7 @@
DocType: Student Group Creation Tool,Student Group Creation Tool,學生組創建工具
DocType: Item,Variant Based On,基於變異對
apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},分配的總權重應為100 ％ 。這是{0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +263,Your Suppliers,您的供應商
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Your Suppliers,您的供應商
apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,不能設置為失落的銷售訂單而成。
DocType: Request for Quotation Item,Supplier Part No,供應商部件號
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',當類是“估值”或“Vaulation和總'不能扣除
@@ -3946,14 +3956,14 @@
DocType: Employee,Date of Issue,發行日期
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}：從{0}給 {1}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"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 +158,Row #{0}: Set Supplier for item {1},行＃{0}：設置供應商項目{1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,行{0}：小時值必須大於零。
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},行＃{0}：設置供應商項目{1}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,Row {0}: Hours value must be greater than zero.,行{0}：小時值必須大於零。
apps/erpnext/erpnext/stock/doctype/item/item.py +170,Website Image {0} attached to Item {1} cannot be found,網站圖像{0}附加到物品{1}無法找到
DocType: Issue,Content Type,內容類型
apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,電腦
DocType: Item,List this Item in multiple groups on the website.,列出這個項目在網站上多個組。
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +323,Please check Multi Currency option to allow accounts with other currency,請檢查多幣種選項，允許帳戶與其他貨幣
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,項：{0}不存在於系統中
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +89,Item: {0} does not exist in the system,項：{0}不存在於系統中
apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,您無權設定值凍結
DocType: Payment Reconciliation,Get Unreconciled Entries,獲取未調節項
DocType: Payment Reconciliation,From Invoice Date,從發票日期
@@ -3978,7 +3988,7 @@
DocType: Item,Customer Code,客戶代碼
apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},生日提醒{0}
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 +340,Debit To account must be a Balance Sheet account,借方帳戶必須是資產負債表科目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +343,Debit To account must be a Balance Sheet account,借方帳戶必須是資產負債表科目
DocType: Leave Block List,Leave Block List Name,休假區塊清單名稱
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,保險開始日期應小於保險終止日期
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,庫存資產
@@ -3993,7 +4003,7 @@
DocType: Sales Order Item,Ordered Qty,訂購數量
apps/erpnext/erpnext/stock/doctype/item/item.py +676,Item {0} is disabled,項目{0}無效
DocType: Stock Settings,Stock Frozen Upto,存貨凍結到...為止
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,BOM不包含任何庫存項目
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +875,BOM does not contain any stock item,BOM不包含任何庫存項目
apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},期間從和週期要日期強制性的經常性{0}
apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,專案活動／任務。
DocType: Vehicle Log,Refuelling Details,加油詳情
@@ -4003,7 +4013,7 @@
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,最後購買率未找到
DocType: Purchase Invoice,Write Off Amount (Company Currency),核銷金額（公司貨幣）
DocType: Sales Invoice Timesheet,Billing Hours,結算時間
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,默認BOM {0}未找到
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,默認BOM {0}未找到
apps/erpnext/erpnext/stock/doctype/item/item.py +485,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,招生計劃
@@ -4036,6 +4046,7 @@
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +319,BOM and Manufacturing Quantity are required,BOM和生產量是必需的
apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,老齡範圍2
apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM取代
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +956,Select Items based on Delivery Date,根據交付日期選擇項目
,Sales Analytics,銷售分析
DocType: Manufacturing Settings,Manufacturing Settings,製造設定
apps/erpnext/erpnext/config/setup.py +56,Setting up Email,設定電子郵件
@@ -4078,7 +4089,7 @@
apps/erpnext/erpnext/config/projects.py +35,Timesheet for tasks.,時間表的任務。
DocType: Purchase Invoice,Against Expense Account,對費用帳戶
DocType: Production Order,Production Order,生產訂單
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +272,Installation Note {0} has already been submitted,安裝注意{0}已提交
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +273,Installation Note {0} has already been submitted,安裝注意{0}已提交
DocType: Bank Reconciliation,Get Payment Entries,獲取付款項
DocType: Quotation Item,Against Docname,對Docname
DocType: SMS Center,All Employee (Active),所有員工（活動）
@@ -4086,7 +4097,7 @@
DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,選擇發票會自動生成期間
DocType: Item Reorder,Re-Order Level,重新排序級別
DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,輸入您想要提高生產訂單或下載的原材料進行分析的項目和計劃數量。
-apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,甘特圖
+apps/erpnext/erpnext/projects/doctype/project/project.js +62,Gantt Chart,甘特圖
DocType: Employee,Applicable Holiday List,適用假期表
apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +61,Series Updated,系列更新
apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,報告類型是強制性的
@@ -4137,11 +4148,11 @@
DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,如果您不想在製作基於課程的組時考慮批量，請不要選中。
DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,如果您不想在製作基於課程的組時考慮批量，請不要選中。
DocType: Asset,Frequency of Depreciation (Months),折舊率（月）
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,信用賬戶
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +475,Credit Account,信用賬戶
DocType: Landed Cost Item,Landed Cost Item,到岸成本項目
apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,顯示零值
DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,製造/從原材料數量給予重新包裝後獲得的項目數量
-apps/erpnext/erpnext/public/js/setup_wizard.js +382,Setup a simple website for my organization,設置一個簡單的網站為我的組織
+apps/erpnext/erpnext/public/js/setup_wizard.js +395,Setup a simple website for my organization,設置一個簡單的網站為我的組織
DocType: Payment Reconciliation,Receivable / Payable Account,應收/應付賬款
DocType: Delivery Note Item,Against Sales Order Item,對銷售訂單項目
apps/erpnext/erpnext/stock/doctype/item/item.py +643,Please specify Attribute Value for attribute {0},請指定屬性值的屬性{0}
@@ -4201,21 +4212,21 @@
,Items To Be Requested,需求項目
DocType: Purchase Order,Get Last Purchase Rate,取得最新採購價格
DocType: Company,Company Info,公司資訊
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1438,Select or add new customer,選擇或添加新客戶
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,成本中心需要預訂費用報銷
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1343,Select or add new customer,選擇或添加新客戶
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Cost center is required to book an expense claim,成本中心需要預訂費用報銷
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),基金中的應用（資產）
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,這是基於該員工的考勤
DocType: Fiscal Year,Year Start Date,年結開始日期
DocType: Attendance,Employee Name,員工姓名
DocType: Sales Invoice,Rounded Total (Company Currency),整數總計（公司貨幣）
apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,不能隱蔽到組，因為帳戶類型選擇的。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +232,{0} {1} has been modified. Please refresh.,{0} {1} 已修改。請更新。
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} {1} 已修改。請更新。
DocType: Leave Block List,Stop users from making Leave Applications on following days.,停止用戶在下面日期提出休假申請。
apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,購買金額
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,供應商報價{0}創建
apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,結束年份不能啟動年前
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Employee Benefits,員工福利
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +254,Packed quantity must equal quantity for Item {0} in row {1},盒裝數量必須等於{1}列品項{0}的數量
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},盒裝數量必須等於{1}列品項{0}的數量
DocType: Production Order,Manufactured Qty,生產數量
DocType: Purchase Receipt Item,Accepted Quantity,允收數量
apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},請設置一個默認的假日列表為員工{0}或公司{1}
@@ -4228,7 +4239,7 @@
DocType: Quality Inspection Reading,Reading 3,閱讀3
,Hub,樞紐
DocType: GL Entry,Voucher Type,憑證類型
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1731,Price List not found or disabled,價格表未找到或被禁用
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1636,Price List not found or disabled,價格表未找到或被禁用
DocType: Employee Loan Application,Approved,批准
DocType: Pricing Rule,Price,價格
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',員工解除對{0}必須設定為“左”
@@ -4291,7 +4302,7 @@
DocType: Assessment Plan,Room,房間
DocType: Purchase Order,Advance Paid,提前支付
DocType: Item,Item Tax,產品稅
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +810,Material to Supplier,材料到供應商
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +803,Material to Supplier,材料到供應商
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,消費稅發票
apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}出現％不止一次
DocType: Expense Claim,Employees Email Id,員工的電子郵件ID
@@ -4327,7 +4338,6 @@
apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,車是空的
DocType: Production Order,Actual Operating Cost,實際運行成本
DocType: Payment Entry,Cheque/Reference No,支票/參考編號
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,供應商>供應商類型
apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,root不能被編輯。
DocType: Item,Units of Measure,測量的單位
DocType: Manufacturing Settings,Allow Production on Holidays,允許假日生產
@@ -4358,12 +4368,12 @@
DocType: Supplier,Credit Days,信貸天
apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,讓學生批
DocType: Leave Type,Is Carry Forward,是弘揚
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,Get Items from BOM,從物料清單取得項目
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Get Items from BOM,從物料清單取得項目
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,交貨期天
-apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},行＃{0}：過帳日期必須是相同的購買日期{1}資產的{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +569,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},行＃{0}：過帳日期必須是相同的購買日期{1}資產的{2}
DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,如果學生住在學院的旅館，請檢查。
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,請在上表中輸入銷售訂單
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +186,Not Submitted Salary Slips,未提交工資單
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,未提交工資單
,Stock Summary,股票摘要
apps/erpnext/erpnext/config/accounts.py +274,Transfer an asset from one warehouse to another,從一個倉庫轉移資產到另一
apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,材料清單