[translations]
diff --git a/erpnext/translations/zh-tw.csv b/erpnext/translations/zh-tw.csv
index 9ef721f..5c1865a 100644
--- a/erpnext/translations/zh-tw.csv
+++ b/erpnext/translations/zh-tw.csv
@@ -22,7 +22,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},貨幣所需的價格表{0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,*將被計算在該交易。
 DocType: Purchase Order,Customer Contact,客戶聯繫
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +651,From Material Request,從物料需求
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,從物料需求
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0}樹
 DocType: Job Applicant,Job Applicant,求職者
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,沒有更多的結果。
@@ -53,7 +53,7 @@
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1。使用這個選項來維護客戶的項目代碼,並可根據客戶的項目代碼做搜索。
 DocType: Mode of Payment Account,Mode of Payment Account,支付帳戶模式
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,顯示變體
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +470,Quantity,數量
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,數量
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),借款(負債)
 DocType: Employee Education,Year of Passing,路過的一年
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,庫存
@@ -64,14 +64,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,保健
 DocType: Purchase Invoice,Monthly,每月一次
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),延遲支付(天)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +598,Invoice,發票
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,發票
 DocType: Maintenance Schedule Item,Periodicity,週期性
 apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,電子郵件地址
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,防禦
 DocType: Company,Abbr,縮寫
 DocType: Appraisal Goal,Score (0-5),得分(0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},行{0}:{1} {2}不相匹配{3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,行#{0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,行#{0}:
 DocType: Delivery Note,Vehicle No,車輛無
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,請選擇價格表
 DocType: Production Order Operation,Work In Progress,在製品
@@ -100,13 +100,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,廣告
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,同一家公司進入不止一次
 DocType: Employee,Married,已婚
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},不允許{0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},股票不能對送貨單更新的{0}
 DocType: Payment Reconciliation,Reconcile,調和
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,雜貨
 DocType: Quality Inspection Reading,Reading 1,閱讀1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,使銀行進入
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,養老基金
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,如果帳戶類型是倉庫,其倉庫項目是強制要設定的,
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,如果帳戶類型是倉庫,其倉庫項目是強制要設定的,
 DocType: SMS Center,All Sales Person,所有的銷售人員
 DocType: Lead,Person Name,人姓名
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date",檢查經常性秩序,取消,停止經常性或將適當的結束日期
@@ -131,9 +132,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},從{0} {1}
 DocType: Item,Copy From Item Group,從項目群組複製
 DocType: Journal Entry,Opening Entry,開放報名
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0}是強制性的
+apps/frappe/frappe/email/doctype/email_account/email_account.py +61,{0} is mandatory,{0}是強制性的
 DocType: Stock Entry,Additional Costs,額外費用
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,帳戶與現有的交易不能被轉換到群組。
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,帳戶與現有的交易不能被轉換到群組。
 DocType: Lead,Product Enquiry,產品查詢
 DocType: Standard Reply,Owner,業主
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,請先輸入公司
@@ -172,7 +173,7 @@
 在選定時間段內所有時間和員工的組合會在模板中,與現有的考勤記錄"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,項目{0}不活躍或生命的盡頭已經達到
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,之後銷售發票已提交將被更新。
-apps/erpnext/erpnext/controllers/accounts_controller.py +494,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",要包括稅款,行{0}項率,稅收行{1}也必須包括在內
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"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 +90,Settings for HR Module,設定人力資源模塊
 DocType: SMS Center,SMS Center,短信中心
 DocType: BOM Replace Tool,New BOM,新的物料清單
@@ -185,7 +186,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,第一個用戶將成為系統管理器(你可以改變這個版本)。
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,進行的作業細節。
 DocType: Serial No,Maintenance Status,維修狀態
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,項目和定價
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,項目和定價
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},從日期應該是在財政年度內。假設起始日期={0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,選擇要為其創建的考核員工。
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},成本中心{0}不屬於公司{1}
@@ -243,7 +244,7 @@
 DocType: Payment Tool,Reference No,參考編號
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,禁假的
 apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} has reached its end of life on {1},項{0}已達到其壽命結束於{1}
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,全年
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,全年
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,庫存調整項目
 DocType: Stock Entry,Sales Invoice No,銷售發票號碼
 DocType: Material Request Item,Min Order Qty,最小訂貨量
@@ -305,7 +306,7 @@
 DocType: Sales Invoice Item,Delivery Note,送貨單
 DocType: Dropbox Backup,Allow Dropbox Access,讓Dropbox的訪問
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,建立稅
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,付款項被修改,你把它之後。請重新拉。
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,付款項被修改,你把它之後。請重新拉。
 apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0}輸入兩次項目稅
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,本週和待活動總結
 DocType: Workstation,Rent Cost,租金成本
@@ -323,8 +324,8 @@
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,公司貨幣被換算成客戶基礎貨幣的匯率
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet",存在於物料清單,送貨單,採購發票,生產訂單,​​採購訂單,採購入庫單,銷售發票,銷售訂單,股票,時間表
 DocType: Item Tax,Tax Rate,稅率
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +619,Select Item,選擇項目
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,選擇項目
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","項目:{0}管理分批,不能使用\
 庫存調整,而是使用庫存分錄。"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,採購發票{0}已經提交
@@ -338,7 +339,7 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,您的電子郵件地址
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,請參閱附件
 DocType: Purchase Order,% Received,% 已收
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,安裝已經完成!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,安裝已經完成!
 ,Finished Goods,成品
 DocType: Delivery Note,Instructions,說明
 DocType: Quality Inspection,Inspected By,視察
@@ -373,7 +374,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,預算不能為集團成本中心成立
 DocType: Account,Cost of Goods Sold,銷貨成本
 DocType: Purchase Invoice,Yearly,每年
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,請輸入成本中心
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,請輸入成本中心
 DocType: Journal Entry Account,Sales Order,銷售訂單
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,平均。賣出價
 DocType: Purchase Order,Start date of current order's period,啟動電流訂單的期限日期
@@ -402,7 +403,7 @@
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,假日高手。
 DocType: Material Request Item,Required Date,所需時間
 DocType: Delivery Note,Billing Address,帳單地址
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +727,Please enter Item Code.,請輸入產品編號。
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,請輸入產品編號。
 DocType: BOM,Costing,成本核算
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",如果選中,稅額將被視為已包含在列印速率/列印數量
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,總數量
@@ -447,7 +448,7 @@
 DocType: Purchase Invoice Item,Item,項目
 DocType: Journal Entry,Difference (Dr - Cr),差異(Dr - Cr)
 DocType: Account,Profit and Loss,損益
-apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,管理轉包
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,管理轉包
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,家具及固定裝置
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,價目表貨幣被換算成公司基礎貨幣的匯率
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},帳戶{0}不屬於公司:{1}
@@ -511,7 +512,8 @@
 DocType: Quotation,Quotation To,報價到
 DocType: Lead,Middle Income,中等收入
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),開啟(Cr )
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,分配金額不能為負
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,測度項目的默認單位{0}不能直接改變,因為你已經做了一些交易(S)與其他計量單位。您將需要創建一個新的項目,以使用不同的默認計量單位。
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,分配金額不能為負
 DocType: Purchase Order Item,Billed Amt,已結算額
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,對這些庫存分錄帳進行的邏輯倉庫。
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},參考號與參考日期須為{0}
@@ -542,7 +544,7 @@
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,請安裝Dropbox的Python模塊
 DocType: Employee,Passport Number,護照號碼
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,經理
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +573,From Purchase Receipt,從採購入庫單
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,從採購入庫單
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,相同的項目已被輸入多次。
 DocType: SMS Settings,Receiver Parameter,收受方參數
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,“根據”和“分組依據”不能相同
@@ -576,7 +578,7 @@
 DocType: Pricing Rule,Sales Manager,銷售經理
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,重命名
 DocType: Journal Entry,Write Off Amount,核銷金額
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,允許用戶
+apps/frappe/frappe/core/page/user_permissions/user_permissions.js +251,Allow User,允許用戶
 DocType: Journal Entry,Bill No,帳單號碼
 DocType: Purchase Invoice,Quarterly,每季
 DocType: Selling Settings,Delivery Note Required,要求送貨單
@@ -603,7 +605,6 @@
 DocType: Material Request Item,Quantity and Warehouse,數量和倉庫
 DocType: Sales Invoice,Commission Rate (%),佣金率(%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry",對憑證類型必須是一個銷售訂單,銷售發票或日記帳分錄
-apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,找不到匯率
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,航天
 apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,歡迎
 DocType: Journal Entry,Credit Card Entry,信用卡進入
@@ -623,9 +624,10 @@
 DocType: Production Order Operation,Planned End Time,計劃結束時間
 ,Sales Person Target Variance Item Group-Wise,銷售人員跨項目群組間的目標差異
 DocType: Dropbox Backup,Daily,每日
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,帳戶與現有的交易不能被轉換為總賬
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,帳戶與現有的交易不能被轉換為總賬
 DocType: Delivery Note,Customer's Purchase Order No,客戶的採購訂單編號
 DocType: Employee,Cell Number,手機號碼
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,汽車材料的要求生成
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,丟失
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,在您不能輸入電流券“對日記帳分錄”專欄
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,能源
@@ -640,7 +642,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,無法關閉或取消BOM,因為它是與其他材料明細表鏈接
 DocType: Opportunity,Maintenance,維護
 DocType: User,Male,男性
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},物品{0}所需交易收據號碼
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},物品{0}所需交易收據號碼
 DocType: Item Attribute Value,Item Attribute Value,項目屬性值
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,銷售活動。
 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.
@@ -688,7 +690,7 @@
 DocType: Address,Personal,個人
 DocType: Expense Claim Detail,Expense Claim Type,費用報銷型
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,對購物車的預設設定
-apps/erpnext/erpnext/controllers/accounts_controller.py +325,"Journal 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 +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",日記條目{0}鏈接抗令{1},檢查它是否應該被拉到作為提前在此發票。
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,生物技術
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Office維護費用
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,請先輸入品項
@@ -762,7 +764,7 @@
 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 +304,Point-of-Sale,銷售點
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",帳戶餘額已歸為信用帳戶,不允許設為借記帳戶
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",帳戶餘額已歸為信用帳戶,不允許設為借記帳戶
 DocType: Account,Balance must be,餘額必須
 DocType: Hub Settings,Publish Pricing,發布定價
 DocType: Notification Control,Expense Claim Rejected Message,報銷回絕訊息
@@ -797,7 +799,7 @@
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,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: GL Entry,Account Currency,賬戶幣種
+DocType: Bank Reconciliation,Account Currency,賬戶幣種
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,請註明舍入賬戶的公司
 DocType: Purchase Receipt,Range,範圍
 DocType: Supplier,Default Payable Accounts,預設應付帳款
@@ -835,7 +837,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,方差
 ,Company Name,公司名稱
 DocType: SMS Center,Total Message(s),訊息總和(s )
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +617,Select Item for Transfer,對於轉讓項目選擇
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,對於轉讓項目選擇
 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.,選取支票存入該銀行帳戶的頭。
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,允許用戶編輯價目表率的交易
@@ -857,7 +859,7 @@
 DocType: SMS Center,All Lead (Open),所有鉛(開放)
 DocType: Purchase Invoice,Get Advances Paid,獲取有償進展
 apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,附上你的照片
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +619,Make ,使
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,使
 DocType: Journal Entry,Total Amount in Words,總金額大寫
 DocType: Workflow State,Stop,停止
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,有一個錯誤。一個可能的原因可能是因為您沒有保存的形式。請聯繫support@erpnext.com如果問題仍然存在。
@@ -878,7 +880,7 @@
 DocType: Company,Default Terms,默認條款
 DocType: Packing Slip Item,Packing Slip Item,包裝單項目
 DocType: POS Profile,Cash/Bank Account,現金/銀行帳戶
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,刪除的項目在數量或價值沒有變化。
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,刪除的項目在數量或價值沒有變化。
 DocType: Delivery Note,Delivery To,交貨給
 apps/erpnext/erpnext/stock/doctype/item/item.py +513,Attribute table is mandatory,屬性表是強制性的
 DocType: Production Planning Tool,Get Sales Orders,獲取銷售訂單
@@ -900,7 +902,7 @@
 DocType: Serial No,Creation Document No,文檔創建編號
 DocType: Issue,Issue,問題
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,客戶不與公司匹配
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.",屬性的項目變體。如大小,顏色等。
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.",屬性的項目變體。如大小,顏色等。
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP倉庫
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},序列號{0}在維護合約期間內直到{1}
 DocType: BOM Operation,Operation,作業
@@ -908,13 +910,13 @@
 DocType: Tax Rule,Shipping State,運輸狀態
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,項目必須使用'從採購入庫“按鈕進行添加
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,銷售費用
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,標準採購
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,標準採購
 DocType: GL Entry,Against,針對
 DocType: Item,Default Selling Cost Center,預設銷售成本中心
 DocType: Sales Partner,Implementation Partner,實施合作夥伴
 apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},銷售訂單{0} {1}
 DocType: Opportunity,Contact Info,聯繫方式
-apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,製作Stock條目
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,製作Stock條目
 DocType: Packing Slip,Net Weight UOM,淨重計量單位
 DocType: Item,Default Supplier,預設的供應商
 DocType: Manufacturing Settings,Over Production Allowance Percentage,對生產補貼比例
@@ -934,7 +936,7 @@
 DocType: Contact,Enter designation of this Contact,輸入該聯繫人指定
 DocType: Contact Us Settings,Address,地址
 DocType: Expense Claim,From Employee,從員工
-apps/erpnext/erpnext/controllers/accounts_controller.py +339,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告: {0} {1}為零,系統將不檢查超收因為金額項目
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告: {0} {1}為零,系統將不檢查超收因為金額項目
 DocType: Journal Entry,Make Difference Entry,使不同入口
 DocType: Upload Attendance,Attendance From Date,考勤起始日期
 DocType: Appraisal Template Goal,Key Performance Area,關鍵績效區
@@ -1011,7 +1013,7 @@
 DocType: Global Defaults,Current Fiscal Year,當前會計年度
 DocType: Global Defaults,Disable Rounded Total,禁用圓角總
 DocType: Lead,Call,通話
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +388,'Entries' cannot be empty,“分錄”不能是空的
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,“分錄”不能是空的
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},重複的行{0}同{1}
 ,Trial Balance,試算表
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,建立職工
@@ -1028,7 +1030,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +398,"An Item Group exists with same name, please change the item name or rename the item group",具有具有相同名稱的項目群組存在,請更改項目名稱或重新命名該項目群組
 DocType: Communication,Delivery Status,交貨狀態
 DocType: Production Order,Manufacture against Sales Order,對製造銷售訂單
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,Rest Of The World,世界其他地區
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,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,工資總額
@@ -1071,6 +1073,7 @@
 DocType: Employee,Place of Issue,簽發地點
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,合同
 DocType: Report,Disabled,不使用
