commit 7c9010018dabb8ebceaadf83cc8c0ee2a55837c0
author Frappe PR Bot <frappe.pr.bot@gmail.com> Wed Jun 07 12:05:29 2017 +0530
committer Nabin Hait <nabinhait@gmail.com> Wed Jun 07 12:05:29 2017 +0530
tree ac9e7a43be615696a5754df59917e945e77a107f
parent 5f27c941000f0de04bea78296c65023a93abe9da

[translation] translation updates (#9156)

erpnext/translations/zh.csv

diff --git a/erpnext/translations/zh.csv b/erpnext/translations/zh.csv
index 3c0dba4..e1d29f7 100644
--- a/erpnext/translations/zh.csv
+++ b/erpnext/translations/zh.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,租
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,适用于用户
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",停止生产订单无法取消，首先Unstop它取消
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",停止生产订单无法取消，首先Unstop它取消
 DocType: Vehicle Service,Mileage,里程
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,难道你真的想放弃这项资产？
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,选择默认供应商
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,选择默认供应商
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},价格表{0}需要制定货币
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,*将被计算在该交易内。
 DocType: Purchase Order,Customer Contact,客户联系
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),杰出的{0}不能小于零（ {1} ）
 DocType: Manufacturing Settings,Default 10 mins,默认为10分钟
 DocType: Leave Type,Leave Type Name,假期类型名称
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,公开显示
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,公开显示
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,系列已成功更新
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,查看
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural日记帐分录提交
@@ -60,11 +60,10 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,显示变体
 DocType: Academic Term,Academic Term,学期
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,材料
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,数量
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,数量
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,账表不能为空。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),借款（负债）
 DocType: Employee Education,Year of Passing,按年排序
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s",参考文献：％S，项目代码：％s和客户：％s的
 DocType: Item,Country of Origin,出生国家
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,库存
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,开放式问题
@@ -74,7 +73,7 @@
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),延迟支付（天）
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,服务费用
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},序号：{0}已在销售发票中引用：{1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,发票
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,发票
 DocType: Maintenance Schedule Item,Periodicity,周期性
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,会计年度{0}是必需的
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,预计交货日期是之前销售订单日期
@@ -109,17 +108,17 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name",附加.csv文件有两列，一为旧名称，一个用于新名称
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} 没有在任何活动的财政年度中。
 DocType: Packed Item,Parent Detail docname,家长可采用DocName细节
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",参考：{0}，商品编号：{1}和顾客：{2}
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,千克
 DocType: Student Log,Log,日志
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,开放的工作。
 DocType: Item Attribute,Increment,增量
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,选择仓库...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,选择仓库...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,广告
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,同一家公司进入不止一次
 DocType: Employee,Married,已婚
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},不允许{0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,从获得项目
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource > HR Settings,请在人力资源>人力资源设置中设置员工命名系统
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,从获得项目
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,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,没有列出项目
@@ -131,7 +130,7 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,接下来折旧日期不能购买日期之前
 DocType: SMS Center,All Sales Person,所有的销售人员
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,**月度分配**帮助你分配预算/目标跨越几个月，如果你在你的业务有季节性。
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,Not items found,未找到项目
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,未找到项目
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,薪酬结构缺失
 DocType: Lead,Person Name,人姓名
 DocType: Sales Invoice Item,Sales Invoice Item,销售发票品目
@@ -149,7 +148,7 @@
 DocType: BOM,Item Image (if not slideshow),项目图片(如果没有指定幻灯片)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,同名客户已存在
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,（小时率/ 60）*实际操作时间
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM,选择BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,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}这个节日之间没有从日期和结束日期
@@ -170,7 +169,7 @@
 DocType: Academic Term,Schools,学校
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},未找到员工的假期记录{0} {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,请先输入公司
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,请首先选择公司
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,Please select Company first,请首先选择公司
 DocType: Employee Education,Under Graduate,本科
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,目标类型
 DocType: BOM,Total Cost,总成本
@@ -185,7 +184,7 @@
 DocType: Expense Claim Detail,Claim Amount,报销金额
 DocType: Employee,Mr,先生
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,在CUTOMER组表中找到重复的客户群
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,供应商类型/供应商
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,供应商类型/供应商
 DocType: Naming Series,Prefix,字首
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,耗材
 DocType: Employee,B-,B-
@@ -194,7 +193,7 @@
 DocType: Training Result Employee,Grade,年级
 DocType: Sales Invoice Item,Delivered By Supplier,交付供应商
 DocType: SMS Center,All Contact,所有联系人
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +877,Production Order already created for all items with BOM,生产订单已经与BOM的所有项目创建
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,生产订单已经与BOM的所有项目创建
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,年薪
 DocType: Daily Work Summary,Daily Work Summary,每日工作总结
 DocType: Period Closing Voucher,Closing Fiscal Year,结算财年
@@ -207,7 +206,7 @@
 DocType: Journal Entry,Contra Entry,对销分录
 DocType: Journal Entry Account,Credit in Company Currency,信用在公司货币
 DocType: Delivery Note,Installation Status,安装状态
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",你想更新考勤？ <br>现任：{0} \ <br>缺席：{1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},已接受+已拒绝的数量必须等于条目{0}的已接收数量
 DocType: Request for Quotation,RFQ-,RFQ-
@@ -272,7 +271,7 @@
 DocType: Sales Invoice,Is Opening Entry,是否期初分录
 DocType: Customer Group,Mention if non-standard receivable account applicable,何况，如果不规范应收账款适用
 DocType: Course Schedule,Instructor Name,导师姓名
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,提交前必须选择仓库
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,For Warehouse is required before Submit,提交前必须选择仓库
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,收到的
 DocType: Sales Partner,Reseller,经销商
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.",如果选中，将包括材料要求非库存物品。
@@ -280,7 +279,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,对销售发票项目
 ,Production Orders in Progress,在建生产订单
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,从融资净现金
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2215,"LocalStorage is full , did not save",localStorage的满了，没救
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save",localStorage的满了，没救
 DocType: Lead,Address & Contact,地址及联系方式
 DocType: Leave Allocation,Add unused leaves from previous allocations,添加未使用的叶子从以前的分配
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},周期{0}下次创建时间为{1}
@@ -307,7 +306,7 @@
 DocType: Item Website Specification,Item Website Specification,项目网站规格
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,已禁止请假
 apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},项目{0}已经到达寿命终止日期{1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,银行条目
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,银行条目
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,全年
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,库存盘点品目
 DocType: Stock Entry,Sales Invoice No,销售发票编号
@@ -326,7 +325,7 @@
 DocType: Student Admission,Student Admission,学生入学
 ,Terretory,区域
 apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,项目{0}已取消
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,物料申请
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Material Request,物料申请
 DocType: Bank Reconciliation,Update Clearance Date,更新清拆日期
 DocType: Item,Purchase Details,购买详情
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +356,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},项目{0}未发现“原材料提供&#39;表中的采购订单{1}
@@ -362,10 +361,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,杰出的支票及存款清除
 DocType: Item,Synced With Hub,与Hub同步
 DocType: Vehicle,Fleet Manager,车队经理
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},行＃{0}：{1}不能为负值对项{2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,密码错误
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},行＃{0}：{1}不能为负值对项{2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,密码错误
 DocType: Item,Variant Of,变体自
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',完成数量不能大于“生产数量”
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',完成数量不能大于“生产数量”
 DocType: Period Closing Voucher,Closing Account Head,结算帐户头
 DocType: Employee,External Work History,外部就职经历
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,循环引用错误
@@ -378,7 +377,7 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,自动创建物料申请时通过邮件通知
 DocType: Journal Entry,Multi Currency,多币种
 DocType: Payment Reconciliation Invoice,Invoice Type,发票类型
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +842,Delivery Note,送货单
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,送货单
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,建立税
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,出售资产的成本
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,付款项被修改，你把它之后。请重新拉。
@@ -404,7 +403,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},行＃{0}：采购发票不能对现有资产进行{1}
 DocType: Item Tax,Tax Rate,税率
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0}已分配给员工{1}的时期{2}到{3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,选择项目
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,选择项目
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,采购发票{0}已经提交
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},行＃{0}：批号必须与{1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,转换为非集团
@@ -442,8 +441,8 @@
 DocType: Request for Quotation,Request for Quotation,询价
 DocType: Salary Slip Timesheet,Working Hours,工作时间
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,更改现有系列的起始/当前序列号。
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1366,Create a new Customer,创建一个新的客户
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",如果几条价格规则同时使用，系统将提醒用户设置优先级。
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,创建一个新的客户
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",如果几条价格规则同时使用，系统将提醒用户设置优先级。
 apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,创建采购订单
 ,Purchase Register,购买注册
 DocType: Course Scheduling Tool,Rechedule,Rechedule
@@ -452,7 +451,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} {1}必须有“假期审批人”的角色
 DocType: Purchase Receipt,Vehicle Date,车日期
 DocType: Student Log,Medical,医药
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,原因丢失
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,原因丢失
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,铅所有者不能等同于铅
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,分配的金额不能超过未调整的量更大
 DocType: Announcement,Receiver,接收器
@@ -469,6 +468,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,数量和价格
 DocType: Delivery Note,% Installed,％已安装
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,教室/实验室等在那里的演讲可以预定。
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,供应商&gt;供应商类型
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,请先输入公司名称
 DocType: Purchase Invoice,Supplier Name,供应商名称
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,阅读ERPNext手册
@@ -485,6 +485,7 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,必修课 - 学年
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,必修课 - 学年
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,自定义作为邮件一部分的简介文本，每个邮件的简介文本是独立的。
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},请为公司{0}设置预设应付账款
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,所有生产流程的全局设置。
 DocType: Accounts Settings,Accounts Frozen Upto,账户被冻结到...为止
 DocType: SMS Log,Sent On,发送日期
@@ -494,7 +495,7 @@
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,假期大师
 DocType: Request for Quotation Item,Required Date,所需时间
 DocType: Delivery Note,Billing Address,帐单地址
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,请输入产品编号。
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,请输入产品编号。
 DocType: BOM,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",如果勾选，税金将被当成已包括在打印税率/打印总额内。
@@ -532,7 +533,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,请选择课程
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,请选择课程
 DocType: Timesheet Detail,Hrs,小时
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,请选择公司
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,请选择公司
 DocType: Stock Entry Detail,Difference Account,差异科目
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,不能因为其依赖的任务{0}没有关闭关闭任务。
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,请重新拉。
@@ -548,7 +549,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,请定义等级为阈值0％
 DocType: Sales Order,To Deliver,为了提供
 DocType: Purchase Invoice Item,Item,产品
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2378,Serial no item cannot be a fraction,序号项目不能是一个分数
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,序号项目不能是一个分数
 DocType: Journal Entry,Difference (Dr - Cr),差异(贷方-借方)
 DocType: Account,Profit and Loss,损益
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,管理转包
@@ -563,7 +564,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,增量不能为0
 DocType: Production Planning Tool,Material Requirement,物料需求
 DocType: Company,Delete Company Transactions,删除公司事务
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,参考编号和参考日期是强制性的银行交易
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,参考编号和参考日期是强制性的银行交易
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,添加/编辑税金及费用
 DocType: Purchase Invoice,Supplier Invoice No,供应商发票编号
 DocType: Territory,For reference,供参考
