[Translation] Updated Translations (#15518)
diff --git a/erpnext/translations/zh.csv b/erpnext/translations/zh.csv
index 5ec0aa6..47cebbf 100644
--- a/erpnext/translations/zh.csv
+++ b/erpnext/translations/zh.csv
@@ -12,7 +12,7 @@
DocType: Item,Customer Items,客户物料
DocType: Project,Costing and Billing,成本核算和计费
apps/erpnext/erpnext/hr/doctype/employee_advance/employee_advance.py +43,Advance account currency should be same as company currency {0},预付科目货币应与公司货币{0}相同
-apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} can not be a ledger,科目{0}的上级科目{1}不能是分类账
+apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} can not be a ledger,科目{0}的上级科目{1}不能是分类账
DocType: Item,Publish Item to hub.erpnext.com,发布项目hub.erpnext.com
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +271,Cannot find active Leave Period,找不到有效的休假期间
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +22,Evaluation,评估
@@ -24,7 +24,7 @@
DocType: Restaurant Order Entry,Click Enter To Add,点击输入要添加
apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py +29,"Missing value for Password, API Key or Shopify URL",缺少密码，API密钥或Shopify网址的值
DocType: Employee,Rented,租
-apps/erpnext/erpnext/public/js/setup_wizard.js +231,All Accounts,所有科目
+apps/erpnext/erpnext/public/js/setup_wizard.js +243,All Accounts,所有科目
apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +15,Cannot transfer Employee with status Left,状态为已离职的员工不能进行调动
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +216,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",停止生产订单无法取消，首先Unstop它取消
DocType: Vehicle Service,Mileage,里程
@@ -33,7 +33,7 @@
apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,选择默认供应商
apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +26,Show Employee,显示员工
DocType: Exchange Rate Revaluation Account,New Exchange Rate,新汇率
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},价格清单{0}需要制定货币
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},价格清单{0}需要制定货币
DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,*将被计算在该交易内。
DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
DocType: Purchase Order,Customer Contact,客户联系
@@ -63,7 +63,7 @@
DocType: Employee Tax Exemption Declaration,HRA as per Salary Structure,HRA根据薪资结构
DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,会计分录和维护余额操作针对的组(头)
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Outstanding for {0} cannot be less than zero ({1}),未付{0}不能小于零（ {1} ）
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1581,Service Stop Date cannot be before Service Start Date,服务停止日期不能早于服务开始日期
+apps/erpnext/erpnext/public/js/controllers/transaction.js +809,Service Stop Date cannot be before Service Start Date,服务停止日期不能早于服务开始日期
DocType: Manufacturing Settings,Default 10 mins,默认为10分钟
DocType: Leave Type,Leave Type Name,休假类型名称
apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,公开显示
@@ -117,12 +117,11 @@
DocType: Lab Prescription,Lab Prescription,实验室处方
,Delay Days,延迟天数
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,服务费用
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1010,Serial Number: {0} is already referenced in Sales Invoice: {1},序号：{0}已在销售发票中引用：{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +993,Serial Number: {0} is already referenced in Sales Invoice: {1},序号：{0}已在销售发票中引用：{1}
DocType: Bank Statement Transaction Invoice Item,Invoice,发票
DocType: Purchase Invoice Item,Item Weight Details,物料重量
DocType: Asset Maintenance Log,Periodicity,周期性
apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,会计年度{0}是必需的
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Group,供应商>供应商组
DocType: Crop Cycle,The minimum distance between rows of plants for optimum growth,植株之间的最小距离，以获得最佳生长
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +21,Defense,Defense
DocType: Salary Component,Abbr,缩写
@@ -170,7 +169,6 @@
DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Appointment charges.,如果未在患者中设置预约费用，则使用默认应收帐户。
DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name",附加.csv文件有两列，一为旧名称，一个用于新名称
apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +192,From Address 2,来自地址2
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,商品代码>商品分组>品牌
apps/erpnext/erpnext/accounts/utils.py +74,{0} {1} not in any active Fiscal Year.,{0} {1} 不在任一激活的财务年度中。
DocType: Packed Item,Parent Detail docname,上级物料名
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",参考：{0}，物料代号：{1}和顾客：{2}
@@ -194,7 +192,7 @@
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +617,Get items from,从...获取物料
DocType: Price List,Price Not UOM Dependant,价格不依赖于UOM
DocType: Purchase Invoice,Apply Tax Withholding Amount,申请预扣税金额
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,Stock cannot be updated against Delivery Note {0},销售出货单{0}不能更新库存
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +529,Stock cannot be updated against Delivery Note {0},销售出货单{0}不能更新库存
apps/erpnext/erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py +122,Total Amount Credited,总金额
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},产品{0}
apps/erpnext/erpnext/templates/generators/item_group.html +33,No items listed,没有物料
@@ -210,7 +208,7 @@
DocType: SMS Center,All Sales Person,所有的销售人员
DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,**月度分配**帮助你分配预算/目标跨越几个月，如果你在你的业务有季节性。
apps/erpnext/erpnext/accounts/page/pos/pos.js +1770,Not items found,未找到物料
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +265,Salary Structure Missing,未分配薪资结构
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +267,Salary Structure Missing,未分配薪资结构
DocType: Lead,Person Name,姓名
DocType: Sales Invoice Item,Sales Invoice Item,销售发票物料
DocType: Account,Credit,贷方
@@ -231,7 +229,7 @@
DocType: BOM,Item Image (if not slideshow),物料图片(如果没有轮播图片)
DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,（小时率/ 60）*实际操作时间
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1119,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,行＃{0}：参考文档类型必须是费用报销或手工凭证之一
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1032,Select BOM,选择BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1050,Select BOM,选择BOM
DocType: SMS Log,SMS Log,短信日志
apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,出货物料成本
apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +39,The holiday on {0} is not between From Date and To Date,在{0}这个节日之间没有从日期和结束日期
@@ -249,7 +247,7 @@
apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,账户仅用于支付
DocType: Loan,Repay Over Number of Periods,偿还期的超过数
DocType: Stock Entry,Additional Costs,额外费用
-apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Account with existing transaction can not be converted to group.,有交易的科目不能被转换为组。
+apps/erpnext/erpnext/accounts/doctype/account/account.py +145,Account with existing transaction can not be converted to group.,有交易的科目不能被转换为组。
DocType: Lead,Product Enquiry,产品查询
DocType: Education Settings,Validate Batch for Students in Student Group,验证学生组学生的批次
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +38,No leave record found for employee {0} for {1},未找到员工的休假记录{0} {1}
@@ -310,7 +308,7 @@
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +427,"Cannot ensure delivery by Serial No as \
Item {0} is added with and without Ensure Delivery by \
Serial No.",无法通过序列号确保交货，因为\项目{0}是否添加了确保交货\序列号
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +193,At least one mode of payment is required for POS invoice.,需要为POS发票定义至少付款模式
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +194,At least one mode of payment is required for POS invoice.,需要为POS发票定义至少付款模式
DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,银行对账单交易发票项目
DocType: Products Settings,Show Products as a List,产品展示作为一个列表
DocType: Salary Detail,Tax on flexible benefit,弹性福利计税
@@ -321,7 +319,7 @@
apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,差异数量
DocType: Production Plan,Material Request Detail,物料申请信息
DocType: Selling Settings,Default Quotation Validity Days,默认报价有效天数
-apps/erpnext/erpnext/controllers/accounts_controller.py +869,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",要包括税款，行{0}项率，税收行{1}也必须包括在内
+apps/erpnext/erpnext/controllers/accounts_controller.py +868,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",要包括税款，行{0}项率，税收行{1}也必须包括在内
DocType: SMS Center,SMS Center,短信中心
DocType: Payroll Entry,Validate Attendance,验证考勤
DocType: Sales Invoice,Change Amount,找零
@@ -376,6 +374,7 @@
apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},物料{0}的安装日期不能早于交付日期
DocType: Pricing Rule,Discount on Price List Rate (%),基于价格清单价格的折扣（％）
apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,物料模板
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +213,Please set Naming Series for {0} via Setup > Settings > Naming Series,请通过设置>设置>命名系列为{0}设置命名系列
DocType: Job Offer,Select Terms and Conditions,选择条款和条件
apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +80,Out Value,输出值
DocType: Bank Statement Settings Item,Bank Statement Settings Item,银行对账单设置项
@@ -447,7 +446,7 @@
,Open Work Orders,打开工单
DocType: Healthcare Practitioner,Out Patient Consulting Charge Item,出患者咨询费用项目
DocType: Payment Term,Credit Months,信贷月份
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +492,Net Pay cannot be less than 0,净工资不能低于0
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +494,Net Pay cannot be less than 0,净工资不能低于0
DocType: Contract,Fulfilled,达到
DocType: Inpatient Record,Discharge Scheduled,出院预定
apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Relieving Date must be greater than Date of Joining,离职日期必须晚于入职日期
@@ -535,10 +534,11 @@
DocType: Tax Rule,Shipping County,航运县
DocType: Currency Exchange,For Selling,出售
apps/erpnext/erpnext/config/desktop.py +159,Learn,学习
+DocType: Purchase Invoice Item,Enable Deferred Expense,启用延期费用
DocType: Asset,Next Depreciation Date,接下来折旧日期
apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,每个员工活动费用
DocType: Accounts Settings,Settings for Accounts,科目设置
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +756,Supplier Invoice No exists in Purchase Invoice {0},供应商发票不存在采购发票{0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +760,Supplier Invoice No exists in Purchase Invoice {0},供应商发票不存在采购发票{0}
apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,管理销售人员。
DocType: Job Applicant,Cover Letter,求职信
apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,待清帐支票及存款
@@ -568,7 +568,7 @@
DocType: Journal Entry,Multi Currency,多币种
DocType: Bank Statement Transaction Invoice Item,Invoice Type,发票类型
DocType: Employee Benefit Claim,Expense Proof,费用证明
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +971,Delivery Note,销售出货
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +989,Delivery Note,销售出货
DocType: Patient Encounter,Encounter Impression,遇到印象
apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,设置税码及税务规则
apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Cost of Sold Asset,出售资产的成本
@@ -618,7 +618,7 @@
DocType: Support Search Source,Response Result Key Path,响应结果关键路径
DocType: Journal Entry,Inter Company Journal Entry,Inter公司手工凭证
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +538,For quantity {0} should not be grater than work order quantity {1},数量{0}不应超过工单数量{1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +522,Please see attachment,请参阅附件
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +524,Please see attachment,请参阅附件
DocType: Purchase Order,% Received,％已收货
apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,创建挺起胸
DocType: Volunteer,Weekends,周末
@@ -672,7 +672,7 @@
DocType: Purchase Receipt,Vehicle Date,车日期
DocType: Student Log,Medical,医药
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,原因丢失
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1765,Please select Drug,请选择药物
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1750,Please select Drug,请选择药物
apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,线索负责人不能是线索本身
apps/erpnext/erpnext/accounts/utils.py +380,Allocated amount can not greater than unadjusted amount,已核销金额不能超过未调整金额
DocType: Announcement,Receiver,接收器
@@ -692,7 +692,7 @@
DocType: Purchase Invoice Item,Quantity and Rate,数量和价格
DocType: Delivery Note,% Installed,％已安装
apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,教室/实验室等在那里的演讲可以预定。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1406,Company currencies of both the companies should match for Inter Company Transactions.,两家公司的公司货币应该符合Inter公司交易。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1292,Company currencies of both the companies should match for Inter Company Transactions.,两家公司的公司货币应该符合Inter公司交易。
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,请先输入公司名称
DocType: Travel Itinerary,Non-Vegetarian,非素食主义者
DocType: Purchase Invoice,Supplier Name,供应商名称
@@ -768,7 +768,7 @@
DocType: Journal Entry,Accounts Payable,应付帐款
apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +55,The amount of {0} set in this payment request is different from the calculated amount of all payment plans: {1}. Make sure this is correct before submitting the document.,此付款申请中设置的{0}金额与所有付款计划的计算金额不同：{1}。在提交文档之前确保这是正确的。
DocType: Patient,Allergies,过敏
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +36,The selected BOMs are not for the same item,所选物料清单不能用于同一个物料
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +43,The selected BOMs are not for the same item,所选物料清单不能用于同一个物料
apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +32,Change Item Code,更改物料代码
DocType: Supplier Scorecard Standing,Notify Other,通知其他
DocType: Vital Signs,Blood Pressure (systolic),血压（收缩期）
@@ -780,7 +780,7 @@
apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,足够的配件组装
DocType: POS Profile User,POS Profile User,POS配置文件用户
apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,行{0}：折旧开始日期是必需的
-DocType: Sales Invoice Item,Service Start Date,服务开始日期
+DocType: Purchase Invoice Item,Service Start Date,服务开始日期
DocType: Subscription Invoice,Subscription Invoice,订阅发票
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,直接收益
DocType: Patient Appointment,Date TIme,约会时间
@@ -834,7 +834,9 @@
apps/erpnext/erpnext/config/stock.py +337,Managing Subcontracting,管理外包
DocType: Vital Signs,Body Temperature,体温
DocType: Project,Project will be accessible on the website to these users,这些用户可在网站上访问该项目
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +292,Cannot cancel {0} {1} because Serial No {2} does not belong to the warehouse {3},无法取消{0} {1}，因为序列号{2}不属于仓库{3}
DocType: Detected Disease,Disease,疾病
+DocType: Company,Default Deferred Expense Account,默认递延费用帐户
apps/erpnext/erpnext/config/projects.py +29,Define Project type.,定义项目类型。
DocType: Supplier Scorecard,Weighting Function,加权函数
DocType: Healthcare Practitioner,OP Consulting Charge,OP咨询费
@@ -924,7 +926,7 @@
DocType: Sales Invoice,Shipping Bill Date,运费单日期
DocType: Production Plan,Production Plan,生产计划
DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,发票创建工具
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +878,Sales Return,销售退货
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +896,Sales Return,销售退货
apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +110,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,注：总分配叶{0}应不低于已核定叶{1}期间
DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,根据序列号输入设置交易数量
,Total Stock Summary,总库存总结
@@ -964,7 +966,7 @@
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,包起来
apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,通过电子邮件通知客户
DocType: Item,Batch Number Series,批号系列
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,另外销售人员{0}存在具有相同员工ID
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +54,Another Sales Person {0} exists with the same Employee id,另外销售人员{0}存在具有相同员工ID
DocType: Employee Advance,Claimed Amount,申报金额
DocType: Travel Itinerary,Departure Datetime,离开日期时间
DocType: Customer,CUST-.YYYY.-,CUST-.YYYY.-
@@ -1012,7 +1014,7 @@
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +112,Manager,经理
DocType: Payment Entry,Payment From / To,支付自/至
apps/erpnext/erpnext/selling/doctype/customer/customer.py +185,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},新的信用额度小于该客户未付总额。信用额度至少应该是 {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +439,Please set account in Warehouse {0},请在仓库{0}中设置科目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +443,Please set account in Warehouse {0},请在仓库{0}中设置科目
apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,“根据”和“分组依据”不能相同
DocType: Sales Person,Sales Person Targets,销售人员目标
DocType: Work Order Operation,In minutes,以分钟为单位
@@ -1023,7 +1025,7 @@
DocType: Fee Validity,Max number of visit,最大访问次数
,Hotel Room Occupancy,酒店客房入住率
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,创建工时单：
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Please set default Cash or Bank account in Mode of Payment {0},请为付款方式{0}设置默认的现金或银行科目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1197,Please set default Cash or Bank account in Mode of Payment {0},请为付款方式{0}设置默认的现金或银行科目
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,注册
DocType: GST Settings,GST Settings,GST设置
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},货币应与价格清单货币相同：{0}
@@ -1064,12 +1066,12 @@
DocType: Loan,Total Interest Payable,合计应付利息
DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,到岸成本税费
DocType: Work Order Operation,Actual Start Time,实际开始时间
+DocType: Purchase Invoice Item,Deferred Expense Account,递延费用帐户
DocType: BOM Operation,Operation Time,操作时间
apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +466,Finish,完
DocType: Salary Structure Assignment,Base,基础
DocType: Timesheet,Total Billed Hours,帐单总时间
DocType: Travel Itinerary,Travel To,目的地
-apps/erpnext/erpnext/controllers/buying_controller.py +759,is not,不是
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1659,Write Off Amount,销帐金额
DocType: Leave Block List Allow,Allow User,允许用户
DocType: Journal Entry,Bill No,账单编号
@@ -1119,14 +1121,12 @@
DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,只有在设置了“现金流量映射器”文档时才能选择
apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +186,From Address 1,来自地址1
DocType: Email Digest,Next email will be sent on:,下次邮件发送时间：
-apps/erpnext/erpnext/controllers/buying_controller.py +756,"Following item {items} {verb} marked as {message} item.\
- You can enable them as {message} item from its Item master",以下物料{item} {verb}被标记为{message}项。\您可以从其物料主数据中将其作为{message}项启用
DocType: Supplier Scorecard,Per Week,每个星期
apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item has variants.,物料有变体。
apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,学生总数
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,物料{0}未找到
DocType: Bin,Stock Value,库存值
-apps/erpnext/erpnext/accounts/doctype/account/account.py +197,Company {0} does not exist,公司{0}不存在
+apps/erpnext/erpnext/accounts/doctype/account/account.py +202,Company {0} does not exist,公司{0}不存在
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +43,{0} has fee validity till {1},{0}有效期至{1}
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +54,Tree Type,树类型
DocType: BOM Explosion Item,Qty Consumed Per Unit,每单位消耗数量
@@ -1172,7 +1172,7 @@
DocType: Inpatient Record,O Negative,O负面
DocType: Work Order Operation,Planned End Time,计划结束时间
,Sales Person Target Variance Item Group-Wise,物料组的销售人员目标差异
-apps/erpnext/erpnext/accounts/doctype/account/account.py +95,Account with existing transaction cannot be converted to ledger,有交易的科目不能被转换为分类账
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Account with existing transaction cannot be converted to ledger,有交易的科目不能被转换为分类账
apps/erpnext/erpnext/config/non_profit.py +33,Memebership Type Details,Memebership类型详细信息
DocType: Delivery Note,Customer's Purchase Order No,客户的采购订单号
DocType: Clinical Procedure,Consume Stock,消费股票
@@ -1185,14 +1185,14 @@
DocType: Soil Texture,Sand,砂
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,能源
DocType: Opportunity,Opportunity From,机会来源
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +998,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,{1}请为第{0}行的物料{2}指定序列号。你已经提供{3}。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +981,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,{1}请为第{0}行的物料{2}指定序列号。你已经提供{3}。
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,请选择一张桌子
DocType: BOM,Website Specifications,网站规格
DocType: Special Test Items,Particulars,细节
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}：申请者{0} 休假类型{1}
apps/erpnext/erpnext/controllers/buying_controller.py +386,Row {0}: Conversion Factor is mandatory,行{0}：转换系数必填
DocType: Student,A+,A +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +351,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",海报价格规则，同样的标准存在，请分配优先级解决冲突。价格规则：{0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +353,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",海报价格规则，同样的标准存在，请分配优先级解决冲突。价格规则：{0}
DocType: Exchange Rate Revaluation,Exchange Rate Revaluation Account,汇率重估科目
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Cannot deactivate or cancel BOM as it is linked with other BOMs,无法停用或取消BOM，因为它被其他BOM引用。
apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js +106,Please select Company and Posting Date to getting entries,请选择公司和发布日期以获取条目
@@ -1259,6 +1259,7 @@
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1125,"Item {0} (Serial No: {1}) cannot be consumed as is reserverd\
to fullfill Sales Order {2}.",无法将项目{0}（序列号：{1}）用作reserverd \以完成销售订单{2}。
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Office Maintenance Expenses,办公维护费用
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","开始日期和结束日期与作业卡<a href=""#Form/Job Card/{0}"">{1}</a>重叠"
apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,去
DocType: Shopify Settings,Update Price from Shopify To ERPNext Price List,将Shopify更新到ERPNext价格清单
apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,设置电子邮件科目
@@ -1270,7 +1271,7 @@
DocType: Salary Component,Do not include in total,不包括在总金额内
DocType: Company,Default Cost of Goods Sold Account,默认销货成本科目
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1291,Sample quantity {0} cannot be more than received quantity {1},采样数量{0}不能超过接收数量{1}
-apps/erpnext/erpnext/stock/get_item_details.py +519,Price List not selected,价格列表没有选择
+apps/erpnext/erpnext/stock/get_item_details.py +523,Price List not selected,价格列表没有选择
DocType: Employee,Family Background,家庭背景
DocType: Request for Quotation Supplier,Send Email,发送电子邮件
apps/erpnext/erpnext/stock/doctype/item/item.py +243,Warning: Invalid Attachment {0},警告：无效的附件{0}
@@ -1305,8 +1306,7 @@
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +112,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}：成本中心{2}不属于公司{3}
apps/erpnext/erpnext/utilities/user_progress.py +92,Upload your letter head (Keep it web friendly as 900px by 100px),上传你的信头（保持网页友好，900px乘100px）
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +89,{0} {1}: Account {2} cannot be a Group,{0} {1}科目{2}不能是一个组
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,项目行{idx}: {文档类型}上不存在'{文档类型}'表
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Timesheet {0} is already completed or cancelled,工时单{0}已完成或取消
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +357,Timesheet {0} is already completed or cancelled,工时单{0}已完成或取消
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,没有任务
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +81,Sales Invoice {0} created as paid,销售发票{0}已创建为已付款
DocType: Item Variant Settings,Copy Fields to Variant,将字段复制到变式
@@ -1331,7 +1331,7 @@
apps/erpnext/erpnext/hr/doctype/leave_period/leave_period.py +73,Allocating leaves...,分配叶子......
DocType: Program Enrollment,Vehicle/Bus Number,车辆/巴士号码
apps/erpnext/erpnext/education/doctype/course/course.js +17,Course Schedule,课程表
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +568,"You have to Deduct Tax for Unsubmitted Tax Exemption Proof and Unclaimed \
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +570,"You have to Deduct Tax for Unsubmitted Tax Exemption Proof and Unclaimed \
Employee Benefits in the last Salary Slip of Payroll Period",您必须在工资核算期最后一个工资单上扣除未提交免税证明和尚未申报员工福利对应的应纳税款
DocType: Request for Quotation Supplier,Quote Status,报价状态
DocType: GoCardless Settings,Webhooks Secret,Webhooks的秘密
@@ -1373,12 +1373,10 @@
DocType: Fertilizer,Fertilizer Contents,肥料含量
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +331,Research & Development,研究与发展
apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,待开票金额
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","开始日期和结束日期与作业卡<a href=""#Form/Job Card/{0}"">{1}</a>重叠"
DocType: Company,Registration Details,工商注册信息
DocType: Timesheet,Total Billed Amount,总开单金额
DocType: Item Reorder,Re-Order Qty,再订货数量
DocType: Leave Block List Date,Leave Block List Date,禁离日日期
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,请在教育>教育设置中设置教师命名系统
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +101,BOM #{0}: Raw material cannot be same as main Item,物料清单＃{0}：原材料不能是BOM产出物料
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,基于采购收货单信息计算的总税费必须与采购单（单头）的总税费一致
DocType: Sales Team,Incentives,提成
@@ -1392,7 +1390,7 @@
apps/erpnext/erpnext/config/selling.py +332,Point-of-Sale,销售点
DocType: Fee Schedule,Fee Creation Status,费用创建状态
DocType: Vehicle Log,Odometer Reading,里程表读数
-apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",科目余额已设置为'贷方'，不能设置为'借方'
+apps/erpnext/erpnext/accounts/doctype/account/account.py +123,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",科目余额已设置为'贷方'，不能设置为'借方'
DocType: Account,Balance must be,余额借贷方向属性
DocType: Notification Control,Expense Claim Rejected Message,报销被拒原因
,Available Qty,可用数量
@@ -1404,7 +1402,7 @@
DocType: Amazon MWS Settings,Always synch your products from Amazon MWS before synching the Orders details,在同步订单详细信息之前，始终从亚马逊MWS同步您的产品
DocType: Delivery Trip,Delivery Stops,交货站点
DocType: Salary Slip,Working Days,工作日
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +577,Cannot change Service Stop Date for item in row {0},无法更改行{0}中项目的服务停止日期
+apps/erpnext/erpnext/accounts/deferred_revenue.py +33,Cannot change Service Stop Date for item in row {0},无法更改行{0}中项目的服务停止日期
DocType: Serial No,Incoming Rate,入库库存评估价
DocType: Packing Slip,Gross Weight,毛重
DocType: Leave Type,Encashment Threshold Days,最大允许折现天数
@@ -1439,7 +1437,7 @@
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +250,Closing (Opening + Total),期末（期初+总计）
DocType: Payroll Entry,Number Of Employees,在职员工人数
DocType: Journal Entry,Depreciation Entry,折旧分录
-apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Please select the document type first,请先选择文档类型
+apps/erpnext/erpnext/selling/report/sales_person_commission_summary/sales_person_commission_summary.py +31,Please select the document type first,请先选择文档类型
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,取消此上门保养之前请先取消物料访问{0}
DocType: Pricing Rule,Rate or Discount,价格或折扣
DocType: Vital Signs,One Sided,单面
@@ -1460,7 +1458,7 @@
apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +102,Please save before assigning task.,在分配任务之前请保存。
apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +82,Balance Value,结余金额
DocType: Lab Test,Lab Technician,实验室技术员
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,销售价格清单
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Sales Price List,销售价格清单
DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.",如果选中，将创建一个客户，映射到患者。将针对该客户创建病人发票。您也可以在创建患者时选择现有客户。
apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.py +63,Customer isn't enrolled in any Loyalty Program,客户未加入任何忠诚度计划
@@ -1520,15 +1518,16 @@
DocType: Lead,CRM-LEAD-.YYYY.-,CRM-LEAD-.YYYY.-
DocType: Loan,Sanctioned,核准
apps/erpnext/erpnext/accounts/page/pos/pos.js +78, is mandatory. Maybe Currency Exchange record is not created for ,必填。也许外币汇率记录没有创建
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +8,Total Contribution Amount: {0},总贡献金额：{0}
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,Row #{0}: Please specify Serial No for Item {1},行＃{0}：请为物料{1}指定序号
DocType: Payroll Entry,Salary Slips Submitted,提交工资单
DocType: Crop Cycle,Crop Cycle,作物周期
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",对于“产品包”的物料，仓库，序列号和批号将被从“装箱单”表考虑。如果仓库和批次号是相同的任何“产品包”项目的所有包装物料，这些值可以在主项表中输入，值将被复制到“装箱单”表。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +678,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",对于“产品包”的物料，仓库，序列号和批号将被从“装箱单”表考虑。如果仓库和批次号是相同的任何“产品包”项目的所有包装物料，这些值可以在主项表中输入，值将被复制到“装箱单”表。
DocType: Amazon MWS Settings,BR,BR
apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +198,From Place,从地方
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +458,Net Pay cannnot be negative,净薪酬不能为负
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +460,Net Pay cannnot be negative,净薪酬不能为负
DocType: Student Admission,Publish on website,发布在网站上
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +734,Supplier Invoice Date cannot be greater than Posting Date,供应商发票的日期不能超过过帐日期更大
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +738,Supplier Invoice Date cannot be greater than Posting Date,供应商发票的日期不能超过过帐日期更大
DocType: Installation Note,MAT-INS-.YYYY.-,MAT-INS-.YYYY.-
DocType: Subscription,Cancelation Date,取消日期
DocType: Purchase Invoice Item,Purchase Order Item,采购订单项
@@ -1582,7 +1581,6 @@
DocType: Purchase Invoice,Get Advances Paid,获取已付预付款
DocType: Item,Automatically Create New Batch,自动创建新批
DocType: Supplier,Represents Company,代表公司
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +71,Make ,生成
DocType: Student Admission,Admission Start Date,入学开始日期
DocType: Journal Entry,Total Amount in Words,总金额词
apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,新员工
@@ -1592,7 +1590,7 @@
DocType: Lead,Next Contact Date,下次联络日期
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,期初数量
DocType: Healthcare Settings,Appointment Reminder,预约提醒
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +539,Please enter Account for Change Amount,请输入零钱科目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +540,Please enter Account for Change Amount,请输入零钱科目
DocType: Program Enrollment Tool Student,Student Batch Name,学生批名
DocType: Holiday List,Holiday List Name,假期列表名称
DocType: Repayment Schedule,Balance Loan Amount,平衡贷款额
@@ -1608,7 +1606,7 @@
DocType: Patient,Patient Relation,患者关系
DocType: Item,Hub Category to Publish,集线器类别发布
DocType: Leave Block List,Leave Block List Dates,禁离日列表日期
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +291,"Sales Order {0} has reservation for item {1}, you can
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +297,"Sales Order {0} has reservation for item {1}, you can
only deliver reserved {1} against {0}. Serial No {2} cannot
be delivered",销售订单{0}对项目{1}有预留，您只能对{0}提供保留的{1}。序列号{2}无法发送
DocType: Sales Invoice,Billing Address GSTIN,帐单地址GSTIN
@@ -1636,6 +1634,7 @@
DocType: POS Closing Voucher,Period End Date,期末结束日期
apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +27,Soil compositions do not add up to 100,土壤成分不加100
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +623,Discount,折扣
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {0}: {1} is required to create the Opening {2} Invoices,行{0}：{1}是创建开始{2}发票所必需的
DocType: Membership,Membership,籍
DocType: Asset,Total Number of Depreciations,折旧总数
DocType: Sales Invoice Item,Rate With Margin,利率保证金
@@ -1681,7 +1680,7 @@
DocType: Tax Rule,Shipping State,运输状态
,Projected Quantity as Source,基于预期可用库存
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,项目必须要由“从采购收货单获取物料”添加
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +883,Delivery Trip,销售出货配送路线安排
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +901,Delivery Trip,销售出货配送路线安排
DocType: Student,A-,A-
DocType: Share Transfer,Transfer Type,转移类型
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,销售费用
@@ -1750,8 +1749,8 @@
DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-形式发票详细信息
DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,付款发票对账
DocType: Clinical Procedure,Procedure Template,程序模板
-apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution %,贡献％
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +239,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}",根据采购设置，如果需要采购订单=='是'，那么为了创建采购发票，用户需要首先为项目{0}创建采购订单
+apps/erpnext/erpnext/selling/report/sales_person_commission_summary/sales_person_commission_summary.py +75,Contribution %,贡献％
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +243,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}",根据采购设置，如果需要采购订单=='是'，那么为了创建采购发票，用户需要首先为项目{0}创建采购订单
,HSN-wise-summary of outward supplies,HSN明智的向外供应摘要
DocType: Company,Company registration numbers for your reference. Tax numbers etc.,公司注册号码，供大家参考。税务号码等
apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +258,To State,国家
@@ -1814,7 +1813,7 @@
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +415,You cannot restart a Subscription that is not cancelled.,您无法重新启动未取消的订阅。
DocType: Account,Balance Sheet,资产负债表
DocType: Leave Type,Is Earned Leave,是年假？有薪假
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Cost Center For Item with Item Code ',成本中心：物料代码‘
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +797,Cost Center For Item with Item Code ',成本中心：物料代码‘
DocType: Fee Validity,Valid Till,有效期至
DocType: Student Report Generation Tool,Total Parents Teacher Meeting,总计家长教师会议
apps/erpnext/erpnext/accounts/page/pos/pos.js +2529,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",付款方式未配置。请检查付款方式或POS配置中是否设置了科目。
@@ -1893,7 +1892,7 @@
,Budget Variance Report,预算差异报表
DocType: Salary Slip,Gross Pay,工资总额
DocType: Item,Is Item from Hub,是来自Hub的Item
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1652,Get Items from Healthcare Services,从医疗保健服务获取项目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1637,Get Items from Healthcare Services,从医疗保健服务获取项目
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,行{0}：活动类型是强制性的。
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Dividends Paid,股利支付
apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +39,Accounting Ledger,会计总帐
@@ -1908,6 +1907,7 @@
apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +20,Payment Mode,付款方式
DocType: Purchase Invoice,Supplied Items,供应的物料
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},请设置餐馆{0}的有效菜单
+apps/erpnext/erpnext/selling/report/sales_person_commission_summary/sales_person_commission_summary.py +81,Commission Rate %,佣金率％
DocType: Work Order,Qty To Manufacture,生产数量
DocType: Email Digest,New Income,新的收入
DocType: Buying Settings,Maintain same rate throughout purchase cycle,在整个采购周期使用同一价格
@@ -1961,7 +1961,7 @@
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,Row {0}: Qty is mandatory,第{0}行的数量字段必填
DocType: Agriculture Analysis Criteria,Agriculture,农业
apps/erpnext/erpnext/manufacturing/doctype/blanket_order/blanket_order.js +15,Create Sales Order,创建销售订单
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +502,Accounting Entry for Asset,资产会计分录
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +506,Accounting Entry for Asset,资产会计分录
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +808,Block Invoice,阻止发票
apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.js +16,Quantity to Make,待生产数量
apps/erpnext/erpnext/accounts/page/pos/pos.js +803,Sync Master Data,同步主数据
@@ -1982,7 +1982,8 @@
DocType: Warehouse,Warehouse Contact Info,仓库联系方式
DocType: Payment Entry,Write Off Difference Amount,销帐差异金额
DocType: Volunteer,Volunteer Name,志愿者姓名
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +533,"{0}: Employee email not found, hence email not sent",{0}：未发现员工的电子邮件，因此，电子邮件未发
+apps/erpnext/erpnext/controllers/accounts_controller.py +775,Rows with duplicate due dates in other rows were found: {0},发现其他行中具有重复截止日期的行：{0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent",{0}：未发现员工的电子邮件，因此，电子邮件未发
apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},给定日期{1}的员工{0}没有分配薪金结构
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},运费规则不适用于国家/地区{0}
DocType: Item,Foreign Trade Details,外贸详细
@@ -1994,7 +1995,7 @@
DocType: Student Group Student,Group Roll Number,组卷编号
DocType: Student Group Student,Group Roll Number,组卷编号
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +177,"For {0}, only credit accounts can be linked against another debit entry",对于{0}，贷方分录只能选择贷方科目
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +667,Delivery Note {0} is not submitted,销售出货单{0}未提交
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +650,Delivery Note {0} is not submitted,销售出货单{0}未提交
apps/erpnext/erpnext/stock/get_item_details.py +167,Item {0} must be a Sub-contracted Item,项目{0}必须是外包项目
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,资本设备
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",定价规则是第一选择是基于“应用在”字段，可以是项目，项目组或品牌。
@@ -2014,6 +2015,7 @@
apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,创建打印格式
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +5,Fee Created,创建费用
apps/erpnext/erpnext/utilities/bot.py +39,Did not find any item called {0},没有找到名字为{0}的物料
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.js +8,Items Filter,物品过滤
DocType: Supplier Scorecard Criteria,Criteria Formula,标准配方
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,总待付款
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +39,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",“至值”为0或为空的运输规则条件最多只能有一个
@@ -2046,7 +2048,7 @@
{total_score} (the total score from that period),
{period_number} (the number of periods to present day)
",可以使用记分卡变量，以及：{total_score}（该期间的总分数），{period_number}（到当前时间段的数量）
-apps/erpnext/erpnext/public/js/setup_wizard.js +242,Collapse All,全部收缩
+apps/erpnext/erpnext/public/js/setup_wizard.js +254,Collapse All,全部收缩
apps/erpnext/erpnext/manufacturing/doctype/blanket_order/blanket_order.js +27,Create Purchase Order,创建采购订单
DocType: Quality Inspection Reading,Reading 8,检验结果8
DocType: Inpatient Record,Discharge Note,卸货说明
@@ -2063,7 +2065,7 @@
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +95,Privilege Leave,特权休假
DocType: Purchase Invoice,Supplier Invoice Date,供应商发票日期
DocType: Asset Settings,This value is used for pro-rata temporis calculation,该值用于按比例计算
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,您需要启用购物车
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +91,You need to enable Shopping Cart,您需要启用购物车
DocType: Payment Entry,Writeoff,注销
DocType: Maintenance Visit,MAT-MVS-.YYYY.-,MAT-MVS-.YYYY.-
DocType: Stock Settings,Naming Series Prefix,命名系列前缀
@@ -2082,7 +2084,6 @@
apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +69,Ageing Range 3,账龄范围3
DocType: POS Closing Voucher Details,POS Closing Voucher Details,POS关闭凭证详细信息
DocType: Shopify Log,Shopify Log,Shopify日志
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +213,Please set Naming Series for {0} via Setup > Settings > Naming Series,请通过设置>设置>命名系列为{0}设置命名系列
DocType: Inpatient Occupancy,Check In,报到
DocType: Maintenance Schedule Item,No of Visits,访问数量
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},针对{1}存在维护计划{0}
@@ -2133,7 +2134,7 @@
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,在固定资产净变动
apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,需要数量
DocType: Leave Control Panel,Leave blank if considered for all designations,如果针对所有 职位请留空
-apps/erpnext/erpnext/controllers/accounts_controller.py +875,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}中的收取类型“实际”不能有“物料税率”
+apps/erpnext/erpnext/controllers/accounts_controller.py +874,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}中的收取类型“实际”不能有“物料税率”
apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},最大值：{0}
apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,起始时间日期
DocType: Shopify Settings,For Company,公司
@@ -2146,7 +2147,7 @@
DocType: Material Request,Terms and Conditions Content,条款和条件内容
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,创建课程表时出现错误
DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,列表中的第一个费用审批人将被设置为默认的费用审批人。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +602,cannot be greater than 100,不能大于100
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,不能大于100
apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,您需要是具有System Manager和Item Manager角色的Administrator以外的用户才能在Marketplace上注册。
apps/erpnext/erpnext/stock/doctype/item/item.py +810,Item {0} is not a stock Item,物料{0}不是库存物料
DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC-.YYYY.-
@@ -2176,7 +2177,7 @@
DocType: HR Settings,Employee Settings,员工设置
apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,加载支付系统
,Batch-Wise Balance History,物料批号结余数量历史记录
-apps/erpnext/erpnext/controllers/accounts_controller.py +1063,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,行＃{0}：如果金额大于项目{1}的开帐单金额，则无法设置费率。
+apps/erpnext/erpnext/controllers/accounts_controller.py +1062,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,行＃{0}：如果金额大于项目{1}的开帐单金额，则无法设置费率。
apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,打印设置在相应的打印格式更新
DocType: Package Code,Package Code,封装代码
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,学徒
@@ -2210,6 +2211,7 @@
DocType: Bank Statement Transaction Entry,Bank Transaction Entries,银行交易分录
DocType: Quality Inspection,Readings,检验结果
DocType: Stock Entry,Total Additional Costs,总额外费用
+apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +47,No of Interactions,没有相互作用
DocType: BOM,Scrap Material Cost(Company Currency),废料成本（公司货币）
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +69,Sub Assemblies,半成品
DocType: Asset,Asset Name,资产名称
@@ -2220,7 +2222,7 @@
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +254,Source warehouse is mandatory for row {0},行{0}中源仓库为必须项
apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,第{0}行的支付条款可能是重复的。
apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),农业（测试版）
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +888,Packing Slip,装箱单
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +906,Packing Slip,装箱单
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Office Rent,办公室租金
apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,短信网关的设置
DocType: Disease,Common Name,通用名称
@@ -2258,14 +2260,11 @@
DocType: Shopify Settings,Import Delivery Notes from Shopify on Shipment,在发货时从Shopify导入交货单
apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,显示关闭
DocType: Leave Type,Is Leave Without Pay,是无薪休假
-DocType: Lab Test,HLC-LT-.YYYY.-,HLC-LT-.YYYY.-
apps/erpnext/erpnext/stock/doctype/item/item.py +276,Asset Category is mandatory for Fixed Asset item,固定资产类的物料其资产类别字段是必填的
DocType: Fee Validity,Fee Validity,费用有效期
apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +146,No records found in the Payment table,没有在支付表中找到记录
apps/erpnext/erpnext/education/utils.py +19,This {0} conflicts with {1} for {2} {3},此{0}冲突{1}在{2} {3}
DocType: Student Attendance Tool,Students HTML,学生HTML
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
- to cancel this document","请删除员工<a href=""#Form/Employee/{0}"">{0}</a> \以取消此文档"
DocType: POS Profile,Apply Discount,应用折扣
DocType: GST HSN Code,GST HSN Code,GST HSN代码
DocType: Employee External Work History,Total Experience,总经验
@@ -2321,7 +2320,7 @@
DocType: UOM,UOM Name,计量单位名称
apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +234,To Address 1,致地址1
DocType: GST HSN Code,HSN Code,HSN代码
-apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +40,Contribution Amount,贡献金额
+apps/erpnext/erpnext/selling/report/sales_person_commission_summary/sales_person_commission_summary.py +87,Contribution Amount,贡献金额
DocType: Inpatient Record,Patient Encounter,患者遭遇
DocType: Purchase Invoice,Shipping Address,销售出货地址
DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,此工具可帮助您更新或修复系统中的库存数量和价值。它通常被用于同步系统值和实际存在于您的仓库。
@@ -2395,7 +2394,6 @@
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Employee Referral,员工推荐
DocType: Student Group,Set 0 for no limit,为不限制设为0
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +191,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,您申请的休假日期是节假日，无需申请休假。
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,需要行{idx}：{field}才能创建开票{invoice_type}发票
DocType: Customer,Primary Address and Contact Detail,主要地址和联系人信息
apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +21,Resend Payment Email,重新发送付款电子邮件
apps/erpnext/erpnext/templates/pages/projects.html +27,New task,新任务
@@ -2445,7 +2443,7 @@
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,Serial No {0} quantity {1} cannot be a fraction,序列号{0}的数量{1}不能是分数
apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,请输入Woocommerce服务器网址
DocType: Purchase Order Item,Supplier Part Number,供应商零件编号
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +132,Conversion rate cannot be 0 or 1,汇率不能为0或1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +136,Conversion rate cannot be 0 or 1,汇率不能为0或1
DocType: Share Balance,To No,至No
apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py +27,All the mandatory Task for employee creation hasn't been done yet.,尚未全部完成创建新员工时必要任务。
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +233,{0} {1} is cancelled or stopped,{0} {1}被取消或停止
@@ -2454,7 +2452,7 @@
DocType: Purchase Invoice,03-Deficiency in services,03-服务不足
DocType: Healthcare Settings,Default Medical Code Standard,默认医疗代码标准
DocType: Purchase Invoice Item,HSN/SAC,HSN / SAC
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +261,Purchase Receipt {0} is not submitted,采购收货单{0}未提交
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +265,Purchase Receipt {0} is not submitted,采购收货单{0}未提交
DocType: Company,Default Payable Account,默认应付科目
apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.",网上购物车，如配送规则，价格清单等的设置
DocType: Purchase Receipt,MAT-PRE-.YYYY.-,MAT-PRE-.YYYY.-
@@ -2480,7 +2478,7 @@
apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +46,"Job Openings for designation {0} already open \
or hiring completed as per Staffing Plan {1}",指定{0}的职位空缺已根据人员配置计划{1}已打开或正在招聘
DocType: Vital Signs,Constipated,大便干燥
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +114,Against Supplier Invoice {0} dated {1},对日期为{1}的供应商发票{0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},对日期为{1}的供应商发票{0}
DocType: Customer,Default Price List,默认价格清单
apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,资产移动记录{0}创建
apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,未找到任何项目。
@@ -2496,7 +2494,7 @@
DocType: Journal Entry,Entry Type,凭证类型
,Customer Credit Balance,客户贷方余额
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +82,Net Change in Accounts Payable,应付账款净额变化
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +256,Credit limit has been crossed for customer {0} ({1}/{2}),客户{0}（{1} / {2}）的信用额度已超过
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +257,Credit limit has been crossed for customer {0} ({1}/{2}),客户{0}（{1} / {2}）的信用额度已超过
apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',”客户折扣“需要指定客户
apps/erpnext/erpnext/config/accounts.py +163,Update bank payment dates with journals.,用日记账更新银行付款时间
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,价钱
@@ -2580,9 +2578,10 @@
apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +24,Appointment Duration (mins),预约时间（分钟）
DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,为每个库存变动创建会计分录
DocType: Leave Allocation,Total Leaves Allocated,总已分配休假
-apps/erpnext/erpnext/public/js/setup_wizard.js +146,Please enter valid Financial Year Start and End Dates,请输入有效的财务年度开始和结束日期
+apps/erpnext/erpnext/public/js/setup_wizard.js +178,Please enter valid Financial Year Start and End Dates,请输入有效的财务年度开始和结束日期
DocType: Employee,Date Of Retirement,退休日期
DocType: Upload Attendance,Get Template,获取模板
+,Sales Person Commission Summary,销售人员委员会摘要
DocType: Additional Salary Component,Additional Salary Component,额外的薪资组件
DocType: Material Request,Transferred,转入
DocType: Vehicle,Doors,门
@@ -2638,6 +2637,7 @@
DocType: Grant Application,Assessment Mark (Out of 10),评估标记（满分10分）
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2手机号码
apps/erpnext/erpnext/setup/doctype/company/company.py +263,Main,主
+apps/erpnext/erpnext/controllers/buying_controller.py +761,Following item {0} is not marked as {1} item. You can enable them as {1} item from its Item master,项目{0}之后未标记为{1}项目。您可以从项目主文件中将它们作为{1}项启用
apps/erpnext/erpnext/stock/doctype/item/item.js +74,Variant,变体
apps/erpnext/erpnext/controllers/status_updater.py +163,"For an item {0}, quantity must be negative number",对于商品{0}，数量必须是负数
DocType: Naming Series,Set prefix for numbering series on your transactions,为交易设置编号系列的前缀
@@ -2647,7 +2647,7 @@
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,机会来源是必填字段
DocType: Email Digest,Annual Expenses,年度支出
DocType: Item,Variants,变种
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1208,Make Purchase Order,创建采购订单
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1226,Make Purchase Order,创建采购订单
DocType: SMS Center,Send To,发送到
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +202,There is not enough leave balance for Leave Type {0},假期类型{0}的剩余天数不足了
DocType: Payment Reconciliation Payment,Allocated amount,已核销金额
@@ -2675,6 +2675,7 @@
DocType: Shipping Rule Condition,A condition for a Shipping Rule,发货规则的一个条件
apps/erpnext/erpnext/hr/doctype/employee/employee.py +175,Please enter ,请输入
apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +64,Maintenance Log,维护日志
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Group,供应商>供应商组
apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +242,Please set filter based on Item or Warehouse,根据项目或仓库请设置过滤器
DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),此打包的净重。（根据内容物料的净重自动计算）
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +43,Make Inter Company Journal Entry,创建公司间业务手工凭证
@@ -2894,8 +2895,8 @@
DocType: Employee,Resignation Letter Date,辞职信日期
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,定价规则进一步过滤基于数量。
apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +115,Not Set,未设置
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,Please set the Date Of Joining for employee {0},请为员工{0}设置加入日期
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,Please set the Date Of Joining for employee {0},请为员工{0}设置加入日期
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +417,Please set the Date Of Joining for employee {0},请为员工{0}设置加入日期
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +417,Please set the Date Of Joining for employee {0},请为员工{0}设置加入日期
DocType: Inpatient Record,Discharge,卸货
DocType: Task,Total Billing Amount (via Time Sheet),总开票金额（通过工时单）
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,重复客户收入
@@ -2905,13 +2906,13 @@
DocType: Chapter,Chapter,章节
apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,对
DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,选择此模式后，默认科目将在POS发票中自动更新。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1027,Select BOM and Qty for Production,选择BOM和数量生产
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1045,Select BOM and Qty for Production,选择BOM和数量生产
DocType: Asset,Depreciation Schedule,折旧计划
apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,销售合作伙伴地址和联系人
DocType: Bank Reconciliation Detail,Against Account,科目
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Half Day Date should be between From Date and To Date,半天时间应该是从之间的日期和终止日期
DocType: Maintenance Schedule Detail,Actual Date,实际日期
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,请在{0}公司中设置默认成本中心。
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +135,Please set the Default Cost Center in {0} company.,请在{0}公司中设置默认成本中心。
DocType: Item,Has Batch No,有批号
apps/erpnext/erpnext/public/js/utils.js +107,Annual Billing: {0},本年总发票金额：{0}
DocType: Shopify Webhook Detail,Shopify Webhook Detail,Shopify Webhook详细信息
@@ -2931,7 +2932,7 @@
,Quotation Trends,报价趋势
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +166,Item Group not mentioned in item master for item {0},物料{0}的物料群组没有设置
DocType: GoCardless Mandate,GoCardless Mandate,GoCardless任务
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Debit To account must be a Receivable account,借记科目必须是应收账款科目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +430,Debit To account must be a Receivable account,借记科目必须是应收账款科目
DocType: Shipping Rule,Shipping Amount,发货金额
DocType: Supplier Scorecard Period,Period Score,期间得分
apps/erpnext/erpnext/utilities/user_progress.py +66,Add Customers,添加客户
@@ -2977,7 +2978,7 @@
DocType: Shareholder,Shareholder,股东
DocType: Purchase Invoice,Additional Discount Amount,额外的折扣金额
DocType: Cash Flow Mapper,Position,位置
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1811,Get Items from Prescriptions,从Prescriptions获取物品
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1796,Get Items from Prescriptions,从Prescriptions获取物品
DocType: Patient,Patient Details,患者细节
DocType: Inpatient Record,B Positive,B积极
apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
@@ -2990,7 +2991,6 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,体育
DocType: Loan Type,Loan Name,贷款名称
apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +66,Total Actual,实际总
-DocType: Lab Test UOM,Test UOM,测试UOM
DocType: Student Siblings,Student Siblings,学生兄弟姐妹
DocType: Subscription Plan Detail,Subscription Plan Detail,订阅计划信息
apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,单位
@@ -3033,7 +3033,7 @@
DocType: Item,Retain Sample,保留样品
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +109,Row {0}: From Time and To Time is mandatory.,行{0}：开始时间和结束时间必填。
DocType: Stock Reconciliation Item,Amount Difference,金额差异
-apps/erpnext/erpnext/stock/get_item_details.py +412,Item Price added for {0} in Price List {1},物料价格{0}自动添加到价格清单{1}中了，以备以后订单使用
+apps/erpnext/erpnext/stock/get_item_details.py +416,Item Price added for {0} in Price List {1},物料价格{0}自动添加到价格清单{1}中了，以备以后订单使用
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,请输入这个销售人员的员工标识
DocType: Territory,Classification of Customers by region,客户按区域分类
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,在生产中
@@ -3044,7 +3044,7 @@
apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,计算的银行对账单余额
DocType: Normal Test Template,Normal Test Template,正常测试模板
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,已禁用用户
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +951,Quotation,报价
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +969,Quotation,报价
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +971,Cannot set a received RFQ to No Quote,无法将收到的询价单设置为无报价
DocType: Salary Slip,Total Deduction,扣除总额
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +22,Select an account to print in account currency,选择一个科目以科目币别进行打印
@@ -3096,6 +3096,7 @@
apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js +9,Get From,得到
apps/erpnext/erpnext/hr/doctype/department/department.js +9,This is a root department and cannot be edited.,这是根部门，无法编辑。
apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,显示付款信息
+apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +53,Duration in Days,持续时间天数
DocType: C-Form,Quarter,季
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Miscellaneous Expenses,杂项费用
DocType: Global Defaults,Default Company,默认公司
@@ -3103,7 +3104,7 @@
apps/erpnext/erpnext/controllers/stock_controller.py +231,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,必须为物料{0}指定费用/差异科目。
DocType: Bank,Bank Name,银行名称
apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +33,-Above,-天以上
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1200,Leave the field empty to make purchase orders for all suppliers,将该字段留空以为所有供应商下达采购订单
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1218,Leave the field empty to make purchase orders for all suppliers,将该字段留空以为所有供应商下达采购订单
DocType: Healthcare Practitioner,Inpatient Visit Charge Item,住院访问费用项目
DocType: Vital Signs,Fluid,流体
DocType: Leave Application,Total Leave Days,总休假天数
@@ -3113,7 +3114,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +107,Item Variant Settings,物料变式设置
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +37,Select Company...,选择公司...
DocType: Leave Control Panel,Leave blank if considered for all departments,如果针对所有部门请留空
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +495,{0} is mandatory for Item {1},{0}是{1}的必填项
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +496,{0} is mandatory for Item {1},{0}是{1}的必填项
apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +136,"Item {0}: {1} qty produced, ",项目{0}：{1}产生的数量，
DocType: Payroll Entry,Fortnightly,半月刊
DocType: Currency Exchange,From Currency,源货币
@@ -3163,7 +3164,7 @@
DocType: Account,Fixed Asset,固定资产
DocType: Amazon MWS Settings,After Date,日期之后
apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,序列化库存
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1271,Invalid {0} for Inter Company Invoice.,Inter公司发票无效的{0}。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1157,Invalid {0} for Inter Company Invoice.,Inter公司发票无效的{0}。
,Department Analytics,部门分析
apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,在默认联系人中找不到电子邮件
apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,生成秘密
@@ -3214,10 +3215,10 @@
apps/erpnext/erpnext/templates/pages/integrations/gocardless_confirmation.html +13,Payment Confirmation,付款确认
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,价格将不会显示如果没有设置价格
DocType: Stock Entry,Total Incoming Value,总收到金额
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,Debit To is required,借记是必需的
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Debit To is required,借记是必需的
DocType: Clinical Procedure,Inpatient Record,住院病历
apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team",工时单帮助追踪的时间，费用和结算由你的团队做activites
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,采购价格清单
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,采购价格清单
apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +161,Date of Transaction,交易日期
apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,供应商记分卡变数模板。
DocType: Job Offer Term,Offer Term,录用通知条款
@@ -3239,7 +3240,7 @@
DocType: Cashier Closing,To Time,要时间
apps/erpnext/erpnext/hr/utils.py +201,) for {0},）为{0}
DocType: Authorization Rule,Approving Role (above authorized value),批准角色（上述授权值）
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +142,Credit To account must be a Payable account,入贷科目必须是一个“应付”科目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +146,Credit To account must be a Payable account,入贷科目必须是一个“应付”科目
DocType: Loan,Total Amount Paid,总金额支付
DocType: Asset,Insurance End Date,保险终止日期
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,请选择付费学生申请者必须入学的学生
@@ -3299,6 +3300,7 @@
DocType: Sales Order,Not Delivered,未交付
,Bank Clearance Summary,银行清帐汇总报表
apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.",创建和管理每日，每周和每月的电子邮件摘要。
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_dashboard.py +6,This is based on transactions against this Sales Person. See timeline below for details,这是基于针对此销售人员的交易。请参阅下面的时间表了解详情
DocType: Appraisal Goal,Appraisal Goal,绩效评估指标
DocType: Stock Reconciliation Item,Current Amount,电流量
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,房屋
@@ -3352,7 +3354,7 @@
DocType: Item,End of Life,寿命结束
apps/erpnext/erpnext/demo/setup/setup_data.py +325,Travel,出差
DocType: Student Report Generation Tool,Include All Assessment Group,包括所有评估小组
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +264,No active or default Salary Structure found for employee {0} for the given dates,发现员工{0}对于给定的日期没有活动或默认的薪资结构
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,No active or default Salary Structure found for employee {0} for the given dates,发现员工{0}对于给定的日期没有活动或默认的薪资结构
DocType: Leave Block List,Allow Users,允许用户(多个)
DocType: Purchase Order,Customer Mobile No,客户手机号码
DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,现金流量映射模板细节
@@ -3368,8 +3370,8 @@
DocType: Travel Request,Any other details,任何其他细节
DocType: Water Analysis,Origin,起源
apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,这份文件是超过限制，通过{0} {1}项{4}。你在做另一个{3}对同一{2}？
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1189,Please set recurring after saving,请设置保存后复发
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +879,Select change amount account,选择零钱科目
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1221,Please set recurring after saving,请设置保存后复发
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +862,Select change amount account,选择零钱科目
DocType: Purchase Invoice,Price List Currency,价格清单货币
DocType: Naming Series,User must always select,用户必须始终选择
DocType: Stock Settings,Allow Negative Stock,允许负库存
@@ -3406,6 +3408,7 @@
DocType: Payment Entry,Payment Deductions or Loss,付款扣除或损失
DocType: Soil Analysis,Soil Analysis Criterias,土壤分析标准
apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,销售或采购的标准合同条款。
+DocType: BOM Item,Item operation,物品操作
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +326,Are you sure you want to cancel this appointment?,你确定要取消这个预约吗？
DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,酒店房间价格套餐
apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,销售渠道
@@ -3419,12 +3422,13 @@
apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,课程：
DocType: Soil Texture,Sandy Loam,桑迪Loam
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +242,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消维护计划{0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource > HR Settings,请在人力资源>人力资源设置中设置员工命名系统
DocType: POS Profile,Applicable for Users,适用于用户
DocType: Supplier Quotation,PUR-SQTN-.YYYY.-,PUR-SQTN-.YYYY.-
DocType: Notification Control,Expense Claim Approved,费用报销已批准
DocType: Purchase Invoice,Set Advances and Allocate (FIFO),设置进度和分配（FIFO）
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,没有创建工单
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +401,Salary Slip of employee {0} already created for this period,员工的工资单{0}已为这一时期创建
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +403,Salary Slip of employee {0} already created for this period,员工的工资单{0}已为这一时期创建
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,Pharmaceutical,医药
apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +24,You can only submit Leave Encashment for a valid encashment amount,假期折现的折现金额不正确
apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,采购物料成本
@@ -3432,6 +3436,7 @@
DocType: Selling Settings,Sales Order Required,销售订单为必须项
apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,成为卖家
DocType: Purchase Invoice,Credit To,入贷
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,商品代码>商品分组>品牌
apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,活动信息/客户
DocType: Employee Education,Post Graduate,研究生
DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,维护计划细节
@@ -3446,8 +3451,9 @@
DocType: Support Search Source,Post Title Key,帖子标题密钥
apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +232,For Job Card,对于工作卡
DocType: Warranty Claim,Raised By,提出
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1533,Prescriptions,处方
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1551,Prescriptions,处方
DocType: Payment Gateway Account,Payment Account,付款帐号
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +169,Supplier > Supplier Type,供应商>供应商类型
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +1041,Please specify Company to proceed,请注明公司进行
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +81,Net Change in Accounts Receivable,应收账款净额变化
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +91,Compensatory Off,补假
@@ -3470,8 +3476,8 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,创建税收模板
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,用户论坛
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,原材料不能为空。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1030,Row #{0} (Payment Table): Amount must be negative,行＃{0}（付款表）：金额必须为负数
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +559,"Could not update stock, invoice contains drop shipping item.",无法更新库存，发票包含由供应商交货（直接发运）项目。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1013,Row #{0} (Payment Table): Amount must be negative,行＃{0}（付款表）：金额必须为负数
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +560,"Could not update stock, invoice contains drop shipping item.",无法更新库存，发票包含由供应商交货（直接发运）项目。
DocType: Contract,Fulfilment Status,履行状态
DocType: Lab Test Sample,Lab Test Sample,实验室测试样品
DocType: Item Variant Settings,Allow Rename Attribute Value,允许重命名属性值
@@ -3555,7 +3561,7 @@
apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,审批与被审批用户不能相同
DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),库存评估价（按库存计量单位）
DocType: SMS Log,No of Requested SMS,请求短信数量
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +326,Leave Without Pay does not match with approved Leave Application records,停薪留职不批准请假的记录相匹配
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +328,Leave Without Pay does not match with approved Leave Application records,停薪留职不批准请假的记录相匹配
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,下一步
DocType: Travel Request,Domestic,国内
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +783,Please supply the specified items at the best possible rates,请在提供最好的利率规定的项目
@@ -3622,7 +3628,7 @@
apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +167,Doc Date,Doc Date
apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},费纪录创造 - {0}
DocType: Asset Category Account,Asset Category Account,资产类别的科目
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1025,Row #{0} (Payment Table): Amount must be positive,行＃{0}（付款表）：金额必须为正值
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1008,Row #{0} (Payment Table): Amount must be positive,行＃{0}（付款表）：金额必须为正值
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},不能生产超过销售订单数量{1}的物料{0}
apps/erpnext/erpnext/stock/doctype/item/item.js +422,Select Attribute Values,选择属性值
DocType: Purchase Invoice,Reason For Issuing document,签发文件的原因
@@ -3754,7 +3760,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,对于行{0}：输入计划的数量
DocType: Account,Income Account,收入科目
DocType: Payment Request,Amount in customer's currency,量客户的货币
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +861,Delivery,交货
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +879,Delivery,交货
DocType: Volunteer,Weekdays,平日
DocType: Stock Reconciliation Item,Current Qty,目前数量
DocType: Restaurant Menu,Restaurant Menu,餐厅菜单
@@ -3776,6 +3782,7 @@
apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},物料{0}已存在
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,参考
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,您将失去先前生成的发票记录。您确定要重新启用此订阅吗？
+DocType: Lab Test,LP-,LP-
DocType: Healthcare Settings,Registration Fee,注册费用
DocType: Loyalty Program Collection,Loyalty Program Collection,忠诚度计划集
DocType: Stock Entry Detail,Subcontracted Item,外包物料
@@ -3800,12 +3807,12 @@
DocType: Subscription,Cancel At End Of Period,在期末取消
apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +114,Property already added,已添加属性
DocType: Item Supplier,Item Supplier,物料供应商
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1290,Please enter Item Code to get batch no,请输入物料代码，以获得批号
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +910,Please select a value for {0} quotation_to {1},请选择一个值{0} quotation_to {1}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1322,Please enter Item Code to get batch no,请输入物料代码，以获得批号
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},请选择一个值{0} quotation_to {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,请选择物料
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,所有地址。
DocType: Company,Stock Settings,库存设置
-apps/erpnext/erpnext/accounts/doctype/account/account.py +239,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",合并是唯一可能的，如果以下属性中均有记载相同。是群组，根类型，公司
+apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",合并是唯一可能的，如果以下属性中均有记载相同。是群组，根类型，公司
DocType: Vehicle,Electric,电动
DocType: Task,% Progress,％进展
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Gain/Loss on Asset Disposal,在资产处置收益/损失
@@ -3973,13 +3980,13 @@
DocType: Membership,Membership Status,成员身份
DocType: Travel Itinerary,Lodging Required,需要住宿
,Requested,要求
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +117,No Remarks,暂无说明
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +121,No Remarks,暂无说明
DocType: Asset,In Maintenance,在维护中
DocType: Amazon MWS Settings,Click this button to pull your Sales Order data from Amazon MWS.,单击此按钮可从亚马逊MWS中提取销售订单数据。
DocType: Vital Signs,Abdomen,腹部
DocType: Purchase Invoice,Overdue,逾期
DocType: Account,Stock Received But Not Billed,已收货未开票/在途物资:/GR/IR
-apps/erpnext/erpnext/accounts/doctype/account/account.py +86,Root Account must be a group,根科目必须是一组
+apps/erpnext/erpnext/accounts/doctype/account/account.py +91,Root Account must be a group,根科目必须是一组
DocType: Drug Prescription,Drug Prescription,药物处方
DocType: Loan,Repaid/Closed,偿还/关闭
DocType: Amazon MWS Settings,CA,CA
@@ -4005,11 +4012,11 @@
DocType: Purchase Invoice,Deemed Export,被视为出口
DocType: Stock Entry,Material Transfer for Manufacture,移库-生产
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,折扣百分比可以应用于一个或所有的价格清单。
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +418,Accounting Entry for Stock,库存的会计分录
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +422,Accounting Entry for Stock,库存的会计分录
DocType: Lab Test,LabTest Approver,LabTest审批者
apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,您已经评估了评估标准{}。
DocType: Vehicle Service,Engine Oil,机油
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1063,Work Orders Created: {0},创建的工单：{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1081,Work Orders Created: {0},创建的工单：{0}
DocType: Sales Invoice,Sales Team1,销售团队1
apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item {0} does not exist,物料{0}不存在
DocType: Sales Invoice,Customer Address,客户地址
@@ -4088,7 +4095,7 @@
apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,更改代码
DocType: Purchase Invoice Item,Valuation Rate,库存评估价
DocType: Vehicle,Diesel,柴油机
-apps/erpnext/erpnext/stock/get_item_details.py +542,Price List Currency not selected,价格清单货币没有选择
+apps/erpnext/erpnext/stock/get_item_details.py +546,Price List Currency not selected,价格清单货币没有选择
DocType: Purchase Invoice,Availed ITC Cess,采用ITC Cess
,Student Monthly Attendance Sheet,学生每月考勤表
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,运费规则仅适用于销售
@@ -4099,6 +4106,8 @@
apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,学生组或课程表是强制性的
apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,学生组或课程表是强制性的
DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,维护发票时间和工作时间的工时单相同
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+ to cancel this document","请删除员工<a href=""#Form/Employee/{0}"">{0}</a> \以取消此文档"
DocType: Maintenance Visit Purpose,Against Document No,文档编号
DocType: BOM,Scrap,废料
apps/erpnext/erpnext/utilities/user_progress.py +217,Go to Instructors,去教练
@@ -4129,14 +4138,14 @@
DocType: Shopify Settings,Delivery Note Series,销售出货单系列
DocType: Purchase Order Item,Returned Qty,退货数量
DocType: Student,Exit,离职
-apps/erpnext/erpnext/accounts/doctype/account/account.py +158,Root Type is mandatory,根类型是强制性的
+apps/erpnext/erpnext/accounts/doctype/account/account.py +163,Root Type is mandatory,根类型是强制性的
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +29,Failed to install presets,无法安装预设
DocType: Healthcare Service Unit Type,UOM Conversion in Hours,UOM按小时转换
DocType: Contract,Signee Details,签名信息
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.",{0}目前拥有{1}供应商记分卡，并且谨慎地向该供应商发出询价。
DocType: Certified Consultant,Non Profit Manager,非营利经理
DocType: BOM,Total Cost(Company Currency),总成本（公司货币）
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +392,Serial No {0} created,序列号{0}已创建
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +398,Serial No {0} created,序列号{0}已创建
DocType: Homepage,Company Description for website homepage,公司介绍了网站的首页
DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",为方便客户，这些代码可以在打印格式(如发票和销售出货单)中使用
apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,供应商名称
@@ -4190,9 +4199,9 @@
DocType: Company,Chart Of Accounts Template,科目表模板
DocType: Attendance,Attendance Date,考勤日期
apps/erpnext/erpnext/assets/doctype/asset/asset.py +80,Update stock must be enable for the purchase invoice {0},必须为采购发票{0}启用更新库存
-apps/erpnext/erpnext/stock/get_item_details.py +401,Item Price updated for {0} in Price List {1},物料价格{0}更新到价格清单{1}中了，之后的订单会使用新价格
+apps/erpnext/erpnext/stock/get_item_details.py +405,Item Price updated for {0} in Price List {1},物料价格{0}更新到价格清单{1}中了，之后的订单会使用新价格
DocType: Salary Structure,Salary breakup based on Earning and Deduction.,基于收入和扣除的工资信息。
-apps/erpnext/erpnext/accounts/doctype/account/account.py +130,Account with child nodes cannot be converted to ledger,科目与子节点不能转换为分类账
+apps/erpnext/erpnext/accounts/doctype/account/account.py +135,Account with child nodes cannot be converted to ledger,科目与子节点不能转换为分类账
DocType: Purchase Invoice Item,Accepted Warehouse,仓库
DocType: Bank Reconciliation Detail,Posting Date,记帐日期
DocType: Item,Valuation Method,估值方法
@@ -4273,7 +4282,7 @@
DocType: Bank Account,Address and Contact,地址和联系方式
DocType: Vital Signs,Hyper,超
DocType: Cheque Print Template,Is Account Payable,为应付账款
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +300,Stock cannot be updated against Purchase Receipt {0},库存不能对采购收货单进行更新{0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +304,Stock cannot be updated against Purchase Receipt {0},库存不能对采购收货单进行更新{0}
DocType: Support Settings,Auto close Issue after 7 days,7天之后自动关闭问题
apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +85,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",假，不是之前分配{0}，因为休假余额已经结转转发在未来的假期分配记录{1}
apps/erpnext/erpnext/accounts/party.py +350,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),注意：到期日/计入日已超过客户信用日期{0}天。
@@ -4303,7 +4312,6 @@
DocType: Asset,Calculate Depreciation,计算折旧
DocType: Delivery Note,Track this Delivery Note against any Project,跟踪此销售出货单的项目
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Cash from Investing,从投资净现金
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,客户>客户群>地区
DocType: Work Order,Work-in-Progress Warehouse,在制品仓库
apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +115,Asset {0} must be submitted,资产{0}必须提交
DocType: Fee Schedule Program,Total Students,学生总数
@@ -4348,6 +4356,7 @@
DocType: Amazon MWS Settings,Synch Products,同步产品
DocType: Loyalty Point Entry,Loyalty Program,忠诚计划
DocType: Student Guardian,Father,父亲
+apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,支持门票
apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,固定资产销售不能选择“更新库存”
DocType: Bank Reconciliation,Bank Reconciliation,银行对帐
DocType: Attendance,On Leave,休假
@@ -4381,7 +4390,7 @@
DocType: Asset,Fully Depreciated,已提足折旧
DocType: Item Barcode,UPC-A,UPC-A
,Stock Projected Qty,预期可用库存
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +505,Customer {0} does not belong to project {1},客户{0}不属于项目{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +506,Customer {0} does not belong to project {1},客户{0}不属于项目{1}
DocType: Employee Attendance Tool,Marked Attendance HTML,显着的考勤HTML
apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers",报价是你发送给客户的建议或出价
DocType: Sales Invoice,Customer's Purchase Order,客户采购订单
@@ -4404,7 +4413,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,去供应商
DocType: POS Closing Voucher Taxes,POS Closing Voucher Taxes,POS关闭凭证税
,Qty to Receive,接收数量
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +562,"Start and end dates not in a valid Payroll Period, cannot calculate {0}.",开始日期和结束日期不在有效的工资核算期间内，无法计算{0}。
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +564,"Start and end dates not in a valid Payroll Period, cannot calculate {0}.",开始日期和结束日期不在有效的工资核算期间内，无法计算{0}。
DocType: Leave Block List,Leave Block List Allowed,禁离日例外用户
DocType: Grading Scale Interval,Grading Scale Interval,分级分度值
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},报销车辆登录{0}
@@ -4412,10 +4421,10 @@
DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,价格上涨率与贴现率的折扣（％）
DocType: Healthcare Service Unit Type,Rate / UOM,费率/ UOM
apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,所有仓库
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1401,No {0} found for Inter Company Transactions.,Inter公司没有找到{0}。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1287,No {0} found for Inter Company Transactions.,Inter公司没有找到{0}。
DocType: Travel Itinerary,Rented Car,租车
apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,关于贵公司
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +139,Credit To account must be a Balance Sheet account,信用科目必须是资产负债表科目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +143,Credit To account must be a Balance Sheet account,信用科目必须是资产负债表科目
DocType: Donor,Donor,捐赠者
DocType: Global Defaults,Disable In Words,禁用词
apps/erpnext/erpnext/stock/doctype/item/item.py +70,Item Code is mandatory because Item is not automatically numbered,物料代码是必须项，因为项目没有自动编号
@@ -4469,7 +4478,7 @@
DocType: Accounts Settings,Show Inclusive Tax In Print,在打印中显示包含税
apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +17,"Bank Account, From Date and To Date are Mandatory",银行账户，开始日期和截止日期必填
apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +29,Message Sent,消息已发送
-apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Account with child nodes cannot be set as ledger,科目与子节点不能被设置为分类帐
+apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with child nodes cannot be set as ledger,科目与子节点不能被设置为分类帐
DocType: C-Form,II,二
DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,价格清单货币转换成客户的本币后的单价
DocType: Purchase Invoice Item,Net Amount (Company Currency),净金额（公司货币）
@@ -4479,10 +4488,10 @@
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},在{1}之后另一个年终结束分录{0}已经被录入
DocType: Work Order,Material Transferred for Manufacturing,材料移送制造
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Account {0} does not exists,科目{0}不存在
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1618,Select Loyalty Program,选择忠诚度计划
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1603,Select Loyalty Program,选择忠诚度计划
DocType: Project,Project Type,项目类型
apps/erpnext/erpnext/projects/doctype/task/task.py +154,Child Task exists for this Task. You can not delete this Task.,子任务存在这个任务。你不能删除这个任务。
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,需要指定目标数量和金额。
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +17,Either target qty or target amount is mandatory.,需要指定目标数量和金额。
apps/erpnext/erpnext/config/projects.py +56,Cost of various activities,各种活动的费用
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}",设置活动为{0}，因为附连到下面的销售者的员工不具有用户ID {1}
DocType: Timesheet,Billing Details,开票（帐单）信息
@@ -4546,7 +4555,7 @@
apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +235,Batches,批
apps/erpnext/erpnext/education/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,创建收费计划表
DocType: Purchase Order Item Supplied,Stock UOM,库存计量单位
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +257,Purchase Order {0} is not submitted,采购订单{0}未提交
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +261,Purchase Order {0} is not submitted,采购订单{0}未提交
DocType: Account,Expenses Included In Asset Valuation,包含在资产评估价中的费用科目
DocType: Vital Signs,Normal reference range for an adult is 16–20 breaths/minute (RCP 2012),成人的正常参考范围是16-20次呼吸/分钟（RCP 2012）
DocType: Customs Tariff Number,Tariff Number,税则号
@@ -4572,7 +4581,6 @@
DocType: Employee Grade,Default Leave Policy,默认休假政策
DocType: Shopify Settings,Shop URL,商店网址
apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,暂无联系人。
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,请通过设置>编号系列设置出席编号系列
DocType: Purchase Invoice Item,Landed Cost Voucher Amount,到岸成本凭证金额
,Item Balance (Simple),物料余额（简单）
apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,供应商开出的账单
@@ -4611,7 +4619,7 @@
,Payment Period Based On Invoice Date,付款期间基于发票日
DocType: Sample Collection,No. of print,打印数量
DocType: Hotel Room Reservation Item,Hotel Room Reservation Item,酒店房间预订项目
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},{0}没有货币汇率
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +59,Missing Currency Exchange Rates for {0},{0}没有货币汇率
DocType: Employee Health Insurance,Health Insurance Name,医保名称
DocType: Assessment Plan,Examiner,检查员
DocType: Student,Siblings,兄弟姐妹
@@ -4638,7 +4646,6 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +115,Company name not same,公司名称不一样
DocType: Lead,Address Desc,地址倒序
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +114,Party is mandatory,请输入往来单位
-apps/erpnext/erpnext/controllers/accounts_controller.py +775,Rows with duplicate due dates in other rows were found: {list},在其他行中找到具有重复到期日的行：{list}
DocType: Topic,Topic Name,主题名称
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +312,Please set default template for Leave Approval Notification in HR Settings.,请在人力资源设置中为离职审批通知设置默认模板。
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +38,Atleast one of the Selling or Buying must be selected,必须至少选择'销售'或'采购'其中的一项
@@ -4687,7 +4694,7 @@
DocType: Delivery Note Item,Available Batch Qty at From Warehouse,源仓库可用的批次数量
DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,工资总额 - 扣除总额 - 贷款还款
DocType: Bank Account,IBAN,IBAN
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +32,Current BOM and New BOM can not be same,当前BOM和新BOM不能相同
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +39,Current BOM and New BOM can not be same,当前BOM和新BOM不能相同
apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +47,Salary Slip ID,工资单编号
apps/erpnext/erpnext/hr/doctype/employee/employee.py +128,Date Of Retirement must be greater than Date of Joining,退休日期必须大于入职日期
apps/erpnext/erpnext/stock/doctype/item/item.js +70,Multiple Variants,多种变体
@@ -4718,7 +4725,7 @@
DocType: POS Profile,Update Stock,更新库存
apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,不同计量单位的项目会导致不正确的（总）净重值。请确保每个物料的净重使用同一个计量单位。
DocType: Certification Application,Payment Details,付款信息
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,BOM税率
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,BOM Rate,BOM税率
apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +249,"Stopped Work Order cannot be cancelled, Unstop it first to cancel",停止的工单不能取消，先取消停止
DocType: Asset,Journal Entry for Scrap,手工凭证报废
apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,请从销售出货单获取物料
@@ -4745,7 +4752,7 @@
DocType: Asset Maintenance Log,Task,任务
DocType: Purchase Taxes and Charges,Reference Row #,参考行＃
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},物料{0}必须指定批次号
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,这是一个root销售人员，无法被编辑。
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +22,This is a root sales person and cannot be edited.,这是一个root销售人员，无法被编辑。
DocType: Salary Component,"If selected, the value specified or calculated in this component will not contribute to the earnings or deductions. However, it's value can be referenced by other components that can be added or deducted. ",如果选择此项，则在此组件中指定或计算的值不会对收入或扣除贡献。但是，它的值可以被添加或扣除的其他组件引用。
DocType: Salary Component,"If selected, the value specified or calculated in this component will not contribute to the earnings or deductions. However, it's value can be referenced by other components that can be added or deducted. ",勾选此项，指定或计算的值不影响收入和扣除，但可被其他收入或扣除项引用。
DocType: Asset Settings,Number of Days in Fiscal Year,会计年度的天数
@@ -4781,7 +4788,7 @@
apps/erpnext/erpnext/assets/doctype/asset/asset.py +86,Enter depreciation details,输入折旧信息
apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}：来自{1}
DocType: Task,depends_on,depends_on
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +71,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,排队更新所有材料清单中的最新价格。可能需要几分钟。
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +78,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,排队更新所有材料清单中的最新价格。可能需要几分钟。
apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,新科目的名称。注：请不要创建科目的客户和供应商
DocType: POS Profile,Display Items In Stock,显示库存商品
apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,国家的默认地址模板
@@ -4820,7 +4827,7 @@
DocType: Driver,HR-DRI-.YYYY.-,HR-DRI-.YYYY.-
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,创建维护访问
DocType: Employee Transfer,Employee Transfer Details,员工转移信息
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +262,Please contact to the user who have Sales Master Manager {0} role,请联系，谁拥有硕士学位的销售经理{0}角色的用户
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +263,Please contact to the user who have Sales Master Manager {0} role,请联系，谁拥有硕士学位的销售经理{0}角色的用户
DocType: Company,Default Cash Account,默认现金科目
apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,公司(非客户或供应商)主数据。
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,基于该学生的考勤
@@ -4828,7 +4835,7 @@
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +180,Add more items or open full form,添加更多项目或全开放形式
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +222,Delivery Notes {0} must be cancelled before cancelling this Sales Order,取消这个销售订单之前必须取消销售出货单{0}
apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,转到用户
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Paid amount + Write Off Amount can not be greater than Grand Total,支付的金额+销帐金额不能大于总金额
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Paid amount + Write Off Amount can not be greater than Grand Total,支付的金额+销帐金额不能大于总金额
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0}不是物料{1}的有效批次号
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +199,Note: There is not enough leave balance for Leave Type {0},注意：休假期类型{0}的剩余天数不够
apps/erpnext/erpnext/regional/india/utils.py +19,Invalid GSTIN or Enter NA for Unregistered,无效的GSTIN或输入NA未注册
@@ -4927,14 +4934,14 @@
DocType: Notification Control,Custom Message,自定义消息
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +33,Investment Banking,投资银行业务
DocType: Purchase Invoice,input,输入
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Cash or Bank Account is mandatory for making payment entry,“现金”或“银行账户”是付款分录的必须项
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Cash or Bank Account is mandatory for making payment entry,“现金”或“银行账户”是付款分录的必须项
DocType: Loyalty Program,Multiple Tier Program,多层计划
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,学生地址
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,学生地址
DocType: Purchase Invoice,Price List Exchange Rate,价格清单汇率
apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +116,All Supplier Groups,所有供应商组织
DocType: Employee Boarding Activity,Required for Employee Creation,用于创建员工时
-apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account Number {0} already used in account {1},已在帐户{1}中使用的帐号{0}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +214,Account Number {0} already used in account {1},已在帐户{1}中使用的帐号{0}
DocType: GoCardless Mandate,Mandate,要求
DocType: POS Profile,POS Profile Name,POS配置文件名称
DocType: Hotel Room Reservation,Booked,预订
@@ -4978,13 +4985,15 @@
DocType: Employee Tax Exemption Declaration Category,Employee Tax Exemption Declaration Category,员工免税申报类别
apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +448,All Territories,所有的区域
apps/erpnext/erpnext/hr/utils.py +215,Please set leave policy for employee {0} in Employee / Grade record,请在员工/成绩记录中为员工{0}设置休假政策
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1373,Invalid Blanket Order for the selected Customer and Item,无效框架订单对所选客户和物料无效
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1405,Invalid Blanket Order for the selected Customer and Item,无效框架订单对所选客户和物料无效
apps/erpnext/erpnext/projects/doctype/task/task_tree.js +49,Add Multiple Tasks,添加多个任务
DocType: Purchase Invoice,Items,物料
apps/erpnext/erpnext/crm/doctype/contract/contract.py +38,End Date cannot be before Start Date.,结束日期不能在开始日期之前。
apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +33,Student is already enrolled.,学生已经注册。
DocType: Fiscal Year,Year Name,年度名称
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,There are more holidays than working days this month.,本月假期比工作日多。
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,There are more holidays than working days this month.,本月假期比工作日多。
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,请通过设置>编号系列设置出席编号系列
+apps/erpnext/erpnext/controllers/buying_controller.py +759,Following items {0} are not marked as {1} item. You can enable them as {1} item from its Item master,以下项{0}未标记为{1}项。您可以从项目主文件中将它们作为{1}项启用
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +101,PDC/LC Ref,部分支付参考号码
DocType: Production Plan Item,Product Bundle Item,产品包物料
DocType: Sales Partner,Sales Partner Name,销售合作伙伴名称
@@ -5008,7 +5017,7 @@
DocType: Contract,Unfulfilled,秕
DocType: Delivery Note Item,From Warehouse,源仓库
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,没有员工提到的标准
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1012,No Items with Bill of Materials to Manufacture,待生产物料没有物料清单
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,待生产物料没有物料清单
DocType: Shopify Settings,Default Customer,默认客户
DocType: Warranty Claim,SER-WRN-.YYYY.-,SER-WRN-.YYYY.-
DocType: Assessment Plan,Supervisor Name,主管名称
@@ -5048,7 +5057,7 @@
DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,税额折后金额
DocType: Patient,Inpatient Status,住院状况
DocType: Daily Work Summary Settings,Daily Work Summary Settings,每日工作总结设置
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1396,Selected Price List should have buying and selling fields checked.,选定价格清单应该有买入和卖出的字段。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1282,Selected Price List should have buying and selling fields checked.,选定价格清单应该有买入和卖出的字段。
apps/erpnext/erpnext/controllers/buying_controller.py +680,Please enter Reqd by Date,请输入按日期请求
DocType: Payment Entry,Internal Transfer,内部转账
DocType: Asset Maintenance,Maintenance Tasks,维护任务
@@ -5071,7 +5080,7 @@
apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,最后沟通
apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,最后沟通
,TDS Payable Monthly,TDS应付月度
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +66,Queued for replacing the BOM. It may take a few minutes.,排队等待更换BOM。可能需要几分钟时间。
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +73,Queued for replacing the BOM. It may take a few minutes.,排队等待更换BOM。可能需要几分钟时间。
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +385,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',分类是“估值”或“估值和总计”的时候不能扣税。
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +286,Serial Nos Required for Serialized Item {0},序列化的物料{0}必须指定序列号
apps/erpnext/erpnext/config/accounts.py +167,Match Payments with Invoices,匹配付款与发票
@@ -5114,7 +5123,7 @@
DocType: Item,Default Material Request Type,默认物料申请类型
DocType: Supplier Scorecard,Evaluation Period,评估期
apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,未知
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1011,Work Order not created,工单未创建
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1029,Work Order not created,工单未创建
apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +36,"An amount of {0} already claimed for the component {1},\
set the amount equal or greater than {2}",已为组件{1}申请的金额{0}，设置等于或大于{2}的金额
DocType: Shipping Rule,Shipping Rule Conditions,配送规则条件
@@ -5169,7 +5178,7 @@
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +304,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order # {3}. Please update operation status via Time Logs,行＃{0}：操作{1}未完成{2}工件订单＃{3}中成品的数量。请通过时间日志更新操作状态
apps/erpnext/erpnext/stock/doctype/batch/batch.js +128,New Batch ID (Optional),新批号（可选）
apps/erpnext/erpnext/stock/doctype/batch/batch.js +128,New Batch ID (Optional),新批号（可选）
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +225,Expense account is mandatory for item {0},必须为物料{0}指定费用科目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +229,Expense account is mandatory for item {0},必须为物料{0}指定费用科目
DocType: BOM,Website Description,显示在网站商的详细说明，可文字，图文，多媒体混排
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,在净资产收益变化
apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,请先取消采购发票{0}
@@ -5194,14 +5203,14 @@
apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +467,No material request created,没有创建重要请求
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},贷款额不能超过最高贷款额度{0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,执照
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +552,Please remove this Invoice {0} from C-Form {1},请删除此发票{0}从C-表格{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +553,Please remove this Invoice {0} from C-Form {1},请删除此发票{0}从C-表格{1}
DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,请选择结转，如果你还需要包括上一会计年度的资产负债叶本财年
DocType: GL Entry,Against Voucher Type,凭证类型
DocType: Healthcare Practitioner,Phone (R),电话（R）
apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +104,Time slots added,添加时隙
DocType: Item,Attributes,属性
apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +36,Enable Template,启用模板
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +250,Please enter Write Off Account,请输入销帐科目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +254,Please enter Write Off Account,请输入销帐科目
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,最后订购日期
DocType: Salary Component,Is Payable,应付
DocType: Inpatient Record,B Negative,B负面
@@ -5212,7 +5221,7 @@
DocType: Hotel Room,Hotel Room,旅馆房间
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},科目{0}不属于公司{1}
DocType: Leave Type,Rounding,四舍五入
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +995,Serial Numbers in row {0} does not match with Delivery Note,行{0}中的序列号与交货单不匹配
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +978,Serial Numbers in row {0} does not match with Delivery Note,行{0}中的序列号与交货单不匹配
DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),分配金额（按比例分配）
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.",然后根据客户，客户组，地区，供应商，供应商组织，市场活动，销售合作伙伴等筛选定价规则。
DocType: Student,Guardian Details,卫详细
@@ -5263,12 +5272,11 @@
DocType: Training Event,Exam,考试
apps/erpnext/erpnext/public/js/hub/hub_call.js +46,Marketplace Error,市场错误
DocType: Complaint,Complaint,抱怨
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +523,Warehouse required for stock Item {0},物料{0}需要指定仓库
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +524,Warehouse required for stock Item {0},物料{0}需要指定仓库
DocType: Leave Allocation,Unused leaves,未使用的休假
apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,进行还款分录
apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,所有部门
DocType: Healthcare Service Unit,Vacant,空的
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +169,Supplier > Supplier Type,供应商>供应商类型
DocType: Patient,Alcohol Past Use,酒精过去使用
DocType: Fertilizer Content,Fertilizer Content,肥料含量
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +248,Cr,信用
@@ -5284,6 +5292,7 @@
apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,客房预订
apps/erpnext/erpnext/crm/doctype/lead/lead.py +57,Ends On date cannot be before Next Contact Date.,结束日期不能在下一次联系日期之前。
DocType: Journal Entry,Pay To / Recd From,支付/ RECD从
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,客户>客户群>地区
DocType: Naming Series,Setup Series,设置系列
DocType: Payment Reconciliation,To Invoice Date,要发票日期
DocType: Bank Account,Contact HTML,联系HTML
@@ -5393,7 +5402,7 @@
apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py +33,Access token or Shopify URL missing,访问令牌或Shopify网址丢失
DocType: Location,Latitude,纬度
DocType: Work Order,Scrap Warehouse,废料仓库
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}",在第{0}行，需要仓库，请为公司{2}的物料{1}设置默认仓库
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}",在第{0}行，需要仓库，请为公司{2}的物料{1}设置默认仓库
DocType: Work Order,Check if material transfer entry is not required,检查是否不需要材料转移条目
DocType: Work Order,Check if material transfer entry is not required,检查是否不需要材料转移条目
DocType: Program Enrollment Tool,Get Students From,让学生从
@@ -5438,7 +5447,6 @@
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +98,Make Material Request,创建物料需求
apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},打开物料{0}
DocType: Asset Finance Book,Written Down Value,账面净值
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource > HR Settings,请在人力资源>人力资源设置中设置员工命名系统
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +232,Sales Invoice {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消销售发票{0}
DocType: Clinical Procedure,Age,账龄
DocType: Sales Invoice Timesheet,Billing Amount,开票金额
@@ -5447,7 +5455,7 @@
DocType: Company,Default Employee Advance Account,默认员工预支科目
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1181,Search Item (Ctrl + i),搜索项目（Ctrl + i）
DocType: C-Form,ACC-CF-.YYYY.-,ACC-CF-.YYYY.-
-apps/erpnext/erpnext/accounts/doctype/account/account.py +166,Account with existing transaction can not be deleted,有交易的科目不能被删除
+apps/erpnext/erpnext/accounts/doctype/account/account.py +171,Account with existing transaction can not be deleted,有交易的科目不能被删除
DocType: Vehicle,Last Carbon Check,最后检查炭
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Legal Expenses,法律费用
apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +147,Please select quantity on row ,请选择行数量
@@ -5466,14 +5474,14 @@
DocType: Maintenance Visit,Breakdown,细目
DocType: Travel Itinerary,Vegetarian,素
DocType: Patient Encounter,Encounter Date,遇到日期
-apps/erpnext/erpnext/controllers/accounts_controller.py +890,Account: {0} with currency: {1} can not be selected,帐号：{0}币种：{1}不能选择
+apps/erpnext/erpnext/controllers/accounts_controller.py +889,Account: {0} with currency: {1} can not be selected,帐号：{0}币种：{1}不能选择
DocType: Bank Statement Transaction Settings Item,Bank Data,银行数据
DocType: Purchase Receipt Item,Sample Quantity,样品数量
DocType: Bank Guarantee,Name of Beneficiary,受益人姓名
DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",通过后台排程程序基于最新的存货评估价/价格清单单价/最近的原材料采购单价自动更新BOM成本。
DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
DocType: Bank Reconciliation Detail,Cheque Date,支票日期
-apps/erpnext/erpnext/accounts/doctype/account/account.py +52,Account {0}: Parent account {1} does not belong to company: {2},科目{0}的上级科目{1}不属于公司{2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},科目{0}的上级科目{1}不属于公司{2}
apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,成功删除与该公司相关的所有交易！
apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +39,As on Date,随着对日
DocType: Additional Salary,HR,HR
@@ -5481,7 +5489,7 @@
DocType: Healthcare Settings,Out Patient SMS Alerts,输出病人短信
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Probation,缓刑
DocType: Program Enrollment Tool,New Academic Year,新学年
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +847,Return / Credit Note,退货/退款单
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Return / Credit Note,退货/退款单
DocType: Stock Settings,Auto insert Price List rate if missing,如果价格清单中不存在该单价则自动插入
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,总支付金额
DocType: GST Settings,B2C Limit,B2C限制
@@ -5499,7 +5507,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,子节点只可创建在群组类节点下
DocType: Attendance Request,Half Day Date,半天日期
DocType: Academic Year,Academic Year Name,学年名称
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1280,{0} not allowed to transact with {1}. Please change the Company.,不允许{0}与{1}进行交易。请更改公司。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1166,{0} not allowed to transact with {1}. Please change the Company.,不允许{0}与{1}进行交易。请更改公司。
DocType: Sales Partner,Contact Desc,联系人倒序
DocType: Email Digest,Send regular summary reports via Email.,通过电子邮件发送定期汇总报表。
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +288,Please set default account in Expense Claim Type {0},请为报销类型设置默认科目{0}
@@ -5529,7 +5537,7 @@
DocType: Serial No,Asset Status,资产状态
DocType: Restaurant Order Entry,Restaurant Table,餐桌
DocType: Hotel Room,Hotel Manager,酒店经理
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,购物车设置税收规则
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,购物车设置税收规则
DocType: Purchase Invoice,Taxes and Charges Added,已添加的税费
apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,折旧行{0}：下一个折旧日期不能在可供使用的日期之前
,Sales Funnel,销售漏斗
@@ -5545,10 +5553,10 @@
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,所有客户群组
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,每月累计
DocType: Attendance Request,On Duty,值班
-apps/erpnext/erpnext/controllers/accounts_controller.py +847,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}是必填项。{1}和{2}的货币转换记录可能还未生成。
+apps/erpnext/erpnext/controllers/accounts_controller.py +846,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}是必填项。{1}和{2}的货币转换记录可能还未生成。
apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},已存在人员配置计划{0}以用于指定{1}
apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,税务模板字段必填。
-apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: Parent account {1} does not exist,科目{0}的上级科目{1}不存在
+apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,科目{0}的上级科目{1}不存在
DocType: POS Closing Voucher,Period Start Date,期间开始日期
DocType: Purchase Invoice Item,Price List Rate (Company Currency),价格清单单价（公司货币）
DocType: Products Settings,Products Settings,产品设置
@@ -5568,7 +5576,7 @@
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,此操作将停止未来的结算。您确定要取消此订阅吗？
DocType: Serial No,Distinct unit of an Item,物料的属性
DocType: Supplier Scorecard Criteria,Criteria Name,标准名称
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1368,Please set Company,请设公司
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1386,Please set Company,请设公司
DocType: Procedure Prescription,Procedure Created,程序已创建
DocType: Pricing Rule,Buying,采购
apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,疾病与肥料
@@ -5614,7 +5622,7 @@
DocType: Amazon MWS Settings,Synch Orders,同步订单
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,工单已审批可开始生产。
apps/erpnext/erpnext/public/js/account_tree_grid.js +65,Select Fiscal Year...,选择财务年度...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,POS Profile required to make POS Entry,请创建POS配置记录
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,POS Profile required to make POS Entry,请创建POS配置记录
apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +15,"Loyalty Points will be calculated from the spent done (via the Sales Invoice), based on collection factor mentioned.",忠诚度积分将根据所花费的完成量（通过销售发票）计算得出。
DocType: Program Enrollment Tool,Enroll Students,招生
DocType: Company,HRA Settings,HRA设置
@@ -5641,6 +5649,7 @@
DocType: Bank Statement Transaction Entry,Matching Invoices,匹配发票
DocType: Work Order,Required Items,所需物料
DocType: Stock Ledger Entry,Stock Value Difference,库存值差异
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: {1} {2} does not exist in above '{1}' table,项目行{0}：{1} {2}在上面的“{1}”表格中不存在
apps/erpnext/erpnext/config/learn.py +229,Human Resource,人力资源
DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,付款方式付款对账
DocType: Disease,Treatment Task,治疗任务
@@ -5766,7 +5775,7 @@
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Same item has been entered multiple times,同一物料重复输入了多次（不同的行）
DocType: Department,Leave Block List,禁止休假日列表
DocType: Purchase Invoice,Tax ID,纳税登记号
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,Item {0} is not setup for Serial Nos. Column must be blank,项目{0}没有启用序列好管理功能，序列号必须留空
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Item {0} is not setup for Serial Nos. Column must be blank,项目{0}没有启用序列好管理功能，序列号必须留空
DocType: Accounts Settings,Accounts Settings,会计设置
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,批准
DocType: Loyalty Program,Customer Territory,客户地区
@@ -5794,7 +5803,7 @@
apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,学到更多
DocType: Cheque Print Template,Distance from top edge,从顶边的距离
DocType: POS Closing Voucher Invoices,Quantity of Items,物料数量
-apps/erpnext/erpnext/stock/get_item_details.py +517,Price List {0} is disabled or does not exist,价格清单{0}禁用或不存在
+apps/erpnext/erpnext/stock/get_item_details.py +521,Price List {0} is disabled or does not exist,价格清单{0}禁用或不存在
DocType: Purchase Invoice,Return,回报
DocType: Pricing Rule,Disable,禁用
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +184,Mode of payment is required to make a payment,付款方式需要进行付款
@@ -5813,7 +5822,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +152,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},行{0}：BOM＃的货币{1}应等于所选货币{2}
DocType: Journal Entry Account,Exchange Rate,汇率
DocType: Patient,Additional information regarding the patient,有关患者的其他信息
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +664,Sales Order {0} is not submitted,销售订单{0}未提交
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +647,Sales Order {0} is not submitted,销售订单{0}未提交
DocType: Homepage,Tag Line,标语
DocType: Fee Component,Fee Component,收费组件
apps/erpnext/erpnext/config/hr.py +286,Fleet Management,车队的管理
@@ -5853,7 +5862,7 @@
DocType: Leave Policy Detail,Leave Policy Detail,休假政策信息
DocType: BOM Scrap Item,BOM Scrap Item,BOM废料
apps/erpnext/erpnext/accounts/page/pos/pos.js +908,Submitted orders can not be deleted,提交的订单不能被删除
-apps/erpnext/erpnext/accounts/doctype/account/account.py +116,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",账户余额已设置为'借方'，不能设置为'贷方'
+apps/erpnext/erpnext/accounts/doctype/account/account.py +121,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",账户余额已设置为'借方'，不能设置为'贷方'
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +330,Quality Management,质量管理
apps/erpnext/erpnext/assets/doctype/asset/asset.py +52,Item {0} has been disabled,物料{0}已被禁用
DocType: Project,Total Billable Amount (via Timesheets),总计费用金额（通过工时单）
@@ -5879,7 +5888,7 @@
DocType: Linked Plant Analysis,Linked Plant Analysis,链接的工厂分析
DocType: Delivery Note,Transporter ID,运输商ID
DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,供应商的货币转换为公司的本币后的单价
-DocType: Sales Invoice Item,Service End Date,服务结束日期
+DocType: Purchase Invoice Item,Service End Date,服务结束日期
apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},行＃{0}：与排时序冲突{1}
DocType: Purchase Invoice Item,Allow Zero Valuation Rate,允许零估值
DocType: Purchase Invoice Item,Allow Zero Valuation Rate,允许评估价为0
@@ -5915,7 +5924,7 @@
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,必须设置试用期开始日期和试用期结束日期
apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,平均率
-apps/erpnext/erpnext/controllers/accounts_controller.py +791,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,支付计划中的总付款金额必须等于大/圆
+apps/erpnext/erpnext/controllers/accounts_controller.py +790,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,支付计划中的总付款金额必须等于大/圆
DocType: Subscription Plan Detail,Plan,计划
apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,基于总帐的银行对账单余额
DocType: Job Applicant,Applicant Name,申请人姓名
@@ -5975,7 +5984,7 @@
DocType: Stock Entry,Material Consumption for Manufacture,出库-生产
DocType: Item Alternative,Alternative Item Code,替代物料代码
DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,允许提交超过设定信用额度的交易的角色。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1047,Select Items to Manufacture,选择待生产物料
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1065,Select Items to Manufacture,选择待生产物料
DocType: Delivery Stop,Delivery Stop,交付停止
apps/erpnext/erpnext/accounts/page/pos/pos.js +976,"Master data syncing, it might take some time",主数据同步，这可能需要一些时间
DocType: Item,Material Issue,发料
@@ -6023,7 +6032,7 @@
DocType: Sales Order Item,For Production,生产
DocType: Payment Request,payment_url,payment_url
DocType: Exchange Rate Revaluation Account,Balance In Account Currency,科目币别余额
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,请在会计科目表中添加一个临时开帐科目
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +188,Please add a Temporary Opening account in Chart of Accounts,请在会计科目表中添加一个临时开帐科目
DocType: Customer,Customer Primary Contact,客户主要联系人
DocType: Project Task,View Task,查看任务
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead％
@@ -6069,7 +6078,7 @@
DocType: Assessment Result Detail,Assessment Result Detail,评价结果详细
DocType: Employee Education,Employee Education,员工教育
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,在物料组中有重复物料组
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1148,It is needed to fetch Item Details.,需要获取物料详细信息。
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1180,It is needed to fetch Item Details.,需要获取物料详细信息。
DocType: Fertilizer,Fertilizer Name,肥料名称
DocType: Salary Slip,Net Pay,净支付金额
DocType: Cash Flow Mapping Accounts,Account,科目
@@ -6087,7 +6096,6 @@
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +251,Invalid {0},无效的{0}
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +93,Sick Leave,病假
DocType: Email Digest,Email Digest,邮件摘要
-apps/erpnext/erpnext/controllers/buying_controller.py +759,are not,不是
DocType: Delivery Note,Billing Address Name,帐单地址名称
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +22,Department Stores,百货
,Item Delivery Date,物料交货日期
@@ -6109,7 +6117,7 @@
DocType: Item,No of Months,没有几个月
DocType: Item,Max Discount (%),最大折扣(%)
apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +30,Credit Days cannot be a negative number,信用日不能是负数
-DocType: Sales Invoice Item,Service Stop Date,服务停止日期
+DocType: Purchase Invoice Item,Service Stop Date,服务停止日期
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,最后订单金额
DocType: Cash Flow Mapper,e.g Adjustments for:,例如调整：
apps/erpnext/erpnext/stock/doctype/item/item.py +290," {0} Retain Sample is based on batch, please check Has Batch No to retain sample of item",{0}保留样品基于批次，请检查有批次否保留样品
@@ -6153,6 +6161,7 @@
DocType: Appointment Type,Physician,医师
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1080,Batch {0} of Item {1} has expired.,物料{1}的批号{0} 已过期。
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,磋商
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,请在教育>教育设置中设置教师命名系统
apps/erpnext/erpnext/manufacturing/report/bom_variance_report/bom_variance_report.py +36,Finished Good,成品
apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +56,"Item Price appears multiple times based on Price List, Supplier/Customer, Currency, Item, UOM, Qty and Dates.",物料价格根据价格表，供应商/客户，货币，物料，UOM，数量和日期多次出现。
DocType: Sales Invoice,Commission,佣金
@@ -6172,7 +6181,7 @@
apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`冻结老于此天数的库存`应该比％d天小。
DocType: Tax Rule,Purchase Tax Template,进项税模板
apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,为您的公司设定您想要实现的销售目标。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1530,Healthcare Services,医疗服务
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1548,Healthcare Services,医疗服务
,Project wise Stock Tracking,项目级库存追踪
DocType: GST HSN Code,Regional,区域性
DocType: Delivery Note,Transport Mode,运输方式
@@ -6205,10 +6214,10 @@
DocType: Warranty Claim,Resolved By,议决
apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js +32,Schedule Discharge,附表卸货
apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,支票及存款非正常清账
-apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: You can not assign itself as parent account,科目{0}不能是自己的上级科目
+apps/erpnext/erpnext/accounts/doctype/account/account.py +53,Account {0}: You can not assign itself as parent account,科目{0}不能是自己的上级科目
DocType: Purchase Invoice Item,Price List Rate,价格清单单价
apps/erpnext/erpnext/utilities/activation.py +72,Create customer quotes,创建客户报价
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1584,Service Stop Date cannot be after Service End Date,服务停止日期不能在服务结束日期之后
+apps/erpnext/erpnext/public/js/controllers/transaction.js +812,Service Stop Date cannot be after Service End Date,服务停止日期不能在服务结束日期之后
DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",根据此仓库显示“有库存”或“无库存”状态。
apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),物料清单(BOM)
DocType: Item,Average time taken by the supplier to deliver,供应商交货时间的平均值
@@ -6220,7 +6229,7 @@
apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,小时
DocType: Project,Expected Start Date,预计开始日期
DocType: Purchase Invoice,04-Correction in Invoice,04-发票纠正
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1020,Work Order already created for all items with BOM,已经为包含物料清单的所有料品创建工单
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1038,Work Order already created for all items with BOM,已经为包含物料清单的所有料品创建工单
DocType: Payment Request,Party Details,党详细
apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant Details Report,变体详细信息报表
DocType: Setup Progress Action,Setup Progress Action,设置进度动作
@@ -6283,7 +6292,7 @@
apps/erpnext/erpnext/stock/stock_ledger.py +382,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} {1}在需要{2}在{3} {4}：{5}来完成这一交易单位。
DocType: Fee Schedule,Student Category,学生组
DocType: Announcement,Student,学生
-apps/erpnext/erpnext/healthcare/doctype/clinical_procedure/clinical_procedure.js +91,Stock quantity to start procedure is not available in the warehouse. Do you want to record a Stock Transfer,仓库中不提供开始操作的库存数量。你想记录股票转移吗？
+apps/erpnext/erpnext/healthcare/doctype/clinical_procedure/clinical_procedure.js +98,Stock quantity to start procedure is not available in the warehouse. Do you want to record a Stock Transfer,仓库中不提供开始操作的库存数量。你想记录股票转移吗？
DocType: Shipping Rule,Shipping Rule Type,运输规则类型
apps/erpnext/erpnext/utilities/user_progress.py +239,Go to Rooms,去房间
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +259,"Company, Payment Account, From Date and To Date is mandatory",公司，付款科目，开始日期和截止日期字段都是必填的
@@ -6325,7 +6334,7 @@
DocType: Lead,Converted,已转换
DocType: Item,Has Serial No,有序列号
DocType: Employee,Date of Issue,签发日期
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +246,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}",根据采购设置，如果需要采购记录==“是”，则为了创建采购发票，用户需要首先为项目{0}创建采购凭证
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +250,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}",根据采购设置，如果需要采购记录==“是”，则为了创建采购发票，用户需要首先为项目{0}创建采购凭证
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},行＃{0}：设置供应商项目{1}
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,行{0}：小时值必须大于零。
apps/erpnext/erpnext/stock/doctype/item/item.py +210,Website Image {0} attached to Item {1} cannot be found,网站图像{0}附加到物料{1}无法找到
@@ -6339,7 +6348,7 @@
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,{0} {1} does not exist,{0} {1}不存在
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +355,Please check Multi Currency option to allow accounts with other currency,请检查多币种选项，允许科目与其他货币
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,项目{0}不存在
-apps/erpnext/erpnext/accounts/doctype/account/account.py +108,You are not authorized to set Frozen value,您没有权限设定冻结值
+apps/erpnext/erpnext/accounts/doctype/account/account.py +113,You are not authorized to set Frozen value,您没有权限设定冻结值
DocType: Payment Reconciliation,Get Unreconciled Entries,获取未对帐/结清分录
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,Employee {0} is on Leave on {1},员工{0}暂停{1}
apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,没有为手工凭证选择还款
@@ -6371,7 +6380,7 @@
DocType: Stock Entry,Total Value Difference (Out - In),总价值差（输出 - ）
DocType: Grant Application,Requested Amount,请求金额
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Row {0}: Exchange Rate is mandatory,行{0}：汇率是必须的
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},员工设置{0}为设置用户ID
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +46,User ID not set for Employee {0},员工设置{0}为设置用户ID
DocType: Vehicle,Vehicle Value,汽车衡
DocType: Crop Cycle,Detected Diseases,检测到的疾病
DocType: Stock Entry,Default Source Warehouse,默认源仓库
@@ -6379,7 +6388,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Birthday Reminder for {0},{0}的生日提醒
DocType: Asset Maintenance Task,Last Completion Date,最后完成日期
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,自上次订购天数
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +426,Debit To account must be a Balance Sheet account,借记科目必须是资产负债表科目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +427,Debit To account must be a Balance Sheet account,借记科目必须是资产负债表科目
DocType: Asset,Naming Series,命名系列
DocType: Vital Signs,Coated,涂
apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,行{0}：使用寿命后的预期值必须小于总采购额
@@ -6397,7 +6406,7 @@
apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,销售出货单{0}不能提交
DocType: Notification Control,Sales Invoice Message,销售发票信息
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,关闭科目{0}的类型必须是负债/权益
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +405,Salary Slip of employee {0} already created for time sheet {1},员工的工资单{0}已为工时单创建{1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Salary Slip of employee {0} already created for time sheet {1},员工的工资单{0}已为工时单创建{1}
DocType: Vehicle Log,Odometer,里程表
DocType: Production Plan Item,Ordered Qty,订单数量
apps/erpnext/erpnext/stock/doctype/item/item.py +802,Item {0} is disabled,物料{0}已被禁用
@@ -6468,7 +6477,7 @@
DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +103,No Delivery Note selected for Customer {},没有为客户{}选择销售出货单
apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,员工{0}没有最大福利金额
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1110,Select Items based on Delivery Date,根据交货日期选择物料
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,根据交货日期选择物料
DocType: Grant Application,Has any past Grant Record,有过去的赠款记录吗？
,Sales Analytics,销售分析
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},可用{0}
@@ -6477,7 +6486,7 @@
DocType: Manufacturing Settings,Manufacturing Settings,生产设置
apps/erpnext/erpnext/config/setup.py +56,Setting up Email,设置电子邮件
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1手机号码
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +130,Please enter default currency in Company Master,请在公司设置中维护默认货币
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +134,Please enter default currency in Company Master,请在公司设置中维护默认货币
DocType: Stock Entry Detail,Stock Entry Detail,手工库存移动信息
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Daily Reminders,每日提醒
apps/erpnext/erpnext/templates/pages/help.html +56,See all open tickets,查看所有打开的门票
@@ -6524,7 +6533,7 @@
DocType: Employee Tax Exemption Category,Max Amount,最大金额
DocType: Journal Entry,Total Amount Currency,总金额币种
apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,搜索子组件
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +195,Item Code required at Row No {0},行{0}中的物料代码是必须项
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Item Code required at Row No {0},行{0}中的物料代码是必须项
DocType: GST Account,SGST Account,SGST账户
apps/erpnext/erpnext/utilities/user_progress.py +154,Go to Items,转到物料主数据
DocType: Sales Partner,Partner Type,合作伙伴类型
@@ -6549,7 +6558,7 @@
DocType: Employee,Cheque,支票
DocType: Training Event,Employee Emails,员工电子邮件
apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +67,Series Updated,系列已更新
-apps/erpnext/erpnext/accounts/doctype/account/account.py +161,Report Type is mandatory,报表类型必填
+apps/erpnext/erpnext/accounts/doctype/account/account.py +166,Report Type is mandatory,报表类型必填
DocType: Item,Serial Number Series,序列号系列
apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},行{1}中的物料{0}必须指定仓库
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +45,Retail & Wholesale,零售及批发
@@ -6596,12 +6605,12 @@
DocType: Company,Series for Asset Depreciation Entry (Journal Entry),固定资产折旧凭证命名序列（手工凭证）
DocType: Membership,Member Since,成员自
DocType: Purchase Invoice,Advance Payments,预付款
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1762,Please select Healthcare Service,请选择医疗保健服务
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1747,Please select Healthcare Service,请选择医疗保健服务
DocType: Purchase Taxes and Charges,On Net Total,基于净总计
apps/erpnext/erpnext/controllers/item_variant.py +92,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},物料{4}的属性{0}其属性值必须{1}到{2}范围内，且增量{3}
DocType: Restaurant Reservation,Waitlisted,轮候
DocType: Employee Tax Exemption Declaration Category,Exemption Category,豁免类别
-apps/erpnext/erpnext/accounts/doctype/account/account.py +126,Currency can not be changed after making entries using some other currency,货币不能使用其他货币进行输入后更改
+apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Currency can not be changed after making entries using some other currency,货币不能使用其他货币进行输入后更改
DocType: Shipping Rule,Fixed,固定
DocType: Vehicle Service,Clutch Plate,离合器压盘
DocType: Company,Round Off Account,四舍五入科目
@@ -6668,7 +6677,7 @@
DocType: Assessment Result,Total Score,总得分
DocType: Crop Cycle,ISO 8601 standard,ISO 8601标准
DocType: Journal Entry,Debit Note,借项通知单
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1494,You can only redeem max {0} points in this order.,您只能按此顺序兑换最多{0}个积分。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1512,You can only redeem max {0} points in this order.,您只能按此顺序兑换最多{0}个积分。
DocType: Expense Claim,HR-EXP-.YYYY.-,HR-EXP-.YYYY.-
apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +102,Please enter API Consumer Secret,请输入API消费者密码
DocType: Stock Entry,As per Stock UOM,按库存计量单位
@@ -6750,7 +6759,7 @@
DocType: Additional Salary,Employee Name,员工姓名
DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,餐厅订单录入项目
DocType: Purchase Invoice,Rounded Total (Company Currency),圆整后金额（公司货币）
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Cannot covert to Group because Account Type is selected.,不能转换到组，因为你选择的是科目类型。
+apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,不能转换到组，因为你选择的是科目类型。
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1}已被修改过，请刷新。
DocType: Leave Block List,Stop users from making Leave Applications on following days.,禁止用户在以下日期提交假期申请。
apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.",如果忠诚度积分无限期到期，请将到期时间保持为空或0。
@@ -6791,7 +6800,7 @@
apps/erpnext/erpnext/accounts/page/pos/pos.js +1733,Price List not found or disabled,价格清单未找到或禁用
DocType: Student Applicant,Approved,已批准
apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +15,Price,价格
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +347,Employee relieved on {0} must be set as 'Left',员工自{0}离职后，其状态必须设置为“已离职”
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +349,Employee relieved on {0} must be set as 'Left',员工自{0}离职后，其状态必须设置为“已离职”
DocType: Marketplace Settings,Last Sync On,上次同步开启
DocType: Guardian,Guardian,监护人
apps/erpnext/erpnext/support/doctype/issue/issue.js +48,All communications including and above this shall be moved into the new Issue,包括及以上的所有通信均应移至新发行中
@@ -6821,7 +6830,7 @@
apps/erpnext/erpnext/hr/doctype/attendance_request/attendance_request.py +52,Attendance not submitted for {0} as it is a Holiday.,由于是假期，{0}的考勤未提交。
DocType: POS Profile,Account for Change Amount,零钱科目
DocType: Exchange Rate Revaluation,Total Gain/Loss,总收益/损失
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1273,Invalid Company for Inter Company Invoice.,公司发票无效公司。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1159,Invalid Company for Inter Company Invoice.,公司发票无效公司。
DocType: Purchase Invoice,input service,输入服务
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},行{0}：往来单位/科目{1} / {2}与{3} {4}不匹配
DocType: Employee Promotion,Employee Promotion,员工晋升
@@ -6893,6 +6902,7 @@
apps/erpnext/erpnext/config/accounts.py +285,"Seasonality for setting budgets, targets etc.",设置季节性的预算，目标等。
DocType: Supplier Scorecard Scoring Variable,Variable Name,变量名
apps/erpnext/erpnext/stock/get_item_details.py +163,"Item {0} is a template, please select one of its variants",物料{0}是一个模板，请选择它的一个变体
+DocType: Purchase Invoice Item,Deferred Expense,递延费用
apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +26,From Date {0} cannot be before employee's joining Date {1},起始日期{0}不能在员工加入日期之前{1}
DocType: Asset,Asset Category,资产类别
apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +32,Net pay cannot be negative,净支付金额不能为负数
@@ -6921,10 +6931,10 @@
DocType: Scheduling Tool,Scheduling Tool,调度工具
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Credit Card,信用卡
DocType: BOM,Item to be manufactured or repacked,待生产或者重新包装的物料
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +764,Syntax error in condition: {0},条件中的语法错误：{0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +766,Syntax error in condition: {0},条件中的语法错误：{0}
DocType: Fee Structure,EDU-FST-.YYYY.-,EDU-FST-.YYYY.-
DocType: Employee Education,Major/Optional Subjects,主修/选修科目
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +125,Please Set Supplier Group in Buying Settings.,请设置供应商组采购设置。
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +121,Please Set Supplier Group in Buying Settings.,请设置供应商组采购设置。
apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +56,"Total flexible benefit component amount {0} should not be less \
than max benefits {1}",灵活福利组件总额{0}不应低于最大福利{1}
DocType: Sales Invoice Item,Drop Ship,由供应商交货（直接发运）
@@ -6956,7 +6966,7 @@
DocType: Work Order,Actual Operating Cost,实际运行成本
DocType: Payment Entry,Cheque/Reference No,支票/参考编号
DocType: Soil Texture,Clay Loam,粘土Loam
-apps/erpnext/erpnext/accounts/doctype/account/account.py +83,Root cannot be edited.,根不能被编辑。
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root cannot be edited.,根不能被编辑。
DocType: Item,Units of Measure,计量单位
DocType: Employee Tax Exemption Declaration,Rented in Metro City,在Metro City租用
DocType: Supplier,Default Tax Withholding Config,预设税款预扣配置
@@ -6988,7 +6998,7 @@
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,设计师
apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,条款和条件模板
DocType: Serial No,Delivery Details,交货细节
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +574,Cost Center is required in row {0} in Taxes table for type {1},类型{1}税费表的行{0}必须有成本中心
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +578,Cost Center is required in row {0} in Taxes table for type {1},类型{1}税费表的行{0}必须有成本中心
DocType: Program,Program Code,程序代码
DocType: Terms and Conditions,Terms and Conditions Help,条款和条件帮助
,Item-wise Purchase Register,物料采购台帐
@@ -7031,7 +7041,7 @@
DocType: Department,Expense Approvers,费用审批人
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +228,Row {0}: Debit entry can not be linked with a {1},行{0}：借记分录不能与连接的{1}
DocType: Journal Entry,Subscription Section,重复
-apps/erpnext/erpnext/accounts/doctype/account/account.py +233,Account {0} does not exist,科目{0}不存在
+apps/erpnext/erpnext/accounts/doctype/account/account.py +238,Account {0} does not exist,科目{0}不存在
DocType: Training Event,Training Program,培训计划
DocType: Account,Cash,现金
DocType: Employee,Short biography for website and other publications.,在网站或其他出版物使用的个人简介