+DocType: Email Digest,Add Quote,添加報價
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},所需的計量單位計量單位:丁文因素:{0}項:{1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,間接費用
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,列#{0}:數量是強制性的
@@ -1097,7 +1100,7 @@
 DocType: Appraisal Goal,Goal,目標
 DocType: Sales Invoice Item,Edit Description,編輯說明
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,預計交貨日期比計劃開始日期較早。
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +681,For Supplier,對供應商
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,對供應商
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,設置帳戶類型有助於在交易中選擇該帳戶。
 DocType: Purchase Invoice,Grand Total (Company Currency),總計(公司貨幣)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,出貨總計
@@ -1117,7 +1120,7 @@
 apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,評論
 DocType: Salary Slip,Bank Account No.,銀行賬號
 DocType: Naming Series,This is the number of the last created transaction with this prefix,這就是以這個前綴的最後一個創建的事務數
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},所需物品估價速率{0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},所需物品估價速率{0}
 DocType: Quality Inspection Reading,Reading 8,閱讀8
 DocType: Sales Partner,Agent,代理人
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'",共有{0}所有項目為零,可能你應該改變“基於分佈式費”
@@ -1178,7 +1181,7 @@
 DocType: Item,Maintain Stock,維護庫存資料
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,生產訂單已創建Stock條目
 DocType: Leave Control Panel,Leave blank if considered for all designations,離開,如果考慮所有指定空白
-apps/erpnext/erpnext/controllers/accounts_controller.py +500,Charge of type 'Actual' in row {0} cannot be included in Item Rate,類型'實際'行{0}的計費,不能被包含在項目單價
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,類型'實際'行{0}的計費,不能被包含在項目單價
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},最大數量:{0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,從日期時間
 DocType: Email Digest,For Company,對於公司
@@ -1203,13 +1206,13 @@
 ,Batch-Wise Balance History,間歇式平衡歷史
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,待辦事項列表
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,學徒
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,負數量是不允許
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,負數量是不允許
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",從項目主檔獲取的稅務詳細資訊表,成為字串並存儲在這欄位。用於稅賦及費用
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,員工不能報告自己。
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",如果帳戶被凍結,條目被允許受限制的用戶。
 DocType: Email Digest,Bank Balance,銀行結餘
-apps/erpnext/erpnext/controllers/accounts_controller.py +436,Accounting Entry for {0}: {1} can only be made in currency: {2},會計分錄為{0}:{1}只能在貨幣做:{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},會計分錄為{0}:{1}只能在貨幣做:{2}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +38,No active Salary Structure found for employee {0} and the month,發現員工{0},而該月沒有活動的薪酬結構
 DocType: Job Opening,"Job profile, qualifications required etc.",所需的工作概況,學歷等。
 DocType: Journal Entry Account,Account Balance,帳戶餘額
@@ -1246,9 +1249,9 @@
 ",在這接下來的發票將生成的日期。它在提交生成。
 DocType: Item Attribute,Item Attribute,項目屬性
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,政府
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,項目變體
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,項目變體
 DocType: Company,Services,服務
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),總計({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),總計({0})
 DocType: Cost Center,Parent Cost Center,父成本中心
 DocType: Sales Invoice,Source,源
 DocType: Leave Type,Is Leave Without Pay,是無薪休假
@@ -1268,7 +1271,7 @@
 DocType: Purchase Invoice Item,Net Amount,淨額
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM表詳細編號
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),額外的優惠金額(公司貨幣)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +620,Error: {0} > {1},錯誤: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},錯誤: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,請從科目表建立新帳戶。
 DocType: Maintenance Visit,Maintenance Visit,維護訪問
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,客戶>客戶群組>領地
@@ -1286,7 +1289,7 @@
 DocType: Sales Invoice,Shipping Address,送貨地址
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,此工具可幫助您更新或修復系統中的庫存數量和價值。它通常被用於同步系統值和實際存在於您的倉庫。
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,送貨單一被儲存,就會顯示出來。
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,品牌主檔。
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,品牌主檔。
 DocType: ToDo,Due Date,到期日
 DocType: Sales Invoice Item,Brand Name,商標名稱
 DocType: Purchase Receipt,Transporter Details,轉運詳細
@@ -1304,14 +1307,14 @@
 ,Bank Reconciliation Statement,銀行對帳表
 DocType: Address,Lead Name,鉛名稱
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,期初存貨餘額
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,期初存貨餘額
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0}必須只出現一次
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},不允許轉院更多{0}不是{1}對採購訂單{2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},{0}的排假成功
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,無項目包裝
 DocType: Shipping Rule Condition,From Value,從價值
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,生產數量是必填的
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,數額沒有反映在銀行
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,數額沒有反映在銀行
 DocType: Quality Inspection Reading,Reading 4,4閱讀
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,索賠費用由公司負責。
 DocType: Company,Default Holiday List,預設假日表列
@@ -1322,7 +1325,7 @@
 ,Material Requests for which Supplier Quotations are not created,對該供應商報價的材料需求尚未建立
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,這一天(S)對你所申請休假的假期。你不需要申請許可。
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,要使用條形碼跟踪項目。您將能夠通過掃描物品條碼,進入交貨單和銷售發票的項目。
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +576,Mark as Delivered,標記為交付
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,標記為交付
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,請報價
 DocType: Dependent Task,Dependent Task,相關任務
 apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},預設計量單位的轉換因子必須是1在行{0}
@@ -1350,7 +1353,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1}被取消或停止
 DocType: Accounts Settings,Credit Controller,信用控制器
 DocType: Delivery Note,Vehicle Dispatch Date,車輛調度日期
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Receipt {0} is not submitted,採購入庫單{0}未提交
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,採購入庫單{0}未提交
 DocType: Company,Default Payable Account,預設應付賬款
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.",設置網上購物車,如航運規則,價格表等
 apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,安裝完成
@@ -1378,7 +1381,7 @@
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,更新與日記帳之銀行付款日期。
 DocType: Quotation,Term Details,長期詳情
 DocType: Manufacturing Settings,Capacity Planning For (Days),容量規劃的期限(天)
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,沒有一個項目無論在數量或價值的任何變化。
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,沒有一個項目無論在數量或價值的任何變化。
 DocType: Warranty Claim,Warranty Claim,保修索賠
 ,Lead Details,鉛詳情
 DocType: Purchase Invoice,End date of current invoice's period,當前發票的期限的最後一天
@@ -1403,7 +1406,7 @@
 DocType: Purchase Invoice,Additional Discount,更多優惠
 DocType: Selling Settings,Selling Settings,銷售設置
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,網上拍賣
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,請註明無論是數量或估價率或兩者
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,請註明無論是數量或估價率或兩者
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory",公司、月分與財務年度是必填的
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,市場推廣開支
 ,Item Shortage Report,商品短缺報告
