[Translation] Updated Translations (#14776)

diff --git a/erpnext/translations/zh.csv b/erpnext/translations/zh.csv
index 8044793..278d57e 100644
--- a/erpnext/translations/zh.csv
+++ b/erpnext/translations/zh.csv
@@ -23,6 +23,7 @@
 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,租
 DocType: Purchase Order,PO-,PO-
+apps/erpnext/erpnext/public/js/setup_wizard.js +231,All Accounts,所有帐户
 apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +15,Cannot transfer Employee with status Left,无法转移状态为左的员工
 DocType: Vehicle Service,Mileage,里程
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +309,Do you really want to scrap this asset?,难道你真的想放弃这项资产?
@@ -105,7 +106,7 @@
 DocType: Lab Prescription,Lab Prescription,实验室处方
 ,Delay Days,延迟天数
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,服务费用
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +904,Serial Number: {0} is already referenced in Sales Invoice: {1},序号:{0}已在销售发票中引用:{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +906,Serial Number: {0} is already referenced in Sales Invoice: {1},序号:{0}已在销售发票中引用:{1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,发票
 DocType: Purchase Invoice Item,Item Weight Details,项目重量细节
 DocType: Asset Maintenance Log,Periodicity,周期性
@@ -171,7 +172,7 @@
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},不允许{0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,Get items from,从获取物料
 DocType: Price List,Price Not UOM Dependant,价格不依赖于UOM
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Stock cannot be updated against Delivery Note {0},送货单{0}不能更新库存
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Stock cannot be updated against Delivery Note {0},送货单{0}不能更新库存
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},产品{0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,没有列出项目
 DocType: Asset Repair,Error Description,错误说明
@@ -187,7 +188,7 @@
 DocType: SMS Center,All Sales Person,所有的销售人员
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,**月度分配**帮助你分配预算/目标跨越几个月,如果你在你的业务有季节性。
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1758,Not items found,未找到项目
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +247,Salary Structure Missing,薪酬结构缺失
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +252,Salary Structure Missing,薪酬结构缺失
 DocType: Lead,Person Name,人姓名
 DocType: Sales Invoice Item,Sales Invoice Item,销售发票品目
 DocType: Account,Credit,贷方
@@ -196,7 +197,7 @@
 apps/erpnext/erpnext/config/stock.py +28,Stock Reports,库存报告
 DocType: Warehouse,Warehouse Detail,仓库详细信息
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,该期限结束日期不能晚于学年年终日期到这个词联系在一起(学年{})。请更正日期,然后再试一次。
-apps/erpnext/erpnext/stock/doctype/item/item.py +284,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",是固定资产不能被反选,因为存在资产记录的项目
+apps/erpnext/erpnext/stock/doctype/item/item.py +285,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",是固定资产不能被反选,因为存在资产记录的项目
 DocType: Delivery Trip,Departure Time,出发时间
 DocType: Vehicle Service,Brake Oil,刹车油
 DocType: Tax Rule,Tax Type,税收类型
@@ -208,7 +209,7 @@
 DocType: BOM,Item Image (if not slideshow),项目图片(如果没有指定幻灯片)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,(小时率/ 60)*实际操作时间
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,行#{0}:参考文档类型必须是费用索赔或日记帐分录之一
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Select BOM,选择BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1022,Select BOM,选择BOM
 DocType: SMS Log,SMS Log,短信日志
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,交付品目成本
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,在{0}这个节日之间没有从日期和结束日期
@@ -271,7 +272,6 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,选择目标仓库
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,选择目标仓库
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +87,Please enter Preferred Contact Email,请输入首选电子邮件联系
-apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxNum,CompAuxNum
 DocType: Journal Entry,Contra Entry,对销分录
 DocType: Journal Entry Account,Credit in Company Currency,信用在公司货币
 DocType: Lab Test UOM,Lab Test UOM,实验室测试UOM
@@ -283,7 +283,7 @@
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,供应原料采购
 DocType: Agriculture Analysis Criteria,Fertilizer,肥料
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +156,At least one mode of payment is required for POS invoice.,需要为POS发票定义至少付款模式
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +157,At least one mode of payment is required for POS invoice.,需要为POS发票定义至少付款模式
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,银行对账单交易发票项目
 DocType: Products Settings,Show Products as a List,产品展示作为一个列表
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure/clinical_procedure.py +102,Item {0} is not active or end of life has been reached,物料{0}处于非活动或寿命终止状态
@@ -295,6 +295,7 @@
 DocType: Selling Settings,Default Quotation Validity Days,默认报价有效天数
 apps/erpnext/erpnext/controllers/accounts_controller.py +832,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",要包括税款,行{0}项率,税收行{1}也必须包括在内
 DocType: SMS Center,SMS Center,短信中心
+DocType: Payroll Entry,Validate Attendance,验证出席
 DocType: Sales Invoice,Change Amount,涨跌额
 DocType: Party Tax Withholding Config,Certificate Received,已收到证书
 DocType: GST Settings,Set Invoice Value for B2C. B2CL and B2CS calculated based on this invoice value.,设置B2C的发票值。 B2CL和B2CS根据此发票值计算。
@@ -375,7 +376,6 @@
 DocType: Work Order Operation,Updated via 'Time Log',通过“时间日志”更新
 apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,选择客户或供应商。
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +444,Advance amount cannot be greater than {0} {1},提前量不能大于{0} {1}
-apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalCode,JournalCode
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +55,"Time slot skiped, the slot {0} to {1} overlap exisiting slot {2} to {3}",时隙滑动,时隙{0}到{1}与现有时隙{2}重叠到{3}
 DocType: Naming Series,Series List for this Transaction,此交易的系列列表
 DocType: Company,Enable Perpetual Inventory,启用永久库存
@@ -395,8 +395,6 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,对销售发票项目
 DocType: Agriculture Analysis Criteria,Linked Doctype,链接的文档类型
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Cash from Financing,从融资净现金
-apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +65,"Please add the remainig benefits {0} to the application as \
-				pro-rata component",请以\ pro-rata组件的形式将应用程序的益处{0}添加到应用程序中
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2376,"LocalStorage is full , did not save",localStorage的满了,没救
 DocType: Lead,Address & Contact,地址及联系方式
 DocType: Leave Allocation,Add unused leaves from previous allocations,从以前的分配中添加未使用的休假
@@ -419,7 +417,7 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,这是基于对这个项目产生的考勤表
 ,Open Work Orders,打开工作订单
 DocType: Payment Term,Credit Months,信贷月份
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +472,Net Pay cannot be less than 0,净工资不能低于0
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +477,Net Pay cannot be less than 0,净工资不能低于0
 DocType: Contract,Fulfilled,达到
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Relieving Date must be greater than Date of Joining,解除日期必须大于加入的日期
 DocType: POS Closing Voucher,Cashier,出纳员
@@ -432,7 +430,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,请设置学生组的学生
 DocType: Item Website Specification,Item Website Specification,项目网站规格
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +553,Leave Blocked,已禁止请假
-apps/erpnext/erpnext/stock/doctype/item/item.py +763,Item {0} has reached its end of life on {1},物料{0}已经到达寿命终止日期{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +776,Item {0} has reached its end of life on {1},物料{0}已经到达寿命终止日期{1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,银行条目
 DocType: Customer,Is Internal Customer,是内部客户
 DocType: Crop,Annual,全年
@@ -450,10 +448,10 @@
 DocType: Item,Publish in Hub,在发布中心
 DocType: Student Admission,Student Admission,学生入学
 ,Terretory,区域
-apps/erpnext/erpnext/stock/doctype/item/item.py +785,Item {0} is cancelled,物料{0}已取消
+apps/erpnext/erpnext/stock/doctype/item/item.py +798,Item {0} is cancelled,物料{0}已取消
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,折旧行{0}:折旧开始日期作为过去的日期输入
 DocType: Contract Template,Fulfilment Terms and Conditions,履行条款和条件
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1069,Material Request,物料申请
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1088,Material Request,物料申请
 DocType: Bank Reconciliation,Update Clearance Date,更新清算日期
 ,GSTR-2,GSTR-2
 DocType: Item,Purchase Details,购买详情
@@ -528,14 +526,14 @@
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},请在{}上设置酒店房价
 DocType: Journal Entry,Multi Currency,多币种
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,发票类型
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +957,Delivery Note,送货单
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +976,Delivery Note,送货单
 DocType: Consultation,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 +134,Cost of Sold Asset,出售资产的成本
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Cost of Sold Asset,出售资产的成本
 DocType: Volunteer,Morning,早上
 apps/erpnext/erpnext/accounts/utils.py +352,Payment Entry has been modified after you pulled it. Please pull it again.,获取付款记录后有修改,请重获取。
 DocType: Program Enrollment Tool,New Student Batch,新学生批次
-apps/erpnext/erpnext/stock/doctype/item/item.py +494,{0} entered twice in Item Tax,{0}输入了两次税项
+apps/erpnext/erpnext/stock/doctype/item/item.py +495,{0} entered twice in Item Tax,{0}输入了两次税项
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,Summary for this week and pending activities,本周和待活动总结
 DocType: Student Applicant,Admitted,录取
 DocType: Workstation,Rent Cost,租金成本
@@ -578,7 +576,7 @@
 DocType: Support Search Source,Response Result Key Path,响应结果关键路径
 DocType: Journal Entry,Inter Company Journal Entry,Inter公司日记帐分录
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +496,For quantity {0} should not be grater than work order quantity {1},数量{0}不应超过工单数量{1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +493,Please see attachment,请参阅附件
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +498,Please see attachment,请参阅附件
 DocType: Purchase Order,% Received,%已收货
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,创建挺起胸
 DocType: Volunteer,Weekends,周末
@@ -649,7 +647,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,数量和价格
 DocType: Delivery Note,% Installed,%已安装
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,教室/实验室等在那里的演讲可以预定。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1149,Company currencies of both the companies should match for Inter Company Transactions.,两家公司的公司货币应该符合Inter公司交易。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1151,Company currencies of both the companies should match for Inter Company Transactions.,两家公司的公司货币应该符合Inter公司交易。
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,请先输入公司名称
 DocType: Travel Itinerary,Non-Vegetarian,非素食主义者
 DocType: Purchase Invoice,Supplier Name,供应商名称
@@ -680,7 +678,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,所有生产流程的全局设置。
 DocType: Accounts Settings,Accounts Frozen Upto,账户被冻结到...为止
 DocType: SMS Log,Sent On,发送日期
-apps/erpnext/erpnext/stock/doctype/item/item.py +723,Attribute {0} selected multiple times in Attributes Table,属性{0}多次选择在属性表
+apps/erpnext/erpnext/stock/doctype/item/item.py +736,Attribute {0} selected multiple times in Attributes Table,属性{0}多次选择在属性表
 DocType: HR Settings,Employee record is created using selected field. ,使用所选字段创建员工记录。
 DocType: Sales Order,Not Applicable,不适用
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +85,Opening Invoice Item,打开发票项目
@@ -690,7 +688,6 @@
 DocType: Travel Request,Costing,成本核算
 DocType: Tax Rule,Billing County,开票县
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",如果选中,税金将被认为已包括于打印税率/打印总额内。
-apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +46,PieceRef,PieceRef
 DocType: Request for Quotation,Message for Supplier,消息供应商
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +40,Work Order,工作指示
 DocType: Driver,DRIVER-.#####,DRIVER  -  #####
@@ -753,7 +750,7 @@
 DocType: Lab Test Template,Lab Routine,实验室常规
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,化妆品
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +18,Please select Completion Date for Completed Asset Maintenance Log,请选择已完成资产维护日志的完成日期
-apps/erpnext/erpnext/stock/doctype/item/item.py +567,"To merge, following properties must be same for both items",若要合并,以下属性必须为这两个项目是相同的
+apps/erpnext/erpnext/stock/doctype/item/item.py +568,"To merge, following properties must be same for both items",若要合并,以下属性必须为这两个项目是相同的
 DocType: Supplier,Block Supplier,块供应商
 DocType: Shipping Rule,Net Weight,净重
 DocType: Job Opening,Planned number of Positions,计划的职位数量
@@ -782,6 +779,7 @@
 DocType: Patient,Risk Factors,风险因素
 DocType: Patient,Occupational Hazards and Environmental Factors,职业危害与环境因素
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +283,Stock Entries already created for Work Order ,已为工单创建的库存条目
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +169,Supplier > Supplier Type,供应商>供应商类型
 DocType: Vital Signs,Respiratory rate,呼吸频率
 apps/erpnext/erpnext/config/stock.py +338,Managing Subcontracting,管理转包
 DocType: Vital Signs,Body Temperature,体温
@@ -804,7 +802,7 @@
 DocType: Crop,Produced Items,生产物品
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,将交易与发票匹配
 DocType: Sales Order Item,Gross Profit,毛利
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +822,Unblock Invoice,取消屏蔽发票
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +841,Unblock Invoice,取消屏蔽发票
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,增量不能为0
 DocType: Company,Delete Company Transactions,删除公司事务
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +366,Reference No and Reference Date is mandatory for Bank transaction,参考编号和参考日期是强制性的银行交易
@@ -834,7 +832,7 @@
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,所有供应商记分卡。
 DocType: Buying Settings,Purchase Receipt Required,外购入库单要求
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +229,Target warehouse in row {0} must be same as Work Order,行{0}中的目标仓库必须与工单相同
-apps/erpnext/erpnext/stock/doctype/item/item.py +169,Valuation Rate is mandatory if Opening Stock entered,估价费用是强制性的,如果打开股票进入
+apps/erpnext/erpnext/stock/doctype/item/item.py +170,Valuation Rate is mandatory if Opening Stock entered,估价费用是强制性的,如果打开股票进入
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +143,No records found in the Invoice table,没有在发票表中找到记录
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +36,Please select Company and Party Type first,请先选择公司和往来单位类型
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default",已经在用户{1}的pos配置文件{0}中设置了默认值,请禁用默认值
@@ -845,7 +843,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,POS Profile中需要领域
 DocType: Supplier,Prevent RFQs,防止RFQ
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,创建销售订单
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +169,Salary Slip submitted for period from {0} to {1},从{0}到{1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +179,Salary Slip submitted for period from {0} to {1},从{0}到{1}
 DocType: Project Task,Project Task,项目任务
 ,Lead Id,线索ID
 DocType: C-Form Invoice Detail,Grand Total,总计
@@ -869,7 +867,7 @@
 DocType: Sales Invoice,Shipping Bill Date,运费单日期
 DocType: Production Plan,Production Plan,生产计划
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,打开发票创建工具
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +863,Sales Return,销售退货
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +882,Sales Return,销售退货
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +110,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,注:总分配叶{0}应不低于已核定叶{1}期间
 DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,根据序列号输入设置交易数量
 ,Total Stock Summary,总库存总结
@@ -884,7 +882,7 @@
 DocType: Quotation,Quotation To,报价对象
 DocType: Lead,Middle Income,中等收入
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),开幕(CR )
-apps/erpnext/erpnext/stock/doctype/item/item.py +895,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,因为该物料已经有使用别的计量单位的交易记录存在了,不再允许直接修改其默认单位{0}了。如果需要请创建一个新物料,以使用不同的默认计量单位。
+apps/erpnext/erpnext/stock/doctype/item/item.py +908,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,因为该物料已经有使用别的计量单位的交易记录存在了,不再允许直接修改其默认单位{0}了。如果需要请创建一个新物料,以使用不同的默认计量单位。
 apps/erpnext/erpnext/accounts/utils.py +356,Allocated amount can not be negative,调配数量不能为负
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,请设定公司
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,请设定公司
@@ -901,6 +899,7 @@
 DocType: Payroll Entry,Select Payment Account to make Bank Entry,选择付款账户,使银行进入
 DocType: Hotel Settings,Default Invoice Naming Series,默认发票命名系列
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll",建立员工档案管理叶,报销和工资
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +679,An error occurred during the update process,更新过程中发生错误
 DocType: Restaurant Reservation,Restaurant Reservation,餐厅预订
 DocType: Land Unit,Land Unit Name,土地单位名称
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +166,Proposal Writing,提案写作
@@ -918,11 +917,12 @@
 apps/erpnext/erpnext/config/accounts.py +144,Update Bank Transaction Dates,更新银行交易日期
 apps/erpnext/erpnext/config/projects.py +41,Time Tracking,时间跟踪
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,输送机重复
-apps/erpnext/erpnext/hr/doctype/employee_advance/employee_advance.py +49,Row {0}# Paid Amount cannot be greater than requested advance amount,行{0}#付费金额不能大于请求的提前金额
+apps/erpnext/erpnext/hr/doctype/employee_advance/employee_advance.py +57,Row {0}# Paid Amount cannot be greater than requested advance amount,行{0}#付费金额不能大于请求的提前金额
 DocType: Fiscal Year Company,Fiscal Year Company,公司财政年度
 DocType: Packing Slip Item,DN Detail,送货单详情
 DocType: Training Event,Conference,会议
 DocType: Employee Grade,Default Salary Structure,默认工资结构
+apps/erpnext/erpnext/hr/report/daily_work_summary_replies/daily_work_summary_replies.py +23,Replies,回复
 DocType: Timesheet,Billed,已开票
 DocType: Batch,Batch Description,批次说明
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,创建学生组
@@ -967,7 +967,7 @@
 DocType: Fee Validity,Max number of visit,最大访问次数
 ,Hotel Room Occupancy,酒店客房入住率
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +386,Timesheet created:,创建时间表:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1054,Please set default Cash or Bank account in Mode of Payment {0},请设置默认的现金或银行账户的付款方式{0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1056,Please set default Cash or Bank account in Mode of Payment {0},请设置默认的现金或银行账户的付款方式{0}
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,注册
 DocType: GST Settings,GST Settings,GST设置
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},货币应与价目表货币相同:{0}
@@ -995,7 +995,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,{0}: {1} not found in Invoice Details table,{0}:{1}在发票明细表中无法找到
 DocType: Asset,Asset Owner Company,资产所有者公司
 DocType: Company,Round Off Cost Center,四舍五入成本中心
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +248,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消维护访问{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +249,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消维护访问{0}
 DocType: Asset Maintenance Log,AML-,AML-
 DocType: Item,Material Transfer,物料转移
 DocType: Cost Center,Cost Center Number,成本中心编号
@@ -1016,13 +1016,12 @@
 DocType: Salary Structure Assignment,Base,基础
 DocType: Timesheet,Total Billed Hours,帐单总时间
 DocType: Travel Itinerary,Travel To,前往
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1564,Write Off Amount,核销金额
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1549,Write Off Amount,核销金额
 DocType: Leave Block List Allow,Allow User,允许用户
 DocType: Journal Entry,Bill No,账单编号
 DocType: Company,Gain/Loss Account on Asset Disposal,在资产处置收益/损失帐户
 DocType: Vehicle Log,Service Details,服务细节
 DocType: Vehicle Log,Service Details,服务细节
-apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +47,EcritureLib,EcritureLib
 DocType: Lab Test Template,Grouped,分组
 DocType: Selling Settings,Delivery Note Required,送货单是必须项
 DocType: Bank Guarantee,Bank Guarantee Number,银行担保编号
@@ -1033,7 +1032,7 @@
 DocType: Sales Invoice Timesheet,Time Sheet,时间表
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,基于..进行原物料倒扣账
 DocType: Sales Invoice,Port Code,港口代码
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +962,Reserve Warehouse,储备仓库
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +981,Reserve Warehouse,储备仓库
 DocType: Lead,Lead is an Organization,领导是一个组织
 DocType: Guardian Interest,Interest,利息
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,售前
@@ -1062,7 +1061,7 @@
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,只有在设置了“现金流量映射器”文档时才能选择
 DocType: Email Digest,Next email will be sent on:,下次邮件发送时间:
 DocType: Supplier Scorecard,Per Week,每个星期
-apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item has variants.,项目有变体。
+apps/erpnext/erpnext/stock/doctype/item/item.py +683,Item has variants.,项目有变体。
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,学生总数
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,项目{0}未找到
 DocType: Bin,Stock Value,库存值
@@ -1101,7 +1100,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +134,{0} is not a stock Item,{0}不是一个库存品目
 apps/erpnext/erpnext/hr/notification/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',请通过点击“培训反馈”,然后点击“新建”
 DocType: Mode of Payment Account,Default Account,默认帐户
-apps/erpnext/erpnext/stock/doctype/item/item.py +288,Please select Sample Retention Warehouse in Stock Settings first,请先在库存设置中选择样品保留仓库
+apps/erpnext/erpnext/stock/doctype/item/item.py +289,Please select Sample Retention Warehouse in Stock Settings first,请先在库存设置中选择样品保留仓库
 DocType: Payment Entry,Received Amount (Company Currency),收到的款项(公司币种)
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,如果商机的来源是“线索”的话,必须指定线索
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +136,Payment Cancelled. Please check your GoCardless Account for more details,付款已取消。请检查您的GoCardless帐户以了解更多详情
@@ -1115,8 +1114,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,客户的采购订单号
 DocType: Clinical Procedure,Consume Stock,消费股票
 DocType: Budget,Budget Against,预算对象
-DocType: Employee,Cell Number,手机号码
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +469,There's no employee for the given criteria. Check that Salary Slips have not already been created.,给定的标准没有雇员。检查工资单还没有被创建。
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +516,There's no employee for the given criteria. Check that Salary Slips have not already been created.,给定的标准没有雇员。检查工资单还没有被创建。
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,已自动生成材料需求
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,丧失
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +184,You can not enter current voucher in 'Against Journal Entry' column,您不能在“对日记账分录”列中选择此凭证。
@@ -1125,7 +1123,7 @@
 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 +892,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,行{0}:{1}项目{2}所需的序列号。你已经提供{3}。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +894,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,行{0}:{1}项目{2}所需的序列号。你已经提供{3}。
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,请选择一张桌子
 DocType: BOM,Website Specifications,网站规格
 DocType: Special Test Items,Particulars,细节
@@ -1208,7 +1206,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +395,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}
+apps/erpnext/erpnext/stock/doctype/item/item.py +244,Warning: Invalid Attachment {0},警告:无效的附件{0}
 DocType: Item,Max Sample Quantity,最大样品量
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +805,No Permission,无此权限
 DocType: Contract Fulfilment Checklist,Contract Fulfilment Checklist,合同履行清单
@@ -1223,7 +1221,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,实验室测试和重要标志
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,银行对帐明细
 apps/erpnext/erpnext/controllers/accounts_controller.py +643,Row #{0}: Asset {1} must be submitted,行#{0}:资产{1}必须提交
-apps/erpnext/erpnext/hr/doctype/leave_period/leave_period.py +50,No employee found,未找到任何雇员
+apps/erpnext/erpnext/hr/doctype/leave_period/leave_period.py +49,No employee found,未找到任何雇员
 DocType: Item,If subcontracted to a vendor,如果分包给供应商
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,学生组已经更新。
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,学生组已经更新。
@@ -1241,7 +1239,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +92,Upload your letter head (Keep it web friendly as 900px by 100px),上传你的信头(保持网页友好,900px乘100px)
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}帐户{2}不能是一个组
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,项目行{idx}: {文档类型}上不存在'{文档类型}'表
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +301,Timesheet {0} is already completed or cancelled,时间表{0}已完成或取消
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,Timesheet {0} is already completed or cancelled,时间表{0}已完成或取消
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,没有任务
 DocType: Item Variant Settings,Copy Fields to Variant,将字段复制到变式
 DocType: Asset,Opening Accumulated Depreciation,打开累计折旧
@@ -1278,7 +1276,6 @@
 DocType: Upload Attendance,Import Attendance,导入考勤记录
 apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,所有品目群组
 DocType: Work Order,Item To Manufacture,要生产的项目
-apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteLib,CompteLib
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1}的状态为{2}
 DocType: Water Analysis,Collection Temperature ,收集温度
 DocType: Employee,Provide Email Address registered in company,提供公司注册邮箱地址
@@ -1294,7 +1291,6 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,开做
 DocType: Issue,Via Customer Portal,通过客户门户
 DocType: Notification Control,Delivery Note Message,送货单留言
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,客户>客户组>地区
 DocType: Lab Test Template,Result Format,结果格式
 DocType: Expense Claim,Expenses,开支
 DocType: Item Variant Attribute,Item Variant Attribute,产品规格属性
@@ -1352,7 +1348,7 @@
 DocType: Restaurant Table,Minimum Seating,最小的座位
 DocType: Item Attribute,Item Attribute Values,项目属性值
 DocType: Examination Result,Examination Result,考试成绩
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +872,Purchase Receipt,外购入库单
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +891,Purchase Receipt,外购入库单
 ,Received Items To Be Billed,要支付的已收项目
 apps/erpnext/erpnext/config/accounts.py +309,Currency exchange rate master.,货币汇率大师
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +210,Reference Doctype must be one of {0},参考文档类型必须是一个{0}
@@ -1363,7 +1359,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +604,BOM {0} must be active,BOM{0}必须处于激活状态
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +423,No Items available for transfer,没有可用于传输的项目
 DocType: Employee Boarding Activity,Activity Name,活动名称
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Change Release Date,更改发布日期
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +836,Change Release Date,更改发布日期
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +238,Closing (Opening + Total),闭幕(开幕+总计)
 DocType: Journal Entry,Depreciation Entry,折旧分录
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Please select the document type first,请选择文档类型第一
@@ -1397,7 +1393,7 @@
 DocType: Support Search Source,Search Term Param Name,搜索字词Param Name
 DocType: Item Barcode,Item Barcode,品目条码
 DocType: Woocommerce Settings,Endpoints,端点
-apps/erpnext/erpnext/stock/doctype/item/item.py +677,Item Variants {0} updated,项目变体{0}已更新
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item Variants {0} updated,项目变体{0}已更新
 DocType: Quality Inspection Reading,Reading 6,阅读6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,没有未付发票(负数),无法{0} {1} {2}
 DocType: Share Transfer,From Folio No,来自Folio No
@@ -1510,8 +1506,7 @@
 DocType: Lead,Next Contact Date,下次联络日期
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,开放数量
 DocType: Healthcare Settings,Appointment Reminder,预约提醒
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +483,Please enter Account for Change Amount,对于涨跌额请输入帐号
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,请在教育>教育设置中设置教师命名系统
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please enter Account for Change Amount,对于涨跌额请输入帐号
 DocType: Program Enrollment Tool Student,Student Batch Name,学生批名
 DocType: Consultation,Doctor,医生
 DocType: Holiday List,Holiday List Name,假期列表名称
@@ -1521,6 +1516,7 @@
 DocType: Budget,Applicable on Material Request,适用于材料请求
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +217,Stock Options,库存选项
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,取消采购订单中的上次采购详细信息
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +584,No Items added to cart,没有项目已添加到购物车
 DocType: Journal Entry Account,Expense Claim,报销
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +323,Do you really want to restore this scrapped asset?,难道你真的想恢复这个报废的资产?
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +420,Qty for {0},{0}数量
@@ -1544,13 +1540,13 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +446,Variant creation has been queued.,变体创建已经排队。
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},{0}的工作摘要
 DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,列表中的第一个请假批准者将被设置为默认的批准批准者。
-apps/erpnext/erpnext/stock/doctype/item/item.py +719,Attribute table is mandatory,属性表是强制性的
+apps/erpnext/erpnext/stock/doctype/item/item.py +732,Attribute table is mandatory,属性表是强制性的
 DocType: Production Plan,Get Sales Orders,获取销售订单
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +69,{0} can not be negative,{0}不能为负
 DocType: Training Event,Self-Study,自习
 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 +577,Discount,折扣
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +579,Discount,折扣
 DocType: Membership,Membership,籍
 DocType: Asset,Total Number of Depreciations,折旧总数
 DocType: Sales Invoice Item,Rate With Margin,利率保证金
@@ -1561,8 +1557,8 @@
 DocType: Agriculture Task,Urgent,加急
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +176,Please specify a valid Row ID for row {0} in table {1},请指定行{0}在表中的有效行ID {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,无法找到变量:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +817,Please select a field to edit from numpad,请选择要从数字键盘编辑的字段
-apps/erpnext/erpnext/stock/doctype/item/item.py +279,Cannot be a fixed asset item as Stock Ledger is created.,不能成为股票分类账创建的固定资产项目。
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +822,Please select a field to edit from numpad,请选择要从数字键盘编辑的字段
+apps/erpnext/erpnext/stock/doctype/item/item.py +280,Cannot be a fixed asset item as Stock Ledger is created.,不能成为股票分类账创建的固定资产项目。
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,转到桌面和开始使用ERPNext
 DocType: Item,Manufacturer,制造商
 DocType: Landed Cost Item,Purchase Receipt Item,采购入库项目
@@ -1592,22 +1588,23 @@
 DocType: Tax Rule,Shipping State,运输状态
 ,Projected Quantity as Source,预计库存量的来源
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,项目必须要由“从采购收据获取品目”添加
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +868,Delivery Trip,送货之旅
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +887,Delivery Trip,送货之旅
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,转移类型
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,销售费用
 DocType: Consultation,Diagnosis,诊断
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,标准采购
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,客户>客户组>地区
 DocType: Attendance Request,Explanation,说明
 DocType: GL Entry,Against,针对
 DocType: Item Default,Sales Defaults,销售默认值
 DocType: Sales Order Item,Work Order Qty,工作订单数量
 DocType: Item Default,Default Selling Cost Center,默认销售成本中心
-apps/erpnext/erpnext/public/js/pos/pos.html +85,Disc,圆盘
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +551,Disc,圆盘
 DocType: Buying Settings,Material Transferred for Subcontract,转包材料转让
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1628,ZIP Code,邮编
 apps/erpnext/erpnext/controllers/selling_controller.py +253,Sales Order {0} is {1},销售订单{0} {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +292,Select interest income account in loan {0},选择贷款{0}中的利息收入帐户
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +302,Select interest income account in loan {0},选择贷款{0}中的利息收入帐户
 DocType: Opportunity,Contact Info,联系方式
 apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,制作Stock条目
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,无法提升状态为Left的员工
@@ -1706,7 +1703,7 @@
 DocType: Delivery Note,Is Return,再来
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +93,Caution,警告
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',开始日期大于任务“{0}”的结束日期
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +843,Return / Debit Note,退货/借记单
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +862,Return / Debit Note,退货/借记单
 DocType: Price List Country,Price List Country,价目表国家
 DocType: Item,UOMs,计量单位
 apps/erpnext/erpnext/stock/utils.py +238,{0} valid serial nos for Item {1},品目{1}有{0}个有效序列号
@@ -1720,7 +1717,7 @@
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,您无法重新启动未取消的订阅。
 DocType: Account,Balance Sheet,资产负债表
 DocType: Leave Type,Is Earned Leave,获得休假
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Cost Center For Item with Item Code ',成本中心:品目代码‘
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +784,Cost Center For Item with Item Code ',成本中心:品目代码‘
 DocType: Fee Validity,Valid Till,有效期至
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,总计家长教师会议
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2517,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",付款方式未配置。请检查付款方式或POS机配置中有设置账户。
@@ -1763,7 +1760,7 @@
 DocType: Maintenance Team Member,Maintenance Role,维护角色
 apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},重复的行{0}同{1}
 ,Trial Balance,试算平衡表
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +462,Fiscal Year {0} not found,会计年度{0}未找到
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +509,Fiscal Year {0} not found,会计年度{0}未找到
 apps/erpnext/erpnext/config/hr.py +386,Setting up Employees,建立职工
 DocType: Sales Order,SO-,所以-
 DocType: Hotel Room Reservation,Hotel Reservation User,酒店预订用户
@@ -1771,6 +1768,7 @@
 DocType: Contract,Fulfilment Deadline,履行截止日期
 DocType: Student,O-,O-
 DocType: Subscription Settings,Subscription Settings,订阅设置
+DocType: Purchase Invoice,Update Auto Repeat Reference,更新自动重复参考
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +281,Optional Holiday List not set for leave period {0},可选假期列表未设置为假期{0}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py +8,All Healthcare Service Unit,所有医疗服务单位
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +165,Research,研究
@@ -1782,10 +1780,10 @@
 DocType: Grading Scale,Intervals,间隔
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,协调的事务
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +42,Earliest,最早
-apps/erpnext/erpnext/stock/doctype/item/item.py +541,"An Item Group exists with same name, please change the item name or rename the item group",同名品目群组已存在,请修改品目名或群组名
+apps/erpnext/erpnext/stock/doctype/item/item.py +542,"An Item Group exists with same name, please change the item name or rename the item group",同名品目群组已存在,请修改品目名或群组名
 DocType: Crop Cycle,Less than a year,不到一年
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,学生手机号码
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +101,Rest Of The World,世界其他地区
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +102,Rest Of The World,世界其他地区
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,物件{0}不能有批次
 DocType: Crop,Yield UOM,产量UOM
 ,Budget Variance Report,预算差异报告
@@ -1858,7 +1856,7 @@
 DocType: Agriculture Analysis Criteria,Agriculture,农业
 apps/erpnext/erpnext/manufacturing/doctype/blanket_order/blanket_order.js +15,Create Sales Order,创建销售订单
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +493,Accounting Entry for Asset,资产会计分录
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +828,Block Invoice,阻止发票
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Block Invoice,阻止发票
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.js +16,Quantity to Make,数量
 apps/erpnext/erpnext/accounts/page/pos/pos.js +798,Sync Master Data,同步主数据
 DocType: Asset Repair,Repair Cost,修理费用
@@ -1867,7 +1865,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +600,Asset {0} created,资产{0}已创建
 DocType: Special Test Items,Special Test Items,特殊测试项目
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,付款方式
-apps/erpnext/erpnext/stock/doctype/item/item.py +217,Website Image should be a public file or website URL,网站形象应该是一个公共文件或网站网址
+apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,网站形象应该是一个公共文件或网站网址
 DocType: Student Applicant,AP,美联社
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,这是一个root群组,无法被编辑。
@@ -1877,7 +1875,7 @@
 DocType: Payment Entry,Write Off Difference Amount,核销金额差异
 DocType: Volunteer,Volunteer Name,志愿者姓名
 DocType: Leave Period,Carry Forward Leaves,继续离开
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +504,"{0}: Employee email not found, hence email not sent",{0}:未发现员工的电子邮件,因此,电子邮件未发
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +509,"{0}: Employee email not found, hence email not sent",{0}:未发现员工的电子邮件,因此,电子邮件未发
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +56,No Salary Structure assigned for Employee {0} on given date {1},给定日期{1}的员工{0}没有分配薪金结构
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},运费规则不适用于国家/地区{0}
 DocType: Item,Foreign Trade Details,外贸详细
@@ -1889,9 +1887,8 @@
 DocType: Student Group Student,Group Roll Number,组卷编号
 DocType: Student Group Student,Group Roll Number,组卷编号
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +177,"For {0}, only credit accounts can be linked against another debit entry",对于{0},贷方分录只能选择贷方账户
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +169,Supplier > Supplier Type,供应商>供应商类型
 apps/erpnext/erpnext/projects/doctype/project/project.py +84,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,所有任务的权重合计应为1。请相应调整的所有项目任务重
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +593,Delivery Note {0} is not submitted,送货单{0}未提交
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +595,Delivery Note {0} is not submitted,送货单{0}未提交
 apps/erpnext/erpnext/stock/get_item_details.py +158,Item {0} must be a Sub-contracted Item,项目{0}必须是外包项目
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,资本设备
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",定价规则是第一选择是基于“应用在”字段,可以是项目,项目组或品牌。
@@ -1903,7 +1900,7 @@
 DocType: Sales Invoice Item,Edit Description,编辑说明
 DocType: Antibiotic,Antibiotic,抗生素
 ,Team Updates,团队更新
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +917,For Supplier,对供应商
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +936,For Supplier,对供应商
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,设置帐户类型有助于在交易中选择该帐户。
 DocType: Purchase Invoice,Grand Total (Company Currency),总计(公司货币)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,创建打印格式
@@ -1939,6 +1936,7 @@
 {total_score} (the total score from that period),
 {period_number} (the number of periods to present day)
 ",可以使用记分卡变量,以及:{total_score}(该期间的总分数),{period_number}(到当前时间段的数量)
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Collapse All,全部收缩
 apps/erpnext/erpnext/manufacturing/doctype/blanket_order/blanket_order.js +27,Create Purchase Order,创建采购订单
 DocType: Quality Inspection Reading,Reading 8,阅读8
 DocType: Purchase Invoice,Taxes and Charges Calculation,税费计算
@@ -2036,7 +2034,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,创建课程表时出现错误
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,列表中的第一个费用审批人将被设置为默认的费用审批人。
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +590,cannot be greater than 100,不能大于100
-apps/erpnext/erpnext/stock/doctype/item/item.py +775,Item {0} is not a stock Item,物料{0}不是库存物料
+apps/erpnext/erpnext/stock/doctype/item/item.py +788,Item {0} is not a stock Item,物料{0}不是库存物料
 DocType: Maintenance Visit,Unscheduled,计划外
 DocType: Employee,Owned,资
 DocType: Salary Component,Depends on Leave Without Pay,依赖于无薪休假
@@ -2081,7 +2079,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,显示未关闭的会计年度的盈亏平衡
 DocType: Item,Asset Naming Series,资产命名系列
 apps/erpnext/erpnext/public/js/hub/hub_form.js +336,Request a Quote,请求报价
-apps/erpnext/erpnext/regional/india/utils.py +170,House rented dates should be atleast 15 days apart,出租房屋的日期应至少相隔15天
+apps/erpnext/erpnext/regional/india/utils.py +177,House rented dates should be atleast 15 days apart,出租房屋的日期应至少相隔15天
 DocType: Clinical Procedure Template,Collection Details,收集细节
 DocType: POS Profile,Allow Print Before Pay,付款前允许打印
 DocType: Land Unit,Linked Soil Texture,连接的土壤纹理
@@ -2101,7 +2099,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Source warehouse is mandatory for row {0},行{0}中源仓库为必须项
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,第{0}行的支付条款可能是重复的。
 apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),农业(测试版)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +873,Packing Slip,装箱单
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +892,Packing Slip,装箱单
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Office Rent,办公室租金
 apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,短信网关的设置
 DocType: Disease,Common Name,通用名称
@@ -2133,13 +2131,13 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,服务
 DocType: HR Settings,Email Salary Slip to Employee,通过电子邮件发送工资单给员工
 DocType: Cost Center,Parent Cost Center,父成本中心
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1046,Select Possible Supplier,选择潜在供应商
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1065,Select Possible Supplier,选择潜在供应商
 DocType: Sales Invoice,Source,源
 DocType: Customer,"Select, to make the customer searchable with these fields",选择,使客户可以使用这些字段进行搜索
 DocType: Shopify Settings,Import Delivery Notes from Shopify on Shipment,在发货时从Shopify导入交货单
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,显示关闭
 DocType: Leave Type,Is Leave Without Pay,是无薪休假
-apps/erpnext/erpnext/stock/doctype/item/item.py +276,Asset Category is mandatory for Fixed Asset item,资产类别是强制性的固定资产项目
+apps/erpnext/erpnext/stock/doctype/item/item.py +277,Asset Category is mandatory for Fixed Asset item,资产类别是强制性的固定资产项目
 DocType: Fee Validity,Fee Validity,费用有效期
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +146,No records found in the Payment table,没有在支付表中找到记录
 apps/erpnext/erpnext/education/utils.py +19,This {0} conflicts with {1} for {2} {3},此{0}冲突{1}在{2} {3}
@@ -2212,7 +2210,7 @@
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},用户{0}已分配给医师{1}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2701,Default warehouse is required for selected item,默认仓库需要选中的项目
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,箱
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1043,Possible Supplier,可能的供应商
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1062,Possible Supplier,可能的供应商
 DocType: Journal Entry,JV-RET-,JV-RET-
 DocType: Budget,Monthly Distribution,月度分布
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,接收人列表为空。请创建接收人列表
@@ -2276,13 +2274,13 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,请选择至少一个域名。
 DocType: Dependent Task,Dependent Task,相关任务
 DocType: Shopify Settings,Shopify Tax Account,Shopify税收帐户