@@ -589,7 +590,7 @@
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,财务/会计年度。
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,累积值
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",抱歉，序列号无法合并
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +736,Make Sales Order,创建销售订单
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,创建销售订单
 DocType: Project Task,Project Task,项目任务
 ,Lead Id,线索ID
 DocType: C-Form Invoice Detail,Grand Total,总计
@@ -606,7 +607,7 @@
 DocType: Job Applicant,Resume Attachment,简历附
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,回头客
 DocType: Leave Control Panel,Allocate,调配
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +805,Sales Return,销售退货
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,销售退货
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,注：总分配叶{0}应不低于已核定叶{1}期间
 DocType: Announcement,Posted By,发布者
 DocType: Item,Delivered by Supplier (Drop Ship),由供应商交货（直接发运）
@@ -658,11 +659,11 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0}“ {1}”不属于{2}财年
 DocType: Buying Settings,Settings for Buying Module,采购模块的设置
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},资产{0}不属于公司{1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,请第一次进入购买收据
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,Please enter Purchase Receipt first,请第一次进入购买收据
 DocType: Buying Settings,Supplier Naming By,供应商命名方式
 DocType: Activity Type,Default Costing Rate,默认成本核算率
 DocType: Maintenance Schedule,Maintenance Schedule,维护计划
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.",然后定价规则将基于客户，客户组，地区，供应商，供应商类型，活动，销售合作伙伴等条件过滤。
+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 Type, Campaign, Sales Partner etc.",然后定价规则将基于客户，客户组，地区，供应商，供应商类型，活动，销售合作伙伴等条件过滤。
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,在库存净变动
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,员工贷款管理
 DocType: Employee,Passport Number,护照号码
@@ -678,7 +679,7 @@
 DocType: Production Order Operation,In minutes,已分钟为单位
 DocType: Issue,Resolution Date,决议日期
 DocType: Student Batch Name,Batch Name,批名
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,创建时间表：
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,创建时间表：
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},请设置默认的现金或银行账户的付款方式{0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,注册
 DocType: Selling Settings,Customer Naming By,客户命名方式
@@ -707,7 +708,7 @@
 DocType: Production Order Operation,Actual Start Time,实际开始时间
 DocType: BOM Operation,Operation Time,操作时间
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,完
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,基础
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,基础
 DocType: Timesheet,Total Billed Hours,帐单总时间
 DocType: Journal Entry,Write Off Amount,核销金额
 DocType: Journal Entry,Bill No,账单编号
@@ -734,7 +735,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,已创建付款输入
 DocType: Purchase Receipt Item Supplied,Current Stock,当前库存
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},行＃{0}：资产{1}不挂项目{2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,预览工资单
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,预览工资单
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,帐户{0}已多次输入
 DocType: Account,Expenses Included In Valuation,开支计入估值
 DocType: Hub Settings,Seller City,卖家城市
@@ -745,7 +746,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,项目{0}未找到
 DocType: Bin,Stock Value,库存值
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,公司{0}不存在
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,树类型
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,树类型
 DocType: BOM Explosion Item,Qty Consumed Per Unit,每单位消耗数量
 DocType: Serial No,Warranty Expiry Date,保修到期日
 DocType: Material Request Item,Quantity and Warehouse,数量和仓库
@@ -768,7 +769,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0}不是一个库存品目
 DocType: Mode of Payment Account,Default Account,默认帐户
 DocType: Payment Entry,Received Amount (Company Currency),收到的款项（公司币种）
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,如果商机的来源是“线索”的话，必须指定线索
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,如果商机的来源是“线索”的话，必须指定线索
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,请选择每周休息日
 DocType: Production Order Operation,Planned End Time,计划结束时间
 ,Sales Person Target Variance Item Group-Wise,品目组特定的销售人员目标差异
@@ -784,6 +785,7 @@
 DocType: Opportunity,Opportunity From,从机会
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,月度工资结算
 DocType: BOM,Website Specifications,网站规格
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,请通过设置&gt;编号系列设置出勤编号系列
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}：申请者{0} 假期类型{1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,行{0}：转换系数是强制性的
@@ -829,6 +831,7 @@
 DocType: Employee,Bank A/C No.,银行账号
 DocType: Bank Guarantee,Project,项目
 DocType: Quality Inspection Reading,Reading 7,阅读7
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,偏序
 DocType: Expense Claim Detail,Expense Claim Type,报销类型
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,购物车的默认设置
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},通过资产日记帐分录报废{0}
@@ -836,9 +839,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,生物技术
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Office Maintenance Expenses,办公维护费用
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,设置电子邮件帐户
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,没有客户或供应商帐户发现。账户是根据\确定
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,没有客户或供应商帐户发现。账户是根据\确定
 DocType: Account,Liability,负债
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,制裁金额不能大于索赔额行{0}。
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,制裁金额不能大于索赔额行{0}。
 DocType: Company,Default Cost of Goods Sold Account,销货账户的默认成本
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,价格列表没有选择
 DocType: Employee,Family Background,家庭背景
@@ -949,13 +952,13 @@
 DocType: Supplier Quotation,Is Subcontracted,是否外包
 DocType: Item Attribute,Item Attribute Values,项目属性值
 DocType: Examination Result,Examination Result,考试成绩
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,外购入库单
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,外购入库单
 ,Received Items To Be Billed,要支付的已收项目
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,提交工资单
 DocType: Employee,Ms,女士
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,货币汇率大师
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},参考文档类型必须是一个{0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},找不到时隙在未来{0}天操作{1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},参考文档类型必须是一个{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},找不到时隙在未来{0}天操作{1}
 DocType: Production Order,Plan material for sub-assemblies,计划材料为子组件
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,销售合作伙伴和地区
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,由于已有库存余额的帐户无法自动创建帐户。您必须创建一个匹配的帐户，然后才能在这个仓库中的条目
@@ -980,7 +983,7 @@
 DocType: Fee Structure,Components,组件
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},请输入项目资产类别{0}
 DocType: Quality Inspection Reading,Reading 6,阅读6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,无法{0} {1} {2}没有任何负面的优秀发票
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,无法{0} {1} {2}没有任何负面的优秀发票
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,购买发票提前
 DocType: Hub Settings,Sync Now,立即同步
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},行{0}：信用记录无法被链接的{1}
@@ -994,11 +997,11 @@
 DocType: Item,Is Purchase Item,是否采购项目
 DocType: Asset,Purchase Invoice,购买发票
 DocType: Stock Ledger Entry,Voucher Detail No,凭证详情编号
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,新的销售发票
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,新的销售发票
 DocType: Stock Entry,Total Outgoing Value,即将离任的总价值
-apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,开幕日期和截止日期应在同一会计年度
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,开幕日期和截止日期应在同一会计年度
 DocType: Lead,Request for Information,索取资料
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,同步离线发票
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,同步离线发票
 DocType: Payment Request,Paid,付费
 DocType: Program Fee,Program Fee,课程费用
 DocType: Salary Slip,Total in words,总字
@@ -1008,7 +1011,7 @@
 DocType: Employee Loan,Sanctioned,制裁
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, is mandatory. Maybe Currency Exchange record is not created for ,是强制性的。也许外币兑换记录没有创建
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},行＃{0}：请注明序号为项目{1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +642,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",对于“产品包”的物品，仓库，序列号和批号将被从“装箱单”表考虑。如果仓库和批次号是相同的任何“产品包”项目的所有包装物品，这些值可以在主项表中输入，值将被复制到“装箱单”表。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +643,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",对于“产品包”的物品，仓库，序列号和批号将被从“装箱单”表考虑。如果仓库和批次号是相同的任何“产品包”项目的所有包装物品，这些值可以在主项表中输入，值将被复制到“装箱单”表。
 DocType: Job Opening,Publish on website,发布在网站上
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,向客户发货。
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,供应商发票的日期不能超过过帐日期更大
@@ -1019,7 +1022,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,方差
 ,Company Name,公司名称
 DocType: SMS Center,Total Message(s),总信息（s ）
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,对于转让项目选择
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,Select Item for Transfer,对于转让项目选择
 DocType: Purchase Invoice,Additional Discount Percentage,额外折扣百分比
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,查看所有帮助影片名单
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,请选择支票存入的银行账户头。
@@ -1048,7 +1051,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),行{0}：数量不适用于{4}在仓库{1}在发布条目的时间（{2} {3}）
 DocType: Purchase Invoice,Get Advances Paid,获取已付预付款
 DocType: Item,Automatically Create New Batch,自动创建新批
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,使
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,使
 DocType: Student Admission,Admission Start Date,入学开始日期
 DocType: Journal Entry,Total Amount in Words,总金额词
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,发生了错误，一个可能的原因可能是您没有保存表单。如果问题仍然存在请联系管理员或support@erpnext.com。
@@ -1095,7 +1098,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,在销售订单/成品仓库保留仓库
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,销售金额
 DocType: Repayment Schedule,Interest Amount,利息金额
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,你是本记录的费用审批人，请更新‘状态’字段并保存。
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,你是本记录的费用审批人，请更新‘状态’字段并保存。
 DocType: Serial No,Creation Document No,创建文档编号
 DocType: Issue,Issue,问题
 DocType: Asset,Scrapped,报废
@@ -1103,7 +1106,7 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.",品目变体的属性。如大小，颜色等。
 DocType: Purchase Invoice,Returns,返回
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,在制品仓库
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},序列号{0}截至至{1}之前在年度保养合同内。
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},序列号{0}截至至{1}之前在年度保养合同内。
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,招聘
 DocType: Lead,Organization Name,组织名称
 DocType: Tax Rule,Shipping State,运输状态
@@ -1116,12 +1119,12 @@
 DocType: GL Entry,Against,针对
 DocType: Item,Default Selling Cost Center,默认销售成本中心
 DocType: Sales Partner,Implementation Partner,实施合作伙伴
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1499,ZIP Code,邮编
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,邮编
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},销售订单{0} {1}
 DocType: Opportunity,Contact Info,联系方式
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,制作Stock条目
 DocType: Packing Slip,Net Weight UOM,净重计量单位
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0}结果
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0}结果
 DocType: Item,Default Supplier,默认供应商
 DocType: Manufacturing Settings,Over Production Allowance Percentage,对生产补贴比例
 DocType: Employee Loan,Repayment Schedule,还款计划