@@ -1421,7 +1424,7 @@
 DocType: Item,Weightage,權重
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,客戶群組存在相同名稱,請更改客戶名稱或重新命名客戶群組
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,請先選擇{0}。
-apps/erpnext/erpnext/templates/pages/order.html +57,text {0},文字{0}
+apps/erpnext/erpnext/templates/pages/order.html +56,text {0},文字{0}
 DocType: Territory,Parent Territory,家長領地
 DocType: Quality Inspection Reading,Reading 2,閱讀2
 DocType: Stock Entry,Material Receipt,收料
@@ -1456,7 +1459,7 @@
 DocType: Employee,Leave Encashed?,離開兌現?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,機會從字段是強制性的
 DocType: Item,Variants,變種
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +537,Make Purchase Order,製作採購訂單
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,製作採購訂單
 DocType: SMS Center,Send To,發送到
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},沒有足夠的餘額休假請假類型{0}
 DocType: Sales Team,Contribution to Net Total,貢獻合計淨
@@ -1476,7 +1479,6 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,項目是不允許有生產訂單。
 DocType: DocField,Attach Image,附上圖片
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),淨重這個包。 (當項目的淨重量總和自動計算)
-DocType: Stock Reconciliation Item,Leave blank if no change,離開,如果沒有變化的空白
 DocType: Sales Order,To Deliver and Bill,準備交貨及開立發票
 DocType: GL Entry,Credit Amount in Account Currency,在賬戶幣金額
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,時間日誌製造。
@@ -1484,7 +1486,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0}必須提交
 DocType: Authorization Control,Authorization Control,授權控制
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,時間日誌中的任務。
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +553,Payment,付款
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,付款
 DocType: Production Order Operation,Actual Time and Cost,實際時間和成本
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},針對銷售訂單{2}的項目{1},最多可以有 {0} 被完成。 
 DocType: Employee,Salutation,招呼
@@ -1569,7 +1571,7 @@
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,表項,將在網站顯示出來
 DocType: Purchase Order Item Supplied,Supplied Qty,附送數量
 DocType: Material Request Item,Material Request Item,物料需求項目
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,項目群組樹。
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,項目群組樹。
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,不能引用的行號大於或等於當前行號碼提供給充電式
 ,Item-wise Purchase History,項目明智的購買歷史
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,紅
@@ -1582,7 +1584,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,行#{0}:操作{1}未完成的成品{2}在生產數量訂單{3}。請通過時間日誌更新運行狀態
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,投資
 DocType: Issue,Resolution Details,詳細解析
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,更改品項的計量單位。
 DocType: Quality Inspection Reading,Acceptance Criteria,驗收標準
 DocType: Item Attribute,Attribute Name,屬性名稱
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},項{0}必須在銷售或服務項目{1}
@@ -1596,7 +1597,7 @@
 DocType: Holiday List,Clear Table,清除表格
 DocType: Features Setup,Brands,品牌
 DocType: C-Form Invoice Detail,Invoice No,發票號碼
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +559,From Purchase Order,從採購訂單
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,從採購訂單
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",離開不能應用/前{0}取消,因為假平衡已經被搬入轉發在未來休假分配記錄{1}
 DocType: Activity Cost,Costing Rate,成本率
 ,Customer Addresses And Contacts,客戶的地址和聯繫方式
@@ -1660,9 +1661,10 @@
 DocType: Workstation,Wages per hour,時薪
 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/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.",顯示/隱藏功能。如序列號, POS等