-apps/erpnext/erpnext/stock/doctype/item/item.py +459,Conversion factor for default Unit of Measure must be 1 in row {0},行{0}中默认计量单位的转换系数必须是1
+apps/erpnext/erpnext/stock/doctype/item/item.py +460,Conversion factor for default Unit of Measure must be 1 in row {0},行{0}中默认计量单位的转换系数必须是1
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +265,Leave of type {0} cannot be longer than {1},类型为{0}的假期不能长于{1}天
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,尝试规划X天行动提前。
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +90,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",已为{3}的子公司计划{2}的{0}空缺和{1}预算。 \根据母公司{3}的员工计划{6},您只能计划最多{4}个职位空缺和预算{5}。
 DocType: HR Settings,Stop Birthday Reminders,停止生日提醒
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +239,Please set Default Payroll Payable Account in Company {0},请公司设定默认应付职工薪酬帐户{0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +249,Please set Default Payroll Payable Account in Company {0},请公司设定默认应付职工薪酬帐户{0}
 DocType: SMS Center,Receiver List,接收人列表
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1098,Search Item,搜索项目
 DocType: Payment Schedule,Payment Amount,付款金额
@@ -2290,10 +2288,13 @@
 DocType: Patient Appointment,Referring Physician,参考医师
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Consumed Amount,消耗量
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +69,Net Change in Cash,现金净变动
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup > Settings > Naming Series,请通过设置>设置>命名系列为{0}设置命名系列
 DocType: Assessment Plan,Grading Scale,分级量表
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Unit of Measure {0} has been entered more than once in Conversion Factor Table,计量单位{0}已经在换算系数表内
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Unit of Measure {0} has been entered more than once in Conversion Factor Table,计量单位{0}已经在换算系数表内
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +696,Already completed,已经完成
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,库存在手
+apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +65,"Please add the remaining benefits {0} to the application as \
+				pro-rata component",请将剩余的权益{0}作为\ pro-rata组件添加到应用程序中
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,导入成功!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},付款申请已经存在{0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,已发料品目成本
@@ -2349,14 +2350,13 @@
 DocType: Share Transfer,Equity/Liability Account,股票/负债账户
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,已存在同名客户
 DocType: Contract,Inactive,待用
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +193,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,这将提交工资单,并创建权责发生制日记账分录。你想继续吗?
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +210,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,这将提交工资单,并创建权责发生制日记账分录。你想继续吗?
 DocType: Purchase Invoice,Total Net Weight,总净重
 DocType: Purchase Order,Order Confirmation No,订单确认号
 DocType: Purchase Invoice,Eligibility For ITC,适用于ITC的资格
 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/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +48,EcritureLet,EcritureLet
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +213,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 +146,Update bank payment dates with journals.,用日记账更新银行付款时间
@@ -2433,15 +2433,15 @@
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +24,Appointment Duration (mins),预约时间(分钟)
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,为每个库存变动创建会计分录
 DocType: Leave Allocation,Total Leaves Allocated,总已核销休假
-apps/erpnext/erpnext/public/js/setup_wizard.js +145,Please enter valid Financial Year Start and End Dates,请输入有效的财政年度开始和结束日期
+apps/erpnext/erpnext/public/js/setup_wizard.js +146,Please enter valid Financial Year Start and End Dates,请输入有效的财政年度开始和结束日期
 DocType: Employee,Date Of Retirement,退休日期
 DocType: Upload Attendance,Get Template,获取模板
 DocType: Additional Salary Component,Additional Salary Component,额外的薪资组件
 DocType: Material Request,Transferred,转入
 DocType: Vehicle,Doors,门
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +113,ERPNext Setup Complete!,ERPNext设置完成!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +114,ERPNext Setup Complete!,ERPNext设置完成!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,收取病人登记费
-apps/erpnext/erpnext/stock/doctype/item/item.py +694,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,股票交易后不能更改属性。创建一个新项目并将库存转移到新项目
+apps/erpnext/erpnext/stock/doctype/item/item.py +695,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,股票交易后不能更改属性。创建一个新项目并将库存转移到新项目
 DocType: Course Assessment Criteria,Weightage,权重
 DocType: Purchase Invoice,Tax Breakup,税收分解
 DocType: Packing Slip,PS-,PS-
@@ -2491,12 +2491,12 @@
 apps/erpnext/erpnext/controllers/status_updater.py +163,"For an item {0}, quantity must be negative number",对于商品{0},数量必须是负数
 DocType: Naming Series,Set prefix for numbering series on your transactions,为交易设置编号系列的前缀
 DocType: Employee Attendance Tool,Employees HTML,HTML员工
-apps/erpnext/erpnext/stock/doctype/item/item.py +473,Default BOM ({0}) must be active for this item or its template,默认BOM({0})必须是活动的这个项目或者其模板
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,Default BOM ({0}) must be active for this item or its template,默认BOM({0})必须是活动的这个项目或者其模板
 DocType: Employee,Leave Encashed?,假期已使用?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,从机会是必选项
 DocType: Email Digest,Annual Expenses,年度支出
 DocType: Item,Variants,变种
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1168,Make Purchase Order,创建采购订单
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1196,Make Purchase Order,创建采购订单
 DocType: SMS Center,Send To,发送到
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,There is not enough leave balance for Leave Type {0},假期类型{0}的剩余天数不足了
 DocType: Payment Reconciliation Payment,Allocated amount,已核销金额
@@ -2510,7 +2510,7 @@
 DocType: Purchase Order Item,Warehouse and Reference,仓库及参考
 DocType: Payroll Period Date,Payroll Period Date,工资期间日期
 DocType: Supplier,Statutory info and other general information about your Supplier,供应商的注册信息和其他一般信息
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +539,You have to Deduct Tax for Unsubmitted Tax Exemption Proof and Unclaimed Employee Benefits in the last Salary Slip of Payroll Period,您必须在工资期末的最后一次工资单上扣除未提交的免税证明和未领取的雇员福利税
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +544,You have to Deduct Tax for Unsubmitted Tax Exemption Proof and Unclaimed Employee Benefits in the last Salary Slip of Payroll Period,您必须在工资期末的最后一次工资单上扣除未提交的免税证明和未领取的雇员福利税
 DocType: Item,Serial Nos and Batches,序列号和批号
 DocType: Item,Serial Nos and Batches,序列号和批号
 apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,学生群体力量
@@ -2528,7 +2528,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,根据项目或仓库请设置过滤器
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),此打包的净重。(根据内容物件的净重自动计算)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +43,Make Inter Company Journal Entry,使公司日记帐分录
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +825,Discount amount cannot be greater than 100%,折扣金额不能大于100%
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +830,Discount amount cannot be greater than 100%,折扣金额不能大于100%
 DocType: Sales Order,To Deliver and Bill,为了提供与比尔
 DocType: Student Group,Instructors,教师
 DocType: GL Entry,Credit Amount in Account Currency,在账户币金额