@@ -1129,7 +1132,7 @@
 DocType: Holiday List,Get Weekly Off Dates,获取周末日期
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,结束日期不能小于开始日期
 DocType: Sales Person,Select company name first.,请先选择公司名称。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,借方
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,借方
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,从供应商收到的报价。
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},{0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,平均年龄
@@ -1149,7 +1152,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,关键绩效区
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,运输
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,无效属性
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1}必须提交
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1}必须提交
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},量必须小于或等于{0}
 DocType: SMS Center,Total Characters,总字符
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},请BOM字段中选择BOM的项目{0}
@@ -1170,7 +1173,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,开始年份
 DocType: Purchase Invoice,Start date of current invoice's period,当前发票周期的起始日期
 DocType: Salary Slip,Leave Without Pay,无薪假期
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,容量规划错误
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,容量规划错误
 ,Trial Balance for Party,试算表的派对
 DocType: Lead,Consultant,顾问
 DocType: Salary Slip,Earnings,盈余
@@ -1185,7 +1188,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""",这将追加到变异的项目代码。例如，如果你的英文缩写为“SM”，而该项目的代码是“T-SHIRT”，该变种的项目代码将是“T-SHIRT-SM”
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,保存工资单后会显示净支付金额(大写)。
 DocType: Purchase Invoice,Is Return,再来
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,返回/借记注
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,返回/借记注
 DocType: Price List Country,Price List Country,价目表国家
 DocType: Item,UOMs,计量单位
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},品目{1}有{0}个有效序列号
@@ -1197,8 +1200,8 @@
 DocType: Employee Loan,Partially Disbursed,部分已支付
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,供应商数据库。
 DocType: Account,Balance Sheet,资产负债表
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',成本中心：品目代码‘
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2340,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",付款方式未配置。请检查是否帐户已就付款方式或POS机配置文件中设置。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',成本中心：品目代码‘
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",付款方式未配置。请检查是否帐户已就付款方式或POS机配置文件中设置。
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,您的销售人员将在此日期收到联系客户的提醒
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,同一项目不能输入多次。
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups",进一步帐户可以根据组进行，但条目可针对非组进行
@@ -1210,7 +1213,7 @@
 ,Purchase Order Items To Be Billed,采购订单的项目被标榜
 DocType: Purchase Invoice Item,Net Rate,净费率
 DocType: Purchase Invoice Item,Purchase Invoice Item,采购发票项目
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,采购收据不能在存库分类帐分录和日记账分录下重复提交
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,采购收据不能在存库分类帐分录和日记账分录下重复提交
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,项目1
 DocType: Holiday,Holiday,假日
 DocType: Support Settings,Close Issue After Days,关闭问题天后
@@ -1281,7 +1284,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},从{0}工资支付{1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},无权修改冻结帐户{0}
 DocType: Journal Entry,Get Outstanding Invoices,获取未清发票
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,销售订单{0}无效
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,销售订单{0}无效
 apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,采购订单帮助您规划和跟进您的购买
 apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged",抱歉，公司不能合并
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
@@ -1304,7 +1307,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,间接支出
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,行{0}：数量是强制性的
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,农业
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,同步主数据
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,同步主数据
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,您的产品或服务
 DocType: Mode of Payment,Mode of Payment,付款方式
 apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,网站形象应该是一个公共文件或网站网址
@@ -1328,15 +1331,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,送货单{0}未提交
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,项目{0}必须是外包项目
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,资本设备
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",定价规则是第一选择是基于“应用在”字段，可以是项目，项目组或品牌。
+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.",定价规则是第一选择是基于“应用在”字段，可以是项目，项目组或品牌。
 DocType: Hub Settings,Seller Website,卖家网站
 DocType: Item,ITEM-,项目-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,对于销售团队总分配比例应为100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},生产订单状态为{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},生产订单状态为{0}
 DocType: Appraisal Goal,Goal,目标
 DocType: Sales Invoice Item,Edit Description,编辑说明
 ,Team Updates,团队更新
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,对供应商
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,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,创建打印格式
@@ -1385,8 +1388,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,食品
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,账龄范围3
 DocType: Maintenance Schedule Item,No of Visits,访问数量
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +113,Mark Attendence,马克考勤
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {1},针对{1}存在维护计划{0}
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,马克考勤
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},针对{1}存在维护计划{0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,招生学生
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},在关闭帐户的货币必须是{0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},对所有目标点的总和应该是100。{0}
@@ -1411,7 +1414,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,平均每日出货
 DocType: POS Profile,Campaign,活动
 DocType: Supplier,Name and Type,名称和类型
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',审批状态必须被“已批准”或“已拒绝”
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',审批状态必须被“已批准”或“已拒绝”
 DocType: Purchase Invoice,Contact Person,联络人
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',“预计开始日期”不能大于“预计结束日期'
 DocType: Course Scheduling Tool,Course End Date,课程结束日期
@@ -1434,7 +1437,7 @@
 DocType: Sales Invoice,Shipping Address Name,送货地址姓名
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,科目表
 DocType: Material Request,Terms and Conditions Content,条款和条件内容
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,不能大于100
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,不能大于100
 apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,项目{0}不是库存项目
 DocType: Maintenance Visit,Unscheduled,计划外
 DocType: Employee,Owned,资
@@ -1482,7 +1485,7 @@
 DocType: Shipping Rule Condition,To Value,To值
 DocType: Asset Movement,Stock Manager,库存管理
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},行{0}中源仓库为必须项
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +810,Packing Slip,装箱单
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,装箱单
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,办公室租金
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,短信网关的设置
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,导入失败！
@@ -1504,7 +1507,7 @@
 DocType: Company,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 +872,Select Possible Supplier,选择潜在供应商
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,选择潜在供应商
 DocType: Sales Invoice,Source,源
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,显示关闭
 DocType: Leave Type,Is Leave Without Pay,是无薪休假
@@ -1554,9 +1557,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,计划扩招
 DocType: Sales Invoice Item,Brand Name,品牌名称
 DocType: Purchase Receipt,Transporter Details,转运详细
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Default warehouse is required for selected item,默认仓库需要选中的项目
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,默认仓库需要选中的项目
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,箱
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,可能的供应商
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,可能的供应商
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,组织机构
 DocType: Budget,Monthly Distribution,月度分布
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,接收人列表为空。请创建接收人列表
@@ -1564,8 +1567,8 @@
 DocType: Sales Partner,Sales Partner Target,销售合作伙伴目标
 DocType: Loan Type,Maximum Loan Amount,最高贷款额度
 DocType: Pricing Rule,Pricing Rule,定价规则
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},学生{0}的重复卷号
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},学生{0}的重复卷号
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},学生{0}的重复卷号
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},学生{0}的重复卷号
 DocType: Budget,Action if Annual Budget Exceeded,如果行动年度预算超标
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,材料要求采购订单
 DocType: Shopping Cart Settings,Payment Success URL,付款成功URL
@@ -1586,7 +1589,7 @@
 DocType: Employee Loan,Repayment Method,还款方式
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website",如果选中，主页将是网站的默认项目组
 DocType: Quality Inspection Reading,Reading 4,阅读4
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},默认BOM {0}未找到项目{1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},默认BOM {0}未找到项目{1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,公司开支报销
 apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students",学生在系统的心脏，添加所有的学生
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},行＃{0}：清除日期{1}无法支票日期前{2}
@@ -1609,12 +1612,12 @@
 DocType: HR Settings,Stop Birthday Reminders,停止生日提醒
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},请公司设定默认应付职工薪酬帐户{0}
 DocType: SMS Center,Receiver List,接收人列表
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1048,Search Item,搜索项目
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,搜索项目
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,消耗量
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,现金净变动
 DocType: Assessment Plan,Grading Scale,分级量表
 apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,计量单位{0}已经在换算系数表内
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,已经完成
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,已经完成
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},付款申请已经存在{0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,已发料品目成本
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},数量不能超过{0}
@@ -1646,6 +1649,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,请输入支付
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,行{0}：提前对供应商必须扣除
 DocType: Company,Default Values,默认值
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{frequency}摘要
 DocType: Expense Claim,Total Amount Reimbursed,报销金额合计
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,这是基于对本车辆的日志。详情请参阅以下时间表
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,搜集
@@ -1670,7 +1674,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,没有一个项目无论在数量或价值的任何变化。
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,强制性领域 - 计划
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,强制性领域 - 计划
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,保修申请
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,保修申请
 ,Lead Details,线索详情
 DocType: Salary Slip,Loan repayment,偿还借款
 DocType: Purchase Invoice,End date of current invoice's period,当前发票周期的结束日期
@@ -1689,7 +1693,7 @@
 DocType: Employee,Permanent Address,永久地址
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",推动打击{0} {1}不能大于付出\超过总计{2}
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,请选择商品代码
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,请选择商品代码
 DocType: Student Sibling,Studying in Same Institute,就读于同一研究所
 DocType: Territory,Territory Manager,区域经理
 DocType: Packed Item,To Warehouse (Optional),仓库（可选）
@@ -1738,7 +1742,7 @@
 ,Item-wise Sales Register,逐项销售登记
 DocType: Asset,Gross Purchase Amount,总购买金额
 DocType: Asset,Depreciation Method,折旧方法
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,离线
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,离线
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,此税项是否包含在基本价格中？
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,总目标
 DocType: Program Course,Required,需要
@@ -1760,7 +1764,7 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,从机会是必选项
 DocType: Email Digest,Annual Expenses,年度支出
 DocType: Item,Variants,变种
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +991,Make Purchase Order,创建采购订单
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,创建采购订单
 DocType: SMS Center,Send To,发送到
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},假期类型{0}的余额不足了
 DocType: Payment Reconciliation Payment,Allocated amount,分配量
@@ -1768,7 +1772,7 @@
 DocType: Sales Invoice Item,Customer's Item Code,客户的品目编号
 DocType: Stock Reconciliation,Stock Reconciliation,库存盘点
 DocType: Territory,Territory Name,区域名称
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,Work-in-Progress Warehouse is required before Submit,提交前需要指定在制品仓库
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,提交前需要指定在制品仓库
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,求职申请。
 DocType: Purchase Order Item,Warehouse and Reference,仓库及参考
 DocType: Supplier,Statutory info and other general information about your Supplier,供应商的注册信息和其他一般信息
@@ -1776,7 +1780,7 @@
 DocType: Item,Serial Nos and Batches,序列号和批号
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,学生群体力量
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,学生群体力量
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,Against Journal Entry {0} does not have any unmatched {1} entry,日记帐分录{0}没有不符合的{1}分录
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,日记帐分录{0}没有不符合的{1}分录
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,估价
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},品目{0}的序列号重复
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,发货规则的一个条件
@@ -1791,7 +1795,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,BOM{0}未提交
 DocType: Authorization Control,Authorization Control,授权控制
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},行＃{0}：拒绝仓库是强制性的反对否决项{1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,付款
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,付款
 apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,管理您的订单
 DocType: Production Order Operation,Actual Time and Cost,实际时间和成本
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},销售订单{2}中品目{1}的最大物流申请量为{0}
@@ -1812,7 +1816,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,您输入了重复的条目。请纠正然后重试。
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,协理
 DocType: Asset Movement,Asset Movement,资产运动
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2066,New Cart,新的车
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,新的车
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,项目{0}不是一个序列项目
 DocType: SMS Center,Create Receiver List,创建接收人列表
 DocType: Vehicle,Wheels,车轮
@@ -1859,7 +1863,7 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",财政预算案不能对{0}指定的，因为它不是一个收入或支出帐户
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,已实现
 DocType: Student Admission,Application Form Route,申请表路线
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,区域/客户
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,区域/客户
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,例如5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,休假类型{0}，因为它是停薪留职无法分配
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},行{0}：已分配量{1}必须小于或等于发票余额{2}
@@ -1879,12 +1883,12 @@
 ,Serial No Status,序列号状态
 DocType: Payment Entry Reference,Outstanding,优秀
 ,Daily Timesheet Summary,每日时间表摘要
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","行{0}：设置{1}的周期性，从和到日期\
 之间差必须大于或等于{2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,这是基于库存移动。见{0}详情
 DocType: Pricing Rule,Selling,销售
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},金额{0} {1}抵扣{2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},金额{0} {1}抵扣{2}
 DocType: Employee,Salary Information,薪资信息
 DocType: Sales Person,Name and Employee ID,姓名和雇员ID
 apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,到期日不能前于过账日期
@@ -1899,14 +1903,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,此收取类型不能引用大于或等于本行的数据。
 DocType: Asset,Sold,出售
 ,Item-wise Purchase History,逐项采购历史
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},请点击“生成表”来获取序列号增加了对项目{0}
+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,冻结的
 ,Open Production Orders,清生产订单
 DocType: Sales Invoice Payment,Base Amount (Company Currency),基本金额（公司币种）
 DocType: Payment Reconciliation Payment,Reference Row,引用行
 DocType: Installation Note,Installation Time,安装时间
 DocType: Sales Invoice,Accounting Details,会计细节
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,删除所有交易本公司
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,Delete all the Transactions for this Company,删除所有交易本公司
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +189,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,行＃{0}：操作{1}未完成的成品{2}在生产数量订单{3}。请通过时间日志更新运行状态
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,投资
 DocType: Issue,Resolution Details,详细解析
@@ -1939,14 +1943,14 @@
 DocType: Discussion,Discussion,讨论
 DocType: Payment Entry,Transaction ID,事务ID
 DocType: Employee,Resignation Letter Date,辞职信日期
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,定价规则进一步过滤基于数量。
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,定价规则进一步过滤基于数量。
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},请为员工{0}设置加入日期
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},请为员工{0}设置加入日期
 DocType: Task,Total Billing Amount (via Time Sheet),总开票金额（通过时间表）
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,重复客户收入
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} {1}必须有“费用审批人”的角色
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} {1}必须有“费用审批人”的角色
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,对
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +884,Select BOM and Qty for Production,选择BOM和数量生产
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,选择BOM和数量生产
 DocType: Asset,Depreciation Schedule,折旧计划
 DocType: Bank Reconciliation Detail,Against Account,针对科目
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,半天时间应该是从之间的日期和终止日期
@@ -1960,7 +1964,7 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},请设置在公司的资产折旧成本中心“{0}
 ,Maintenance Schedules,维护计划
 DocType: Task,Actual End Date (via Time Sheet),实际结束日期（通过时间表）
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},数量 {0}{1} 对应 {2}{3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},数量 {0}{1} 对应 {2}{3}
 ,Quotation Trends,报价趋势
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},项目{0}的项目群组没有设置
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,入借帐户必须是应收账科目
@@ -1989,7 +1993,7 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,时间表
 DocType: HR Settings,HR Settings,人力资源设置
 DocType: Salary Slip,net pay info,净工资信息
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,Expense Claim is pending approval. Only the Expense Approver can update status.,报销正在等待批准。只有开支审批人才能更改其状态。
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,Expense Claim is pending approval. Only the Expense Approver can update status.,报销正在等待批准。只有开支审批人才能更改其状态。
 DocType: Email Digest,New Expenses,新的费用
 DocType: Purchase Invoice,Additional Discount Amount,额外的折扣金额
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",行＃{0}：订购数量必须是1，因为项目是固定资产。请使用单独的行多数量。
@@ -2023,19 +2027,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},帐户{0}是无效的。帐户货币必须是{1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},行{0}计量单位换算系数是必须项
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",行＃{0}：参考文件类型必须是销售订单之一，销售发票或日记帐分录
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",行＃{0}：参考文件类型必须是销售订单之一，销售发票或日记帐分录
 DocType: Salary Component,Deduction,扣款
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,行{0}：从时间和时间是强制性的。
 DocType: Stock Reconciliation Item,Amount Difference,金额差异
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},加入项目价格为{0}价格表{1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,请输入这个销售人员的员工标识
 DocType: Territory,Classification of Customers by region,客户按区域分类
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,差量必须是零
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,差量必须是零
 DocType: Project,Gross Margin,毛利
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,请先输入生产项目
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,计算的银行对账单余额
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,已禁用用户
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,报价
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,报价
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,扣除总额
 ,Production Analytics,生产Analytics（分析）
@@ -2061,7 +2065,7 @@
 DocType: Guardian,Work Address,工作地址
 DocType: Appraisal,Calculate Total Score,计算总分
 DocType: Request for Quotation,Manufacturing Manager,生产经理
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},序列号{0}截至至{1}之前在保修内。
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},序列号{0}截至至{1}之前在保修内。
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,分裂送货单成包。
 apps/erpnext/erpnext/hooks.py +87,Shipments,发货
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,仓库{3}的{1}和库存值（{2}）的帐户余额（{0}）必须相同
@@ -2084,7 +2088,7 @@
 DocType: Email Digest,Note: Email will not be sent to disabled users,注意：邮件不会发送给已禁用用户
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,交互次数
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,交互次数
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,选择公司...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,选择公司...
 DocType: Leave Control Panel,Leave blank if considered for all departments,如果针对所有部门请留空
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).",就业（永久，合同，实习生等）的类型。
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0}是{1}的必填项
@@ -2096,7 +2100,7 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),单价（公司货币）
 DocType: Student Guardian,Others,他人
 DocType: Payment Entry,Unallocated Amount,未分配金额
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,无法找到匹配的项目。请选择其他值{0}。
+apps/erpnext/erpnext/templates/includes/product_page.js +71,Cannot find a matching Item. Please select some other value for {0}.,无法找到匹配的项目。请选择其他值{0}。
 DocType: POS Profile,Taxes and Charges,税项和收费
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.",库存中已被购买，销售或保留的一个产品或服务。
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,没有更多的更新
@@ -2129,6 +2133,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},行＃{0}：资产{1}已经是{2}
 DocType: Quotation Item,Stock Balance,库存余额
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,销售订单到付款
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,请通过设置&gt;设置&gt;命名系列为{0}设置命名系列
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,CEO
 DocType: Expense Claim Detail,Expense Claim Detail,报销详情
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,请选择正确的帐户
@@ -2160,7 +2165,7 @@
 DocType: Quality Inspection,Quality Manager,质量经理
 DocType: Job Applicant,Job Opening,职务空缺
 DocType: Payment Reconciliation,Payment Reconciliation,付款对账
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,请选择Incharge人的名字
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,请选择Incharge人的名字
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,技术
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},总未付：{0}
 DocType: BOM Website Operation,BOM Website Operation,BOM网站运营
@@ -2195,13 +2200,13 @@
 DocType: Project,External,外部
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,用户和权限
 DocType: Vehicle Log,VLOG.,VLOG。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Production Orders Created: {0},生产订单创建：{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},生产订单创建：{0}
 DocType: Branch,Branch,分支
 DocType: Guardian,Mobile Number,手机号码
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,印刷及品牌
 DocType: Bin,Actual Quantity,实际数量
 DocType: Shipping Rule,example: Next Day Shipping,例如：次日发货
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,序列号{0}未找到
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,序列号{0}未找到
 DocType: Scheduling Tool,Student Batch,学生批
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,您的客户
 apps/erpnext/erpnext/utilities/activation.py +117,Make Student,使学生
@@ -2230,7 +2235,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,软件
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,接下来跟日期不能过去
 DocType: Company,For Reference Only.,仅供参考。
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2400,Select Batch No,选择批号
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,选择批号
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},无效的{0}：{1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,预付款总额
@@ -2256,11 +2261,11 @@
 DocType: Rename Tool,Rename Tool,重命名工具
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,更新成本
 DocType: Item Reorder,Item Reorder,项目重新排序
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,显示工资单
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,转印材料
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,显示工资单
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,Transfer Material,转印材料
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",设定流程，操作成本及向流程指定唯一的流程编号
 apps/erpnext/erpnext/controllers/status_updater.py +190,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 +1039,Please set recurring after saving,请设置保存后复发
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,请设置保存后复发
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,选择变化量账户
 DocType: Purchase Invoice,Price List Currency,价格表货币
 DocType: Naming Series,User must always select,用户必须始终选择
@@ -2310,7 +2315,7 @@
 DocType: Upload Attendance,Attendance To Date,考勤结束日期
 DocType: Warranty Claim,Raised By,提出
 DocType: Payment Gateway Account,Payment Account,付款帐号
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +854,Please specify Company to proceed,请注明公司进行
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,请注明公司进行
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,应收账款净额变化
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,补假
 DocType: Offer Letter,Accepted,已接受
@@ -2319,12 +2324,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,请确保你真的要删除这家公司的所有交易。主数据将保持原样。这个动作不能撤消。
 DocType: Room,Room Number,房间号
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},无效的参考{0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} {1}不能大于生产订单{3}的计划数量({2})
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} {1}不能大于生产订单{3}的计划数量({2})
 DocType: Shipping Rule,Shipping Rule Label,配送规则标签
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,用户论坛
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,原材料不能为空。
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.",无法更新库存，发票包含下降航运项目。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,快速日记帐分录
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,快速日记帐分录
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,如果任何条目中引用了BOM，你不能更改其税率
 DocType: Employee,Previous Work Experience,以前的工作经验
 DocType: Stock Entry,For Quantity,对于数量
@@ -2360,12 +2365,11 @@
 DocType: Email Digest,How frequently?,多经常？
 DocType: Purchase Receipt,Get Current Stock,获取当前库存
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,物料清单树
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,商品编号&gt;商品组&gt;品牌
 DocType: Student,Joining Date,入职日期
 ,Employees working on a holiday,员工在假期工作
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,马克现在
 DocType: Project,% Complete Method,完成百分比法
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},序列号为{0}的开始日期不能早于交付日期
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},序列号为{0}的开始日期不能早于交付日期
 DocType: Production Order,Actual End Date,实际结束日期
 DocType: BOM,Operating Cost (Company Currency),营业成本（公司货币）
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2382,7 +2386,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,停薪留职不批准请假的记录相匹配
 DocType: Campaign,Campaign-.####,活动-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,下一步
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,请在提供最好的利率规定的项目
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,请在提供最好的利率规定的项目
 DocType: Selling Settings,Auto close Opportunity after 15 days,15天之后自动关闭商机
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,结束年份
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,报价/铅％
@@ -2432,7 +2436,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,记录数量
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},费纪录创造 -  {0}
 DocType: Asset Category Account,Asset Category Account,资产类别的帐户
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},不能生产超过销售订单数量{1}的品目{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},不能生产超过销售订单数量{1}的品目{0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,库存记录{0}不提交
 DocType: Payment Reconciliation,Bank / Cash Account,银行/现金账户
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,接着联系到不能相同铅邮箱地址
@@ -2454,6 +2458,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,清拆日期未提及
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,生产
 DocType: Guardian,Occupation,占用
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,请在人力资源&gt;人力资源设置中设置员工命名系统
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,行{0} ：开始日期必须是之前结束日期
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),总计（数量）
 DocType: Sales Invoice,This Document,本文档
@@ -2470,7 +2475,7 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,报告问题
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,基础设施费用
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90以上
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,行＃{0}：日记条目{1}没有帐户{2}或已经对另一凭证匹配
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,行＃{0}：日记条目{1}没有帐户{2}或已经对另一凭证匹配
 DocType: Buying Settings,Default Buying Price List,默认采购价格表
 DocType: Process Payroll,Salary Slip Based on Timesheet,基于时间表工资单
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,No employee for the above selected criteria OR salary slip already created,已创建的任何雇员对上述选择标准或工资单
@@ -2504,7 +2509,7 @@
 DocType: Delivery Note,DN-RET-,DN-RET-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,没有考勤表
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,休假类型{0}不能随身转发
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',维护计划没有为所有品目生成，请点击“生产计划”
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',维护计划没有为所有品目生成，请点击“生产计划”
 ,To Produce,以生产
 apps/erpnext/erpnext/config/hr.py +93,Payroll,工资表
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",对于行{0} {1}。以包括{2}中的档案速率，行{3}也必须包括
@@ -2522,7 +2527,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,残疾人模板必须不能默认模板
 DocType: Account,Income Account,收益账户
 DocType: Payment Request,Amount in customer's currency,量客户的货币
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +779,Delivery,交货
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,交货
 DocType: Stock Reconciliation Item,Current Qty,目前数量
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",参见成本部分的“材料价格基于”
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,上一页
@@ -2531,7 +2536,7 @@
 DocType: Payment Entry,Total Allocated Amount,总拨款额
 DocType: Item Reorder,Material Request Type,物料申请类型
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural日记条目从{0}薪金{1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save",localStorage的是满的，没救
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save",localStorage的是满的，没救
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,行{0}：计量单位转换系数是必需的
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,参考
 DocType: Budget,Cost Center,成本中心
@@ -2541,16 +2546,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,从销售交易隐藏客户的税号
 DocType: Upload Attendance,Upload HTML,上传HTML
 DocType: Employee,Relieving Date,解除日期
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",定价规则是由覆盖价格表/定义折扣百分比，基于某些条件。
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",定价规则是由覆盖价格表/定义折扣百分比，基于某些条件。
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,仓库只能通过仓储记录/送货单/采购收据来修改
 DocType: Employee Education,Class / Percentage,类/百分比
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,营销和销售主管
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Income Tax,所得税
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.",如果选择的定价规则是由为'价格'，它将覆盖价目表。定价规则价格是最终价格，所以没有进一步的折扣应适用。因此，在像销售订单，采购订单等交易，这将是“速度”字段进账，而不是“价格单率”字段。
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.",如果选择的定价规则是由为'价格'，它将覆盖价目表。定价规则价格是最终价格，所以没有进一步的折扣应适用。因此，在像销售订单，采购订单等交易，这将是“速度”字段进账，而不是“价格单率”字段。
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,轨道信息通过行业类型。
 DocType: Item Supplier,Item Supplier,项目供应商
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,请输入产品编号，以获得批号
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +802,Please select a value for {0} quotation_to {1},请选择一个值{0} quotation_to {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,请输入产品编号，以获得批号
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},请选择一个值{0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,所有地址。
 DocType: Company,Stock Settings,库存设置
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",合并是唯一可能的，如果以下属性中均有记载相同。是集团，根型，公司
@@ -2595,7 +2600,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,新仓库名称
 apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),总{0}（{1}）
 DocType: C-Form Invoice Detail,Territory,区域
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,请注明无需访问
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,请注明无需访问
 DocType: Stock Settings,Default Valuation Method,默认估值方法
 DocType: Vehicle Log,Fuel Qty,燃油数量
 DocType: Production Order Operation,Planned Start Time,计划开始时间
@@ -2643,7 +2648,7 @@
 DocType: Project,Copied From,复制自
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},名称错误：{0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,短缺
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} 没有关联 {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} 没有关联 {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,雇员{0}的考勤已标记
 DocType: Packing Slip,If more than one package of the same type (for print),如果有多个同样类型的打包（用于打印）
 ,Salary Register,薪酬注册
@@ -2662,7 +2667,7 @@
 DocType: Tax Rule,Use for Shopping Cart,使用的购物车
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},值{0}的属性{1}不在有效的项目列表中存在的属性值项{2}
 DocType: BOM Item,Scrap %,折旧％
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection",费用会根据你选择的品目数量和金额按比例分配。
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection",费用会根据你选择的品目数量和金额按比例分配。
 DocType: Maintenance Visit,Purposes,用途
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,Atleast one item should be entered with negative quantity in return document,ATLEAST一个项目应该负数量回报文档中输入
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",操作{0}比任何可用的工作时间更长工作站{1}，分解成运行多个操作
@@ -2683,11 +2688,11 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,管理区域
 DocType: Journal Entry Account,Sales Invoice,销售发票
 DocType: Journal Entry Account,Party Balance,党平衡
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,请选择适用的折扣
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,请选择适用的折扣
 DocType: Company,Default Receivable Account,默认应收账户
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,为上述选择条件支付的工资总计创建银行分录
 DocType: Stock Entry,Material Transfer for Manufacture,用于生产的物料转移
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,折扣百分比可以应用于一个或所有的价目表。
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,折扣百分比可以应用于一个或所有的价目表。
 DocType: Purchase Invoice,Half-yearly,半年一次
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,库存的会计分录
 DocType: Vehicle Service,Engine Oil,机油
@@ -2700,24 +2705,24 @@
 DocType: Account,Root Type,根类型
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},行＃{0}：无法返回超过{1}项{2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,情节
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,Plot,情节
 DocType: Item Group,Show this slideshow at the top of the page,在页面顶部显示此幻灯片
 DocType: BOM,Item UOM,项目计量单位
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),税额后，优惠金额（公司货币）
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},行{0}必须指定目标仓库
 DocType: Cheque Print Template,Primary Settings,主要设置
 DocType: Purchase Invoice,Select Supplier Address,选择供应商地址
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,添加员工
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,添加员工
 DocType: Purchase Invoice Item,Quality Inspection,质量检验
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,超小
 DocType: Company,Standard Template,标准模板
 DocType: Training Event,Theory,理论
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,Warning: Material Requested Qty is less than Minimum Order Qty,警告：物料请求的数量低于最低起订量
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +761,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,静音电子邮件
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco",食品，饮料与烟草
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},只能使支付对未付款的{0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},只能使支付对未付款的{0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,佣金率不能大于100
 DocType: Stock Entry,Subcontract,外包
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,请输入{0}第一
@@ -2800,7 +2805,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,金额
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,如果询价的来源是活动的话请输入活动名称。
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,报纸出版商
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,选择财政年度
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,选择财政年度
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,重新排序级别
 DocType: Company,Chart Of Accounts Template,图表帐户模板
 DocType: Attendance,Attendance Date,考勤日期
@@ -2815,7 +2820,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,重复的条目
 DocType: Program Enrollment Tool,Get Students,让学生
 DocType: Serial No,Under Warranty,在保修期内
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[错误]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[错误]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,大写金额将在销售订单保存后显示。
 ,Employee Birthday,雇员生日
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,学生考勤批处理工具
@@ -2842,7 +2847,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,此销售订单% 的材料已记账。
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,期末进入
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,有交易的成本中心不能转化为组
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},金额{0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},金额{0} {1} {2} {3}
 DocType: Account,Depreciation,折旧
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),供应商
 DocType: Employee Attendance Tool,Employee Attendance Tool,员工考勤工具
@@ -2877,7 +2882,7 @@
 ,Stock Analytics,库存分析
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,操作不能留空
 DocType: Maintenance Visit Purpose,Against Document Detail No,对文档详情编号
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,党的类型是强制性
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,党的类型是强制性
 DocType: Quality Inspection,Outgoing,传出
 DocType: Material Request,Requested For,对于要求
 DocType: Quotation Item,Against Doctype,对文档类型
@@ -2897,7 +2902,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,为基于活动的组手动选择学生
 DocType: Journal Entry,User Remark,用户备注
 DocType: Lead,Market Segment,市场分类
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},支付的金额不能超过总负余额大于{0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},支付的金额不能超过总负余额大于{0}
 DocType: Employee Internal Work History,Employee Internal Work History,雇员内部就职经历
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),结算(借记)
 DocType: Cheque Print Template,Cheque Size,支票大小
@@ -2933,7 +2938,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",差异帐户必须是资产/负债类型的帐户，因为此库存盘点在期初进行
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},支付额不能超过贷款金额较大的{0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},所需物品的采购订单号{0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +868,Production Order not created,生产订单未创建
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,生产订单未创建
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',“起始日期”必须早于'终止日期'
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},无法改变地位的学生{0}与学生申请链接{1}
 DocType: Asset,Fully Depreciated,已提足折旧
@@ -2946,7 +2951,7 @@
 DocType: Warranty Claim,From Company,源公司
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,评估标准的得分之和必须是{0}。
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,请设置折旧数预订
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,价值或数量
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,价值或数量
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,制作订单不能上调：
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,分钟
 DocType: Purchase Invoice,Purchase Taxes and Charges,购置税和费
@@ -2959,7 +2964,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,所有仓库
 DocType: Sales Partner,Retailer,零售商
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,信用帐户必须是资产负债表科目
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +124,All Supplier Types,所有供应商类型
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,所有供应商类型
 DocType: Global Defaults,Disable In Words,禁用词
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,项目编号是必须项，因为项目没有自动编号
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Quotation {0} not of type {1},报价{0} 不属于{1}类型
@@ -2968,6 +2973,7 @@
 DocType: Production Order,PRO-,PRO-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,银行透支账户
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,创建工资单
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,行＃{0}：分配金额不能大于未结算金额。
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,浏览BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,抵押贷款
 DocType: Purchase Invoice,Edit Posting Date and Time,编辑投稿时间
@@ -3007,7 +3013,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},不允许对早于{0}的库存交易进行更新
 DocType: Purchase Invoice Item,PR Detail,PR详细
 DocType: Sales Order,Fully Billed,完全开票
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},请员工支付设置的默认帐户{0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,现款
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +127,Delivery warehouse required for stock item {0},需要的库存项目交割仓库{0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),包的总重量，通常是净重+包装材料的重量。 （用于打印）
@@ -3018,7 +3023,7 @@
 DocType: Student Group,Group Based On,基于组
 DocType: Journal Entry,Bill Date,账单日期
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required",服务项目，类型，频率和消费金额要求
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",有多个最高优先级定价规则时使用以下的内部优先级：
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",有多个最高优先级定价规则时使用以下的内部优先级：
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},难道你真的想从提交{0}所有的工资单{1}
 DocType: Cheque Print Template,Cheque Height,支票高度
 DocType: Supplier,Supplier Details,供应商详情
@@ -3030,7 +3035,7 @@
 DocType: Vehicle Log,Invoice Ref,发票编号
 DocType: Purchase Order,Recurring Order,周期性订单
 DocType: Company,Default Income Account,默认收益账户
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,客户群组/客户
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,客户群组/客户
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),未关闭的财年利润/损失（信用）
 DocType: Sales Invoice,Time Sheets,考勤表
 DocType: Payment Gateway Account,Default Payment Request Message,默认的付款请求消息
@@ -3050,10 +3055,10 @@
 DocType: Notification Control,Quotation Message,报价信息
 DocType: Employee Loan,Employee Loan Application,职工贷款申请
 DocType: Issue,Opening Date,开幕日期
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,出席已成功标记。
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,出席已成功标记。
 DocType: Journal Entry,Remark,备注
 DocType: Purchase Receipt Item,Rate and Amount,单价及小计
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},帐户类型为{0}必须{1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},帐户类型为{0}必须{1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,叶子度假
 DocType: School Settings,Current Academic Term,当前学术期限
 DocType: School Settings,Current Academic Term,当前学术期限
@@ -3076,7 +3081,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,学生组
 DocType: Shopping Cart Settings,Quotation Series,报价系列
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item",具有名称 {0} 的品目已存在，请更名
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1903,Please select customer,请选择客户
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,请选择客户
 DocType: C-Form,I,I
 DocType: Company,Asset Depreciation Cost Center,资产折旧成本中心
 DocType: Sales Order Item,Sales Order Date,销售订单日期
@@ -3103,11 +3108,12 @@
 DocType: Bank Reconciliation Detail,Clearance Date,清拆日期
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,总消费金额是强制性
 DocType: Lead,Address Desc,地址倒序
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,党是强制性
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,党是强制性
 DocType: Journal Entry,JV-,将N-
 DocType: Topic,Topic Name,主题名称
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,必须至少选择'销售'或'采购'其中的一项
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,选择您的业务的性质。
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},行＃{0}：引用{1} {2}中的重复条目
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,生产流程进行的地方。
 DocType: Asset Movement,Source Warehouse,源仓库
 DocType: Installation Note,Installation Date,安装日期
@@ -3135,7 +3141,6 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,月度分布比例
 DocType: Territory,Territory Targets,区域目标
 DocType: Delivery Note,Transporter Info,转运信息
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,客户&gt;客户群&gt;领土
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},请设置在默认情况下公司{0} {1}
 DocType: Cheque Print Template,Starting position from top edge,起价顶边位置
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,同一个供应商已多次输入
@@ -3145,7 +3150,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,打印模板的信头。
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,标题打印模板例如形式发票。
 DocType: Student Guardian,Student Guardian,学生家长
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,估值类型罪名不能标记为包容性
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Valuation type charges can not marked as Inclusive,估值类型罪名不能标记为包容性
 DocType: POS Profile,Update Stock,更新库存
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,不同计量单位的项目会导致不正确的（总）净重值。请确保每个品目的净重使用同一个计量单位。
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM税率
@@ -3173,7 +3178,7 @@
 DocType: Company,Exchange Gain / Loss Account,兑换收益/损失帐户
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,员工考勤
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},目的必须是一个{0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,填写表格并保存
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,Fill the form and save it,填写表格并保存
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,下载一个包含所有原材料及其库存状态的报告
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,社区论坛
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,实际库存数量
@@ -3200,17 +3205,17 @@
 DocType: Sales Order Item,Supplier delivers to Customer,供应商提供给客户
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}](#Form/Item/{0}) 超出了库存
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,下一个日期必须大于过帐日期更大
-apps/erpnext/erpnext/public/js/controllers/transaction.js +970,Show tax break-up,展会税分手
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,展会税分手
 apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},到期/参照日期不能迟于{0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,数据导入和导出
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it",Stock条目存在对仓库{0}，因此你不能重新分配或修改
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,没有发现学生
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,没有发现学生
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,发票发布日期
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,卖
 DocType: Sales Invoice,Rounded Total,总圆角
 DocType: Product Bundle,List items that form the package.,打包的品目列表。
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,百分比分配应该等于100 ％
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,在选择之前，甲方请选择发布日期
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,在选择之前，甲方请选择发布日期
 DocType: Program Enrollment,School House,学校议院
 DocType: Serial No,Out of AMC,出资产管理公司
 apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,请选择报价
@@ -3221,7 +3226,7 @@
 DocType: Company,Default Cash Account,默认现金账户
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,公司(非客户或供应商)大师。
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,这是基于这名学生出席
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +177,No Students in,没有学生
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,没有学生
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,添加更多项目或全开放形式
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',请输入“预产期”
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,取消这个销售订单之前必须取消送货单{0}
@@ -3253,6 +3258,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,项目3
 DocType: Purchase Order,Customer Contact Email,客户联系电子邮件
 DocType: Warranty Claim,Item and Warranty Details,项目和保修细节
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,商品编号&gt;商品组&gt;品牌
 DocType: Sales Team,Contribution (%),贡献（％）
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注意：付款分录不会创建，因为“现金或银行账户”没有指定
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,选择程序以获取强制性课程。
@@ -3280,8 +3286,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,汽车
 DocType: Vehicle,Insurance Company,保险公司
 DocType: Asset Category Account,Fixed Asset Account,固定资产帐户
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,变量
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,来自送货单
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,变量
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,来自送货单
 DocType: Student,Student Email Address,学生的电子邮件地址
 DocType: Timesheet Detail,From Time,起始时间
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,有现货
@@ -3293,12 +3299,12 @@
 DocType: Purchase Invoice,Price List Exchange Rate,价目表汇率
 DocType: Purchase Invoice Item,Rate,单价
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,实习生
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1470,Address Name,地址名称
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,地址名称
 DocType: Stock Entry,From BOM,从BOM
 DocType: Assessment Code,Assessment Code,评估准则
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,基本
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,早于{0}的库存事务已冻结
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',请点击“生成表”
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',请点击“生成表”
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m",如公斤，单元，号数，米
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,如果输入参考日期，参考编号是强制输入的
 DocType: Bank Reconciliation Detail,Payment Document,付款单据
@@ -3306,19 +3312,19 @@
 DocType: Salary Slip,Salary Structure,薪酬结构
 DocType: Account,Bank,银行
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,航空公司
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,发料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,Issue Material,发料
 DocType: Material Request Item,For Warehouse,对仓库
 DocType: Employee,Offer Date,报价有效期
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,语录
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,您在离线模式。您将无法重新加载，直到你有网络。
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,您在离线模式。您将无法重新加载，直到你有网络。
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,没有学生团体创建的。
 DocType: Purchase Invoice Item,Serial No,序列号
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,每月还款额不能超过贷款金额较大
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,请输入您的详细维护性第一
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,请输入您的详细维护性第一
 DocType: Purchase Invoice,Print Language,打印语言
 DocType: Salary Slip,Total Working Hours,总的工作时间
 DocType: Stock Entry,Including items for sub assemblies,包括子组件项目
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1832,Enter value must be positive,输入值必须为正
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,输入值必须为正
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,所有的区域
 DocType: Purchase Invoice,Items,项目
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,学生已经注册。
@@ -3341,7 +3347,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',测度变异的默认单位“{0}”必须是相同模板“{1}”
 DocType: Shipping Rule,Calculate Based On,计算基于
 DocType: Delivery Note Item,From Warehouse,从仓库
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,No Items with Bill of Materials to Manufacture,不与物料清单的项目，以制造
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,不与物料清单的项目，以制造
 DocType: Assessment Plan,Supervisor Name,主管名称
 DocType: Program Enrollment Course,Program Enrollment Course,课程注册课程
 DocType: Program Enrollment Course,Program Enrollment Course,课程注册课程
@@ -3367,9 +3373,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,Child account exists for this account. You can not delete this account.,此科目有子科目，无法删除。
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,需要指定目标数量和金额
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},品目{0}没有默认的BOM
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,请选择发布日期第一
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,开业日期应该是截止日期之前，
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,请通过设置&gt;编号系列设置出勤编号系列
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,请选择发布日期第一
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,开业日期应该是截止日期之前，
 DocType: Leave Control Panel,Carry Forward,顺延
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,有交易的成本中心不能转化为总账
 DocType: Department,Days for which Holidays are blocked for this department.,此部门的禁离日
@@ -3382,7 +3387,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,附加信头
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,最后沟通
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,最后沟通
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',分类是“估值”或“估值和总计”的时候不能扣税。
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',分类是“估值”或“估值和总计”的时候不能扣税。
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.",列出你的头税（如增值税，关税等，它们应该具有唯一的名称）及其标准费率。这将创建一个标准的模板，你可以编辑和多以后添加。
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},序列化的品目{0}必须指定序列号
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,匹配付款与发票
@@ -3411,7 +3416,7 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,未知
 DocType: Shipping Rule,Shipping Rule Conditions,配送规则条件
 DocType: BOM Replace Tool,The new BOM after replacement,更换后的物料清单
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,销售点
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,销售点
 DocType: Payment Entry,Received Amount,收金额
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order",创建全量，订单已经忽略数量
 DocType: Account,Tax,税项
@@ -3427,7 +3432,7 @@
 DocType: Job Opening,Job Title,职位
 apps/erpnext/erpnext/utilities/activation.py +97,Create Users,创建用户
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,公克
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,量生产必须大于0。
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,量生产必须大于0。
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,保养电话的现场报告。
 DocType: Stock Entry,Update Rate and Availability,更新率和可用性
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,百分比你被允许接收或传递更多针对订购的数量。例如：如果您订购100个单位。和你的津贴是10％，那么你被允许接收110个单位。
@@ -3440,12 +3445,12 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,请取消采购发票{0}第一
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",电子邮件地址必须是唯一的，已经存在了{0}
 DocType: Serial No,AMC Expiry Date,AMC到期时间
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,收据
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,收据
 ,Sales Register,销售记录
 DocType: Daily Work Summary Settings Company,Send Emails At,发送电子邮件在
 DocType: Quotation,Quotation Lost Reason,报价丧失原因
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,选择您的域名
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},交易参考编号{0}日{1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},交易参考编号{0}日{1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,无需编辑。
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,本月和待活动总结
 DocType: Customer Group,Customer Group Name,客户群组名称
@@ -3494,11 +3499,11 @@
 DocType: Training Event,Exam,考试
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},物件{0}需要指定仓库
 DocType: Leave Allocation,Unused leaves,未使用的叶子
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,信用
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,信用
 DocType: Tax Rule,Billing State,计费状态
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,转让
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1}与缔约方帐户{2} 无关联
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),获取展开BOM（包括子品目）
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1}与缔约方帐户{2} 无关联
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),获取展开BOM（包括子品目）
 DocType: Authorization Rule,Applicable To (Employee),适用于(员工)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,截止日期是强制性的
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,增量属性{0}不能为0
@@ -3509,13 +3514,13 @@
 ,Inactive Customers,不活跃的客户
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,购买收据
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,定价规则如何被应用？
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,定价规则如何被应用？
 DocType: Stock Entry,Delivery Note No,送货单编号
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created",如果选中，只有购买最终的原料材料的请求将被包含在材料的要求。否则，父件材料的要求将被创建
 DocType: Cheque Print Template,Message to show,信息显示
 DocType: Company,Retail,零售
 DocType: Attendance,Absent,缺席
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,产品包
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,产品包
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},行{0}：无效参考{1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,购置税和费模板
 DocType: Upload Attendance,Download Template,下载模板
@@ -3528,7 +3533,7 @@
 apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,使铅
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,打印和文具
 DocType: Stock Settings,Show Barcode Field,显示条形码域
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,发送电子邮件供应商
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,发送电子邮件供应商
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",工资已经处理了与{0}和{1}，留下申请期之间不能在此日期范围内的时期。
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,一个序列号的安装记录
 DocType: Guardian Interest,Guardian Interest,卫利息
@@ -3557,10 +3562,9 @@
 DocType: Production Order Item,Production Order Item,生产订单项目
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,未找到记录
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,报废资产成本
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,部分ordred
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{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 +654,Get Items from Product Bundle,获取从产品捆绑项目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,获取从产品捆绑项目
 DocType: Asset,Straight Line,直线
 DocType: Project User,Project User,项目用户
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,分裂
@@ -3630,14 +3634,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,支票日期
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},科目{0}的上级科目{1}不属于公司{2}
 DocType: Program Enrollment Tool,Student Applicants,学生申请
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,成功删除与该公司相关的所有交易！
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,Successfully deleted all transactions related to this company!,成功删除与该公司相关的所有交易！
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,随着对日
 DocType: Appraisal,HR,HR
 DocType: Program Enrollment,Enrollment Date,报名日期
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,缓刑
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,工资组件
 DocType: Program Enrollment Tool,New Academic Year,新学年
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +765,Return / Credit Note,返回/信用票据
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,返回/信用票据
 DocType: Stock Settings,Auto insert Price List rate if missing,自动插入价目表率，如果丢失
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,总支付金额
 DocType: Production Order Item,Transferred Qty,转让数量
@@ -3657,7 +3661,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.",叶似漫不经心，生病等类型
 DocType: Email Digest,Send regular summary reports via Email.,通过电子邮件发送定期汇总报告。
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},请报销类型设置默认帐户{0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},请报销类型设置默认帐户{0}
 DocType: Assessment Result,Student Name,学生姓名
 DocType: Brand,Item Manager,项目经理
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,应付职工薪酬
@@ -3706,7 +3710,7 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,项目特定的税项详情
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,研究所缩写
 ,Item-wise Price List Rate,逐项价目表率
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,供应商报价
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,供应商报价
 DocType: Quotation,In Words will be visible once you save the Quotation.,大写金额将在报价单保存后显示。
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},数量（{0}）不能是行{1}中的分数
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},数量（{0}）不能是行{1}中的分数
@@ -3729,7 +3733,7 @@
 Updated via 'Time Log'",单位为分钟，通过“时间日志”更新
 DocType: Customer,From Lead,来自潜在客户
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,发布生产订单。
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,选择财政年度...
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,选择财政年度...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,需要POS资料，使POS进入
 DocType: Program Enrollment Tool,Enroll Students,招生
 DocType: Hub Settings,Name Token,名称令牌
@@ -3762,7 +3766,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,为销售人员设置品次群组特定的目标
 DocType: Stock Settings,Freeze Stocks Older Than [Days],冻结老于此天数的库存
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,行＃{0}：资产是必须的固定资产购买/销售
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.",如果存在多个价格规则，则会应用优先级别。优先权是一个介于0到20的数字，默认值是零（或留空）。数字越大，意味着优先级别越高。
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.",如果存在多个价格规则，则会应用优先级别。优先权是一个介于0到20的数字，默认值是零（或留空）。数字越大，意味着优先级别越高。
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,会计年度：{0}不存在
 DocType: Currency Exchange,To Currency,以货币
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,允许以下用户批准在禁离日请假的申请。
@@ -3772,7 +3776,6 @@
 DocType: Item,Taxes,税
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,支付和未送达
 DocType: Project,Default Cost Center,默认成本中心
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,请通过设置&gt;设置&gt;命名系列为{0}设置命名系列
 DocType: Bank Guarantee,End Date,结束日期
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,库存交易
 DocType: Budget,Budget Accounts,预算科目
@@ -3789,7 +3792,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,产品{0}不属于库存产品，因此被忽略
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,Submit this Production Order for further processing.,提交此生产订单以进行下一步处理。
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",要在一个特定的交易不适用于定价规则，所有适用的定价规则应该被禁用。
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",要在一个特定的交易不适用于定价规则，所有适用的定价规则应该被禁用。
 DocType: Assessment Group,Parent Assessment Group,家长评估小组
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,工作
 ,Sales Order Trends,销售订单趋势
@@ -3800,7 +3803,7 @@
 DocType: Stock Entry Detail,Additional Cost,额外费用
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,财政年度结束日期
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher",按凭证分类后不能根据凭证编号过滤
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,创建供应商报价
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,创建供应商报价
 DocType: Quality Inspection,Incoming,接收
 DocType: BOM,Materials Required (Exploded),所需物料（正展开）
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself",将用户添加到您的组织，除了自己
@@ -3828,6 +3831,7 @@
 DocType: Employee,History In Company,公司内历史
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,简讯
 DocType: Stock Ledger Entry,Stock Ledger Entry,存库分类帐分录
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,客户&gt;客户群&gt;领土
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,同一项目已进入多次
 DocType: Department,Leave Block List,禁离日列表
 DocType: Sales Invoice,Tax ID,税号
@@ -3852,7 +3856,7 @@
 DocType: Purchase Invoice,Return,回报
 DocType: Production Order Operation,Production Order Operation,生产订单操作
 DocType: Pricing Rule,Disable,禁用
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,付款方式需要进行付款
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,付款方式需要进行付款
 DocType: Project Task,Pending Review,待审核
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}",资产{0}不能被废弃，因为它已经是{1}
 DocType: Task,Total Expense Claim (via Expense Claim),总费用报销（通过费用报销）
@@ -3864,7 +3868,7 @@
 DocType: Homepage,Tag Line,标语
 DocType: Fee Component,Fee Component,收费组件
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,车队的管理
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,添加的项目
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,添加的项目
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},仓库{0}的上级账户{1}不属于公司{2}
 DocType: Cheque Print Template,Regular,定期
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,所有评估标准的权重总数要达到100％
@@ -3886,12 +3890,12 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,请输入收件人编号的URL参数
 DocType: Payment Entry,Paid Amount,支付的金额
 DocType: Assessment Plan,Supervisor,监
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,线上
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,线上
 ,Available Stock for Packing Items,库存可用打包品目
 DocType: Item Variant,Item Variant,项目变体
 DocType: Assessment Result Tool,Assessment Result Tool,评价结果工具
 DocType: BOM Scrap Item,BOM Scrap Item,BOM项目废料
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,提交的订单不能被删除
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,提交的订单不能被删除
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",账户余额已设置为'借方'，不能设置为'贷方'
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,质量管理
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,项目{0}已被禁用
@@ -3921,7 +3925,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,学生的电子邮件ID
 DocType: Employee,Notice (days),通告（天）
 DocType: Tax Rule,Sales Tax Template,销售税模板
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,Select items to save the invoice,选取要保存发票
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,选取要保存发票
 DocType: Employee,Encashment Date,兑现日期
 DocType: Training Event,Internet,互联网
 DocType: Account,Stock Adjustment,库存调整
@@ -3945,7 +3949,7 @@
 DocType: Item Variant Attribute,Attribute,属性
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,请从指定/至范围
 DocType: Serial No,Under AMC,在年度保养合同中
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,项目的评估价格将基于到岸成本凭证金额重新计算
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,项目的评估价格将基于到岸成本凭证金额重新计算
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,销售业务的默认设置。
 DocType: Guardian,Guardian Of ,守护者
 DocType: Grading Scale Interval,Threshold,阈
@@ -3971,8 +3975,8 @@
 DocType: Account,Receivable,应收账款
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,行＃{0}：不能更改供应商的采购订单已经存在
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,作用是允许提交超过设定信用额度交易的。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +901,Select Items to Manufacture,选择项目，以制造
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time",主数据同步，这可能需要一些时间
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,选择项目，以制造
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time",主数据同步，这可能需要一些时间
 DocType: Item,Material Issue,发料
 DocType: Hub Settings,Seller Description,卖家描述
 DocType: Employee Education,Qualification,学历
@@ -3997,7 +4001,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},日期应该是在财政年度内。假设终止日期= {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc",在这里，你可以保持身高，体重，过敏，医疗问题等
 DocType: Leave Block List,Applies to Company,适用于公司
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +199,Cannot cancel because submitted Stock Entry {0} exists,不能取消，因为提交的仓储记录{0}已经存在
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,不能取消，因为提交的仓储记录{0}已经存在
 DocType: Employee Loan,Disbursement Date,支付日期
 DocType: Vehicle,Vehicle,车辆
 DocType: Purchase Invoice,In Words,大写金额
@@ -4012,7 +4016,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead％
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,资产折旧和平衡
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},金额{0} {1}从转移{2}到{3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},金额{0} {1}从转移{2}到{3}
 DocType: Sales Invoice,Get Advances Received,获取已收预付款
 DocType: Email Digest,Add/Remove Recipients,添加/删除收件人
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},交易不反对停止生产订单允许{0}
@@ -4037,7 +4041,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,评价结果详细
 DocType: Employee Education,Employee Education,雇员教育
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,在项目组表中找到重复的项目组
-apps/erpnext/erpnext/public/js/controllers/transaction.js +986,It is needed to fetch Item Details.,这是需要获取项目详细信息。
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,It is needed to fetch Item Details.,这是需要获取项目详细信息。
 DocType: Salary Slip,Net Pay,净支付金额
 DocType: Account,Account,账户
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,序列号{0}已收到过
@@ -4046,7 +4050,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.",仓库{0}不会链接到任何帐户，请创建/链接对应的（资产）占仓库。
 DocType: Purchase Invoice,Recurring Id,经常性ID
 DocType: Customer,Sales Team Details,销售团队详情
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1288,Delete permanently?,永久删除？
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,永久删除？
 DocType: Expense Claim,Total Claimed Amount,总索赔额
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,销售的潜在机会
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},无效的{0}
@@ -4085,7 +4089,7 @@
 DocType: Item Attribute Value,Attribute Value,属性值
 ,Itemwise Recommended Reorder Level,项目特定的推荐重订购级别
 DocType: Salary Detail,Salary Detail,薪酬详细
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,请选择{0}第一
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,请选择{0}第一
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,一批项目的{0} {1}已过期。
 DocType: Sales Invoice,Commission,佣金
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,时间表制造。
@@ -4106,17 +4110,17 @@
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,下订单
 DocType: Email Digest,New Purchase Orders,新建采购订单
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,根本不能有一个父成本中心
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,选择品牌...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,选择品牌...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,作为累计折旧
 DocType: Sales Invoice,C-Form Applicable,C-表格适用
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},运行时间必须大于0的操作{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},运行时间必须大于0的操作{0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,仓库是强制性的
 DocType: Supplier,Address and Contacts,地址和联系方式
 DocType: UOM Conversion Detail,UOM Conversion Detail,计量单位换算详情
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),建议900px宽乘以100px高。
 DocType: Program,Program Abbreviation,计划缩写
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,生产订单不能对一个项目提出的模板
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,费用会在每个品目的采购收据中更新
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,生产订单不能对一个项目提出的模板
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,费用会在每个品目的采购收据中更新
 DocType: Warranty Claim,Resolved By,议决
 DocType: Bank Guarantee,Start Date,开始日期
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,调配一段时间假期。
@@ -4130,7 +4134,7 @@
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,评价结果
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,小时
 DocType: Project,Expected Start Date,预计开始日期
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,删除项目，如果收费并不适用于该项目
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,删除项目，如果收费并不适用于该项目
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,例如：smsgateway.com/API/send_sms.cgi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,交易货币必须与支付网关货币
 DocType: Payment Entry,Receive,接受
@@ -4141,15 +4145,15 @@
 DocType: Workstation,Operating Costs,运营成本
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,如果积累了每月预算超出行动
 DocType: Purchase Invoice,Submit on creation,提交关于创建
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},货币{0}必须{1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},货币{0}必须{1}
 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 +499,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：一个重新排序条目已存在这个仓库{1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.",不能更改状态为丧失，因为已有报价。
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.",不能更改状态为丧失，因为已有报价。
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,培训反馈
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,生产订单{0}必须提交
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},请选择开始日期和结束日期的项目{0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},请选择开始日期和结束日期的项目{0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},当然是行强制性{0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,无效的主名称
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc的DocType
@@ -4167,7 +4171,7 @@
 ,Ordered Items To Be Delivered,订购项目交付
 DocType: Account,Income,收益
 DocType: Industry Type,Industry Type,行业类型
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,发现错误！
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,发现错误！
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,警告：申请的假期含有以下的禁离日
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,销售发票{0}已提交过
 DocType: Assessment Result Detail,Score,得分了
@@ -4200,12 +4204,12 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,您的供应商
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,不能更改状态为丧失，因为已有销售订单。
 DocType: Request for Quotation Item,Supplier Part No,供应商部件号
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',当类是“估值”或“Vaulation和总&#39;不能扣除
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,从......收到
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',当类是“估值”或“Vaulation和总&#39;不能扣除
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,从......收到
 DocType: Lead,Converted,已转换
 DocType: Item,Has Serial No,有序列号
 DocType: Employee,Date of Issue,签发日期
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}：申请者{0} 金额{1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}：申请者{0} 金额{1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},行＃{0}：设置供应商项目{1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,行{0}：小时值必须大于零。
 apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,网站图像{0}附加到物品{1}无法找到
@@ -4256,7 +4260,7 @@
 DocType: Sales Order Item,Ordered Qty,订购数量
 apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,项目{0}无效
 DocType: Stock Settings,Stock Frozen Upto,库存冻结止
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM不包含任何库存项目
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,BOM不包含任何库存项目
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},期间从和周期要日期强制性的经常性{0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,项目活动/任务。
 DocType: Vehicle Log,Refuelling Details,加油详情
@@ -4266,7 +4270,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,最后购买率未找到
 DocType: Purchase Invoice,Write Off Amount (Company Currency),核销金额（公司货币）
 DocType: Sales Invoice Timesheet,Billing Hours,结算时间
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,默认BOM {0}未找到
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,默认BOM {0}未找到
 apps/erpnext/erpnext/stock/doctype/item/item.py +491,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,招生计划
@@ -4292,7 +4296,7 @@
 DocType: Maintenance Visit,Maintenance Date,维护日期
 DocType: Purchase Invoice Item,Rejected Serial No,拒绝序列号
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,新年的开始日期或结束日期与{0}重叠。为了避免请将公司
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},品目{0}的开始日期必须小于结束日期
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,Start date should be less than end date for Item {0},品目{0}的开始日期必须小于结束日期
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","例如：ABCD ##### 
 如果设置了序列但是没有在交易中输入序列号，那么系统会根据序列自动生产序列号。如果要强制手动输入序列号，请不要勾选此项。"
@@ -4378,7 +4382,6 @@
 DocType: Request for Quotation Supplier,Download PDF,下载PDF
 DocType: Production Order,Planned End Date,计划的结束日期
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,物件的存储位置。
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,供应商&gt;供应商类型
 DocType: Request for Quotation,Supplier Detail,供应商详细
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},公式或条件错误:{0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,已开票金额
@@ -4417,7 +4420,7 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,如果您不想在制作基于课程的组时考虑批量，请不要选中。
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,如果您不想在制作基于课程的组时考虑批量，请不要选中。
 DocType: Asset,Frequency of Depreciation (Months),折旧率（月）
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,信用账户
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,信用账户
 DocType: Landed Cost Item,Landed Cost Item,到岸成本品目
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,显示零值
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,原材料被生产/重新打包后得到的品目数量
@@ -4470,7 +4473,7 @@
 DocType: Opportunity Item,Basic Rate,基础税率
 DocType: GL Entry,Credit Amount,信贷金额
 DocType: Cheque Print Template,Signatory Position,签署的位置
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,设置为丧失
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,设置为丧失
 DocType: Timesheet,Total Billable Hours,总计费时间
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,付款收货注意事项
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,这是基于对这个顾客的交易。详情请参阅以下时间表
@@ -4484,11 +4487,11 @@
 ,Items To Be Requested,要申请的项目
 DocType: Purchase Order,Get Last Purchase Rate,获取最新的采购税率
 DocType: Company,Company Info,公司简介
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1320,Select or add new customer,选择或添加新客户
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,成本中心需要预订费用报销
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,选择或添加新客户
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,成本中心需要预订费用报销
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),资金(资产)申请
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,这是基于该员工的考勤
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,借方科目
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Debit Account,借方科目
 DocType: Fiscal Year,Year Start Date,年度起始日期
 DocType: Attendance,Employee Name,雇员姓名
 DocType: Sales Invoice,Rounded Total (Company Currency),圆润的总计（公司货币）
@@ -4512,7 +4515,7 @@
 DocType: Quality Inspection Reading,Reading 3,阅读3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,凭证类型
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1596,Price List not found or disabled,价格表未找到或禁用
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,价格表未找到或禁用
 DocType: Employee Loan Application,Approved,已批准
 DocType: Pricing Rule,Price,价格
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',{0}的假期批准后，雇员的状态必须设置为“离开”
@@ -4531,7 +4534,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},行{0}：甲方/客户不与匹配{1} / {2} {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,请输入您的费用帐户
 DocType: Account,Stock,库存
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",行＃{0}：参考文件类型必须是采购订单之一，购买发票或日记帐分录
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",行＃{0}：参考文件类型必须是采购订单之一，购买发票或日记帐分录
 DocType: Employee,Current Address,当前地址
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",如果品目为另一品目的变体，那么它的描述，图片，价格，税率等将从模板自动设置。你也可以手动设置。
 DocType: Serial No,Purchase / Manufacture Details,采购/制造详细信息
@@ -4584,7 +4587,7 @@
 DocType: Assessment Plan,Room,房间
 DocType: Purchase Order,Advance Paid,已支付的预付款
 DocType: Item,Item Tax,项目税项
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,材料到供应商
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,材料到供应商
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,消费税发票
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}出现％不止一次
 DocType: Expense Claim,Employees Email Id,雇员的邮件地址
@@ -4617,7 +4620,7 @@
 DocType: Customer,Commission Rate,佣金率
 apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,在Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,按部门禁止假期申请。
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer",付款方式必须是接收之一，收费和内部转账
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer",付款方式必须是接收之一，收费和内部转账
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics（分析）
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,购物车是空的
 DocType: Vehicle,Model,模型
@@ -4647,7 +4650,7 @@
 DocType: Batch,Expiry Date,到期时间
 ,Supplier Addresses and Contacts,供应商的地址和联系方式
 ,accounts-browser,账户浏览器
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,属性是相同的两个记录。
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,属性是相同的两个记录。
 apps/erpnext/erpnext/config/projects.py +13,Project master.,项目主。
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.",要允许对账单或过度订货，库存设置或更新项目“津贴”。
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,不要在货币旁显示货币代号，例如$等。
@@ -4655,7 +4658,7 @@
 DocType: Supplier,Credit Days,信用期
 apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,让学生批
 DocType: Leave Type,Is Carry Forward,是否顺延假期
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,从物料清单获取品目
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,从物料清单获取品目
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,交货天数
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},行＃{0}：过帐日期必须是相同的购买日期{1}资产的{2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,请在上表中输入销售订单