-apps/erpnext/erpnext/controllers/accounts_controller.py +237,Account {0} is invalid. Account Currency must be {1},帳戶{0}是無效的。帳戶貨幣必須是{1}
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,下列資料的要求已自動根據項目的重新排序水平的提高
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},帳戶{0}是無效的。帳戶貨幣必須是{1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},計量單位換算係數是必需的行{0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},清拆日期不能行檢查日期前{0}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},清拆日期不能行檢查日期前{0}
 DocType: Salary Slip,Deduction,扣除
 DocType: Address Template,Address Template,地址模板
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,請輸入這個銷售人員的員工標識
@@ -1690,24 +1692,24 @@
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",追蹤銷售計劃。追踪訊息,報價,銷售訂單等,從競賽來衡量投資報酬。
 DocType: Expense Claim,Approver,審批人
 ,SO Qty,SO數量
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",Stock條目對倉庫存在{0},因此你不能重新分配或修改倉庫
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",Stock條目對倉庫存在{0},因此你不能重新分配或修改倉庫
 DocType: Appraisal,Calculate Total Score,計算總分
 DocType: Supplier Quotation,Manufacturing Manager,生產經理
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},序列號{0}在保修期內直到{1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,分裂送貨單成包。
 apps/erpnext/erpnext/hooks.py +68,Shipments,發貨
-DocType: Purchase Order,To be delivered to customer,要傳送給客戶
+DocType: Purchase Order Item,To be delivered to customer,要傳送給客戶
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,時間日誌狀態必須被提交。
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,序列號{0}不屬於任何倉庫
 apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,設置
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,行#
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,行#
 DocType: Purchase Invoice,In Words (Company Currency),大寫(Company Currency)
 DocType: Pricing Rule,Supplier,供應商
 DocType: C-Form,Quarter,季
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,雜項開支
 DocType: Global Defaults,Default Company,預設公司
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,費用或差異帳戶是強制性的項目{0} ,因為它影響整個股票價值
-apps/erpnext/erpnext/controllers/accounts_controller.py +355,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",無法行overbill的項目{0} {1}超過{2}。要允許超額計費,請在「股票設定」設定
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",無法行overbill的項目{0} {1}超過{2}。要允許超額計費,請在「股票設定」設定
 DocType: Employee,Bank Name,銀行名稱
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-以上
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,用戶{0}被禁用
@@ -1721,7 +1723,7 @@
 DocType: DocField,Name,名稱
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",請ATLEAST一行選擇分配金額,發票類型和發票號碼
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},所需的{0}項目銷售訂單
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,量以不反映在系統
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,量以不反映在系統
 DocType: Purchase Invoice Item,Rate (Company Currency),率(公司貨幣)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,他人
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,無法找到匹配的項目。請選擇其他值{0}。
@@ -1732,7 +1734,7 @@
 DocType: Web Form,Select DocType,選擇DocType
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,銀行業
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,請在“產生排程”點擊以得到排程表
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,新的成本中心
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,新的成本中心
 DocType: Bin,Ordered Quantity,訂購數量
 apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""",例如「建設建設者工具“
 DocType: Quality Inspection,In Process,在過程
@@ -1740,7 +1742,7 @@
 DocType: Purchase Order Item,Reference Document Type,參考文檔類型
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0}針對銷售訂單{1}
 DocType: Account,Fixed Asset,固定資產
-apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,序列化庫存
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,序列化庫存
 DocType: Activity Type,Default Billing Rate,默認計費率
 DocType: Time Log Batch,Total Billing Amount,總結算金額
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,應收賬款
@@ -1748,6 +1750,7 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,銷售訂單到付款
 DocType: Expense Claim Detail,Expense Claim Detail,報銷詳情
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,時間日誌創建:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,請選擇正確的帳戶
 DocType: Item,Weight UOM,重量計量單位
 DocType: Employee,Blood Group,血型
 DocType: Purchase Invoice Item,Page Break,分頁符
@@ -1792,7 +1795,7 @@
 DocType: Quality Inspection,Sample Size,樣本大小
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,所有項目已開具發票
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',請指定一個有效的“從案號”
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,進一步的成本中心可以根據組進行,但項可以對非組進行
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,進一步的成本中心可以根據組進行,但項可以對非組進行
 DocType: Project,External,外部
 DocType: Features Setup,Item Serial Nos,產品序列號
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,用戶和權限
@@ -1849,7 +1852,7 @@
 DocType: Rename Tool,Rename Tool,重命名工具
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,更新成本
 DocType: Item Reorder,Item Reorder,項目重新排序
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +568,Transfer Material,轉印材料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,轉印材料
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",指定作業、作業成本並給予該作業一個專屬的作業編號。
 DocType: Purchase Invoice,Price List Currency,價格表貨幣
 DocType: Naming Series,User must always select,用戶必須始終選擇
@@ -1864,7 +1867,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,保證金
 DocType: System Settings,In Hours,以小時為單位
 DocType: Process Payroll,Create Salary Slip,建立工資單
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,預計結餘按銀行
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,預計結餘按銀行
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),資金來源(負債)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},列{0}的數量({1})必須與生產量{2}相同
 DocType: Appraisal,Employee,僱員
@@ -1879,7 +1882,7 @@
 DocType: Sales Invoice,Mass Mailing,郵件群發
 DocType: Page,Standard,標準
 DocType: Rename Tool,File to Rename,文件重命名
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},項目{0}需要採購訂單號
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},項目{0}需要採購訂單號
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,顯示支付
 apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},指定BOM {0}的項目不存在{1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,維護時間表{0}必須取消早於取消這個銷售訂單
@@ -1935,7 +1938,7 @@
 DocType: Contact,Enter department to which this Contact belongs,輸入聯繫屬於的部門
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,共缺席
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,行{0}的項目或倉庫不符合物料需求
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,計量單位
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,計量單位
 DocType: Fiscal Year,Year End Date,年結日
 DocType: Task Depends On,Task Depends On,任務取決於
 DocType: Lead,Opportunity,機會
@@ -2010,7 +2013,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,RECD數量
 DocType: Email Account,Email Ids,電子郵件ID
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},無法產生更多的項目{0}不是銷售訂單數量{1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +475,Stock Entry {0} is not submitted,股票輸入{0}不提交
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,股票輸入{0}不提交
 DocType: Payment Reconciliation,Bank / Cash Account,銀行/現金帳戶
 DocType: Tax Rule,Billing City,結算城市
 DocType: Global Defaults,Hide Currency Symbol,隱藏貨幣符號
@@ -2020,12 +2023,12 @@
 DocType: Features Setup,Quality,品質
 DocType: Contact Us Settings,Introduction,介紹
 DocType: Warranty Claim,Service Address,服務地址
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,庫存調整最多100行。
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,庫存調整最多100行。
 DocType: Stock Entry,Manufacture,製造
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,請送貨單第一
 DocType: Purchase Invoice,Currency and Price List,貨幣和價格表
 DocType: Opportunity,Customer / Lead Name,客戶/鉛名稱
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,清拆日期未提及
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,清拆日期未提及
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,生產
 DocType: Item,Allow Production Order,允許生產訂單
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,列#{0}:開始日期必須早於結束日期
@@ -2039,7 +2042,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,我的地址
 DocType: Stock Ledger Entry,Outgoing Rate,傳出率
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,組織分支主檔。
-apps/erpnext/erpnext/controllers/accounts_controller.py +238, or ,或
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,或
 DocType: Sales Order,Billing Status,計費狀態
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,公用事業費用
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90以上
@@ -2088,7 +2091,7 @@
 DocType: Notification Control,Purchase Order Message,採購訂單的訊息
 DocType: Tax Rule,Shipping Country,航運國家
 DocType: Upload Attendance,Upload HTML,上傳HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","預付款總額({0})反對令{1}不能大於\
 比總計({2})"
 DocType: Employee,Relieving Date,解除日期
@@ -2105,9 +2108,9 @@
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,所有地址。
 DocType: Company,Stock Settings,庫存設定
 DocType: User,Bio,生物
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",合併是唯一可能的,如果以下屬性中均有記載相同。是集團,根型,公司
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",合併是唯一可能的,如果以下屬性中均有記載相同。是集團,根型,公司
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,管理客戶群組樹。
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,新的成本中心名稱
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,新的成本中心名稱
 DocType: Leave Control Panel,Leave Control Panel,休假控制面板
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,無預設的地址模板。請從設定>列印與品牌>地址模板 新增之。
 DocType: Appraisal,HR User,HR用戶
@@ -2125,8 +2128,8 @@
 DocType: Payment Tool Detail,Payment Tool Detail,支付工具的詳細資訊
 ,Sales Browser,銷售瀏覽器
 DocType: Journal Entry,Total Credit,貸方總額
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +478,Warning: Another {0} # {1} exists against stock entry {2},警告:另一個{0}#{1}存在對股票入門{2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +397,Local,當地
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},警告:另一個{0}#{1}存在對股票入門{2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,當地
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),貸款及墊款(資產)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,債務人
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,大
@@ -2136,9 +2139,6 @@
 DocType: Stock Settings,Default Valuation Method,預設的估值方法
 DocType: Production Order Operation,Planned Start Time,計劃開始時間
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,關閉資產負債表和賬面利潤或虧損。
-apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
-			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.",測度項目的默認單位{0}不能直接改變,因為\你已經做了一些交易(S)與其他計量單位。要更改默認的計量單位,\使用“計量單位更換工具”下的股票模塊工具。
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,指定的匯率將一種貨幣兌換成另一種
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,{0}報價被取消
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,未償還總額
@@ -2212,6 +2212,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,暫無產品說明
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,過期的
 DocType: Account,Stock Received But Not Billed,庫存接收,但不付款
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,根帳戶必須是一組
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,工資總額+欠費​​金額​​+兌現金額 - 扣除項目金額
 DocType: Monthly Distribution,Distribution Name,分配名稱
 DocType: Features Setup,Sales and Purchase,買賣
@@ -2248,12 +2249,12 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},目標倉庫是強制性的行{0}
 DocType: Quality Inspection,Quality Inspection,品質檢驗
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,超小
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +537,Warning: Material Requested Qty is less than Minimum Order Qty,警告:物料需求的數量低於最少訂購量
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,警告:物料需求的數量低於最少訂購量
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,帳戶{0}被凍結
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,法人/子公司與帳戶的獨立走勢屬於該組織。
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco",食品、飲料&煙草
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL或BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,Can only make payment against unbilled {0},只能使支付對未付款的{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},只能使支付對未付款的{0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,佣金率不能大於100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,最低庫存水平
 DocType: Stock Entry,Subcontract,轉包
@@ -2292,7 +2293,7 @@
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,來料質量檢驗。
 DocType: Purchase Order Item,Returned Qty,返回的數量
 DocType: Employee,Exit,出口
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,root類型是強制性的
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,root類型是強制性的
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,序列號{0}創建
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",為方便客戶,這些代碼可以在列印格式,如發票和送貨單使用
 DocType: Employee,You can enter any date manually,您可以手動輸入任何日期
@@ -2318,13 +2319,14 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,重新排序級別
 DocType: Attendance,Attendance Date,考勤日期
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,工資分手基於盈利和演繹。
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,有子節點的帳不能轉換到總帳
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,有子節點的帳不能轉換到總帳
 DocType: Address,Preferred Shipping Address,偏好的送貨地址
 DocType: Purchase Receipt Item,Accepted Warehouse,收料倉庫
 DocType: Bank Reconciliation Detail,Posting Date,發布日期
 DocType: Item,Valuation Method,估值方法
+apps/erpnext/erpnext/setup/utils.py +88,Unable to find exchange rate for {0} to {1},找不到匯率{0} {1}
 DocType: Sales Invoice,Sales Team,銷售團隊
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,重複的條目
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,重複的條目
 DocType: Serial No,Under Warranty,在保修期
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[錯誤]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,銷售訂單一被儲存,就會顯示出來。
@@ -2373,7 +2375,7 @@
 DocType: Material Request,Requested For,要求
 DocType: Quotation Item,Against Doctype,針對文檔類型
 DocType: Delivery Note,Track this Delivery Note against any Project,跟踪此送貨單反對任何項目
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,root帳號不能被刪除
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,root帳號不能被刪除
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,顯示Stock條目
 ,Is Primary Address,是主地址
 DocType: Production Order,Work-in-Progress Warehouse,在製品倉庫
@@ -2402,7 +2404,7 @@
 ,Billed Amount,帳單金額
 DocType: Bank Reconciliation,Bank Reconciliation,銀行對帳
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,獲取更新
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,材料需求{0}被取消或停止
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +107,Material Request {0} is cancelled or stopped,材料需求{0}被取消或停止
 apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,添加了一些樣本記錄
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,離開管理
 DocType: Event,Groups,組
@@ -2414,8 +2416,8 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,快速幫助
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},列{0}的來源和目標倉庫不可相同
 DocType: Features Setup,Sales Extras,額外銷售
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0}預算帳戶{1}對成本中心{2}將超過{3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",差異帳戶必須是資產/負債類型的帳戶,因為此庫存調整是一個開始分錄
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0}預算帳戶{1}對成本中心{2}將超過{3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",差異帳戶必須是資產/負債類型的帳戶,因為此庫存調整是一個開始分錄
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},所需物品{0}的採購訂單號
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',“起始日期”必須經過'終止日期'
 ,Stock Projected Qty,存貨預計數量
@@ -2499,7 +2501,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,電話
 DocType: Project,Total Costing Amount (via Time Logs),總成本核算金額(通過時間日誌)
 DocType: Purchase Order Item Supplied,Stock UOM,庫存計量單位
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,採購訂單{0}未提交
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,採購訂單{0}未提交
 ,Projected,預計
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},序列號{0}不屬於倉庫{1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,注:系統將不檢查過交付和超額預訂的項目{0}的數量或金額為0
@@ -2554,7 +2556,7 @@
 DocType: Stock Entry,Customer or Supplier Details,客戶或供應商詳細信息
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,集合
 DocType: Lead,Lead Owner,鉛所有者
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,倉庫是必需的
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,倉庫是必需的
 DocType: Employee,Marital Status,婚姻狀況
 DocType: Stock Settings,Auto Material Request,自動物料需求
 DocType: Time Log,Will be updated when billed.,計費時將被更新。
@@ -2563,7 +2565,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,日期退休必須大於加入的日期
 DocType: Sales Invoice,Against Income Account,對收入帳戶
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}%交付
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +82,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,項目{0}:有序數量{1}不能低於最低訂貨量{2}(項中定義)。
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,項目{0}:有序數量{1}不能低於最低訂貨量{2}(項中定義)。
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,每月分配比例
 DocType: Territory,Territory Targets,境內目標
 DocType: Delivery Note,Transporter Info,轉運資訊
@@ -2576,11 +2578,11 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,不同計量單位的項目會導致不正確的(總)淨重值。確保每個項目的淨重是在同一個計量單位。
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM率
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,請送貨單拉項目
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,日記條目{0}都是非聯
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,日記條目{0}都是非聯
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.",類型電子郵件,電話,聊天,訪問等所有通信記錄
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,請提及公司舍入成本中心
 DocType: Purchase Invoice,Terms,條款
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,新建立
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,新建立
 DocType: Buying Settings,Purchase Order Required,購貨訂單要求
 ,Item-wise Sales History,項目明智的銷售歷史
 DocType: Expense Claim,Total Sanctioned Amount,總被制裁金額
@@ -2591,7 +2593,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},批號是強制性的項目{0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,您可以通過選擇備份頻率啟動和\
 ,Stock Ledger,庫存總帳
-apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},價格:{0}
+apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},價格:{0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,工資單上扣除
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,筆記
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,首先選擇一組節點。
@@ -2619,7 +2621,7 @@
 DocType: BOM Replace Tool,BOM Replace Tool,BOM替換工具
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,依據國家別啟發式的預設地址模板
 DocType: Sales Order Item,Supplier delivers to Customer,供應商提供給客戶
-apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,展會稅分手
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,展會稅分手
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},由於/參考日期不能後{0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,數據導入和導出
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',如果您涉及製造活動。啟動項目「製造的」
@@ -2649,7 +2651,7 @@
 DocType: Hub Settings,Publish Availability,發布房源
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,出生日期不能大於今天。
 ,Stock Ageing,存貨帳齡分析表
-apps/erpnext/erpnext/controllers/accounts_controller.py +201,{0} '{1}' is disabled,{0}“{1}”被禁用
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0}“{1}”被禁用
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,設置為打開
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,發送電子郵件的自動對提交的交易聯繫。
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2694,7 +2696,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0}前的庫存交易被凍結
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',請點擊“生成表”
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,日期應該是一樣的起始日期為半天假
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m",如公斤,單位,NOS,M
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m",如公斤,單位,NOS,M
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,如果你輸入的參考日期,參考編號是強制性的
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,加入日期必須大於出生日期
 DocType: Salary Structure,Salary Structure,薪酬結構
@@ -2703,7 +2705,7 @@
 通過分配優先級。價格規則:{0}"
 DocType: Account,Bank,銀行
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,航空公司
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +572,Issue Material,發行材料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,發行材料
 DocType: Material Request Item,For Warehouse,對於倉​​庫
 DocType: Employee,Offer Date,到職日期
 DocType: Hub Settings,Access Token,存取 Token
@@ -2742,9 +2744,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,原料
 DocType: Leave Application,Follow via Email,通過電子郵件跟隨
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,稅額折後金額
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,此帳戶存在子帳戶。您無法刪除此帳戶。
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,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 +449,No default BOM exists for Item {0},項目{0}不存在預設的的BOM
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},項目{0}不存在預設的的BOM
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,請選擇發布日期第一
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,開業日期應該是截止日期之前,
 DocType: Leave Control Panel,Carry Forward,發揚
@@ -2771,10 +2773,10 @@
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0}必須減少{1}或應增加超量容許度
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,總現
 apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,小時
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","系列化項目{0}不能被更新\
 使用庫存調整"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +592,Transfer Material to Supplier,轉印材料供應商
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,轉印材料供應商
 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/crm/doctype/opportunity/opportunity.js +82,Create Quotation,建立報價
@@ -2786,6 +2788,7 @@
 DocType: Features Setup,Point of Sale,銷售點
 DocType: Account,Tax,稅
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},行{0}:{1}不是有效的{2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,從產品包
 DocType: Production Planning Tool,Production Planning Tool,生產規劃工具
 DocType: Quality Inspection,Report Date,報告日期
 DocType: C-Form,Invoices,發票
@@ -2799,7 +2802,7 @@
 DocType: Stock Entry,Update Rate and Availability,更新率和可用性
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,相對於訂單量允許接受或交付的變動百分比額度。例如:如果你下定100個單位量,而你的許可額度是10%,那麼你可以收到最多110個單位量。
 DocType: Pricing Rule,Customer Group,客戶群組
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},交際費是強制性的項目{0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},交際費是強制性的項目{0}
 DocType: Item,Website Description,網站簡介
 DocType: Serial No,AMC Expiry Date,AMC到期時間
 ,Sales Register,銷售登記
@@ -2813,8 +2816,8 @@
 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.js +477,Get Items,找項目
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,請輸入核銷帳戶
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,找項目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,請輸入核銷帳戶
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,最後訂購日期
 DocType: DocField,Image,圖像
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,使消費稅發票
@@ -2832,7 +2835,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,項目明智的數據不適用於報價
 DocType: Project,Expected End Date,預計結束日期
 DocType: Appraisal Template,Appraisal Template Title,評估模板標題
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,商業
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,商業
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,父項{0}不能是庫存產品
 DocType: Cost Center,Distribution Id,分配標識
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,真棒服務
@@ -2853,7 +2856,7 @@
 DocType: Customer,Default Receivable Accounts,預設應收帳款
 DocType: Tax Rule,Billing State,計費狀態
 DocType: Item Reorder,Transfer,轉讓
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +628,Fetch exploded BOM (including sub-assemblies),取得爆炸BOM(包括子組件)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),取得爆炸BOM(包括子組件)
 DocType: Authorization Rule,Applicable To (Employee),適用於(員工)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,截止日期是強制性的
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,增量屬性{0}不能為0
@@ -2867,7 +2870,7 @@
 DocType: Company,Retail,零售
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,客戶{0}不存在
 DocType: Attendance,Absent,缺席
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +463,Product Bundle,產品包
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,產品包
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},行{0}:無效參考{1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,購置稅和費模板
 DocType: Upload Attendance,Download Template,下載模板
@@ -2882,21 +2885,21 @@
 DocType: Salary Slip,Earning & Deduction,收入及扣除
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,帳戶{0}不能為集團
 apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,區域
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,可選。此設置將被應用於過濾各種交易進行。
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,負面評價率是不允許的
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,可選。此設置將被應用於過濾各種交易進行。
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,負面評價率是不允許的
 DocType: Holiday List,Weekly Off,每週關閉
 DocType: Fiscal Year,"For e.g. 2012, 2012-13",對於例如2012、2012-13
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),臨時溢利/(虧損)(信用)
 DocType: Sales Invoice,Return Against Sales Invoice,射向銷售發票
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,項目5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},請在公司{1}下設定預設值{0} 
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},請在公司{1}下設定預設值{0} 
 DocType: Serial No,Creation Time,創作時間
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,總收入
 DocType: Sales Invoice,Product Bundle Help,產品包幫助
 ,Monthly Attendance Sheet,每月考勤表
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,沒有資料
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}:成本中心是強制性的項目{2}
-DocType: Purchase Invoice,Get Items from Product Bundle,獲取從產品捆綁項目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,獲取從產品捆綁項目
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,帳戶{0}為未啟用
 DocType: GL Entry,Is Advance,為進
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,考勤起始日期和出席的日期,是強制性的
@@ -2929,7 +2932,7 @@
 DocType: Time Log,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 。
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,申請許可。
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,帳戶與現有的交易不能被刪除
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,帳戶與現有的交易不能被刪除
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,法律費用
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc",該月的一天,在這汽車的訂單將產生如05,28等
 DocType: Sales Invoice,Posting Time,登錄時間
@@ -2943,7 +2946,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 +132,Travel Expenses,差旅費
 DocType: Maintenance Visit,Breakdown,展開
-apps/erpnext/erpnext/controllers/accounts_controller.py +242,Account: {0} with currency: {1} can not be selected,帳號:{0}幣種:{1}不能選擇
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,帳號:{0}幣種:{1}不能選擇
 DocType: Bank Reconciliation Detail,Cheque Date,支票日期
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},帳戶{0}:父帳戶{1}不屬於公司:{2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,成功刪除與該公司相關的所有交易!
@@ -2994,7 +2997,7 @@
 DocType: Stock Settings,Role Allowed to edit frozen stock,角色可以編輯凍結的庫存
 ,Territory Target Variance Item Group-Wise,地域內跨項目群組間的目標差異
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,所有客戶群組
-apps/erpnext/erpnext/controllers/accounts_controller.py +475,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}是強制性的。也許外幣兌換記錄為{1}到{2}尚未建立。
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{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 +37,Tax Template is mandatory.,稅務模板是強制性的。
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,帳戶{0}:父帳戶{1}不存在
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),價格列表費率(公司貨幣)
@@ -3039,7 +3042,7 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,選擇會計年度...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,所需的POS資料,使POS進入
 DocType: Hub Settings,Name Token,名令牌
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,標準銷售
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,標準銷售
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,至少要有一間倉庫
 DocType: Serial No,Out of Warranty,超出保修期
 DocType: BOM Replace Tool,Replace,更換
@@ -3095,7 +3098,7 @@
 DocType: Stock Entry Detail,Additional Cost,額外費用
 apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,財政年度年結日
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher",是冷凍的帳戶。要禁止該帳戶創建/編輯事務,你需要角色
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +563,Make Supplier Quotation,讓供應商報價
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,讓供應商報價
 DocType: Quality Inspection,Incoming,來
 DocType: BOM,Materials Required (Exploded),所需材料(分解)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),降低盈利停薪留職(LWP)
@@ -3170,7 +3173,7 @@
 ,Available Stock for Packing Items,可用庫存包裝項目
 DocType: Item Variant,Item Variant,項目變
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,設置此地址模板為預設當沒有其它的預設值
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",帳戶餘額已歸為借記帳戶,不允許設為信用帳戶
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"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 +76,Quality Management,品質管理
 DocType: Production Planning Tool,Filter based on customer,過濾器可根據客戶
 DocType: Payment Tool Detail,Against Voucher No,針對券無
@@ -3181,7 +3184,7 @@
 DocType: Item Group,Parent Item Group,父項目群組
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0}for {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,成本中心
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,倉庫。
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,倉庫。
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,供應商貨幣被換算成公司基礎貨幣的匯率
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},行#{0}:與排時序衝突{1}
 DocType: Opportunity,Next Contact,下一頁聯繫
@@ -3281,7 +3284,7 @@
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.",當任何選中的交易都是“已提交”,郵件彈出窗口自動打開,在該事務發送電子郵件到相關的“聯繫”,與交易作為附件。用戶可能會或可能不會發送電子郵件。
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,全局設置
 DocType: Employee Education,Employee Education,員工教育
-apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,這是需要獲取項目詳細信息。
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,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 +213,Serial No {0} has already been received,序列號{0}已收到
@@ -3295,7 +3298,7 @@
 DocType: Email Digest,Email Digest,電子郵件摘要
 DocType: Delivery Note,Billing Address Name,帳單地址名稱
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,百貨
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,系統平衡
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,系統平衡
 DocType: Workflow,Is Active,啟用
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,沒有以下的倉庫會計分錄
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,首先保存文檔。
@@ -3352,7 +3355,7 @@
  {%,如果email_id%}電子郵件:{{email_id}}< BR&GT {%ENDIF - %} 
  </代碼> </ PRE>"
 DocType: Salary Slip Deduction,Default Amount,違約金額
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,倉庫系統中未找到
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,倉庫系統中未找到
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,本月摘要
 DocType: Quality Inspection Reading,Quality Inspection Reading,質量檢驗閱讀
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`凍結股票早於`應該是少於%d天。
@@ -3392,7 +3395,7 @@
 DocType: Dropbox Backup,Dropbox Access Allowed,允許訪問Dropbox
 DocType: Dropbox Backup,Weekly,每週
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,例如:。 smsgateway.com / API / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +589,Receive,接受
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,接受
 DocType: Maintenance Visit,Fully Completed,全面完成
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}%完成
 DocType: Employee,Educational Qualification,學歷
@@ -3404,7 +3407,7 @@
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,採購主檔經理
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,生產訂單{0}必須提交
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},請選擇項目{0}的開始日期和結束日期
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,主報告
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,主報告
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,無效的主名稱
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc的DocType
 apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,新增/編輯價格
@@ -3464,7 +3467,7 @@
 DocType: Item,List this Item in multiple groups on the website.,列出這個項目在網站上多個組。
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,請檢查多幣種選項,允許帳戶與其他貨幣
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,項:{0}不存在於系統中
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,您無權設定值凍結
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,您無權設定值凍結
 DocType: Payment Reconciliation,Get Unreconciled Entries,獲取未調節項
 DocType: Cost Center,Budgets,預算
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,已更新
@@ -3594,7 +3597,7 @@
 DocType: Employee,Applicable Holiday List,適用假期表
 DocType: Employee,Cheque,支票
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,系列更新
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,報告類型是強制性的
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,報告類型是強制性的
 DocType: Item,Serial Number Series,序列號系列
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},倉庫是強制性的股票項目{0}行{1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,零售及批發
@@ -3616,7 +3619,7 @@
 ,Item Prices,產品價格
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,採購訂單一被儲存,就會顯示出來。
 DocType: Period Closing Voucher,Period Closing Voucher,期末券
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,價格表師傅。
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,價格表師傅。
 DocType: Task,Review Date,評論日期
 DocType: Purchase Invoice,Advance Payments,預付款
 DocType: DocPerm,Level,級別
@@ -3624,7 +3627,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,行目標倉庫{0}必須與生產訂單
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,沒有權限使用支付工具
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,為重複%不是指定的“通知電子郵件地址”
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,貨幣不能使用其他貨幣進行輸入後更改
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,貨幣不能使用其他貨幣進行輸入後更改
 DocType: Company,Round Off Account,四捨五入賬戶
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,行政開支
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,諮詢
@@ -3687,7 +3690,6 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,規劃工作站工作時間以外的時間日誌。
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1}已提交
 ,Items To Be Requested,項目要請求
-DocType: Purchase Order,Get Last Purchase Rate,獲取最新預訂價
 DocType: Time Log,Billing Rate based on Activity Type (per hour),根據活動類型計費率(每小時)
 DocType: Company,Company Info,公司資訊
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent",公司電子郵件ID沒有找到,因此郵件無法發送
@@ -3697,7 +3699,7 @@
 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 +115,Cannot covert to Group because Account Type is selected.,不能隱蔽到組,因為帳戶類型選擇的。
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,不能隱蔽到組,因為帳戶類型選擇的。
 DocType: Purchase Common,Purchase Common,採購普通
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1}已修改。請更新。
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,停止用戶在下面日期提出休假申請。
@@ -3711,7 +3713,7 @@
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,客戶提出的賬單。
 DocType: DocField,Default,預設
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,項目編號
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +470,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},行無{0}:金額不能大於金額之前對報銷{1}。待審核金額為{2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},行無{0}:金額不能大於金額之前對報銷{1}。待審核金額為{2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0}用戶已新增
 DocType: Maintenance Schedule,Schedule,時間表
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""",定義預算這個成本中心。要設置預算的行動,請參閱“企業名錄”
@@ -3728,7 +3730,7 @@
 DocType: Employee,Education,教育
 DocType: Selling Settings,Campaign Naming By,活動命名由
 DocType: Employee,Current Address Is,當前地址是
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.",可選。設置公司的默認貨幣,如果沒有指定。
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.",可選。設置公司的默認貨幣,如果沒有指定。
 DocType: Address,Office,辦公室
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,標準報告
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,會計日記帳分錄。
@@ -3736,17 +3738,17 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,請選擇員工記錄第一。
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},行{0}:甲方/客戶不與匹配{1} / {2} {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,要創建一個納稅帳戶
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,請輸入您的費用帳戶
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,請輸入您的費用帳戶
 DocType: Account,Stock,庫存
 DocType: Employee,Current Address,當前地址
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",如果項目是另一項目,然後描述,圖像,定價,稅費等會從模板中設置的一個變體,除非明確指定
 DocType: Serial No,Purchase / Manufacture Details,採購/製造詳細資訊
-apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,批量庫存
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,批量庫存
 DocType: Employee,Contract End Date,合同結束日期
 DocType: Sales Order,Track this Sales Order against any Project,跟踪對任何項目這個銷售訂單
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,基於上述標準拉銷售訂單(待定提供)
 DocType: DocShare,Document Type,文件類型
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +667,From Supplier Quotation,從供應商報價
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,從供應商報價
 DocType: Deduction Type,Deduction Type,扣類型
 DocType: Attendance,Half Day,半天
 DocType: Pricing Rule,Min Qty,最小數量
@@ -3793,7 +3795,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,實際數量是強制性
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,信用卡
 DocType: BOM,Item to be manufactured or repacked,產品被製造或重新包裝
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,庫存交易的預設設定。
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,庫存交易的預設設定。
 DocType: Purchase Invoice,Next Date,下一個日期
 DocType: Employee Education,Major/Optional Subjects,大/選修課
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,請輸入稅費
@@ -3812,8 +3814,8 @@
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,按部門封鎖請假申請。
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,車是空的
 DocType: Production Order,Actual Operating Cost,實際運行成本
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,root不能被編輯。
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,分配的金額不能超過未調整金額
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,root不能被編輯。
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,分配的金額不能超過未調整金額
 DocType: Manufacturing Settings,Allow Production on Holidays,允許生產的假日
 DocType: Sales Order,Customer's Purchase Order Date,客戶的採購訂單日期
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,股本
@@ -3836,16 +3838,16 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(半天)
 DocType: Supplier,Credit Days,信貸天
 DocType: Leave Type,Is Carry Forward,是弘揚
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Get Items from BOM,從物料清單獲取項目
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,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/config/manufacturing.py +120,Bill of Materials,材料清單
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},行{0}:黨的類型和黨的需要應收/應付帳戶{1}
 DocType: Dropbox Backup,Send Notifications To,發送通知給
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,參考日期
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,參考日期
 DocType: Employee,Reason for Leaving,離職原因
 DocType: Expense Claim Detail,Sanctioned Amount,制裁金額
 DocType: GL Entry,Is Opening,是開幕
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},行{0}:借記條目不能與連接的{1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,帳戶{0}不存在
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,帳戶{0}不存在
 DocType: Account,Cash,現金
 DocType: Employee,Short biography for website and other publications.,網站和其他出版物的短的傳記。