@@ -2536,7 +2536,7 @@
 apps/erpnext/erpnext/config/accounts.py +472,Share Management,股份管理
 DocType: Authorization Control,Authorization Control,授权控制
 apps/erpnext/erpnext/controllers/buying_controller.py +387,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},行#{0}:拒绝仓库是强制性的反对否决项{1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +837,Payment,付款
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +856,Payment,付款
 apps/erpnext/erpnext/controllers/stock_controller.py +96,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.",仓库{0}未与任何科目关联,请在仓库或公司{1}主数据中设置默认库存科目。
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,管理您的订单
 DocType: Work Order Operation,Actual Time and Cost,实际时间和成本
@@ -2548,7 +2548,7 @@
 DocType: Item,Will also apply for variants,会同时应用于变体
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}",资产不能被取消,因为它已经是{0}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},员工{0}上半天{1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +51,Total working hours should not be greater than max working hours {0},总的工作时间不应超过最高工时更大{0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},总的工作时间不应超过最高工时更大{0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,于
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,用于销售的产品组合。
 DocType: Material Request Plan Item,Actual Qty,实际数量
@@ -2624,7 +2624,7 @@
 DocType: Bank Guarantee,Margin Money,保证金
 DocType: Budget,Budget,预算
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +80,Set Open,设置打开
-apps/erpnext/erpnext/stock/doctype/item/item.py +273,Fixed Asset Item must be a non-stock item.,固定资产项目必须是一个非库存项目。
+apps/erpnext/erpnext/stock/doctype/item/item.py +274,Fixed Asset Item must be a non-stock item.,固定资产项目必须是一个非库存项目。
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +52,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",财政预算案不能对{0}指定的,因为它不是一个收入或支出帐户
 apps/erpnext/erpnext/hr/utils.py +227,Max exemption amount for {0} is {1},{0}的最大免除金额为{1}
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,已实现
@@ -2667,7 +2667,7 @@
 apps/erpnext/erpnext/accounts/party.py +320,Due Date cannot be before Posting Date,到期日不能前于过账日期
 DocType: Website Item Group,Website Item Group,网站物件组
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +331,Added to Favourites,已添加到收藏夹
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +482,No salary slip found to submit for the above selected criteria OR salary slip already submitted,没有发现提交上述选定标准或已提交工资单的工资单
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +529,No salary slip found to submit for the above selected criteria OR salary slip already submitted,没有发现提交上述选定标准或已提交工资单的工资单
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,关税与税项
 DocType: Projects Settings,Projects Settings,项目设置
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +388,Please enter Reference date,参考日期请输入
@@ -2685,7 +2685,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},请点击“生成表”来获取序列号增加了对项目{0}
 DocType: Account,Frozen,冻结的
 DocType: Sales Invoice Payment,Base Amount (Company Currency),基本金额(公司币种)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +933,Raw Materials,原料
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +952,Raw Materials,原料
 DocType: Payment Reconciliation Payment,Reference Row,引用行
 DocType: Installation Note,Installation Time,安装时间
 DocType: Sales Invoice,Accounting Details,会计细节
@@ -2736,8 +2736,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 +398,Please set the Date Of Joining for employee {0},请为员工{0}设置加入日期
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +398,Please set the Date Of Joining for employee {0},请为员工{0}设置加入日期
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +403,Please set the Date Of Joining for employee {0},请为员工{0}设置加入日期
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +403,Please set the Date Of Joining for employee {0},请为员工{0}设置加入日期
 DocType: Task,Total Billing Amount (via Time Sheet),总开票金额(通过时间表)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,重复客户收入
 DocType: Soil Texture,Silty Clay Loam,泥土粘土
@@ -2745,7 +2745,7 @@
 DocType: Chapter,Chapter,章节
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,对
 DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,选择此模式后,默认帐户将在POS发票中自动更新。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +989,Select BOM and Qty for Production,选择BOM和数量生产
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1017,Select BOM and Qty for Production,选择BOM和数量生产
 DocType: Asset,Depreciation Schedule,折旧计划
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,销售合作伙伴地址和联系人
 DocType: Bank Reconciliation Detail,Against Account,针对科目
@@ -2771,7 +2771,7 @@
 ,Quotation Trends,报价趋势
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +166,Item Group not mentioned in item master for item {0},项目{0}的项目群组没有设置
 DocType: GoCardless Mandate,GoCardless Mandate,GoCardless任务
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Debit To account must be a Receivable account,入借帐户必须是应收账科目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +375,Debit To account must be a Receivable account,入借帐户必须是应收账科目
 DocType: Shipping Rule,Shipping Amount,发货数量
 DocType: Supplier Scorecard Period,Period Score,期间得分
 apps/erpnext/erpnext/utilities/user_progress.py +66,Add Customers,添加客户
@@ -2791,7 +2791,7 @@
 DocType: Program Enrollment,Self-Driving Vehicle,自驾车
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,供应商记分卡站立
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +445,Row {0}: Bill of Materials not found for the Item {1},行{0}:材料清单未找到项目{1}
-apps/erpnext/erpnext/hr/doctype/leave_period/leave_period.py +98,Leave Allocations {0} created,保留创建的分配{0}
+apps/erpnext/erpnext/hr/doctype/leave_period/leave_period.py +97,Leave Allocations {0} created,保留创建的分配{0}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +112,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,共分配叶{0}不能小于已经批准叶{1}期间
 DocType: Contract Fulfilment Checklist,Requirement,需求
 DocType: Journal Entry,Accounts Receivable,应收帐款
@@ -2880,8 +2880,8 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,计算的银行对账单余额
 DocType: Normal Test Template,Normal Test Template,正常测试模板
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,已禁用用户
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +937,Quotation,报价
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +989,Cannot set a received RFQ to No Quote,无法将收到的询价单设置为无报价
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +956,Quotation,报价
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1008,Cannot set a received RFQ to No Quote,无法将收到的询价单设置为无报价
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,扣除总额
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +22,Select an account to print in account currency,选择一个账户以账户货币进行打印
@@ -2895,14 +2895,14 @@
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,供应商记分卡设置
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,评估计划名称
 DocType: Work Order Operation,Work Order Operation,工作订单操作
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,Warning: Invalid SSL certificate on attachment {0},警告:附件{0}中存在无效的SSL证书
+apps/erpnext/erpnext/stock/doctype/item/item.py +249,Warning: Invalid SSL certificate on attachment {0},警告:附件{0}中存在无效的SSL证书
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads",信息帮助你的业务,你所有的联系人和更添加为您的线索
 DocType: Work Order Operation,Actual Operation Time,实际操作时间
 DocType: Authorization Rule,Applicable To (User),适用于(用户)
 DocType: Purchase Taxes and Charges,Deduct,扣款
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +219,Job Description,职位描述
 DocType: Student Applicant,Applied,应用的
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +879,Re-open,重新打开
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Re-open,重新打开
 DocType: Sales Invoice Item,Qty as per Stock UOM,按库存计量单位数量
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2名称
 DocType: Attendance,Attendance Request,出席请求
@@ -2925,7 +2925,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +241,Serial No {0} does not belong to any Warehouse,序列号{0}不属于任何仓库
 DocType: Grant Application,Email Notification Sent,电子邮件通知已发送
 DocType: Purchase Invoice,In Words (Company Currency),大写金额(公司货币)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1023,"Item Code, warehouse, quantity are required on row",在行上需要项目代码,仓库,数量
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1042,"Item Code, warehouse, quantity are required on row",在行上需要项目代码,仓库,数量
 DocType: Bank Guarantee,Supplier,供应商
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,显示付款详情
 DocType: Consultation,Consultation Time,咨询时间
@@ -2944,7 +2944,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +107,Item Variant Settings,项目变式设置
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +37,Select Company...,选择公司...
 DocType: Leave Control Panel,Leave blank if considered for all departments,如果针对所有部门请留空
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +439,{0} is mandatory for Item {1},{0}是{1}的必填项
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +441,{0} is mandatory for Item {1},{0}是{1}的必填项
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +136,"Item {0}: {1} qty produced, ",项目{0}:{1}产生的数量,
 DocType: Payroll Entry,Fortnightly,半月刊
 DocType: Currency Exchange,From Currency,源货币
@@ -2954,7 +2954,7 @@
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +206,Please set GST Accounts in GST Settings,请在GST设置中设置GST帐户
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +46,Type of Business,业务类型
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",请ATLEAST一行选择分配金额,发票类型和发票号码
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,新的采购成本
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +143,Cost of New Purchase,新的采购成本
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +99,Sales Order required for Item {0},销售订单为品目{0}的必须项
 DocType: Grant Application,Grant Description,授予说明
 DocType: Purchase Invoice Item,Rate (Company Currency),单价(公司货币)
@@ -2989,7 +2989,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +396,{0} against Sales Order {1},{0}不允许销售订单{1}
 DocType: Account,Fixed Asset,固定资产
 apps/erpnext/erpnext/config/stock.py +328,Serialized Inventory,序列化库存
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1014,Invalid {0} for Inter Company Invoice.,Inter公司发票无效的{0}。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1016,Invalid {0} for Inter Company Invoice.,Inter公司发票无效的{0}。
 ,Department Analytics,部门分析
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,在默认联系人中找不到电子邮件
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,生成秘密
@@ -3037,7 +3037,7 @@
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_confirmation.html +13,Payment Confirmation,付款确认
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,价格将不会显示如果没有设置价格
 DocType: Stock Entry,Total Incoming Value,总传入值
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +367,Debit To is required,借记是必需的
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Debit To is required,借记是必需的
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team",时间表帮助追踪的时间,费用和结算由你的团队做activites
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,采购价格表
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,供应商记分卡变数模板。
@@ -3168,7 +3168,7 @@
 DocType: Normal Test Items,Require Result Value,需要结果值
 DocType: Item,Show a slideshow at the top of the page,在页面顶部显示幻灯片
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,物料清单
-apps/erpnext/erpnext/stock/doctype/item/item.py +177,Stores,仓库
+apps/erpnext/erpnext/stock/doctype/item/item.py +178,Stores,仓库
 DocType: Project Type,Projects Manager,项目经理
 DocType: Serial No,Delivery Time,交货时间
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +39,Ageing Based On,账龄基于
@@ -3176,7 +3176,7 @@
 DocType: Item,End of Life,寿命结束
 apps/erpnext/erpnext/demo/setup/setup_data.py +325,Travel,出差
 DocType: Student Report Generation Tool,Include All Assessment Group,包括所有评估小组
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +246,No active or default Salary Structure found for employee {0} for the given dates,发现员工{0}对于给定的日期没有活动或默认的薪酬结构
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +251,No active or default Salary Structure found for employee {0} for the given dates,发现员工{0}对于给定的日期没有活动或默认的薪酬结构
 DocType: Leave Block List,Allow Users,允许用户(多个)
 DocType: Purchase Order,Customer Mobile No,客户手机号码
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,现金流量映射模板细节
@@ -3186,14 +3186,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +81,Update Cost,更新成本
 DocType: Item Reorder,Item Reorder,项目重新排序
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,显示工资单
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +898,Transfer Material,转印材料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Transfer Material,转印材料
 DocType: Fees,Send Payment Request,发送付款请求
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",设定流程,操作成本及向流程指定唯一的流程编号
 DocType: Travel Request,Any other details,任何其他细节
 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 +1162,Please set recurring after saving,请设置保存后复发
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +774,Select change amount account,选择变化量账户
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +776,Select change amount account,选择变化量账户
 DocType: Purchase Invoice,Price List Currency,价格表货币
 DocType: Naming Series,User must always select,用户必须始终选择
 DocType: Stock Settings,Allow Negative Stock,允许负库存
@@ -3234,7 +3234,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +325,Are you sure you want to cancel this appointment?,你确定要取消这个预约吗?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,酒店房间价格套餐
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,销售渠道
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +199,Please set default account in Salary Component {0},请薪酬部分设置默认帐户{0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +209,Please set default account in Salary Component {0},请薪酬部分设置默认帐户{0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,要求在
 DocType: Rename Tool,File to Rename,文件重命名
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},请行选择BOM为项目{0}
@@ -3243,18 +3243,17 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +690,Specified BOM {0} does not exist for Item {1},品目{1}指定的BOM{0}不存在
 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 +238,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消维护计划{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +239,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消维护计划{0}
 DocType: POS Profile,Applicable for Users,适用于用户
 DocType: Notification Control,Expense Claim Approved,报销批准
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,没有创建工作订单
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +384,Salary Slip of employee {0} already created for this period,员工的工资单{0}已为这一时期创建
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +389,Salary Slip of employee {0} already created for this period,员工的工资单{0}已为这一时期创建
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,Pharmaceutical,医药
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +24,You can only submit Leave Encashment for a valid encashment amount,您只能提交离开封存以获得有效的兑换金额
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,采购品目成本
 DocType: Employee Separation,Employee Separation Template,员工分离模板
 DocType: Selling Settings,Sales Order Required,销售订单为必须项
 DocType: Purchase Invoice,Credit To,入贷
-apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +46,PieceDate,PieceDate
 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,维护计划细节
@@ -3269,7 +3268,7 @@
 DocType: Support Search Source,Post Title Key,帖子标题密钥
 DocType: Warranty Claim,Raised By,提出
 DocType: Payment Gateway Account,Payment Account,付款帐号
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +1053,Please specify Company to proceed,请注明公司进行
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +1072,Please specify Company to proceed,请注明公司进行
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +81,Net Change in Accounts Receivable,应收账款净额变化
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +91,Compensatory Off,补假
 DocType: Job Offer,Accepted,已接受
@@ -3289,7 +3288,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,使税收模板
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,用户论坛
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +319,Raw Materials cannot be blank.,原材料不能为空。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +503,"Could not update stock, invoice contains drop shipping item.",无法更新库存,发票包含由供应商交货(直接发运)项目。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +505,"Could not update stock, invoice contains drop shipping item.",无法更新库存,发票包含由供应商交货(直接发运)项目。
 DocType: Contract,Fulfilment Status,履行状态
 DocType: Lab Test Sample,Lab Test Sample,实验室测试样品
 DocType: Item Variant Settings,Allow Rename Attribute Value,允许重命名属性值
@@ -3320,19 +3319,21 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,最新价格在所有BOM中更新
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,项目状态
 DocType: UOM,Check this to disallow fractions. (for Nos),要对编号禁止分数,请勾选此项。
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Group,供应商>供应商集团
 DocType: Student Admission Program,Naming Series (for Student Applicant),命名系列(面向学生申请人)
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +16,Bonus Payment Date cannot be a past date,奖金支付日期不能是过去的日期
 DocType: Travel Request,Copy of Invitation/Announcement,邀请/公告的副本
 DocType: Delivery Note,Transporter Name,承运商名称
 DocType: Authorization Rule,Authorized Value,授权值
 DocType: BOM,Show Operations,显示操作
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education > Education Settings,请在教育>教育设置中设置教师命名系统
 ,Minutes to First Response for Opportunity,分钟的机会第一个反应
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +97,Total Absent,共缺席
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1016,Item or Warehouse for row {0} does not match Material Request,行{0}中的项目或仓库与物料申请不符合
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,计量单位
 DocType: Fiscal Year,Year End Date,年度结束日期
 DocType: Task Depends On,Task Depends On,任务取决于
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1031,Opportunity,机会
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1050,Opportunity,机会
 DocType: Operation,Default Workstation,默认工作台
 DocType: Notification Control,Expense Claim Approved Message,报销批准消息
 DocType: Payment Entry,Deductions or Loss,扣除或损失
@@ -3370,18 +3371,18 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,审批与被审批用户不能相同
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),基础利率(按库存计量单位)
 DocType: SMS Log,No of Requested SMS,请求短信数量
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,Leave Without Pay does not match with approved Leave Application records,停薪留职不批准请假的记录相匹配
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +314,Leave Without Pay does not match with approved Leave Application records,停薪留职不批准请假的记录相匹配
 DocType: Campaign,Campaign-.####,活动-.####
 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 +801,Please supply the specified items at the best possible rates,请在提供最好的利率规定的项目
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +820,Please supply the specified items at the best possible rates,请在提供最好的利率规定的项目
 apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +19,Employee Transfer cannot be submitted before Transfer Date ,员工转移无法在转移日期前提交
 DocType: Certification Application,USD,美元
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,创建发票
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +103,Remaining Balance,保持平衡
 DocType: Selling Settings,Auto close Opportunity after 15 days,15天之后自动关闭商机
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +87,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,由于{1}的记分卡,{0}不允许采购订单。
-apps/erpnext/erpnext/stock/doctype/item/item.py +513,Barcode {0} is not a valid {1} code,条形码{0}不是有效的{1}代码
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Barcode {0} is not a valid {1} code,条形码{0}不是有效的{1}代码
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js +25,End Year,结束年份
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,报价/铅%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,报价/铅%
@@ -3440,8 +3441,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,记录数量
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +65,Fee Records Created - {0},费纪录创造 -  {0}
 DocType: Asset Category Account,Asset Category Account,资产类别的帐户
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +919,Row #{0} (Payment Table): Amount must be positive,行#{0}(付款表):金额必须为正值
-apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +44,CompteNum,CompteNum
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +921,Row #{0} (Payment Table): Amount must be positive,行#{0}(付款表):金额必须为正值
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +139,Cannot produce more Item {0} than Sales Order quantity {1},不能生产超过销售订单数量{1}的品目{0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +422,Select Attribute Values,选择属性值
 DocType: Purchase Invoice,Reason For Issuing document,签发文件的原因
@@ -3537,7 +3537,7 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Receipt document must be submitted,收到文件必须提交
 DocType: Purchase Invoice Item,Received Qty,收到数量
 DocType: Stock Entry Detail,Serial No / Batch,序列号/批次
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +346,Not Paid and Not Delivered,没有支付,未送达
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +347,Not Paid and Not Delivered,没有支付,未送达
 DocType: Product Bundle,Parent Item,父项目
 DocType: Account,Account Type,账户类型
 DocType: Delivery Note,DN-RET-,DN-RET-
@@ -3558,11 +3558,11 @@
 DocType: Volunteer Skill,Volunteer Skill,志愿者技能
 DocType: Bank Reconciliation,Include POS Transactions,包括POS交易
 DocType: Purchase Invoice,Inter Company Invoice Reference,Inter公司发票参考
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +807,Please select an item in the cart,请在购物车中选择一个项目
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +812,Please select an item in the cart,请在购物车中选择一个项目
 DocType: Landed Cost Voucher,Purchase Receipt Items,采购入库项目
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,自定义表单
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +77,Arrear,拖欠
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +158,Depreciation Amount during the period,期间折旧额
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Depreciation Amount during the period,期间折旧额
 DocType: Sales Invoice,Is Return (Credit Note),是退货(信用票据)
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},资产{0}需要序列号
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,被禁用模板不能设为默认模板
@@ -3570,7 +3570,7 @@
 DocType: Shareholder,SH-,SH-
 DocType: Account,Income Account,收益账户
 DocType: Payment Request,Amount in customer's currency,量客户的货币
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +847,Delivery,交货
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +866,Delivery,交货
 DocType: Volunteer,Weekdays,平日
 DocType: Stock Reconciliation Item,Current Qty,目前数量
 DocType: Restaurant Menu,Restaurant Menu,餐厅菜单
@@ -3612,7 +3612,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +114,Property already added,已添加属性
 DocType: Item Supplier,Item Supplier,项目供应商
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1263,Please enter Item Code to get batch no,请输入产品编号,以获得批号
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +895,Please select a value for {0} quotation_to {1},请选择一个值{0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +914,Please select a value for {0} quotation_to {1},请选择一个值{0} quotation_to {1}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +428,No Items selected for transfer,没有选择转移项目
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,所有地址。
 DocType: Company,Stock Settings,库存设置
@@ -3621,7 +3621,7 @@
 DocType: Task,% Progress,%进展
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Gain/Loss on Asset Disposal,在资产处置收益/损失
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",下表中将只选择状态为“已批准”的学生申请人。
-apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +117,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,帐户{0}的帐户号码不可用。 <br>请正确设置您的会计科目表。
+apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +118,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,帐户{0}的帐户号码不可用。 <br>请正确设置您的会计科目表。
 DocType: Task,Depends on Tasks,取决于任务
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,管理客户群组
 DocType: Normal Test Items,Result Value,结果值
@@ -3692,7 +3692,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +161,Quotation {0} is cancelled,报价{0}已被取消
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,总待处理金额
 DocType: Sales Partner,Targets,目标
-apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +54,Please register the SIREN number in the company information file,请在公司信息文件中注册SIREN号码
+apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +40,Please register the SIREN number in the company information file,请在公司信息文件中注册SIREN号码
 DocType: Price List,Price List Master,价格表大师
 DocType: GST Account,CESS Account,CESS帐户
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,所有的销售交易都可以标记多个**销售人员**,方便你设置和监控目标。
@@ -3738,7 +3738,7 @@
 DocType: Project,Copied From,复制自
 DocType: Project,Copied From,复制自
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,发票已在所有结算时间创建
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +159,Name error: {0},名称错误:{0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,Name error: {0},名称错误:{0}
 DocType: Cash Flow Mapping,Is Finance Cost,财务成本
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,雇员{0}的考勤已标记
 DocType: Packing Slip,If more than one package of the same type (for print),如果有多个同样类型的打包(用于打印)
@@ -3753,10 +3753,10 @@
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),时间(分钟)
 DocType: Project Task,Working,工作
 DocType: Stock Ledger Entry,Stock Queue (FIFO),库存队列(先进先出)
-apps/erpnext/erpnext/public/js/setup_wizard.js +127,Financial Year,财政年度
+apps/erpnext/erpnext/public/js/setup_wizard.js +128,Financial Year,财政年度
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,{0} does not belong to Company {1},{0}不属于公司{1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,无法解决{0}的标准分数函数。确保公式有效。
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +122,Cost as on,成本上
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost as on,成本上
 DocType: Healthcare Settings,Out Patient Settings,出患者设置
 DocType: Account,Round Off,四舍五入
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +263,Quantity must be positive,数量必须是正数
@@ -3809,9 +3809,9 @@
 DocType: Lab Test,LabTest Approver,LabTest审批者
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,您已经评估了评估标准{}。
 DocType: Vehicle Service,Engine Oil,机油
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1025,Work Orders Created: {0},创建的工单:{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Work Orders Created: {0},创建的工单:{0}
 DocType: Sales Invoice,Sales Team1,销售团队1
-apps/erpnext/erpnext/stock/doctype/item/item.py +562,Item {0} does not exist,物料{0}不存在
+apps/erpnext/erpnext/stock/doctype/item/item.py +563,Item {0} does not exist,物料{0}不存在
 DocType: Sales Invoice,Customer Address,客户地址
 DocType: Loan,Loan Details,贷款详情
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +61,Failed to setup post company fixtures,未能设置公司固定装置
@@ -3841,7 +3841,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +171,Extra Small,超小
 DocType: Company,Standard Template,标准模板
 DocType: Training Event,Theory,理论
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +844,Warning: Material Requested Qty is less than Minimum Order Qty,警告:物料请求的数量低于最低起订量
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +863,Warning: Material Requested Qty is less than Minimum Order Qty,警告:物料请求的数量低于最低起订量
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,科目{0}已冻结
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,属于本机构的,带独立科目表的法人/附属机构。
 DocType: Payment Request,Mute Email,静音电子邮件
@@ -3903,6 +3903,7 @@
 DocType: Fee Validity,Visited yet,已访问
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +134,Warehouses with existing transaction can not be converted to group.,与现有的交易仓库不能转换为组。
 DocType: Assessment Result Tool,Result HTML,结果HTML
+DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,项目和公司应根据销售交易多久更新一次。
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,到期
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,新增学生
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},请选择{0}
@@ -3911,6 +3912,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,列出您所购买或出售的产品或服务。
 DocType: Water Analysis,Storage Temperature,储存温度
 DocType: Employee Attendance Tool,Unmarked Attendance,无标记考勤
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +254,Creating Payment Entries......,创建支付条目......
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Researcher,研究员
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,计划注册学生工具
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},开始日期应该小于任务{0}的结束日期
@@ -3933,7 +3935,7 @@
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",为方便客户,这些代码可以在打印格式(如发票和送货单)中使用
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,供应商名称
 apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,无法检索{0}的信息。
-apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +134,Opening Entry Journal,开幕词报
+apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +138,Opening Entry Journal,开幕词报
 DocType: Contract,Fulfilment Terms,履行条款
 DocType: Sales Invoice,Time Sheet List,时间表列表
 DocType: Employee,You can enter any date manually,您可以手动输入日期
@@ -3961,6 +3963,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,待活动
 DocType: Patient Appointment,Reminded,提醒
 DocType: Patient,PID-,PID-
+apps/erpnext/erpnext/public/js/setup_wizard.js +126,View Chart of Accounts,查看会计科目表
 DocType: Chapter Member,Chapter Member,章会员
 DocType: Material Request Plan Item,Minimum Order Quantity,最小起订量
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,你的组织
@@ -4015,7 +4018,6 @@
 DocType: Department,Leave Approver,假期审批人
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +316,Please select a batch,请选择一个批次
 apps/erpnext/erpnext/config/hr.py +145,Travel and Expense Claim,旅行和费用索赔
-apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +42,JournalLib,JournalLib
 DocType: Assessment Group,Assessment Group Name,评估小组名称
 DocType: Manufacturing Settings,Material Transferred for Manufacture,材料移送制造
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +60,Add to Details,添加到详细信息
@@ -4066,8 +4068,6 @@
 DocType: Hub Tracked Item,Hub Tracked Item,Hub跟踪物品
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,收件人原件
 DocType: Asset Category Account,Accumulated Depreciation Account,累计折旧科目
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","请删除员工<a href=""#Form/Employee/{0}"">{0}</a> \以取消此文档"
 DocType: Certified Consultant,Discuss ID,讨论ID
 DocType: Stock Settings,Freeze Stock Entries,冻结仓储记录
 DocType: Program Enrollment,Boarding Student,寄宿学生
@@ -4093,7 +4093,7 @@
 DocType: Fee Schedule Program,Total Students,学生总数
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},考勤记录{0}存在针对学生{1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,Reference #{0} dated {1},参考# {0}记载日期为{1}
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,折旧淘汰因处置资产
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +179,Depreciation Eliminated due to disposal of assets,折旧淘汰因处置资产
 DocType: Employee Transfer,New Employee ID,新员工ID
 DocType: Loan,Member,会员
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,管理地址
@@ -4159,7 +4159,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 +449,Customer {0} does not belong to project {1},客户{0}不属于项目{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +451,Customer {0} does not belong to project {1},客户{0}不属于项目{1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,显着的考勤HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers",语录是建议,你已经发送到你的客户提高出价
 DocType: Sales Invoice,Customer's Purchase Order,客户采购订单
@@ -4182,14 +4182,14 @@
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,去供应商
 DocType: POS Closing Voucher Taxes,POS Closing Voucher Taxes,POS关闭凭证税
 ,Qty to Receive,接收数量
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +533,"Start and end dates not in a valid Payroll Period, cannot calculate {0}.",开始日期和结束日期不在有效的工资核算期间内,无法计算{0}。
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +538,"Start and end dates not in a valid Payroll Period, cannot calculate {0}.",开始日期和结束日期不在有效的工资核算期间内,无法计算{0}。
 DocType: Leave Block List,Leave Block List Allowed,禁离日例外用户
 DocType: Grading Scale Interval,Grading Scale Interval,分级分度值
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},报销车辆登录{0}
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,价格上涨率与贴现率的折扣(%)
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,价格上涨率与贴现率的折扣(%)
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,所有仓库
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1144,No {0} found for Inter Company Transactions.,Inter公司没有找到{0}。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1146,No {0} found for Inter Company Transactions.,Inter公司没有找到{0}。
 DocType: Travel Itinerary,Rented Car,租车
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +131,Credit To account must be a Balance Sheet account,信用帐户必须是资产负债表科目
 DocType: Donor,Donor,捐赠者
@@ -4206,7 +4206,7 @@
 DocType: Physician Schedule,Schedule Name,计划名称
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,创建工资单
 DocType: Currency Exchange,For Buying,为了购买
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +845,Add All Suppliers,添加所有供应商
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +864,Add All Suppliers,添加所有供应商
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +95,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,行#{0}:已分配金额不能大于未付金额。
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +84,Browse BOM,浏览BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Secured Loans,抵押贷款
@@ -4238,7 +4238,7 @@
 DocType: Patient Appointment,Patient Appointment,患者预约
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,审批与被审批角色不能相同
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,从该电子邮件摘要退订
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +835,Get Suppliers By,获得供应商
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +854,Get Suppliers By,获得供应商
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},{0}找不到项目{1}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,去课程
 DocType: Accounts Settings,Show Inclusive Tax In Print,在打印中显示包含税
@@ -4257,7 +4257,6 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Account {0} does not exists,科目{0}不存在
 DocType: Project,Project Type,项目类型
 apps/erpnext/erpnext/projects/doctype/task/task.py +153,Child Task exists for this Task. You can not delete this Task.,子任务存在这个任务。你不能删除这个任务。
-apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +48,DateLet,DateLet
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,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}
@@ -4283,7 +4282,6 @@
 DocType: Student Group,Group Based On,基于组
 DocType: Journal Entry,Bill Date,账单日期
 DocType: Healthcare Settings,Laboratory SMS Alerts,实验室短信
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +234,Creating Bank Entries......,创建银行分录......
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required",服务项目,类型,频率和消费金额要求
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",有多个最高优先级定价规则时使用以下的内部优先级:
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,植物分析标准
@@ -4324,7 +4322,6 @@
 DocType: Purchase Order Item Supplied,Stock UOM,库存计量单位
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +249,Purchase Order {0} is not submitted,采购订单{0}未提交
 DocType: Account,Expenses Included In Asset Valuation,资产评估中包含的费用
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,请通过设置&gt;设置&gt;命名系列为{0}设置命名系列
 DocType: Vital Signs,Normal reference range for an adult is 16–20 breaths/minute (RCP 2012),成人的正常参考范围是16-20次呼吸/分钟(RCP 2012)
 DocType: Customs Tariff Number,Tariff Number,税则号
 DocType: Work Order Item,Available Qty at WIP Warehouse,在WIP仓库可用的数量
@@ -4361,7 +4358,7 @@
 DocType: Item,Warranty Period (in days),保修期限(天数)
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Failed to set defaults,无法设置默认值
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,与关系Guardian1
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +795,Please select BOM against item {0},请选择物料{0}的物料清单
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +797,Please select BOM against item {0},请选择物料{0}的物料清单
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js +18,Make Invoices,制作发票
 DocType: Shopping Cart Settings,Show Stock Quantity,显示库存数量
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +77,Net Cash from Operations,从运营的净现金
@@ -4408,6 +4405,7 @@
 DocType: Appraisal Goal,Weightage (%),权重(%)
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +512,Change POS Profile,更改POS配置文件
 DocType: Bank Reconciliation Detail,Clearance Date,清拆日期
+apps/erpnext/erpnext/stock/doctype/item/item.py +700,"Asset is already exists against the item {0}, you cannot change the has serial no value",资产已针对商品{0}存在,您无法更改已连续编号的值
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,评估报告
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Gross Purchase Amount is mandatory,总消费金额是强制性
 apps/erpnext/erpnext/setup/doctype/company/company.js +115,Company name not same,公司名称不一样
@@ -4457,7 +4455,6 @@
 DocType: Woocommerce Settings,API consumer secret,API消费者秘密
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,在从仓库可用的批次数量
 DocType: Customer,CUST-,CUST-
-apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +50,Idevise,Idevise
 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 +29,Current BOM and New BOM can not be same,当前BOM和新BOM不能相同
@@ -4597,7 +4594,7 @@
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,这是基于这名学生出席
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,没有学生
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +179,Add more items or open full form,添加更多项目或全开放形式
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +218,Delivery Notes {0} must be cancelled before cancelling this Sales Order,取消这个销售订单之前必须取消送货单{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +219,Delivery Notes {0} must be cancelled before cancelling this Sales Order,取消这个销售订单之前必须取消送货单{0}
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,转到用户
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,Paid amount + Write Off Amount can not be greater than Grand Total,支付的金额+写的抵销金额不能大于总计
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0}不是物料{1}的有效批次号
@@ -4663,7 +4660,7 @@
 DocType: Stock Reconciliation Item,Before reconciliation,在对账前
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),已添加的税费(公司货币)
-apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,项目税项的行{0}中必须指定类型为税项/收益/支出/应课的账户。
+apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,项目税项的行{0}中必须指定类型为税项/收益/支出/应课的账户。
 DocType: Sales Order,Partly Billed,天色帐单
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +54,Item {0} must be a Fixed Asset Item,物料{0}必须被定义为是固定资产
 apps/erpnext/erpnext/stock/doctype/item/item.js +403,Make Variants,变种
@@ -4677,6 +4674,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,总待处理金额
 DocType: Journal Entry,Printing Settings,打印设置
 DocType: Employee Advance,Advance Account,预付帐户
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,请通过设置&gt;编号系列设置考勤编号系列
 DocType: Job Offer,Job Offer Terms,招聘条款
 DocType: Sales Invoice,Include Payment (POS),包括支付(POS)
 DocType: Shopify Settings,eg: frappe.myshopify.com,例如:frappe.myshopify.com
@@ -4704,7 +4702,6 @@
 DocType: GoCardless Mandate,Mandate,要求
 DocType: POS Profile,POS Profile Name,POS配置文件名称
 DocType: Hotel Room Reservation,Booked,预订
-apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +45,CompAuxLib,CompAuxLib
 DocType: Detected Disease,Tasks Created,创建的任务
 DocType: Purchase Invoice Item,Rate,单价
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +107,Intern,实习生
@@ -4723,7 +4720,7 @@
 DocType: Salary Slip,Salary Structure,薪酬结构
 DocType: Account,Bank,银行
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,航空公司
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +902,Issue Material,发料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +921,Issue Material,发料
 apps/erpnext/erpnext/config/erpnext_integrations.py +32,Connect Shopify with ERPNext,将Shopify与ERPNext连接
 DocType: Material Request Item,For Warehouse,对仓库
 DocType: Employee,Offer Date,录取日期
@@ -4750,13 +4747,12 @@
 apps/erpnext/erpnext/crm/doctype/contract/contract.py +38,End Date cannot be before Start Date.,结束日期不能在开始日期之前。
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +34,Student is already enrolled.,学生已经注册。
 DocType: Fiscal Year,Year Name,年度名称
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,There are more holidays than working days this month.,这个月的假期比工作日多。
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,There are more holidays than working days this month.,这个月的假期比工作日多。
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +101,PDC/LC Ref,PDC / LC参考
 DocType: Production Plan Item,Product Bundle Item,产品包项目
 DocType: Sales Partner,Sales Partner Name,销售合作伙伴名称
 apps/erpnext/erpnext/hooks.py +136,Request for Quotations,索取报价
 DocType: Payment Reconciliation,Maximum Invoice Amount,最大发票额
-apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +50,Montantdevise,Montantdevise
 apps/erpnext/erpnext/healthcare/setup.py +211,Haematology,血液学
 DocType: Normal Test Items,Normal Test Items,正常测试项目
 DocType: Student Language,Student Language,学生语言
@@ -4770,12 +4766,12 @@
 DocType: Issue,Opening Time,开放时间
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +97,From and To dates required,必须指定起始和结束日期
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,证券及商品交易
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',物料变体的默认单位“{0}”必须与模板默认单位一致“{1}”
+apps/erpnext/erpnext/stock/doctype/item/item.py +718,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',物料变体的默认单位“{0}”必须与模板默认单位一致“{1}”
 DocType: Shipping Rule,Calculate Based On,计算基于
 DocType: Contract,Unfulfilled,秕
 DocType: Delivery Note Item,From Warehouse,从仓库
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,没有雇员提到的标准
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +974,No Items with Bill of Materials to Manufacture,不与物料清单的项目,以制造
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,没有雇员提到的标准
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1002,No Items with Bill of Materials to Manufacture,不与物料清单的项目,以制造
 DocType: Shopify Settings,Default Customer,默认客户
 DocType: Assessment Plan,Supervisor Name,主管名称
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,不要确认是否在同一天创建约会
@@ -4797,18 +4793,19 @@
 DocType: Manufacturer,Limited to 12 characters,限12个字符
 DocType: Journal Entry,Print Heading,打印标题
 apps/erpnext/erpnext/config/stock.py +150,Delivery Trip service tours to customers.,送货服务游览给顾客。
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,项目代码&gt;项目组&gt;品牌
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +57,Total cannot be zero,总不能为零
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,“ 最后的订单到目前的天数”必须大于或等于零
 DocType: Plant Analysis Criteria,Maximum Permissible Value,最大允许值
 DocType: Journal Entry Account,Employee Advance,员工晋升
 DocType: Payroll Entry,Payroll Frequency,工资频率
 DocType: Lab Test Template,Sensitivity,灵敏度
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +946,Raw Material,原料
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +965,Raw Material,原料
 DocType: Leave Application,Follow via Email,通过电子邮件关注
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,植物和机械设备
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,税额折后金额
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,每日工作总结设置
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1139,Selected Price List should have buying and selling fields checked.,选定价目表应该有买入和卖出的字段。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1141,Selected Price List should have buying and selling fields checked.,选定价目表应该有买入和卖出的字段。
 apps/erpnext/erpnext/controllers/buying_controller.py +664,Please enter Reqd by Date,请输入按日期请求
 DocType: Payment Entry,Internal Transfer,内部转账
 DocType: Asset Maintenance,Maintenance Tasks,维护任务
@@ -4824,7 +4821,6 @@
 DocType: Crop Cycle,Detected Disease,检测到的疾病
 ,Produced,生产
 apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,还款开始日期不能在付款日期之前。
-DocType: Employee Benefit Application,Remainig Benefits (Yearly),Remainig福利(每年)
 DocType: Item,Item Code for Suppliers,对于供应商项目编号
 DocType: Issue,Raised By (Email),提出(电子邮件)
 DocType: Training Event,Trainer Name,讲师姓名
@@ -4858,12 +4854,12 @@
 apps/erpnext/erpnext/config/accounts.py +105,Accounting Statements,会计报表
 DocType: Drug Prescription,Hour,小时
 DocType: Restaurant Order Entry,Last Sales Invoice,上次销售发票
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +797,Please select Qty against item {0},请选择项目{0}的数量
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +799,Please select Qty against item {0},请选择项目{0}的数量
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +31,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,新序列号不能有仓库,仓库只能通过库存记录和采购收据设置。
 DocType: Lead,Lead Type,线索类型
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,You are not authorized to approve leaves on Block Dates,您无权批准锁定日期内的休假
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +396,All these items have already been invoiced,这些品目都已开具发票
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +968,Set New Release Date,设置新的发布日期
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +987,Set New Release Date,设置新的发布日期
 DocType: Company,Monthly Sales Target,每月销售目标
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},可以被{0}的批准
 DocType: Hotel Room,Hotel Room Type,酒店房间类型
@@ -4871,7 +4867,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 +973,Work Order not created,工作订单未创建
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1001,Work Order not created,工作订单未创建
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +33,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}",已为组件{1}申请的金额{0},设置等于或大于{2}的金额
 DocType: Shipping Rule,Shipping Rule Conditions,配送规则条件
@@ -4926,12 +4922,10 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,请取消采购发票{0}第一
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",电子邮件地址必须是唯一的,已经存在了{0}
 DocType: Serial No,AMC Expiry Date,AMC到期时间
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,供应商&gt;供应商集团
 DocType: Asset,Receipt,收据
 ,Sales Register,销售记录
 DocType: Daily Work Summary Group,Send Emails At,发送电子邮件在
 DocType: Quotation,Quotation Lost Reason,报价丧失原因
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,项目代码&gt;项目组&gt;品牌
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +383,Transaction reference no {0} dated {1},交易参考编号{0}日{1}
 apps/erpnext/erpnext/setup/doctype/supplier_group/supplier_group.js +5,There is nothing to edit.,无需编辑。
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +499,Form View,表单视图
@@ -4946,7 +4940,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +458,No material request created,没有创建重要请求
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},贷款额不能超过最高贷款额度{0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,执照
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +496,Please remove this Invoice {0} from C-Form {1},请删除此发票{0}从C-表格{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +498,Please remove this Invoice {0} from C-Form {1},请删除此发票{0}从C-表格{1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,请选择结转,如果你还需要包括上一会计年度的资产负债叶本财年
 DocType: GL Entry,Against Voucher Type,对凭证类型
 DocType: Physician,Phone (R),电话(R)
@@ -4962,7 +4956,7 @@
 DocType: Hotel Room,Hotel Room,旅馆房间
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +49,Account {0} does not belongs to company {1},帐户{0}不属于公司{1}
 DocType: Leave Type,Rounding,四舍五入
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +889,Serial Numbers in row {0} does not match with Delivery Note,行{0}中的序列号与交货单不匹配
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +891,Serial Numbers in row {0} does not match with Delivery Note,行{0}中的序列号与交货单不匹配
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.",然后根据客户,客户组,地区,供应商,供应商组织,市场活动,销售合作伙伴等筛选定价规则。
 DocType: Student,Guardian Details,卫详细
 DocType: C-Form,C-Form,C-表
@@ -4996,7 +4990,7 @@
 DocType: Item Alternative,Alternative Item Name,替代项目名称
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,父项{0}不能是库存产品
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +187,Website Listing,网站列表
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +485,"Could not submit any Salary Slip <br>\
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +532,"Could not submit any Salary Slip <br>\
 			Possible reasons: <br>\
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",无法提交任何薪资单<br> \可能的原因: <br> \ 1.净工资小于0。 <br> \ 2.员工主数据中指定的公司电子邮件地址无效。 <br>
@@ -5014,7 +5008,7 @@
 DocType: Stock Entry Detail,Basic Amount,基本金额
 DocType: Training Event,Exam,考试
 DocType: Complaint,Complaint,抱怨
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Warehouse required for stock Item {0},物件{0}需要指定仓库
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,Warehouse required for stock Item {0},物件{0}需要指定仓库
 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,所有部门
@@ -5024,8 +5018,8 @@
 DocType: Project Update,Problematic/Stuck,问题/卡住
 DocType: Tax Rule,Billing State,计费状态
 DocType: Share Transfer,Transfer,转让
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +258,Work Order {0} must be cancelled before cancelling this Sales Order,在取消此销售订单之前,必须先取消工单{0}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +966,Fetch exploded BOM (including sub-assemblies),获取展开BOM(包括子品目)
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,Work Order {0} must be cancelled before cancelling this Sales Order,在取消此销售订单之前,必须先取消工单{0}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +985,Fetch exploded BOM (including sub-assemblies),获取展开BOM(包括子品目)
 DocType: Authorization Rule,Applicable To (Employee),适用于(员工)
 apps/erpnext/erpnext/controllers/accounts_controller.py +160,Due Date is mandatory,截止日期是强制性的
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,增量属性{0}不能为0
@@ -5071,7 +5065,7 @@
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,使铅
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Print and Stationery,打印和文具
 DocType: Stock Settings,Show Barcode Field,显示条形码域
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +814,Send Supplier Emails,发送电子邮件供应商
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +833,Send Supplier Emails,发送电子邮件供应商
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +172,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",工资已经处理了与{0}和{1},留下申请期之间不能在此日期范围内的时期。
 DocType: Fiscal Year,Auto Created,自动创建
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py +19,Submit this to create the Employee record,提交这个来创建员工记录
@@ -5094,12 +5088,11 @@
 DocType: Job Offer,Awaiting Response,正在等待回应
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +83,Above,以上
 DocType: Support Search Source,Link Options,链接选项
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1500,Total Amount {0},总金额{0}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1485,Total Amount {0},总金额{0}
 apps/erpnext/erpnext/controllers/item_variant.py +307,Invalid attribute {0} {1},无效的属性{0} {1}
 DocType: Supplier,Mention if non-standard payable account,如果非标准应付账款提到
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',请选择“所有评估组”以外的评估组
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},行{0}:项目{1}需要费用中心
-apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +43,EcritureDate,EcritureDate
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +6,This is based on transactions against this Physician.,这是基于对这位医师的交易。
 DocType: Training Event Employee,Optional,可选的
 DocType: Salary Slip,Earning & Deduction,盈余及扣除
@@ -5120,10 +5113,10 @@
 DocType: Sales Invoice,Product Bundle Help,产品包帮助
 ,Monthly Attendance Sheet,每月考勤表
 apps/erpnext/erpnext/hr/report/employee_advance_summary/employee_advance_summary.py +15,No record found,未找到记录
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,报废资产成本
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Cost of Scrapped Asset,报废资产成本
 apps/erpnext/erpnext/controllers/stock_controller.py +240,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}:成本中心是品目{2}的必须项
 DocType: Vehicle,Policy No,政策:
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +691,Get Items from Product Bundle,从产品包获取物料
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Get Items from Product Bundle,从产品包获取物料
 DocType: Asset,Straight Line,直线
 DocType: Project User,Project User,项目用户
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,分裂
@@ -5187,12 +5180,13 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +98,Make Material Request,制作材料要求
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},打开项目{0}
 DocType: Asset Finance Book,Written Down Value,写下价值
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +228,Sales Invoice {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消销售发票{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +229,Sales Invoice {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消销售发票{0}
 DocType: Clinical Procedure,Age,账龄
 DocType: Sales Invoice Timesheet,Billing Amount,开票金额
 DocType: Cash Flow Mapping,Select Maximum Of 1,选择最多1个
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,项目{0}的数量无效,应为大于0的数字。
 DocType: Company,Default Employee Advance Account,默认员工高级帐户
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1110,Search Item (Ctrl + i),搜索项目(Ctrl + i)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +166,Account with existing transaction can not be deleted,有交易的科目不能被删除
 DocType: Vehicle,Last Carbon Check,最后检查炭
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Legal Expenses,法律费用
@@ -5225,7 +5219,7 @@
 DocType: Healthcare Settings,Out Patient SMS Alerts,输出病人短信
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Probation,缓刑
 DocType: Program Enrollment Tool,New Academic Year,新学年
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +833,Return / Credit Note,退货/退款单
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +852,Return / Credit Note,退货/退款单
 DocType: Stock Settings,Auto insert Price List rate if missing,自动插入价目表率,如果丢失
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,总支付金额
 DocType: GST Settings,B2C Limit,B2C限制
@@ -5243,7 +5237,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,子节点可以在&#39;集团&#39;类型的节点上创建
 DocType: Attendance Request,Half Day Date,半天日期
 DocType: Academic Year,Academic Year Name,学年名称
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1023,{0} not allowed to transact with {1}. Please change the Company.,不允许{0}与{1}进行交易。请更改公司。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1025,{0} not allowed to transact with {1}. Please change the Company.,不允许{0}与{1}进行交易。请更改公司。
 DocType: Sales Partner,Contact Desc,联系人倒序
 DocType: Email Digest,Send regular summary reports via Email.,通过电子邮件发送定期汇总报告。
 DocType: Payment Entry,PE-,PE-
@@ -5303,12 +5297,12 @@
 DocType: Program,Courses,培训班
 DocType: Monthly Distribution Percentage,Percentage Allocation,核销百分比
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Secretary,秘书
-apps/erpnext/erpnext/regional/india/utils.py +168,House rented dates required for exemption calculation,房子租用日期计算免责
+apps/erpnext/erpnext/regional/india/utils.py +175,House rented dates required for exemption calculation,房子租用日期计算免责
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction",如果禁用“,在词”字段不会在任何交易可见
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,此操作将停止未来的结算。您确定要取消此订阅吗?
 DocType: Serial No,Distinct unit of an Item,品目的属性
 DocType: Supplier Scorecard Criteria,Criteria Name,标准名称
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1329,Please set Company,请设公司
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1348,Please set Company,请设公司
 DocType: Pricing Rule,Buying,采购
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,疾病与肥料
 DocType: HR Settings,Employee Records to be created by,雇员记录创建于
@@ -5325,14 +5319,15 @@
 DocType: Employee Onboarding,Job Offer,工作机会
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,机构缩写
 ,Item-wise Price List Rate,逐项价目表率
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1087,Supplier Quotation,供应商报价
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1106,Supplier Quotation,供应商报价
 DocType: Quotation,In Words will be visible once you save the Quotation.,大写金额将在报价单保存后显示。
 apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},数量({0})不能是行{1}中的分数
 apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},数量({0})不能是行{1}中的分数
 DocType: Contract,Unsigned,无符号
+DocType: Selling Settings,Each Transaction,每笔交易
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +507,Barcode {0} already used in Item {1},条码{0}已被品目{1}使用
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Barcode {0} already used in Item {1},条码{0}已被品目{1}使用
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,规则增加运输成本。
 DocType: Hotel Room,Extra Bed Capacity,加床容量
 DocType: Item,Opening Stock,期初库存
@@ -5354,7 +5349,7 @@
 DocType: Customer,From Lead,来自潜在客户
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,发布生产订单。
 apps/erpnext/erpnext/public/js/account_tree_grid.js +65,Select Fiscal Year...,选择财政年度...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +572,POS Profile required to make POS Entry,需要POS资料,使POS进入
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +574,POS Profile required to make POS Entry,需要POS资料,使POS进入
 DocType: Program Enrollment Tool,Enroll Students,招生
 DocType: Company,HRA Settings,HRA设置
 DocType: Employee Transfer,Transfer Date,转移日期
@@ -5374,6 +5369,7 @@
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,项目名称
 DocType: Customer,Mention if non-standard receivable account,提到如果不规范应收账款
+apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +60,Please add the remaining benefits {0} to any of the existing component,请将其余好处{0}添加到任何现有组件
 DocType: Journal Entry Account,If Income or Expense,收入或支出
 DocType: Bank Statement Transaction Entry,Matching Invoices,匹配发票
 DocType: Work Order,Required Items,所需物品
@@ -5383,7 +5379,7 @@
 DocType: Disease,Treatment Task,治疗任务
 DocType: Purchase Order Item,Blanket Order,总订单
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,所得税资产
-apps/erpnext/erpnext/regional/india/utils.py +177,House rent paid days overlap with {0},房租支付天数与{0}重叠
+apps/erpnext/erpnext/regional/india/utils.py +184,House rent paid days overlap with {0},房租支付天数与{0}重叠
 DocType: BOM Item,BOM No,BOM编号
 DocType: Instructor,INS/,INS /
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Journal Entry {0} does not have account {1} or already matched against other voucher,日记帐分录{0}没有科目{1}或已经匹配其他凭证
@@ -5408,7 +5404,7 @@
 DocType: Subscription,Taxes,税
 DocType: Purchase Invoice,capital goods,资本货物
 DocType: Purchase Invoice Item,Weight Per Unit,每单位重量
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +350,Paid and Not Delivered,支付和未送达
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +351,Paid and Not Delivered,支付和未送达
 DocType: Project,Default Cost Center,默认成本中心
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,库存交易
 DocType: Budget,Budget Accounts,预算科目
@@ -5427,7 +5423,7 @@
 DocType: Item Attribute,From Range,从范围
 DocType: BOM,Set rate of sub-assembly item based on BOM,基于BOM设置子组合项目的速率
 DocType: Hotel Room Reservation,Invoiced,已开发票
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +161,Syntax error in formula or condition: {0},式或条件语法错误:{0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +169,Syntax error in formula or condition: {0},式或条件语法错误:{0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,每日工作总结公司的设置
 apps/erpnext/erpnext/stock/utils.py +151,Item {0} ignored since it is not a stock item,产品{0}不属于库存产品,因此被忽略
 DocType: Appraisal,APRSL,APRSL
@@ -5442,7 +5438,7 @@
 ,Employee Information,雇员资料
 DocType: Stock Entry Detail,Additional Cost,额外费用
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +56,"Can not filter based on Voucher No, if grouped by Voucher",按凭证分类后不能根据凭证编号过滤
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +923,Make Supplier Quotation,创建供应商报价
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +942,Make Supplier Quotation,创建供应商报价
 DocType: Quality Inspection,Incoming,接收
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,销售和采购的默认税收模板被创建。
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,评估结果记录{0}已经存在。
@@ -5542,11 +5538,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +143,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},行{0}:BOM#的货币{1}应等于所选货币{2}
 DocType: Journal Entry Account,Exchange Rate,汇率
 DocType: Patient,Additional information regarding the patient,有关患者的其他信息
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +590,Sales Order {0} is not submitted,销售订单{0}未提交
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +592,Sales Order {0} is not submitted,销售订单{0}未提交
 DocType: Homepage,Tag Line,标语
 DocType: Fee Component,Fee Component,收费组件
 apps/erpnext/erpnext/config/hr.py +278,Fleet Management,车队的管理
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1085,Add items from,添加项目..
+apps/erpnext/erpnext/hr/doctype/employee_advance/employee_advance.py +43,Advance account currency should be same as company curreny {0},预付款帐户币种应与公司现金{0}相同
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1104,Add items from,添加项目..
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,作物和土地
 DocType: Cheque Print Template,Regular,定期
 DocType: Fertilizer,Density (if liquid),密度(如果液体)
@@ -5572,7 +5569,7 @@
 DocType: Payment Entry,Paid Amount,支付的金额
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,探索销售周期
 DocType: Assessment Plan,Supervisor,监
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +891,Retention Stock Entry,保留股票入场
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +918,Retention Stock Entry,保留股票入场
 ,Available Stock for Packing Items,库存可用打包品目
 DocType: Item Variant,Item Variant,项目变体
 ,Work Order Stock Report,工单库存报表
@@ -5613,7 +5610,6 @@
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,允许零估值
 DocType: Bank Guarantee,Receiving,接收
 DocType: Training Event Employee,Invited,邀请
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +241,Multiple active Salary Structures found for employee {0} for the given dates,发现员工{0}对于给定的日期多个活动薪金结构
 apps/erpnext/erpnext/config/accounts.py +314,Setup Gateway accounts.,设置网关帐户。
 DocType: Employee,Employment Type,就职类型
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,固定资产
@@ -5672,6 +5668,7 @@
 DocType: Work Order Item,Available Qty at Source Warehouse,源仓库可用数量
 apps/erpnext/erpnext/config/support.py +22,Warranty,质量保证
 DocType: Purchase Invoice,Debit Note Issued,借记发行说明
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1111,"Search by item code, serial number, batch no or barcode",按项目代码,序列号,批号或条码进行搜索
 DocType: Work Order,Warehouses,仓库
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +19,{0} asset cannot be transferred,{0}资产不得转让
 DocType: Hotel Room Pricing,Hotel Room Pricing,酒店房间价格
@@ -5680,7 +5677,6 @@
 DocType: Workstation,per hour,每小时
 DocType: Blanket Order,Purchasing,购买
 DocType: Announcement,Announcement,公告
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,请在人力资源&gt;人力资源设置中设置员工命名系统
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +107,Customer LPO,客户LPO
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.",对于基于批次的学生组,学生批次将由课程注册中的每位学生进行验证。
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,无法删除,因为此仓库有库存分类账分录。
@@ -5694,15 +5690,15 @@
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},{0}和{1}之间的得分重叠
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +321,Dispatch,调度
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +75,Max discount allowed for item: {0} is {1}%,品目{0}的最大折扣为 {1}%
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,净资产值作为
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +191,Net Asset value as on,净资产值作为
 DocType: Crop,Produce,生产
 DocType: Hotel Settings,Default Taxes and Charges,默认税费
 DocType: Account,Receivable,应收账款
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,行#{0}:不能更改供应商的采购订单已经存在
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +315,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,行#{0}:不能更改供应商的采购订单已经存在
 DocType: Stock Entry,Material Consumption for Manufacture,材料消耗制造
 DocType: Item Alternative,Alternative Item Code,替代项目代码
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,作用是允许提交超过设定信用额度交易的。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1009,Select Items to Manufacture,选择项目,以制造
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1037,Select Items to Manufacture,选择项目,以制造
 DocType: Delivery Stop,Delivery Stop,交付停止
 apps/erpnext/erpnext/accounts/page/pos/pos.js +967,"Master data syncing, it might take some time",主数据同步,这可能需要一些时间
 DocType: Item,Material Issue,发料
@@ -5721,10 +5717,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,行{0}:{1}必须大于0
 DocType: Assessment Criteria,Assessment Criteria Group,评估标准组
 DocType: Healthcare Settings,Patient Name By,病人姓名By
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Accrual Journal Entry for salaries from {0} to {1},从{0}到{1}的薪金的应计日记帐分录
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +266,Accrual Journal Entry for salaries from {0} to {1},从{0}到{1}的薪金的应计日记帐分录
 DocType: Sales Invoice Item,Enable Deferred Revenue,启用延期收入
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},打开累计折旧必须小于等于{0}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,请通过设置&gt;编号系列设置考勤编号系列
 DocType: Warehouse,Warehouse Name,仓库名称
 DocType: Naming Series,Select Transaction,选择交易
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,请输入角色核准或审批用户
@@ -5739,7 +5734,6 @@
 DocType: Leave Block List,Applies to Company,适用于公司
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +240,Cannot cancel because submitted Stock Entry {0} exists,不能取消,因为提交的仓储记录{0}已经存在
 DocType: Loan,Disbursement Date,支付日期
-apps/erpnext/erpnext/hr/report/daily_work_summary_replies/daily_work_summary_replies.py +23,Reply Count,回复计数
 DocType: BOM Update Tool,Update latest price in all BOMs,更新所有BOM的最新价格
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +23,Medical Record,医疗记录
 DocType: Vehicle,Vehicle,车辆
@@ -5753,7 +5747,6 @@
 DocType: Exchange Rate Revaluation Account,Balance In Account Currency,账户货币余额
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,请在会计科目表中添加一个临时开户账户
 DocType: Customer,Customer Primary Contact,客户主要联系人
-apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +154,Period Closing Journal,期间结束日志
 DocType: Project Task,View Task,查看任务
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
@@ -5769,7 +5762,7 @@
 DocType: Production Plan,Include Subcontracted Items,包括转包物料
 apps/erpnext/erpnext/projects/doctype/project/project.py +224,Join,加入
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,短缺数量
-apps/erpnext/erpnext/stock/doctype/item/item.py +737,Item variant {0} exists with same attributes,项目变体{0}存在具有相同属性
+apps/erpnext/erpnext/stock/doctype/item/item.py +750,Item variant {0} exists with same attributes,项目变体{0}存在具有相同属性
 DocType: Loan,Repay from Salary,从工资偿还
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +360,Requesting payment against {0} {1} for amount {2},请求对付款{0} {1}量{2}
@@ -5818,6 +5811,7 @@
 DocType: Delivery Note,Billing Address Name,帐单地址名称
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +22,Department Stores,百货
 ,Item Delivery Date,物品交货日期
+DocType: Selling Settings,Sales Update Frequency,销售更新频率
 DocType: Production Plan,Material Requested,要求的材料
 DocType: Warehouse,PIN,销
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +116,Error '{0}' occured. Arguments {1}.,发生错误“{0}”。参数{1}。
@@ -5838,7 +5832,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +30,Credit Days cannot be a negative number,信用日不能是负数
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,最后订单金额
 DocType: Cash Flow Mapper,e.g Adjustments for:,例如调整:
-apps/erpnext/erpnext/stock/doctype/item/item.py +290," {0} Retain Sample is based on batch, please check Has Batch No to retain sample of item",{0}保留样品基于批次,请检查有批次否保留样品
+apps/erpnext/erpnext/stock/doctype/item/item.py +291," {0} Retain Sample is based on batch, please check Has Batch No to retain sample of item",{0}保留样品基于批次,请检查有批次否保留样品
 DocType: Task,Is Milestone,是里程碑
 DocType: Certification Application,Yet to appear,尚未出现
 DocType: Delivery Stop,Email Sent To,电子邮件发送给
@@ -5877,7 +5871,7 @@
 DocType: Certification Application,Name of Applicant,申请人名称
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,时间表制造。
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,小计
-apps/erpnext/erpnext/stock/doctype/item/item.py +688,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,股票交易后不能更改Variant属性。你将不得不做一个新的项目来做到这一点。
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,股票交易后不能更改Variant属性。你将不得不做一个新的项目来做到这一点。
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,GoCardless SEPA授权
 DocType: Physician,Charges,收费
 DocType: Production Plan,Get Items For Work Order,获取工作订单的物品
@@ -5894,6 +5888,7 @@
 apps/erpnext/erpnext/config/healthcare.py +45,Laboratory,实验室
 DocType: UOM Category,UOM Category,UOM类别
 DocType: Clinical Procedure Item,Actual Qty (at source/target),实际数量(源/目标)
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,请在人力资源&gt;人力资源设置中设置员工命名系统
 DocType: Item Customer Detail,Ref Code,参考代码
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,POS Profile中需要客户组
 DocType: HR Settings,Payroll Settings,薪资设置
@@ -5905,7 +5900,7 @@
 apps/erpnext/erpnext/public/js/stock_analytics.js +54,Select Brand...,选择品牌...
 apps/erpnext/erpnext/public/js/setup_wizard.js +32,Non Profit (beta),非营利(测试版)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,培训活动/结果
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +152,Accumulated Depreciation as on,作为累计折旧
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +167,Accumulated Depreciation as on,作为累计折旧
 DocType: Employee Tax Exemption Category,Employee Tax Exemption Category,员工免税类别
 DocType: Sales Invoice,C-Form Applicable,C-表格适用
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +466,Operation Time must be greater than 0 for Operation {0},运行时间必须大于0的操作{0}
@@ -5914,7 +5909,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +72,Failed to create website,无法创建网站
 DocType: Soil Analysis,Mg/K,镁/ K
 DocType: UOM Conversion Detail,UOM Conversion Detail,计量单位换算详情
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +946,Retention Stock Entry already created or Sample Quantity not provided,已创建保留库存条目或未提供“样品数量”
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +973,Retention Stock Entry already created or Sample Quantity not provided,已创建保留库存条目或未提供“样品数量”
 DocType: Program,Program Abbreviation,计划缩写
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,费用会在每个品目的采购收据中更新
 DocType: Warranty Claim,Resolved By,议决
@@ -5933,7 +5928,7 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,小时
 DocType: Project,Expected Start Date,预计开始日期
 DocType: Purchase Invoice,04-Correction in Invoice,04-发票纠正
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +982,Work Order already created for all items with BOM,已经为包含物料清单的所有料品创建工单
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1010,Work Order already created for all items with BOM,已经为包含物料清单的所有料品创建工单
 apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant Details Report,变体详细信息报告
 DocType: Setup Progress Action,Setup Progress Action,设置进度动作
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,买价格表
@@ -5954,7 +5949,7 @@
 DocType: Asset,Disposal Date,处置日期
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",电子邮件将在指定的时间发送给公司的所有在职职工,如果他们没有假期。回复摘要将在午夜被发送。
 DocType: Employee Leave Approver,Employee Leave Approver,雇员假期审批者
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}:一个重新排序条目已存在这个仓库{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +526,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}:一个重新排序条目已存在这个仓库{1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.",不能更改状态为丧失,因为已有报价。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,CWIP Account,CWIP账户
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,培训反馈
@@ -5996,7 +5991,7 @@
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure/clinical_procedure.js +91,Stock quantity to start procedure is not available in the warehouse. Do you want to record a Stock Transfer,仓库中不提供开始操作的库存数量。你想记录股票转移吗?
 DocType: Shipping Rule,Shipping Rule Type,运输规则类型
 apps/erpnext/erpnext/utilities/user_progress.py +239,Go to Rooms,去房间
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +237,"Company, Payment Account, From Date and To Date is mandatory",公司,付款帐户,从日期和日期是强制性的
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +257,"Company, Payment Account, From Date and To Date is mandatory",公司,付款帐户,从日期和日期是强制性的
 DocType: Company,Budget Detail,预算详情
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,在发送前,请填写留言
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,供应商重复
@@ -6004,7 +5999,7 @@
 DocType: Asset,Custodian,保管人
 apps/erpnext/erpnext/config/accounts.py +324,Point-of-Sale Profile,简介销售点的
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0}应该是0到100之间的一个值
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +350,Payment of {0} from {1} to {2},从{1}到{2}的{0}付款
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +365,Payment of {0} from {1} to {2},从{1}到{2}的{0}付款
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,无担保贷款
 DocType: Cost Center,Cost Center Name,成本中心名称
 DocType: Student,B+,B +
@@ -6024,7 +6019,7 @@
 DocType: Naming Series,Help HTML,HTML帮助
 DocType: Student Group Creation Tool,Student Group Creation Tool,学生组创建工具
 DocType: Item,Variant Based On,基于变异对
-apps/erpnext/erpnext/hr/doctype/leave_period/leave_period.py +71,Employee {0} already have Leave Allocation {1} for this period,在此期间,员工{0}已经有离职分配{1}
+apps/erpnext/erpnext/hr/doctype/leave_period/leave_period.py +67,Employee {0} already have Leave Allocation {1} for this period,在此期间,员工{0}已经有离职分配{1}
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},分配的总权重应为100 % 。这是{0}
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,您的供应商
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,不能更改状态为丧失,因为已有销售订单。
@@ -6038,7 +6033,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +238,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}",根据购买设置,如果需要购买记录==“是”,则为了创建采购发票,用户需要首先为项目{0}创建采购凭证
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Row #{0}: Set Supplier for item {1},行#{0}:设置供应商项目{1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,行{0}:小时值必须大于零。
-apps/erpnext/erpnext/stock/doctype/item/item.py +210,Website Image {0} attached to Item {1} cannot be found,网站图像{0}附加到物品{1}无法找到
+apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,网站图像{0}附加到物品{1}无法找到
 DocType: Issue,Content Type,内容类型
 DocType: Asset,Assets,资产
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,电脑
@@ -6066,7 +6061,7 @@
 ,Average Commission Rate,平均佣金率
 DocType: Share Balance,No of Shares,股份数目
 DocType: Taxable Salary Slab,To Amount,金额
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,'Has Serial No' can not be 'Yes' for non-stock item,非库存项目不能勾选'是否有序列号'
+apps/erpnext/erpnext/stock/doctype/item/item.py +464,'Has Serial No' can not be 'Yes' for non-stock item,非库存项目不能勾选'是否有序列号'
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,选择状态
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance can not be marked for future dates,考勤不能标记为未来的日期
 DocType: Support Search Source,Post Description Key,发布说明密钥
@@ -6088,7 +6083,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +232,Birthday Reminder for {0},{0}的生日提醒
 DocType: Asset Maintenance Task,Last Completion Date,最后完成日期
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,自上次订购天数
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Debit To account must be a Balance Sheet account,借记帐户必须是资产负债表科目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +372,Debit To account must be a Balance Sheet account,借记帐户必须是资产负债表科目
 DocType: Asset,Naming Series,命名系列
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,行{0}:使用寿命后的预期值必须小于总采购额
 DocType: GoCardless Settings,GoCardless Settings,GoCardless设置
@@ -6105,12 +6100,12 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,送货单{0}不能提交
 DocType: Notification Control,Sales Invoice Message,销售发票信息
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,关闭帐户{0}的类型必须是负债/权益
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +388,Salary Slip of employee {0} already created for time sheet {1},员工的工资单{0}已为时间表创建{1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +393,Salary Slip of employee {0} already created for time sheet {1},员工的工资单{0}已为时间表创建{1}
 DocType: Vehicle Log,Odometer,里程表
 DocType: Production Plan Item,Ordered Qty,订购数量
-apps/erpnext/erpnext/stock/doctype/item/item.py +767,Item {0} is disabled,物料{0}已被禁用
+apps/erpnext/erpnext/stock/doctype/item/item.py +780,Item {0} is disabled,物料{0}已被禁用
 DocType: Stock Settings,Stock Frozen Upto,库存冻结止
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +979,BOM does not contain any stock item,BOM不包含任何库存项目
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +998,BOM does not contain any stock item,BOM不包含任何库存项目
 DocType: Chapter,Chapter Head,章主管
 DocType: Payment Term,Month(s) after the end of the invoice month,发票月份结束后的月份
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +47,Salary Structure should have flexible benefit component(s) to dispense benefit amount,薪酬结构应该有灵活的福利组成来分配福利金额
@@ -6129,7 +6124,7 @@
 DocType: Sales Invoice Timesheet,Billing Hours,结算时间
 DocType: Project,Total Sales Amount (via Sales Order),总销售额(通过销售订单)
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +603,Default BOM for {0} not found,默认BOM {0}未找到
-apps/erpnext/erpnext/stock/doctype/item/item.py +529,Row #{0}: Please set reorder quantity,行#{0}:请设置再订购数量
+apps/erpnext/erpnext/stock/doctype/item/item.py +530,Row #{0}: Please set reorder quantity,行#{0}:请设置再订购数量
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,点击项目将其添加到此处
 DocType: Fees,Program Enrollment,招生计划
 DocType: Share Transfer,To Folio No,对开本No
@@ -6175,7 +6170,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},没有为客户{}选择送货单
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,员工{0}没有最大福利金额
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +25,BOM replaced,BOM已替换
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1072,Select Items based on Delivery Date,根据交付日期选择项目
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1100,Select Items based on Delivery Date,根据交付日期选择项目
 DocType: Grant Application,Has any past Grant Record,有过去的赠款记录吗?
 ,Sales Analytics,销售分析
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},可用{0}
@@ -6276,7 +6271,7 @@
 apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,捐助者类型信息。
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +60,Available for use date is required,需要使用可用日期
 DocType: Request for Quotation,Supplier Detail,供应商详细
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +163,Error in formula or condition: {0},公式或条件错误:{0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,Error in formula or condition: {0},公式或条件错误:{0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,已开票金额
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,标准重量必须达100%
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,考勤
@@ -6310,7 +6305,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,咨询
 DocType: Customer Group,Parent Customer Group,母公司集团客户
 DocType: Vehicle Service,Change,变化
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +848,Subscription,订阅
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +867,Subscription,订阅
 DocType: Purchase Invoice,Contact Email,联络人电邮
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,费用创作待定
 DocType: Appraisal Goal,Score Earned,已得分数
@@ -6326,7 +6321,6 @@
 DocType: Purchase Invoice,07-Others,07,其他
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +158,Please enter serial numbers for serialized item ,请输入序列号序列号
 DocType: Bin,Reserved Qty for Production,预留数量生产
-apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +43,EcritureNum,EcritureNum
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,如果您不想在制作基于课程的组时考虑批量,请不要选中。
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,如果您不想在制作基于课程的组时考虑批量,请不要选中。
 DocType: Asset,Frequency of Depreciation (Months),折旧率(月)
@@ -6338,7 +6332,7 @@
 DocType: Payment Reconciliation,Receivable / Payable Account,应收/应付账款
 DocType: Delivery Note Item,Against Sales Order Item,对销售订单项目
 DocType: Hub Settings,Company Logo,公司标志
-apps/erpnext/erpnext/stock/doctype/item/item.py +732,Please specify Attribute Value for attribute {0},请指定属性值的属性{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +745,Please specify Attribute Value for attribute {0},请指定属性值的属性{0}
 DocType: Item Default,Default Warehouse,默认仓库
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Budget cannot be assigned against Group Account {0},财政预算案不能对集团客户分配{0}
 DocType: Shopping Cart Settings,Show Price,显示价格
@@ -6354,12 +6348,12 @@
 DocType: Student Attendance Tool,Batch,批次
 DocType: Support Search Source,Query Route String,查询路由字符串
 DocType: Donor,Donor Type,捐助者类型
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +677,Auto repeat document updated,自动重复文件更新
 apps/erpnext/erpnext/stock/doctype/item/item.js +29,Balance,余额
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +66,Please select the Company,请选择公司
 DocType: Room,Seating Capacity,座位数
 DocType: Issue,ISS-,ISS-
 DocType: Lab Test Groups,Lab Test Groups,实验室测试组
-apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +60,Please add the remainig benefits {0} to any of the existing component,请将这些优点{0}添加到任何现有的组件中
 apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py +151,Party Type and Party is mandatory for {0} account,{0}帐户必须使用派对类型和派对
 DocType: Project,Total Expense Claim (via Expense Claims),总费用报销(通过费用报销)
 DocType: GST Settings,GST Summary,消费税总结
@@ -6370,7 +6364,6 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +102,Please enter API Consumer Secret,请输入API消费者密码
 DocType: Stock Entry,As per Stock UOM,按库存计量单位
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,未过期
-apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +49,ValidDate,有效日期
 DocType: Student Log,Achievement,成就
 DocType: Asset,Insurer,保险公司
 DocType: Batch,Source Document Type,源文档类型
@@ -6449,7 +6442,7 @@
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,餐厅订单录入项目
 DocType: Purchase Invoice,Rounded Total (Company Currency),元整后金额(公司货币)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Cannot covert to Group because Account Type is selected.,不能转换到组,因为你选择的是帐户类型。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +266,{0} {1} has been modified. Please refresh.,{0} {1}已被修改过,请刷新。
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +267,{0} {1} has been modified. Please refresh.,{0} {1}已被修改过,请刷新。
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,禁止用户在以下日期提交假期申请。
 DocType: Asset Maintenance Team,Maintenance Team Members,维护团队成员
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +71,Purchase Amount,购买金额
@@ -6460,6 +6453,8 @@
 DocType: Work Order,Manufactured Qty,已生产数量
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +79,The shares don't exist with the {0},这些份额不存在{0}
 DocType: Sales Partner Type,Sales Partner Type,销售伙伴类型
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","请删除员工<a href=""#Form/Employee/{0}"">{0}</a> \以取消此文档"
 DocType: Shopify Webhook Detail,Webhook ID,Webhook ID
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,已创建发票
 DocType: Asset,Out of Order,乱序
@@ -6482,14 +6477,14 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1721,Price List not found or disabled,价格表未找到或禁用
 DocType: Student Applicant,Approved,已批准
 apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +15,Price,价格
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Employee relieved on {0} must be set as 'Left',{0}的假期批准后,雇员的状态必须设置为“离开”
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Employee relieved on {0} must be set as 'Left',{0}的假期批准后,雇员的状态必须设置为“离开”
 DocType: Hub Settings,Last Sync On,上次同步开启
 DocType: Guardian,Guardian,监护人
 DocType: Item Alternative,Item Alternative,项目选择
 DocType: Opening Invoice Creation Tool,Create missing customer or supplier.,创建缺少的客户或供应商。
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,雇员{1}的限期评估{0}已经创建
 DocType: Academic Term,Education,教育
-apps/erpnext/erpnext/public/js/pos/pos.html +89,Del,德尔
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +551,Del,德尔
 DocType: Selling Settings,Campaign Naming By,活动命名:
 DocType: Employee,Current Address Is,当前地址是
 apps/erpnext/erpnext/utilities/user_progress.py +51,Monthly Sales Target (,每月销售目标(
@@ -6508,7 +6503,7 @@
 apps/erpnext/erpnext/hr/doctype/attendance_request/attendance_request.py +52,Attendance not submitted for {0} as it is a Holiday.,由于是假期,因此未出席{0}的考勤。
 DocType: POS Profile,Account for Change Amount,帐户涨跌额
 DocType: Exchange Rate Revaluation,Total Gain/Loss,总收益/损失
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1016,Invalid Company for Inter Company Invoice.,公司发票无效公司。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1018,Invalid Company for Inter Company Invoice.,公司发票无效公司。
 DocType: Purchase Invoice,input service,输入服务
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},行{0}:往来单位/科目{1} / {2}与{3} {4}不匹配
 DocType: Employee Promotion,Employee Promotion,员工晋升
@@ -6573,6 +6568,7 @@
 DocType: Physician,Phone (Office),电话(办公室)
 apps/erpnext/erpnext/controllers/buying_controller.py +740,"Following item {items} {verb} not marked as {message} item.\
 			You can enable them as {message} item from its Item master",以下项目{项目} {动词}未标记为{消息}项目\您可以将其作为项目主项目中的{消息}项目启用
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +22,"Cannot Submit, Employees left to mark attendance",无法提交,雇员留下来标记出席
 apps/erpnext/erpnext/hooks.py +151,Admission,入场
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},招生{0}
 apps/erpnext/erpnext/config/accounts.py +263,"Seasonality for setting budgets, targets etc.",设置季节性的预算,目标等。
@@ -6584,7 +6580,7 @@
 DocType: Purchase Order,Advance Paid,已支付的预付款
 DocType: Manufacturing Settings,Overproduction Percentage For Sales Order,销售订单超额生产百分比
 DocType: Item,Item Tax,项目税项
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Material to Supplier,材料到供应商
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +907,Material to Supplier,材料到供应商
 DocType: Soil Texture,Loamy Sand,泥沙
 DocType: Production Plan,Material Request Planning,物料请求计划
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +700,Excise Invoice,消费税发票
@@ -6598,7 +6594,6 @@
 DocType: Program,Program Name,程序名称
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,考虑税收或收费
 DocType: Driver,Driving License Category,驾驶执照类别
-apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +158,No Reference,没有参考
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,实际数量是必须项
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +93,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0}目前拥有{1}供应商记分卡,而采购订单应谨慎提供给供应商。
 DocType: Asset Maintenance Team,Asset Maintenance Team,资产维护团队
@@ -6607,7 +6602,7 @@
 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 +781,Syntax error in condition: {0},条件中的语法错误:{0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +779,Syntax error in condition: {0},条件中的语法错误:{0}
 DocType: Employee Education,Major/Optional Subjects,主修/选修科目
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +125,Please Set Supplier Group in Buying Settings.,请设置供应商组购买设置。
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +44,"Total flexible benefit component amount {0} should not be less \
@@ -6628,7 +6623,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +56,Attach Logo,附加标志
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +51,Stock Levels,库存水平
 DocType: Customer,Commission Rate,佣金率
-apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py +234,Successfully created payment entries,成功创建付款条目
+apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py +239,Successfully created payment entries,成功创建付款条目
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,为{1}创建{0}记分卡:
 apps/erpnext/erpnext/stock/doctype/item/item.js +559,Make Variant,在Variant
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +156,"Payment Type must be one of Receive, Pay and Internal Transfer",付款方式必须是接收之一,收费和内部转账
@@ -6656,7 +6651,7 @@
 DocType: Company,Existing Company,现有的公司
 DocType: Healthcare Settings,Result Emailed,电子邮件结果
 apps/erpnext/erpnext/controllers/buying_controller.py +92,"Tax Category has been changed to ""Total"" because all the Items are non-stock items",税项类别已更改为“合计”,因为所有物品均为非库存物品
-apps/erpnext/erpnext/hr/doctype/leave_period/leave_period.py +76,To date can not be equal or less than from date,迄今为止不能等于或少于日期
+apps/erpnext/erpnext/hr/doctype/leave_period/leave_period.py +72,To date can not be equal or less than from date,迄今为止不能等于或少于日期
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,没什么可改变的
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,请选择一个csv文件
 DocType: Student Leave Application,Mark as Present,标记为现
@@ -6687,7 +6682,7 @@
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,让学生批
 DocType: Fee Schedule,FRQ.,FRQ。
 DocType: Leave Type,Is Carry Forward,是否顺延假期
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +890,Get Items from BOM,从物料清单获取物料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +909,Get Items from BOM,从物料清单获取物料
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,交货天数
 DocType: Cash Flow Mapping,Is Income Tax Expense,是所得税费用
 apps/erpnext/erpnext/controllers/accounts_controller.py +650,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},行#{0}:过帐日期必须是相同的购买日期{1}资产的{2}
@@ -6696,6 +6691,7 @@
 ,Stock Summary,库存摘要
 apps/erpnext/erpnext/config/assets.py +62,Transfer an asset from one warehouse to another,从一个仓库转移资产到另一
 DocType: Vehicle,Petrol,汽油
+DocType: Employee Benefit Application,Remaining Benefits (Yearly),剩余福利(每年)
 apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,材料清单
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Row {0}: Party Type and Party is required for Receivable / Payable account {1},行{0}:请为应收/应付科目输入{1}往来单位类型和往来单位
 DocType: Employee,Leave Policy,离开政策