diff --git a/erpnext/translations/zh.csv b/erpnext/translations/zh.csv
index 5038d4c..e788c0d 100644
--- a/erpnext/translations/zh.csv
+++ b/erpnext/translations/zh.csv
@@ -1,6 +1,5 @@
 DocType: Employee,Salary Mode,薪酬模式
 DocType: Employee,Divorced,离婚
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +84,Warning: Same item has been entered multiple times.,警告：相同项目已经输入多次。
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,项目已同步
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,允许项目将在一个事务中多次添加
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,取消此保修要求之前请先取消物料访问{0}
@@ -21,6 +20,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"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?,难道你真的想放弃这项资产？
+DocType: Item,Manufacturer Part Numbers,制造商部件号
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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.,*将被计算在该交易内。
@@ -31,7 +31,7 @@
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,没有更多结果。
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,法律
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +166,Actual type tax cannot be included in Item rate in row {0},实际类型税不能被包含在商品率排{0}
-DocType: C-Form,Customer,顾客
+DocType: C-Form,Customer,客户
 DocType: Purchase Receipt Item,Required By,必选
 DocType: Delivery Note,Return Against Delivery Note,射向送货单
 DocType: Purchase Order,% Billed,% 已记账
@@ -46,23 +46,28 @@
 apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,公开显示
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,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日记帐分录提交
 DocType: Pricing Rule,Apply On,应用于
 DocType: Item Price,Multiple Item prices.,多个品目的价格。
 ,Purchase Order Items To Be Received,采购订单项目可收
 DocType: SMS Center,All Supplier Contact,所有供应商联系人
+DocType: Support Settings,Support Settings,支持设置
+DocType: SMS Parameter,Parameter,参数
 apps/erpnext/erpnext/projects/doctype/project/project.py +62,Expected End Date can not be less than Expected Start Date,预计结束日期不能小于预期开始日期
-apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,行＃{0}：速率必须与{1}：{2}（{3} / {4}）
+apps/erpnext/erpnext/utilities/transaction_base.py +106,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,行＃{0}：速率必须与{1}：{2}（{3} / {4}）
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,新建假期申请
+,Batch Item Expiry Status,批处理项到期状态
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,银行汇票
 DocType: Mode of Payment Account,Mode of Payment Account,付款方式账户
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,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 +614,Quantity,数量
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,Accounts table cannot be blank.,账表不能为空。
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,数量
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,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,开放式问题
 DocType: Production Plan Item,Production Plan Item,生产计划项目
@@ -70,17 +75,19 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,医疗保健
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),延迟支付（天）
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,服务费用
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,发票
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,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,预计交货日期是之前销售订单日期
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defense
 DocType: Salary Component,Abbr,缩写
 DocType: Appraisal Goal,Score (0-5),得分（0-5）
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},行{0}：{1} {2}不相匹配{3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,Row {0}: {1} {2} does not match with {3},行{0}：{1} {2}不相匹配{3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,行＃{0}：
 DocType: Timesheet,Total Costing Amount,总成本计算金额
 DocType: Delivery Note,Vehicle No,车辆编号
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,请选择价格表
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,列＃{0}：付款单据才能完成trasaction
 DocType: Production Order Operation,Work In Progress,在制品
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,请选择日期
 DocType: Employee,Holiday List,假期列表
@@ -88,17 +95,20 @@
 DocType: Cost Center,Stock User,库存用户
 DocType: Company,Phone No,电话号码
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,课程表创建：
-apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},新{0}：#{1}
+apps/erpnext/erpnext/controllers/recurring_document.py +135,New {0}: #{1},新{0}：#{1}
 ,Sales Partners Commission,销售合作伙伴佣金
 apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +21,Abbreviation cannot have more than 5 characters,缩写不能超过5个字符
 DocType: Payment Request,Payment Request,付钱请求
 DocType: Asset,Value After Depreciation,折旧后
 DocType: Employee,O+,O +
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,有关
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance date can not be less than employee's joining date,考勤日期不得少于员工的加盟日期
+DocType: Grading Scale,Grading Scale Name,分级标准名称
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,这是一个root帐户，不能被编辑。
 DocType: BOM,Operations,操作
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},不能为{0}设置折扣授权
 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 +74,{0} {1} not in any active Fiscal Year.,{0} {1} 没有在任何活动的财政年度中。
 DocType: Packed Item,Parent Detail docname,家长可采用DocName细节
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,千克
 DocType: Student Log,Log,日志
@@ -109,7 +119,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,同一家公司进入不止一次
 DocType: Employee,Married,已婚
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},不允许{0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,从获得项目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,从获得项目
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,Stock cannot be updated against Delivery Note {0},送货单{0}不能更新库存
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},产品{0}
 DocType: Payment Reconciliation,Reconcile,对账
@@ -117,9 +127,11 @@
 DocType: Quality Inspection Reading,Reading 1,阅读1
 DocType: Process Payroll,Make Bank Entry,创建银行分录
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,养老基金
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,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/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,薪酬结构缺失
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,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,销售发票品目
 DocType: Account,Credit,贷方
@@ -136,6 +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 +892,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}这个节日之间没有从日期和结束日期
@@ -147,15 +160,18 @@
 DocType: Item,Copy From Item Group,从品目组复制
 DocType: Journal Entry,Opening Entry,开放报名
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,账户只需支付
+DocType: Employee Loan,Repay Over Number of Periods,偿还期的超过数
 DocType: Stock Entry,Additional Costs,额外费用
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Account with existing transaction can not be converted to group.,有交易的科目不能被转换为组。
 DocType: Lead,Product Enquiry,产品查询
 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,请首先选择公司
 DocType: Employee Education,Under Graduate,本科
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,目标类型
 DocType: BOM,Total Cost,总成本
+DocType: Journal Entry Account,Employee Loan,员工贷款
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +89,Activity Log:,活动日志：
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,Item {0} does not exist in the system or has expired,项目{0}不存在于系统中或已过期
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,房地产
@@ -175,16 +191,20 @@
 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 +880,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,结算财年
 apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1}已冻结
 apps/erpnext/erpnext/setup/doctype/company/company.py +131,Please select Existing Company for creating Chart of Accounts,请选择现有的公司创建会计科目表
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,库存费用
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,请输入首选电子邮件联系
 DocType: Journal Entry,Contra Entry,对销分录
 DocType: Journal Entry Account,Credit in Company Currency,信用在公司货币
 DocType: Delivery Note,Installation Status,安装状态
-apps/erpnext/erpnext/controllers/buying_controller.py +320,Accepted + Rejected Qty must be equal to Received quantity for Item {0},已接受+已拒绝的数量必须等于条目{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 +321,Accepted + Rejected Qty must be equal to Received quantity for Item {0},已接受+已拒绝的数量必须等于条目{0}的已接收数量
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,供应原料采购
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,付款中的至少一个模式需要POS发票。
@@ -194,7 +214,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +471,Item {0} is not active or end of life has been reached,项目{0}处于非活动或寿命终止状态
 apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,例如：基础数学
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",要包括税款，行{0}项率，税收行{1}也必须包括在内
-apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,人力资源模块的设置
+apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,人力资源模块的设置
 DocType: SMS Center,SMS Center,短信中心
 DocType: Sales Invoice,Change Amount,涨跌额
 DocType: BOM Replace Tool,New BOM,新建物料清单
@@ -213,6 +233,7 @@
 DocType: Customer,Individual,个人
 DocType: Interest,Academics User,学术界用户
 DocType: Cheque Print Template,Amount In Figure,量图
+DocType: Employee Loan Application,Loan Info,贷款信息
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,规划维护访问。
 DocType: SMS Settings,Enter url parameter for message,请输入消息的URL参数
 DocType: POS Profile,Customer Groups,客户群
@@ -230,17 +251,20 @@
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,调配一年的假期。
 DocType: SG Creation Tool Course,SG Creation Tool Course,SG创建工具课程
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,留空，如果你想获取选定学期所有课程
-apps/erpnext/erpnext/controllers/selling_controller.py +168,Selling price for item {0} is lower than its {1}. Selling price should be atleast {2},售价项{0}低于其{1}。销售价格应该是ATLEAST {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +177,Selling price for item {0} is lower than its {1}. Selling price should be atleast {2},售价项{0}低于其{1}。销售价格应该是ATLEAST {2}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,库存不足
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,禁用容量规划和时间跟踪
 DocType: Email Digest,New Sales Orders,新建销售订单
 DocType: Bank Reconciliation,Bank Account,银行帐户
 DocType: Leave Type,Allow Negative Balance,允许负余额
+DocType: Employee,Create User,创建用户
 DocType: Selling Settings,Default Territory,默认地区
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,电视
 DocType: Production Order Operation,Updated via 'Time Log',通过“时间日志”更新
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +414,Advance amount cannot be greater than {0} {1},提前量不能大于{0} {1}
 DocType: Naming Series,Series List for this Transaction,此交易的系列列表
+DocType: Company,Default Payroll Payable Account,默认情况下，应付职工薪酬帐户
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.js +7,Update Email Group,更新电子邮件组
 DocType: Sales Invoice,Is Opening Entry,是否期初分录
 DocType: Customer Group,Mention if non-standard receivable account applicable,何况，如果不规范应收账款适用
 DocType: Course Schedule,Instructor Name,导师姓名
@@ -252,13 +276,14 @@
 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 +1818,"LocalStorage is full , did not save",localStorage的满了，没救
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2179,"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 +227,Next Recurring {0} will be created on {1},周期{0}下次创建时间为{1}
+apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},周期{0}下次创建时间为{1}
 DocType: Sales Partner,Partner website,合作伙伴网站
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,新增项目
 ,Contact Name,联系人姓名
+DocType: Course Assessment Criteria,Course Assessment Criteria,课程评价标准
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,依上述条件创建工资单
 DocType: POS Customer Group,POS Customer Group,POS客户群
 DocType: Cheque Print Template,Line spacing for amount in words,行距文字量
@@ -266,11 +291,11 @@
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,未提供描述
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,请求您的报价。
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,这是基于对这个项目产生的考勤表
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +351,Net Pay cannot be less than 0,净工资不能低于0
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +371,Net Pay cannot be less than 0,净工资不能低于0
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,只有选择的休假审批者可以提交此请假
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,解除日期必须大于加入的日期
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +190,Leaves per Year,每年叶
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +123,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,行{0}：请检查'是推进'对帐户{1}，如果这是一个进步条目。
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,行{0}：请检查'是推进'对帐户{1}，如果这是一个进步条目。
 apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},仓库{0}不属于公司{1}
 DocType: Email Digest,Profit & Loss,利润损失
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,升
@@ -292,24 +317,26 @@
 DocType: Pricing Rule,Supplier Type,供应商类型
 DocType: Course Scheduling Tool,Course Start Date,课程开始日期
 ,Student Batch-Wise Attendance,学生分批出席
+DocType: POS Profile,Allow user to edit Rate,允许用户编辑率
 DocType: Item,Publish in Hub,在发布中心
 DocType: Student Admission,Student Admission,学生入学
 ,Terretory,区域
 apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,项目{0}已取消
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,物料申请
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +877,Material Request,物料申请
 DocType: Bank Reconciliation,Update Clearance Date,更新清拆日期
 DocType: Item,Purchase Details,购买详情
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},项目{0}未发现“原材料提供&#39;表中的采购订单{1}
 DocType: Employee,Relation,关系
 DocType: Shipping Rule,Worldwide Shipping,全球航运
 DocType: Student Guardian,Mother,母亲
+apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) and stock value ({1}) must be same,帐户余额（{0}）和库存值（{1}）必须是相同
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,确认客户订单。
 DocType: Purchase Receipt Item,Rejected Quantity,拒绝数量
 DocType: SMS Settings,SMS Sender Name,短信发送者名称
 DocType: Notification Control,Notification Control,通知控制
 DocType: Lead,Suggestions,建议
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,为此区域设置品目群组特定的预算。你还可以设置“分布”，为预算启动季节性。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},对支付{0} {1}不能大于未偿还{2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Payment against {0} {1} cannot be greater than Outstanding Amount {2},对支付{0} {1}不能大于未偿还{2}
 DocType: Supplier,Address HTML,地址HTML
 DocType: Lead,Mobile No.,手机号码
 DocType: Maintenance Schedule,Generate Schedule,生成时间表
@@ -318,6 +345,7 @@
 DocType: Student Group Student,Student Group Student,学生组学生
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,最新
 DocType: Vehicle Service,Inspection,检查
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +56,Student {0}: {1} does not belong to Student Batch {2},学生{0}：{1}不属于学生批次{2}
 DocType: Email Digest,New Quotations,新报价
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,电子邮件工资单员工根据员工选择首选的电子邮件
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,假期审批人列表的第一个将被设为默认审批人
@@ -326,18 +354,20 @@
 DocType: Asset,Next Depreciation Date,接下来折旧日期
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,每个员工活动费用
 DocType: Accounts Settings,Settings for Accounts,帐户设置
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +635,Supplier Invoice No exists in Purchase Invoice {0},供应商发票不存在采购发票{0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +643,Supplier Invoice No exists in Purchase Invoice {0},供应商发票不存在采购发票{0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,管理销售人员。
 DocType: Job Applicant,Cover Letter,求职信
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,杰出的支票及存款清除
 DocType: Item,Synced With Hub,与Hub同步
 DocType: Vehicle,Fleet Manager,车队经理
-apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,密码错误
+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 +64,Wrong Password,密码错误
 DocType: Item,Variant Of,变体自
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +349,Completed Qty can not be greater than 'Qty to Manufacture',完成数量不能大于“生产数量”
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',完成数量不能大于“生产数量”
 DocType: Period Closing Voucher,Closing Account Head,结算帐户头
 DocType: Employee,External Work History,外部就职经历
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,循环引用错误
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +49,Guardian1 Name,Guardian1名称
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,大写金额（出口）将在送货单保存后显示。
 DocType: Cheque Print Template,Distance from left edge,从左侧边缘的距离
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} [{1}]的单位（＃窗体/项目/ {1}）在[{2}]研究发现（＃窗体/仓储/ {2}）
@@ -346,11 +376,12 @@
 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 +835,Delivery Note,送货单
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +841,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 +349,Payment Entry has been modified after you pulled it. Please pull it again.,付款项被修改，你把它之后。请重新拉。
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,{0} entered twice in Item Tax,{0}输入两次税项
+apps/erpnext/erpnext/stock/doctype/item/item.py +440,{0} entered twice in Item Tax,{0}输入了两次税项
+DocType: Grade Interval,Min Score,闵分数
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,本周和待活动总结
 DocType: Student Applicant,Admitted,录取
 DocType: Workstation,Rent Cost,租金成本
@@ -363,24 +394,24 @@
 DocType: Shipping Rule,Valid for Countries,有效的国家
 apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,这个项目是一个模板，并且可以在交易不能使用。项目的属性将被复制到变型，除非“不复制”设置
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,总订货考虑
-apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).",雇员指派(例如总裁，总监等) 。
-apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,请输入“重复上月的一天'字段值
+apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).",雇员指派(例如总裁，总监等) 。
+apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,请输入“重复上月的一天'字段值
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,客户货币转换为客户的基础货币后的单价
 DocType: Course Scheduling Tool,Course Scheduling Tool,排课工具
 apps/erpnext/erpnext/controllers/accounts_controller.py +564,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 +794,Select Item,选择项目
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,选择项目
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry",项目{0}通过批次管理，不能通过库存盘点进行盘点，请使用库存登记
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,采购发票{0}已经提交
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,采购发票{0}已经提交
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,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,转换为非集团
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,产品批次(patch)/批(lot)。
 DocType: C-Form Invoice Detail,Invoice Date,发票日期
 DocType: GL Entry,Debit Amount,借方金额
 apps/erpnext/erpnext/accounts/party.py +239,There can only be 1 Account per Company in {0} {1},只能有每公司1帐户{0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +367,Please see attachment,请参阅附件
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +387,Please see attachment,请参阅附件
 DocType: Purchase Order,% Received,％已收货
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,创建挺起胸
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,安装已经完成！
@@ -389,6 +420,7 @@
 DocType: Quality Inspection,Inspected By,验货人
 DocType: Maintenance Visit,Maintenance Type,维护类型
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},序列号{0}不属于送货单{1}
+apps/erpnext/erpnext/templates/pages/demo.html +55,ERPNext Demo,ERPNext演示
 apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,添加项目
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,项目质量检验参数
 DocType: Leave Application,Leave Approver Name,假期审批人姓名
@@ -405,8 +437,9 @@
 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 +1335,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/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,采购退货
+apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,创建采购订单
 ,Purchase Register,购买注册
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,适用费用
@@ -415,19 +448,20 @@
 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/lead/lead.py +42,Lead Owner cannot be same as the Lead,铅所有者不能等同于铅
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,铅所有者不能等同于铅
 apps/erpnext/erpnext/accounts/utils.py +355,Allocated amount can not greater than unadjusted amount,分配的金额不能超过未调整的量更大
 DocType: Announcement,Receiver,接收器
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},工作站在以下假期关闭：{0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,机会
 DocType: Employee,Single,单身
+DocType: Salary Slip,Total Loan Repayment,总贷款还款
 DocType: Account,Cost of Goods Sold,销货成本
 DocType: Purchase Invoice,Yearly,每年
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,请输入成本中心
 DocType: Journal Entry Account,Sales Order,销售订单
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,平均卖出价
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Selling Rate,平均卖出价
 DocType: Assessment Plan,Examiner Name,考官名称
-apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},行{0}中的数量不能为分数
+apps/erpnext/erpnext/utilities/transaction_base.py +148,Quantity cannot be a fraction in row {0},行{0}中的数量不能为分数
 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.,教室/实验室等在那里的演讲可以预定。
@@ -454,12 +488,13 @@
 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 +817,Please enter Item Code.,请输入产品编号。
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +873,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",如果勾选，税金将被当成已包括在打印税率/打印总额内。
 DocType: Request for Quotation,Message for Supplier,消息供应商
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,总数量
+DocType: Item,Show in Website (Variant),展网站（变体）
 DocType: Employee,Health Concerns,健康问题
 DocType: Process Payroll,Select Payroll Period,选择工资期
 DocType: Purchase Invoice,Unpaid,未付
@@ -473,6 +508,7 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,考勤记录。
 DocType: Salary Structure,Salary Component for timesheet based payroll.,薪酬部分基于时间表工资。
 DocType: Sales Order Item,Used for Production Plan,用于生产计划
+DocType: Employee Loan,Total Payment,总付款
 DocType: Manufacturing Settings,Time Between Operations (in mins),时间操作之间（以分钟）
 DocType: Customer,Buyer of Goods and Services.,产品和服务购买者。
 DocType: Journal Entry,Accounts Payable,应付帐款
@@ -480,6 +516,7 @@
 DocType: Pricing Rule,Valid Upto,有效期至
 DocType: Training Event,Workshop,作坊
 apps/erpnext/erpnext/public/js/setup_wizard.js +243,List a few of your customers. They could be organizations or individuals.,列出一些你的客户，他们可以是组织或个人。
+,Enough Parts to Build,足够的配件组装
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Direct Income,直接收益
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account",按科目分类后不能根据科目过滤
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,行政主任
@@ -498,8 +535,8 @@
 ,Serial No Warranty Expiry,序列号/保修到期
 DocType: Sales Invoice,Offline POS Name,离线POS名称
 DocType: Sales Order,To Deliver,为了提供
-DocType: Purchase Invoice Item,Item,项目
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,Serial no item cannot be a fraction,序号项目不能是一个分数
+DocType: Purchase Invoice Item,Item,产品
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2342,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,管理转包
@@ -519,12 +556,13 @@
 DocType: Purchase Invoice,Supplier Invoice No,供应商发票编号
 DocType: Territory,For reference,供参考
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions",无法删除序列号{0}，因为它采用的是现货交易
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +242,Closing (Cr),结算(信用)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +245,Closing (Cr),结算(信用)
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,移动项目
 DocType: Serial No,Warranty Period (Days),保修期限（天数）
 DocType: Installation Note Item,Installation Note Item,安装单项目
 DocType: Production Plan Item,Pending Qty,待定数量
 DocType: Budget,Ignore,忽略
+apps/erpnext/erpnext/accounts/party.py +351,{0} {1} is not active,{0} {1} 未激活
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},短信发送至以下号码：{0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,设置检查尺寸打印
 DocType: Salary Slip,Salary Slip Timesheet,工资单时间表
@@ -545,6 +583,7 @@
 DocType: C-Form Invoice Detail,Grand Total,总计
 DocType: Training Event,Course,课程
 DocType: Timesheet,Payslip,工资单
+apps/erpnext/erpnext/public/js/pos/pos.html +4,Item Cart,项目车
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +38,Fiscal Year Start Date should not be greater than Fiscal Year End Date,财年开始日期应不大于结束日期
 DocType: Issue,Resolution,决议
 DocType: C-Form,IV,IV
@@ -555,7 +594,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/accounts/doctype/sales_invoice/sales_invoice.js +763,Sales Return,销售退货
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,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),由供应商交货（直接发运）
@@ -564,21 +603,25 @@
 apps/erpnext/erpnext/config/selling.py +28,Customer database.,客户数据库。
 DocType: Quotation,Quotation To,报价对象
 DocType: Lead,Middle Income,中等收入
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),开幕（CR ）
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +217,Opening (Cr),开幕（CR ）
 apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,测度项目的默认单位{0}不能直接改变，因为你已经做了一些交易（S）与其他计量单位。您将需要创建一个新的项目，以使用不同的默认计量单位。
 apps/erpnext/erpnext/accounts/utils.py +353,Allocated amount can not be negative,调配数量不能为负
 DocType: Purchase Order Item,Billed Amt,已开票金额
 DocType: Training Result Employee,Training Result Employee,训练结果员工
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,创建库存记录所依赖的逻辑仓库。
+DocType: Repayment Schedule,Principal Amount,本金
+DocType: Employee Loan Application,Total Payable Interest,合计应付利息
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,销售发票时间表
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No & Reference Date is required for {0},{0}需要参考编号与参考日期
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Reference No & Reference Date is required for {0},{0}需要参考编号与参考日期
 DocType: Process Payroll,Select Payment Account to make Bank Entry,选择付款账户，使银行进入
+apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll",建立员工档案管理叶，报销和工资
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,添加到知识库
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,提案写作
 DocType: Payment Entry Deduction,Payment Entry Deduction,输入付款扣除
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,另外销售人员{0}存在具有相同员工ID
 DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests",如果选中，原料是分包的将被纳入材料要求项
 apps/erpnext/erpnext/config/accounts.py +80,Masters,大师
+DocType: Assessment Plan,Maximum Assessment Score,最大考核评分
 apps/erpnext/erpnext/config/accounts.py +140,Update Bank Transaction Dates,更新银行交易日期
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,时间跟踪
 DocType: Fiscal Year Company,Fiscal Year Company,公司财政年度
@@ -586,12 +629,12 @@
 DocType: Training Event,Conference,会议
 DocType: Timesheet,Billed,已开票
 DocType: Batch,Batch Description,批次说明
-apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.",支付网关帐户没有创建，请手动创建一个。
-DocType: Delivery Note,Time at which items were delivered from warehouse,时间在哪个项目是从仓库运送
+apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.",支付网关帐户没有创建，请手动创建一个。
 DocType: Sales Invoice,Sales Taxes and Charges,销售税费
 DocType: Employee,Organization Profile,组织简介
 DocType: Student,Sibling Details,兄弟姐妹详情
 DocType: Vehicle Service,Vehicle Service,汽车服务
+apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,自动触发基于条件的反馈请求。
 DocType: Employee,Reason for Resignation,原因辞职
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,绩效考核模板。
 DocType: Sales Invoice,Credit Note Issued,信用票据发行
@@ -606,22 +649,27 @@
 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/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,护照号码
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Relation with Guardian2,与关系Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,经理
+DocType: Payment Entry,Payment From / To,支付自/至
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},新的信用额度小于当前余额为客户着想。信用额度是ATLEAST {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,相同的品目已输入多次
 DocType: SMS Settings,Receiver Parameter,接收人参数
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,“根据”和“分组依据”不能相同
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,供应商&gt;供应商类型
 DocType: Sales Person,Sales Person Targets,销售人员目标
 DocType: Installation Note,IN-,在-
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter email address,请输入您的电子邮件地址
 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 +301,Timesheet created:,创建时间表：
+DocType: Program Enrollment,Batch Name,批名
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,创建时间表：
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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,客户命名方式
+DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,将显示学生每月学生出勤记录报告为存在
 DocType: Depreciation Schedule,Depreciation Amount,折旧额
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,转换为组
 DocType: Activity Cost,Activity Type,活动类型
@@ -637,14 +685,15 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,已消耗
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +157,{0}: {1} not found in Invoice Details table,{0}：{1}在发票明细表中无法找到
 DocType: Company,Round Off Cost Center,四舍五入成本中心
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +205,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消维护访问{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +218,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消维护访问{0}
 DocType: Item,Material Transfer,物料转移
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +207,Opening (Dr),开幕（博士）
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +210,Opening (Dr),开幕（博士）
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},发布时间标记必须经过{0}
+DocType: Employee Loan,Total Interest Payable,合计应付利息
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,到岸成本税费
 DocType: Production Order Operation,Actual Start Time,实际开始时间
 DocType: BOM Operation,Operation Time,操作时间
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,完
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +134,Finish,完
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,基础
 DocType: Timesheet,Total Billed Hours,帐单总时间
 DocType: Journal Entry,Write Off Amount,核销金额
@@ -652,14 +701,16 @@
 DocType: Company,Gain/Loss Account on Asset Disposal,在资产处置收益/损失帐户
 DocType: Purchase Invoice,Quarterly,季度
 DocType: Selling Settings,Delivery Note Required,送货单是必须项
+DocType: Assessment Criteria,Assessment Criteria,评估标准
 DocType: BOM Item,Basic Rate (Company Currency),基础利率（公司货币）
 DocType: Student Attendance,Student Attendance,学生出勤
 DocType: Sales Invoice Timesheet,Time Sheet,时间表
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,反吹为原材料的开
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +59,Please enter item details,请输入项目细节
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,请输入项目细节
 DocType: Interest,Interest,利益
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,售前
 DocType: Purchase Receipt,Other Details,其他详细信息
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Suplier
 DocType: Account,Accounts,会计
 DocType: Vehicle,Odometer Value (Last),里程表值（最后）
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,市场营销
@@ -683,12 +734,14 @@
 DocType: Material Request Item,Quantity and Warehouse,数量和仓库
 DocType: Sales Invoice,Commission Rate (%),佣金率（％）
 DocType: Project,Estimated Cost,估计成本
+DocType: Purchase Order,Link to material requests,链接到材料请求
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,航天
 DocType: Journal Entry,Credit Card Entry,信用卡分录
 apps/erpnext/erpnext/config/accounts.py +51,Company and Accounts,公司与账户
 apps/erpnext/erpnext/config/stock.py +22,Goods received from Suppliers.,来自供应商的已收入成品。
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,在数值
 DocType: Lead,Campaign Name,活动名称
+DocType: Selling Settings,Close Opportunity After Days,关闭机会后日
 ,Reserved,保留的
 DocType: Purchase Order,Supply Raw Materials,供应原料
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,下一次发票生成的日期，提交时将会生成。
@@ -706,7 +759,7 @@
 DocType: Employee,Cell Number,手机号码
 apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,汽车材料的要求生成
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,丧失
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,You can not enter current voucher in 'Against Journal Entry' column,您不能在“对日记账分录”列中选择此凭证。
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +140,You can not enter current voucher in 'Against Journal Entry' column,您不能在“对日记账分录”列中选择此凭证。
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,预留制造
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,能源
 DocType: Opportunity,Opportunity From,从机会
@@ -719,10 +772,10 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",海报价格规则，同样的标准存在，请分配优先级解决冲突。价格规则：{0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,无法停用或取消BOM，因为它被其他BOM引用。
 DocType: Opportunity,Maintenance,维护
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Receipt number required for Item {0},所需物品交易收据号码{0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,Purchase Receipt number required for Item {0},所需物品交易收据号码{0}
 DocType: Item Attribute Value,Item Attribute Value,项目属性值
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,销售活动。
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +42,Make Timesheet,制作时间表
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +48,Make Timesheet,制作时间表
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -758,10 +811,13 @@
 DocType: Budget,Project,项目
 DocType: Quality Inspection Reading,Reading 7,阅读7
 DocType: Expense Claim Detail,Expense Claim Type,报销类型
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +192,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,请设置命名为系列{0}通过设置&gt;设置&gt;命名系列
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,购物车的默认设置
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +128,Asset scrapped via Journal Entry {0},通过资产日记帐分录报废{0}
+DocType: Employee Loan,Interest Income Account,利息收入账户
 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,没有客户或供应商帐户发现。账户是根据\确定
 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}。
@@ -770,7 +826,7 @@
 DocType: Employee,Family Background,家庭背景
 DocType: Request for Quotation Supplier,Send Email,发送电子邮件
 apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},警告：无效的附件{0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,No Permission,无此权限
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +744,No Permission,无此权限
 DocType: Company,Default Bank Account,默认银行账户
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",要根据党的筛选，选择党第一类型
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},“库存更新'校验不通过，因为{0}中的退货条目未交付
@@ -787,12 +843,14 @@
 DocType: Warehouse,Tree Details,树详细信息
 DocType: Training Event,Event Status,事件状态
 ,Support Analytics,客户支持分析
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,"If you have any questions, please get back to us.",如果您有任何疑问，请再次与我们联系。
 DocType: Item,Website Warehouse,网站仓库
 DocType: Payment Reconciliation,Minimum Invoice Amount,最小发票金额
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +112,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}：成本中心{2}不属于公司{3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +89,{0} {1}: Account {2} cannot be a Group,{0} {1}帐户{2}不能是一个组
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,项目行{idx}: {文档类型}上不存在'{文档类型}'表
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,时间表{0}已完成或取消
+apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,没有任务
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",每月自动生成发票的日期，例如5号，28号等
 DocType: Asset,Opening Accumulated Depreciation,打开累计折旧
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,得分必须小于或等于5
@@ -801,11 +859,13 @@
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,客户和供应商
 DocType: Student Batch Instructor,Student Batch Instructor,学生导师批
 DocType: Email Digest,Email Digest Settings,邮件摘要设置
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +341,Thank you for your business!,感谢您的业务！
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,来自客户的支持记录。
+,Production Order Stock Report,生产订单库存报告
 DocType: HR Settings,Retirement Age,退休年龄
 DocType: Bin,Moving Average Rate,移动平均价格
 DocType: Production Planning Tool,Select Items,选择品目
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{0} against Bill {1} dated {2},{0}对日期为{2}的账单{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Bill {1} dated {2},{0}对日期为{2}的账单{1}
 apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,课程表
 DocType: Maintenance Visit,Completion Status,完成状态
 DocType: HR Settings,Enter retirement age in years,在年内进入退休年龄
@@ -813,7 +873,6 @@
 DocType: Cheque Print Template,Starting location from left edge,从左边起始位置
 DocType: Item,Allow over delivery or receipt upto this percent,允许在交付或接收高达百分之这
 DocType: Stock Entry,STE-,甜菊
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,预计交货日期不能早于销售订单日期
 DocType: Upload Attendance,Import Attendance,导入考勤记录
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,所有品目群组
 DocType: Process Payroll,Activity Log,活动日志
@@ -821,11 +880,12 @@
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,在提交交易时自动编写信息。
 DocType: Production Order,Item To Manufacture,要生产的项目
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +81,{0} {1} status is {2},{0} {1}的状态为{2}
+DocType: Employee,Provide Email Address registered in company,提供公司注册邮箱地址
 DocType: Shopping Cart Settings,Enable Checkout,启用结帐
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,采购订单到付款
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,预计数量
 DocType: Sales Invoice,Payment Due Date,付款到期日
-apps/erpnext/erpnext/stock/doctype/item/item.js +302,Item Variant {0} already exists with same attributes,项目变体{0}已经具有相同属性的存在
+apps/erpnext/erpnext/stock/doctype/item/item.js +340,Item Variant {0} already exists with same attributes,项目变体{0}已经具有相同属性的存在
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',“打开”
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,开做
 DocType: Notification Control,Delivery Note Message,送货单留言
@@ -841,6 +901,7 @@
 DocType: Item Reorder,Re-Order Qty,再次订货数量
 DocType: Leave Block List Date,Leave Block List Date,禁离日日期
 DocType: Pricing Rule,Price or Discount,价格或折扣
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,在外购入库单项目表总的相关费用必须是相同的总税费
 DocType: Sales Team,Incentives,奖励
 DocType: SMS Log,Requested Numbers,请求号码
 DocType: Production Planning Tool,Only Obtain Raw Materials,只有取得原料
@@ -869,21 +930,23 @@
 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 +733,Purchase Receipt,外购入库单
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +788,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 +267,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 +284,Unable to find Time Slot in the next {0} days for Operation {1},找不到时隙在未来{0}天操作{1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},找不到时隙在未来{0}天操作{1}
 DocType: Production Order,Plan material for sub-assemblies,计划材料为子组件
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,销售合作伙伴和地区
+apps/erpnext/erpnext/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,由于已有库存余额的帐户无法自动创建帐户。您必须创建一个匹配的帐户，然后才能在这个仓库中的条目
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +507,BOM {0} must be active,BOM{0}处于非活动状态
 DocType: Journal Entry,Depreciation Entry,折旧分录
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,请选择文档类型第一
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,取消此上门保养之前请先取消物料访问{0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},序列号{0}不属于品目{1}
 DocType: Purchase Receipt Item Supplied,Required Qty,所需数量
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,Warehouses with existing transaction can not be converted to ledger.,与现有的交易仓库不能转换到总帐。
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +223,Warehouses with existing transaction can not be converted to ledger.,与现有的交易仓库不能转换到总帐。
 DocType: Bank Reconciliation,Total Amount,总金额
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,互联网出版
 DocType: Production Planning Tool,Production Orders,生产订单
@@ -894,15 +957,15 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +142,Please mention Round Off Account in Company,请注明舍入账户的公司
 DocType: Purchase Receipt,Range,范围
 DocType: Supplier,Default Payable Accounts,默认应付账户(多个)
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +45,Employee {0} is not active or does not exist,雇员{0}非活动或不存在
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +47,Employee {0} is not active or does not exist,雇员{0}非活动或不存在
 DocType: Fee Structure,Components,组件
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},请输入项目资产类别{0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +240,Please enter Asset Category in Item {0},请输入项目资产类别{0}
 apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,项目变体{0}已更新
 DocType: Quality Inspection Reading,Reading 6,阅读6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +862,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 +192,Row {0}: Credit entry can not be linked with a {1},行{0}：信用记录无法被链接的{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +187,Row {0}: Credit entry can not be linked with a {1},行{0}：信用记录无法被链接的{1}
 apps/erpnext/erpnext/config/accounts.py +210,Define budget for a financial year.,定义预算财政年度。
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,选择此模式时POS发票的银行/现金账户将会被自动更新。
 DocType: Lead,LEAD-,铅-
@@ -913,23 +976,24 @@
 DocType: Item,Is Purchase Item,是否采购项目
 DocType: Asset,Purchase Invoice,购买发票
 DocType: Stock Ledger Entry,Voucher Detail No,凭证详情编号
-apps/erpnext/erpnext/accounts/page/pos/pos.js +706,New Sales Invoice,新的销售发票
+apps/erpnext/erpnext/accounts/page/pos/pos.js +709,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,开幕日期和截止日期应在同一会计年度
 DocType: Lead,Request for Information,索取资料
-apps/erpnext/erpnext/accounts/page/pos/pos.js +720,Sync Offline Invoices,同步离线发票
+apps/erpnext/erpnext/accounts/page/pos/pos.js +723,Sync Offline Invoices,同步离线发票
 DocType: Payment Request,Paid,付费
 DocType: Program Fee,Program Fee,课程费用
 DocType: Salary Slip,Total in words,总字
 DocType: Material Request Item,Lead Time Date,交货时间日期
 DocType: Guardian,Guardian Name,监护人姓名
 DocType: Cheque Print Template,Has Print Format,拥有打印格式
+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 +103,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.",对于“产品包”的物品，仓库，序列号和批号将被从“装箱单”表考虑。如果仓库和批次号是相同的任何“产品包”项目的所有包装物品，这些值可以在主项表中输入，值将被复制到“装箱单”表。
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,供应商发票的日期不能超过过帐日期更大
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +623,Supplier Invoice Date cannot be greater than Posting Date,供应商发票的日期不能超过过帐日期更大
 DocType: Purchase Invoice Item,Purchase Order Item,采购订单项目
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,间接收益
 DocType: Student Attendance Tool,Student Attendance Tool,学生考勤工具
@@ -937,7 +1001,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 +792,Select Item for Transfer,对于转让项目选择
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,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.,请选择支票存入的银行账户头。
@@ -945,7 +1009,7 @@
 DocType: Pricing Rule,Max Qty,最大数量
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
 						Please enter a valid Invoice",行{0}：发票{1}是无效的，它可能会被取消/不存在。 \请输入有效的发票
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,行{0}：付款方式对销售/采购订单应始终被标记为提前
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,行{0}：付款方式对销售/采购订单应始终被标记为提前
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,化学品
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,默认银行/现金帐户时，会选择此模式可以自动在工资日记条目更新。
 apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
@@ -955,9 +1019,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,仪表
 DocType: Workstation,Electricity Cost,电力成本
 DocType: HR Settings,Don't send Employee Birthday Reminders,不要发送员工生日提醒
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,库存条目
 DocType: Item,Inspection Criteria,检验标准
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,转移
+DocType: BOM Website Item,BOM Website Item,BOM网站项目
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,上传你的信头和logo。(您可以在以后对其进行编辑）。
 DocType: Timesheet Detail,Bill,法案
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,接下来折旧日期输入为过去的日期
@@ -965,17 +1029,18 @@
 DocType: SMS Center,All Lead (Open),所有潜在客户（开放）
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +222,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,获取已付预付款
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,Make ,使
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +763,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。
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,我的购物车
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},订单类型必须是一个{0}
+apps/erpnext/erpnext/controllers/selling_controller.py +159,Order Type must be one of {0},订单类型必须是一个{0}
 DocType: Lead,Next Contact Date,下次联络日期
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,开放数量
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Please enter Account for Change Amount,对于涨跌额请输入帐号
-DocType: Program Enrollment,Student Batch Name,学生批名
+DocType: Student Batch,Student Batch Name,学生批名
 DocType: Holiday List,Holiday List Name,假期列表名称
+DocType: Repayment Schedule,Balance Loan Amount,平衡贷款额
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,课程时间表
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,库存选项
 DocType: Journal Entry Account,Expense Claim,报销
@@ -989,14 +1054,15 @@
 DocType: Company,Default Terms,默认条款
 DocType: Packing Slip Item,Packing Slip Item,装箱单项目
 DocType: Purchase Invoice,Cash/Bank Account,现金/银行账户
+apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},请指定{0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,删除的项目在数量或价值没有变化。
 DocType: Delivery Note,Delivery To,交货对象
 apps/erpnext/erpnext/stock/doctype/item/item.py +649,Attribute table is mandatory,属性表是强制性的
 DocType: Production Planning Tool,Get Sales Orders,获取销售订单
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +65,{0} can not be negative,{0}不能为负
-apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,折扣
+apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,折扣
 DocType: Asset,Total Number of Depreciations,折旧总数
-DocType: Workstation,Wages,薪金
+DocType: Workstation,Wages,工资
 DocType: Project,Internal,内部
 DocType: Task,Urgent,加急
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +149,Please specify a valid Row ID for row {0} in table {1},请指定行{0}在表中的有效行ID {1}
@@ -1006,14 +1072,15 @@
 DocType: Purchase Receipt,PREC-RET-,PREC-RET-
 DocType: POS Profile,Sales Invoice Payment,销售发票付款
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,在销售订单/成品仓库保留仓库
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,销售金额
+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 +115,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,报废
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,客户不与公司匹配
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.",品目变体的属性。如大小，颜色等。
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,返回
+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/config/hr.py +35,Recruitment,招聘
@@ -1028,24 +1095,27 @@
 DocType: GL Entry,Against,针对
 DocType: Item,Default Selling Cost Center,默认销售成本中心
 DocType: Sales Partner,Implementation Partner,实施合作伙伴
-apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},销售订单{0} {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1467,ZIP Code,邮编
+apps/erpnext/erpnext/controllers/selling_controller.py +268,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}结果
 DocType: Item,Default Supplier,默认供应商
 DocType: Manufacturing Settings,Over Production Allowance Percentage,对生产补贴比例
+DocType: Employee Loan,Repayment Schedule,还款计划
 DocType: Shipping Rule Condition,Shipping Rule Condition,配送规则条件
 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/config/buying.py +23,Quotations received from Suppliers.,从供应商收到的报价。
-apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},{0} | {1} {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},{0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,平均年龄
 DocType: Opportunity,Your sales person who will contact the customer in future,联系客户的销售人员
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,List a few of your suppliers. They could be organizations or individuals.,列出一些你的供应商，他们可以是组织或个人。
 apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,查看所有产品
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +59,All BOMs,所有的材料明细表
 DocType: Company,Default Currency,默认货币
 DocType: Expense Claim,From Employee,来自员工
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告： 因为{1}中的物件{0}为零，系统将不会检查超额
@@ -1053,7 +1123,7 @@
 DocType: Upload Attendance,Attendance From Date,考勤起始日期
 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 +69,Invalid Attribute,无效属性
+apps/erpnext/erpnext/controllers/item_variant.py +94,Invalid Attribute,无效属性
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{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,总字符
@@ -1064,18 +1134,18 @@
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,公司注册号码，供大家参考。税务号码等
 DocType: Sales Partner,Distributor,经销商
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,购物车配送规则
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,Production Order {0} must be cancelled before cancelling this Sales Order,生产订单{0}必须取消这个销售订单之前被取消
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,生产订单{0}必须取消这个销售订单之前被取消
 apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',请设置“收取额外折扣”
 ,Ordered Items To Be Billed,订购物品被标榜
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,从范围必须小于要范围
 DocType: Global Defaults,Global Defaults,全局默认值
-apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,项目合作邀请
+apps/erpnext/erpnext/projects/doctype/project/project.py +202,Project Collaboration Invitation,项目合作邀请
 DocType: Salary Slip,Deductions,扣款列表
 DocType: Leave Allocation,LAL/,LAL /
 apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +328,Capacity Planning Error,容量规划错误
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,容量规划错误
 ,Trial Balance for Party,试算表的派对
 DocType: Lead,Consultant,顾问
 DocType: Salary Slip,Earnings,盈余
@@ -1090,19 +1160,23 @@
 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 +768,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}个有效序列号
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,项目编号不能因序列号改变
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +24,POS Profile {0} already created for user: {1} and company {2},POS简介{0}已经为用户创建：{1}和公司{2}
-DocType: Purchase Order Item,UOM Conversion Factor,计量单位换算系数
+DocType: Sales Invoice Item,UOM Conversion Factor,计量单位换算系数
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,请输入产品代码来获得批号
 DocType: Stock Settings,Default Item Group,默认品目群组
+DocType: Employee Loan,Partially Disbursed,部分已支付
 DocType: Grading Structure,Grading System Name,分级系统名称
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,供应商数据库。
 DocType: Account,Balance Sheet,资产负债表
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',成本中心：品目代码‘
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1908,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",付款方式未配置。请检查是否帐户已就付款方式或POS机配置文件中设置。
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2304,"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/doctype/purchase_common/purchase_common.py +75,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",进一步帐户可以根据组进行，但条目可针对非组进行
 DocType: Lead,Lead,线索
 DocType: Email Digest,Payables,应付账款
@@ -1115,26 +1189,29 @@
 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/report/bom_search/bom_search.js +8,Item 1,项目1
 DocType: Holiday,Holiday,假日
+DocType: Support Settings,Close Issue After Days,关闭问题天后
 DocType: Leave Control Panel,Leave blank if considered for all branches,如果针对所有分支请留空
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-形式不适用发票：{0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,未核销付款详情
 DocType: Global Defaults,Current Fiscal Year,当前财年
 DocType: Purchase Order,Group same items,组相同的项目
 DocType: Global Defaults,Disable Rounded Total,禁用总计化整
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,“分录”不能为空
-apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},重复的行{0}同{1}
+DocType: Employee Loan Application,Repayment Info,还款信息
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +436,'Entries' cannot be empty,“分录”不能为空
+apps/erpnext/erpnext/utilities/transaction_base.py +77,Duplicate row {0} with same {1},重复的行{0}同{1}
 ,Trial Balance,试算表
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,会计年度{0}未找到
-apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,建立职工
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +416,Fiscal Year {0} not found,会计年度{0}未找到
+apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,建立职工
 DocType: Sales Order,SO-,所以-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,请选择前缀第一
 DocType: Employee,O-,O-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,研究
 DocType: Maintenance Visit Purpose,Work Done,已完成工作
-apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,请指定属性表中的至少一个属性
+apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,请指定属性表中的至少一个属性
 DocType: Announcement,All Students,所有学生
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,项目{0}必须是一个非库存项目
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,View Ledger,查看总帐
+DocType: Grading Scale,Intervals,间隔
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,最早
 apps/erpnext/erpnext/stock/doctype/item/item.py +509,"An Item Group exists with same name, please change the item name or rename the item group",同名品目群组已存在，请修改品目名或群组名
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,学生手机号码
@@ -1144,7 +1221,6 @@
 DocType: Salary Slip,Gross Pay,工资总额
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Activity Type is mandatory.,行{0}：活动类型是强制性的。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Dividends Paid,股利支付
-DocType: Task,depends_on_tasks,depends_on_tasks
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,会计总帐
 DocType: Stock Reconciliation,Difference Amount,差额
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,留存收益
@@ -1158,11 +1234,14 @@
 DocType: Email Digest,New Income,新的收入
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,在整个采购周期使用同一价格
 DocType: Opportunity Item,Opportunity Item,项目的机会
+,Student and Guardian Contact Details,学生和监护人联系方式
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} Email Address is required to send email,行{0}：对于供应商{0}的电邮地址发送电子邮件
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,临时开通
 ,Employee Leave Balance,雇员假期余量
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},账户{0}的余额必须总是{1}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},行对项目所需的估值速率{0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +328,Example: Masters in Computer Science,举例：硕士计算机科学
+DocType: Item,Item Manufacturers,项目制造商
 DocType: Purchase Invoice,Rejected Warehouse,拒绝仓库
 DocType: GL Entry,Against Voucher,对凭证
 DocType: Item,Default Buying Cost Center,默认采购成本中心
@@ -1170,17 +1249,18 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js +73, to ,至
 DocType: Item,Lead Time in days,在天交货期
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +58,Accounts Payable Summary,应付帐款摘要
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +329,Payment of salary from {0} to {1},从{0}工资支付{1}
+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 +214,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/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,采购订单帮助您规划和跟进您的购买
 apps/erpnext/erpnext/setup/doctype/company/company.py +209,"Sorry, companies cannot be merged",抱歉，公司不能合并
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",在材质要求总发行/传输量{0} {1} \不能超过请求的数量{2}的项目更大的{3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,小
 DocType: Employee,Employee Number,雇员编号
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},箱号已被使用，请尝试从{0}开始
-DocType: Project,% Completed,％已完成
+DocType: Project,% Completed,% 已完成
 ,Invoiced Amount (Exculsive Tax),已开票金额（未含税）
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,项目2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,账户头{0}已创建
@@ -1195,23 +1275,24 @@
 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 +77,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 +711,Sync Master Data,同步主数据
+apps/erpnext/erpnext/accounts/page/pos/pos.js +714,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 +179,Website Image should be a public file or website URL,网站形象应该是一个公共文件或网站网址
 DocType: Student Applicant,AP,美联社
 DocType: Purchase Invoice Item,BOM,BOM
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,请先输入项目
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,这是一个root群组，无法被编辑。
 DocType: Journal Entry Account,Purchase Order,采购订单
 DocType: Vehicle,Fuel UOM,燃油计量单位
 DocType: Warehouse,Warehouse Contact Info,仓库联系方式
 DocType: Payment Entry,Write Off Difference Amount,核销金额差异
 DocType: Purchase Invoice,Recurring Type,经常性类型
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent",{0}：未发现员工的电子邮件，因此，电子邮件未发
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,"{0}: Employee email not found, hence email not sent",{0}：未发现员工的电子邮件，因此，电子邮件未发
+DocType: Item,Foreign Trade Details,外贸详细
 DocType: Email Digest,Annual Income,年收入
 DocType: Serial No,Serial No Details,序列号详情
 DocType: Purchase Invoice Item,Item Tax Rate,项目税率
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,"For {0}, only credit accounts can be linked against another debit entry",对于{0}，贷方分录只能选择贷方账户
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +133,"For {0}, only credit accounts can be linked against another debit entry",对于{0}，贷方分录只能选择贷方账户
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,所有任务的权重合计应为1。请相应调整的所有项目任务重
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +533,Delivery Note {0} is not submitted,送货单{0}未提交
 apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sub-contracted Item,项目{0}必须是外包项目
@@ -1219,12 +1300,13 @@
 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.",定价规则是第一选择是基于“应用在”字段，可以是项目，项目组或品牌。
 DocType: Hub Settings,Seller Website,卖家网站
 DocType: Item,ITEM-,项目-
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,对于销售团队总分配比例应为100
+apps/erpnext/erpnext/controllers/selling_controller.py +152,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}
 DocType: Appraisal Goal,Goal,目标
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,学生一批实力
 DocType: Sales Invoice Item,Edit Description,编辑说明
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,For Supplier,对供应商
+,Team Updates,团队更新
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,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,创建打印格式
@@ -1238,7 +1320,7 @@
 DocType: Purchase Invoice,Total (Company Currency),总（公司货币）
 apps/erpnext/erpnext/stock/utils.py +177,Serial number {0} entered more than once,序列号{0}已多次输入
 DocType: Depreciation Schedule,Journal Entry,日记帐分录
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,{0} items in progress,正在进行{0}项目
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +77,{0} items in progress,{0}操作中的单品
 DocType: Workstation,Workstation Name,工作站名称
 DocType: Grade Interval,Grade Code,等级代码
 DocType: POS Item Group,POS Item Group,POS项目组
@@ -1258,7 +1340,7 @@
 apps/erpnext/erpnext/accounts/party.py +168,Please select a Company,请选择一个公司
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,特权休假
 DocType: Purchase Invoice,Supplier Invoice Date,供应商发票日期
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +87,You need to enable Shopping Cart,您需要启用购物车
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,您需要启用购物车
 DocType: Payment Entry,Writeoff,注销
 DocType: Appraisal Template Goal,Appraisal Template Goal,评估目标模板
 DocType: Salary Component,Earning,盈余
@@ -1268,20 +1350,23 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,之间存在重叠的条件：
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,日记帐分录{0}已经被其他凭证调整
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,总订单价值
-apps/erpnext/erpnext/demo/setup/setup_data.py +314,Food,食品
+apps/erpnext/erpnext/demo/setup/setup_data.py +315,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 +102,Mark Attendence,马克考勤
+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}
 DocType: Project,Start and End Dates,开始和结束日期
 ,Delivered Items To Be Billed,无开账单的已交付品目
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},开放BOM {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,仓库不能为序列号变更
 DocType: Authorization Rule,Average Discount,平均折扣
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Rename Tool,Utilities,公用事业
 DocType: Purchase Invoice Item,Accounting,会计
 DocType: Employee,EMP/,EMP /
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation {0} already used for another salary component,缩写{0}已用于另一薪水部件
 DocType: Asset,Depreciation Schedules,折旧计划
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,申请期间不能请假外分配周期
 DocType: Activity Cost,Projects,项目
@@ -1306,13 +1391,14 @@
 DocType: Employee,Prefered Email,首选电子邮件
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,在固定资产净变动
 DocType: Leave Control Panel,Leave blank if considered for all designations,如果针对所有 职位请留空
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Warehouse is mandatory for non group Accounts of type Stock,仓库是强制性的类型股票的非组帐户
 apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}中的收取类型“实际”不能有“品目税率”
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},最大值：{0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,起始时间日期
 DocType: Email Digest,For Company,对公司
 apps/erpnext/erpnext/config/support.py +17,Communication log.,通信日志。
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.",询价被禁止访问门脉，为更多的检查门户设置。
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,采购数量
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Buying Amount,采购数量
 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,条款和条件内容
@@ -1333,6 +1419,7 @@
 DocType: HR Settings,Employee Settings,雇员设置
 ,Batch-Wise Balance History,批次余额历史
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,打印设置在相应的打印格式更新
+DocType: Package Code,Package Code,封装代码
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Apprentice,学徒
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,负数量是不允许的
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1351,6 +1438,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,显示未关闭的会计年度的盈亏平衡
 DocType: Shipping Rule,Shipping Account,送货账户
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: 帐户{2}无效
+apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,制作销售订单，以帮助你计划你的工作和按时交付
 DocType: Quality Inspection,Readings,阅读
 DocType: Stock Entry,Total Additional Costs,总额外费用
 DocType: Course Schedule,SH,SH
@@ -1361,7 +1449,7 @@
 DocType: Shipping Rule Condition,To Value,To值
 DocType: Asset Movement,Stock Manager,库存管理
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},行{0}中源仓库为必须项
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,Packing Slip,装箱单
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,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!,导入失败！
@@ -1374,14 +1462,16 @@
 DocType: Opportunity,With Items,随着项目
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,在数量
 DocType: Notification Control,Expense Claim Rejected,报销拒绝
-DocType: Item Attribute,Item Attribute,项目属性
+DocType: Item,Item Attribute,项目属性
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Government,政府
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,报销{0}已经存在车辆日志
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,学院名称
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,请输入还款金额
 apps/erpnext/erpnext/config/stock.py +300,Item Variants,项目变体
 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 +868,Select Possible Supplier,选择潜在供应商
 DocType: Sales Invoice,Source,源
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,显示关闭
 DocType: Leave Type,Is Leave Without Pay,是无薪休假
@@ -1393,27 +1483,32 @@
 DocType: POS Profile,Apply Discount,应用折扣
 DocType: Employee External Work History,Total Experience,总经验
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,打开项目
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,装箱单（ S）取消
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +267,Packing Slip(s) cancelled,装箱单（ S）取消
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,从投资现金流
 DocType: Program Course,Program Course,课程计划
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,货运及转运费
 DocType: Homepage,Company Tagline for website homepage,公司标语的网站主页
 DocType: Item Group,Item Group Name,项目群组名称
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,已经过
+DocType: Student,Date of Leaving,离开日期
 DocType: Pricing Rule,For Price List,对价格表
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,猎头
+apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,建立潜在客户
 DocType: Maintenance Schedule,Schedules,计划任务
 DocType: Purchase Invoice Item,Net Amount,净额
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM详情编号
+DocType: Landed Cost Voucher,Additional Charges,附加费用
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),额外的优惠金额（公司货币）
 apps/erpnext/erpnext/accounts/doctype/account/account.js +7,Please create new account from Chart of Accounts.,请从科目表创建新帐户。
 DocType: Maintenance Visit,Maintenance Visit,维护访问
+DocType: Student,Leaving Certificate Number,毕业证书号码
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,可用的批次数量在仓库
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,更新打印格式
 DocType: Landed Cost Voucher,Landed Cost Help,到岸成本帮助
 DocType: Purchase Invoice,Select Shipping Address,选择送货地址
 DocType: Leave Block List,Block Holidays on important days.,禁止重要日子的假期。
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,Accounts Receivable Summary,应收账款汇总
+DocType: Employee Loan,Monthly Repayment Amount,每月还款额
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,请在员工记录设置员工角色设置用户ID字段
 DocType: UOM,UOM Name,计量单位名称
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,贡献金额
@@ -1426,13 +1521,16 @@
 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 +2058,Default warehouse is required for selected item,默认仓库需要选中的项目
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2459,Default warehouse is required for selected item,默认仓库需要选中的项目
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,箱
-apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,本组织设置
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +865,Possible Supplier,可能的供应商
+apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,组织机构
 DocType: Budget,Monthly Distribution,月度分布
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +48,Student Batch exists with same name,学生批量使用相同的名称
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,接收人列表为空。请创建接收人列表
 DocType: Production Plan Sales Order,Production Plan Sales Order,生产计划销售订单
 DocType: Sales Partner,Sales Partner Target,销售合作伙伴目标
+DocType: Loan Type,Maximum Loan Amount,最高贷款额度
 DocType: Pricing Rule,Pricing Rule,定价规则
 DocType: Budget,Action if Annual Budget Exceeded,如果行动年度预算超标
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,材料要求采购订单
@@ -1451,9 +1549,12 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,未选择品目
 DocType: Shipping Rule Condition,From Value,起始值
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,Manufacturing Quantity is mandatory,生产数量为必须项
+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/config/hr.py +127,Claims for company expense.,公司开支报销
+apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students",学生在系统的心脏，添加所有的学生
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},行＃{0}：清除日期{1}无法支票日期前{2}
 DocType: Company,Default Holiday List,默认假期列表
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},行{0}：从时间和结束时间{1}是具有重叠{2}
@@ -1464,19 +1565,22 @@
 DocType: Student Group,Set 0 for no limit,为不限制设为0
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,这一天（S）对你所申请休假的假期。你不需要申请许可。
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,重新发送付款电子邮件
-apps/erpnext/erpnext/utilities/activation.py +77,Make Quotation,请报价
+apps/erpnext/erpnext/templates/pages/projects.html +27,New task,新任务
+apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,请报价
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,其他报告
 DocType: Dependent Task,Dependent Task,相关任务
 apps/erpnext/erpnext/stock/doctype/item/item.py +406,Conversion factor for default Unit of Measure must be 1 in row {0},行{0}中默认计量单位的转换系数必须是1
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},类型为{0}的假期不能长于{1}天
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,尝试规划X天行动提前。
 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 +942,Search Item,搜索项目
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1021,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 +401,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 +567,Already completed,已经完成
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +599,Already completed,已经完成
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},数量不能超过{0}
@@ -1488,12 +1592,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,序列号{0}的数量{1}不能是分数
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,主要的供应商类型。
 DocType: Purchase Order Item,Supplier Part Number,供应商零件编号
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Conversion rate cannot be 0 or 1,汇率不能为0或1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Conversion rate cannot be 0 or 1,汇率不能为0或1
 DocType: Sales Invoice,Reference Document,参考文献
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +185,{0} {1} is cancelled or stopped,{0} {1}被取消或停止
 DocType: Accounts Settings,Credit Controller,信用控制人
 DocType: Delivery Note,Vehicle Dispatch Date,车辆调度日期
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +222,Purchase Receipt {0} is not submitted,外购入库单{0}未提交
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +230,Purchase Receipt {0} is not submitted,外购入库单{0}未提交
 DocType: Company,Default Payable Account,默认应付账户
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.",网上购物车，如配送规则，价格表等的设置
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}％帐单
@@ -1501,19 +1605,21 @@
 DocType: Party Account,Party Account,党的帐户
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,人力资源
 DocType: Lead,Upper Income,高收入
+DocType: Item Manufacturer,Item Manufacturer,产品制造商
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +13,Reject,拒绝
 DocType: Journal Entry Account,Debit in Company Currency,借记卡在公司货币
 DocType: BOM Item,BOM Item,BOM品目
 DocType: Appraisal,For Employee,对员工
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,行{0}：提前对供应商必须扣除
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,请输入支付
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,Row {0}: Advance against Supplier must be debit,行{0}：提前对供应商必须扣除
 DocType: Company,Default Values,默认值
 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,搜集
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +81,Against Supplier Invoice {0} dated {1},对日期为{1}的供应商发票{0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},对日期为{1}的供应商发票{0}
 DocType: Customer,Default Price List,默认价格表
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Asset Movement record {0} created,资产运动记录{0}创建
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,您不能删除会计年度{0}。会计年度{0}设置为默认的全局设置
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +233,Asset Movement record {0} created,资产运动记录{0}创建
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,您不能删除会计年度{0}。会计年度{0}被设置为默认的全局设置
 DocType: Journal Entry,Entry Type,条目类型
 ,Customer Credit Balance,客户贷方余额
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Accounts Payable,应付账款净额变化
@@ -1528,6 +1634,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/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,保修申请
 ,Lead Details,线索详情
+DocType: Salary Slip,Loan repayment,偿还借款
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,当前发票周期的结束日期
 DocType: Pricing Rule,Applicable For,适用于
@@ -1543,9 +1650,10 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;总&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,启用购物车
 DocType: Employee,Permanent Address,永久地址
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +248,"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,请选择商品代码
+DocType: Student Sibling,Studying in Same Institute,就读于同一研究所
 DocType: Territory,Territory Manager,区域经理
 DocType: Packed Item,To Warehouse (Optional),仓库（可选）
 DocType: Payment Entry,Paid Amount (Company Currency),支付的金额（公司货币）
@@ -1566,7 +1674,7 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,学生批或学生组是强制性
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,为每个库存变动创建会计分录
 DocType: Leave Allocation,Total Leaves Allocated,分配的总叶
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +155,Warehouse required at Row No {0},在行无需仓库{0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +156,Warehouse required at Row No {0},在行无需仓库{0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +78,Please enter valid Financial Year Start and End Dates,请输入有效的财政年度开始和结束日期
 DocType: Employee,Date Of Retirement,退休日期
 DocType: Upload Attendance,Get Template,获取模板
@@ -1586,13 +1694,13 @@
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.",如果此项目有变体，那么它不能在销售订单等选择
 DocType: Lead,Next Contact By,下次联络人
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +254,Quantity required for Item {0} in row {1},行{1}中的品目{0}必须指定数量
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +114,Warehouse {0} can not be deleted as quantity exists for Item {1},仓库{0}无法删除，因为物件{1}有库存量
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +114,Warehouse {0} can not be deleted as quantity exists for Item {1},仓库{0}无法删除，因为产品{1}有库存量
 DocType: Quotation,Order Type,订单类型
 DocType: Purchase Invoice,Notification Email Address,通知邮件地址
 ,Item-wise Sales Register,逐项销售登记
 DocType: Asset,Gross Purchase Amount,总购买金额
 DocType: Asset,Depreciation Method,折旧方法
-apps/erpnext/erpnext/accounts/page/pos/pos.js +684,Offline,离线
+apps/erpnext/erpnext/accounts/page/pos/pos.js +686,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,需要
@@ -1604,6 +1712,7 @@
 DocType: Purchase Invoice Item,Batch No,批号
 apps/erpnext/erpnext/setup/utils.py +106,Unable to find exchange rate for {0} to {1} for key date {2},无法找到汇率{0} {1}的关键日期{2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,允许多个销售订单对客户的采购订单
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Guardian2 Mobile No,Guardian2手机号码
 apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,主
 apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,变体
 DocType: Naming Series,Set prefix for numbering series on your transactions,为交易设置编号系列的前缀
@@ -1613,7 +1722,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 +992,Make Purchase Order,创建采购订单
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,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,分配量
@@ -1630,15 +1739,19 @@
 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,发货规则的一个条件
 DocType: Grading Structure,Grading Intervals,分级间隔
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +169,Please set filter based on Item or Warehouse,根据项目或仓库请设置过滤器
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,请输入
+apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings",行不能overbill为项目{0} {1}超过{2}。要允许对帐单，请在购买设置中设置
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,根据项目或仓库请设置过滤器
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),此打包的净重。（根据内容物件的净重自动计算）
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,Please create an Account for this Warehouse and link it. This cannot be done automatically as an account with name {0} already exists,请创建此仓库的帐户，并将其链接。这不能与名称的帐户自动完成{0}已存在
 DocType: Sales Order,To Deliver and Bill,为了提供与比尔
 DocType: Student Batch,Instructors,教师
 DocType: GL Entry,Credit Amount in Account Currency,在账户币金额
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,BOM {0} must be submitted,BOM{0}未提交
 DocType: Authorization Control,Authorization Control,授权控制
 apps/erpnext/erpnext/controllers/buying_controller.py +304,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},行＃{0}：拒绝仓库是强制性的反对否决项{1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,Payment,付款
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +763,Payment,付款
+apps/erpnext/erpnext/utilities/activation.py +82,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}
 DocType: Employee,Salutation,称呼
@@ -1646,7 +1759,8 @@
 DocType: Student Leave Application,Student Leave Application,学生请假申请
 DocType: Item,Will also apply for variants,会同时应用于变体
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,"Asset cannot be cancelled, as it is already {0}",资产不能被取消，因为它已经是{0}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +40,Total working hours should not be greater than max working hours {0},总的工作时间不应超过最高工时更大{0}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},员工{0}上半天{1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},总的工作时间不应超过最高工时更大{0}
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,在销售时捆绑品目。
 DocType: Quotation Item,Actual Qty,实际数量
 DocType: Sales Invoice Item,References,参考
@@ -1656,6 +1770,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 +2031,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,车轮
@@ -1680,7 +1795,7 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +180,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},请公司制定“关于资产处置收益/损失帐户”{0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,从购买收据获取品目
 DocType: Serial No,Creation Date,创建日期
-apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},项目{0}多次出现价格表{1}
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},产品{0}多次出现价格表{1}
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +38,"Selling must be checked, if Applicable For is selected as {0}",如果“适用于”的值为{0}，则必须选择“销售”
 DocType: Production Plan Material Request,Material Request Date,材料申请日期
 DocType: Purchase Order Item,Supplier Quotation Item,供应商报价品目
@@ -1713,6 +1828,7 @@
 ,Amount to Deliver,量交付
 apps/erpnext/erpnext/public/js/setup_wizard.js +297,A Product or Service,产品或服务
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,这个词开始日期不能超过哪个术语链接学年的开学日期较早（学年{}）。请更正日期，然后再试一次。
+DocType: Guardian,Guardian Interests,守护兴趣
 DocType: Naming Series,Current Value,当前值
 apps/erpnext/erpnext/controllers/accounts_controller.py +248,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,多个会计年度的日期{0}存在。请设置公司财年
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0}已创建
@@ -1731,7 +1847,7 @@
 apps/erpnext/erpnext/accounts/party.py +293,Due Date cannot be before Posting Date,到期日不能前于过账日期
 DocType: Website Item Group,Website Item Group,网站物件组
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,关税与税项
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +349,Please enter Reference date,参考日期请输入
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +344,Please enter Reference date,参考日期请输入
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0}付款项不能由{1}过滤
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,将在网站显示的物件表
 DocType: Purchase Order Item Supplied,Supplied Qty,附送数量
@@ -1747,7 +1863,7 @@
 DocType: Payment Reconciliation Payment,Reference Row,引用行
 DocType: Installation Note,Installation Time,安装时间
 DocType: Sales Invoice,Accounting Details,会计细节
-apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,删除所有交易本公司
+apps/erpnext/erpnext/setup/doctype/company/company.js +67,Delete all the Transactions for this Company,删除所有交易本公司
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +181,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,详细解析
@@ -1756,6 +1872,8 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,请输入在上表请求材料
 DocType: Item Attribute,Attribute Name,属性名称
 DocType: BOM,Show In Website,在网站上显示
+DocType: Shopping Cart Settings,Show Quantity in Website,显示在网站数量
+DocType: Employee Loan Application,Total Payable Amount,合计应付额
 DocType: Task,Expected Time (in hours),预期时间（以小时计）
 DocType: Item Reorder,Check in (group),检查（组）
 ,Qty to Order,订购数量
@@ -1764,9 +1882,11 @@
 DocType: Opportunity,Mins to First Response,分钟为第一个反应
 DocType: Pricing Rule,Margin Type,保证金类型
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0}小时
+DocType: Course,Default Grading Scale,默认等级规模
 DocType: Appraisal,For Employee Name,对员工姓名
 DocType: Holiday List,Clear Table,清除表格
 DocType: C-Form Invoice Detail,Invoice No,发票号码
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +337,Make Payment,付款
 DocType: Room,Room Name,房间名称
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",离开不能应用/前{0}取消，因为假平衡已经被搬入转发在未来休假分配记录{1}
 DocType: Activity Cost,Costing Rate,成本率
@@ -1780,8 +1900,10 @@
 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/public/js/setup_wizard.js +303,Pair,对
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +887,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,半天时间应该是从之间的日期和终止日期
 DocType: Maintenance Schedule Detail,Actual Date,实际日期
 DocType: Item,Has Batch No,有批号
 apps/erpnext/erpnext/public/js/utils.js +90,Annual Billing: {0},年度结算：{0}
@@ -1804,6 +1926,8 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,Expected value after useful life must be greater than or equal to {0},使用寿命后预期值必须大于或等于{0}
 DocType: Purchase Receipt,Vehicle Number,车号
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,经常性发票终止日期
+DocType: Employee Loan,Loan Amount,贷款额度
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +396,Row {0}: Bill of Materials not found for the Item {1},行{0}：材料清单未找到项目{1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,共分配叶{0}不能小于已经批准叶{1}期间
 DocType: Journal Entry,Accounts Receivable,应收帐款
 ,Supplier-Wise Sales Analytics,供应商特定的销售分析
@@ -1815,6 +1939,7 @@
 DocType: Landed Cost Voucher,Distribute Charges Based On,费用分配基于
 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 +117,Expense Claim is pending approval. Only the Expense Approver can update status.,报销正在等待批准。只有开支审批人才能更改其状态。
 DocType: Email Digest,New Expenses,新的费用
 DocType: Purchase Invoice,Additional Discount Amount,额外的折扣金额
@@ -1823,6 +1948,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +273,Abbr can not be blank or space,缩写不能为空或空格
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,集团以非组
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,体育
+DocType: Loan Type,Loan Name,贷款名称
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,实际总
 DocType: Student Siblings,Student Siblings,学生兄弟姐妹
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,单位
@@ -1832,7 +1958,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,您的会计年度结束于
 DocType: POS Profile,Price List,价格表
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,默认财政年度已经更新为{0}。请刷新您的浏览器以使更改生效。
-apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,报销
+apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,报销
 DocType: Issue,Support,支持
 ,BOM Search,BOM搜索
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,Closing (Opening + Totals),截止（开标+总计）
@@ -1854,25 +1980,28 @@
 DocType: Territory,Classification of Customers by region,客户按区域分类
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,差量必须是零
 DocType: Project,Gross Margin,毛利
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,Please enter Production Item first,请先输入生产项目
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +188,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 +692,Quotation,报价
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +743,Quotation,报价
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,扣除总额
+,Production Analytics,生产Analytics（分析）
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,成本更新
 DocType: Employee,Date of Birth,出生日期
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,Item {0} has already been returned,项目{0}已被退回
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**财年**表示财政年度。所有的会计分录和其他重大交易将根据**财年**跟踪。
 DocType: Opportunity,Customer / Lead Address,客户/潜在客户地址
-apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},警告：附件无效的SSL证书{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},警告：附件{0}中存在无效的SSL证书
 DocType: Student Admission,Eligibility,合格
+apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads",信息帮助你的业务，你所有的联系人和更添加为您的线索
 DocType: Production Order Operation,Actual Operation Time,实际操作时间
 DocType: Authorization Rule,Applicable To (User),适用于(用户)
 DocType: Purchase Taxes and Charges,Deduct,扣款
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,职位描述
 DocType: Student Applicant,Applied,应用的
-DocType: Purchase Order Item,Qty as per Stock UOM,按库存计量单位数量
+DocType: Sales Invoice Item,Qty as per Stock UOM,按库存计量单位数量
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +52,Guardian2 Name,Guardian2名称
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","命名序列中不能输入特殊符号，""-""，""#""，"".""和""/""除外"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",追踪销售活动。追踪来自活动的潜在客户，报价，销售订单等，统计投资回报率。
 DocType: Expense Claim,Approver,审批者
@@ -1882,7 +2011,7 @@
 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/config/stock.py +158,Split Delivery Note into packages.,分裂送货单成包。
-apps/erpnext/erpnext/hooks.py +81,Shipments,发货
+apps/erpnext/erpnext/hooks.py +87,Shipments,发货
 DocType: Payment Entry,Total Allocated Amount (Company Currency),总拨款额（公司币种）
 DocType: Purchase Order Item,To be delivered to customer,要传送给客户
 DocType: BOM,Scrap Material Cost,废料成本
@@ -1894,16 +2023,16 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,杂项开支
 DocType: Global Defaults,Default Company,默认公司
 apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,品目{0}必须指定开支/差异账户。
-apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",不能为行{1}的{0}开具超过{2}的超额账单。要允许超额账单请更改仓储设置。
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,银行名称
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-以上
+DocType: Employee Loan,Employee Loan Account,员工贷款账户
 DocType: Leave Application,Total Leave Days,总休假天数
 DocType: Email Digest,Note: Email will not be sent to disabled users,注意：邮件不会发送给已禁用用户
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,选择公司...
 DocType: Leave Control Panel,Leave blank if considered for all departments,如果针对所有部门请留空
-apps/erpnext/erpnext/config/hr.py +202,"Types of employment (permanent, contract, intern etc.).",就业（永久，合同，实习生等）的类型。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,{0} is mandatory for Item {1},物料 {1} 必须有{0}
+apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).",就业（永久，合同，实习生等）的类型。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,{0} is mandatory for Item {1},{0}是{1}的必填项
 DocType: Process Payroll,Fortnightly,半月刊
 DocType: Currency Exchange,From Currency,源货币
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",请ATLEAST一行选择分配金额，发票类型和发票号码
@@ -1912,24 +2041,28 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),单价（公司货币）
 DocType: Student Guardian,Others,他人
 DocType: Payment Entry,Unallocated Amount,未分配金额
-apps/erpnext/erpnext/templates/includes/product_page.js +65,Cannot find a matching Item. Please select some other value for {0}.,无法找到匹配的项目。请选择其他值{0}。
+apps/erpnext/erpnext/templates/includes/product_page.js +69,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,没有更多的更新
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,第一行的“收取类型”不能是“基于上一行的金额”或者“前一行的总计”
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,子项不应该是一个产品包。请删除项目`{0}`和保存
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,银行业
+apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,添加时间表
 DocType: Vehicle Service,Service Item,服务项目
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,请在“生成表”点击获取时间表
-apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,There were errors while deleting following schedules:,有错误，同时删除以下时间表：
+apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,There were errors while deleting following schedules:,删除以下计划时发生错误：
 DocType: Bin,Ordered Quantity,订购数量
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,"e.g. ""Build tools for builders""",例如“建筑工人的建筑工具！”
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}在{2}会计分录只能在货币言：{3}
+DocType: Grading Scale,Grading Scale Intervals,分级刻度间隔
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}在{2}会计分录只能在货币：{3}
 DocType: Production Order,In Process,进行中
 DocType: Authorization Rule,Itemwise Discount,项目特定的折扣
 apps/erpnext/erpnext/config/accounts.py +69,Tree of financial accounts.,财务账目的树。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{0} against Sales Order {1},{0}不允许销售订单{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +352,{0} against Sales Order {1},{0}不允许销售订单{1}
 DocType: Account,Fixed Asset,固定资产
 apps/erpnext/erpnext/config/stock.py +315,Serialized Inventory,序列化库存
+DocType: Employee Loan,Account Info,帐户信息
 DocType: Activity Type,Default Billing Rate,默认计费率
 DocType: Sales Invoice,Total Billing Amount,总结算金额
 apps/erpnext/erpnext/hr/doctype/daily_work_summary_settings/daily_work_summary_settings.py +17,There must be a default incoming Email Account enabled for this to work. Please setup a default incoming Email Account (POP/IMAP) and try again.,必须有这个工作，启用默认进入的电子邮件帐户。请设置一个默认的传入电子邮件帐户（POP / IMAP），然后再试一次。
@@ -1939,7 +2072,7 @@
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,销售订单到付款
 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 +847,Please select correct account,请选择正确的帐户
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +848,Please select correct account,请选择正确的帐户
 DocType: Item,Weight UOM,重量计量单位
 DocType: Salary Structure Employee,Salary Structure Employee,薪资结构员工
 DocType: Employee,Blood Group,血型
@@ -1958,9 +2091,11 @@
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.",如果您已经创建了销售税和费模板标准模板，选择一个，然后点击下面的按钮。
 DocType: BOM Scrap Item,Basic Amount (Company Currency),基本金额（公司币种）
 DocType: Student,Guardians,守护者
+DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,价格将不会显示如果没有设置价格
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,请指定一个国家的这种运输规则或检查全世界运输
 DocType: Stock Entry,Total Incoming Value,总传入值
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,借记是必需的
+apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team",时间表帮助追踪的时间，费用和结算由你的团队做activites
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,采购价格表
 DocType: Offer Letter Term,Offer Term,要约期限
 DocType: Quality Inspection,Quality Manager,质量经理
@@ -1969,16 +2104,18 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,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网站运营
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,报价函
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,生成材料要求(MRP)和生产订单。
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,总开票金额
 DocType: BOM,Conversion Rate,兑换率
+apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,产品搜索
 DocType: Timesheet Detail,To Time,要时间
 DocType: Authorization Rule,Approving Role (above authorized value),批准角色（上述授权值）
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,入贷科目必须是一个“应付”科目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +110,Credit To account must be a Payable account,入贷科目必须是一个“应付”科目
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +272,BOM recursion: {0} cannot be parent or child of {2},BOM {0}不能是{2}的上级或下级
 DocType: Production Order Operation,Completed Qty,已完成数量
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"For {0}, only debit accounts can be linked against another credit entry",对于{0}，借方分录只能选择借方账户
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,"For {0}, only debit accounts can be linked against another credit entry",对于{0}，借方分录只能选择借方账户
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,价格表{0}被禁用
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty cannot be more than {1} for operation {2},行{0}：已完成的数量不能超过{1}操作{2}
 DocType: Manufacturing Settings,Allow Overtime,允许加班
@@ -1991,12 +2128,13 @@
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,新地址
 DocType: Quality Inspection,Sample Size,样本大小
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,请输入收据凭证
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +375,All items have already been invoiced,所有品目已开具发票
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +376,All items have already been invoiced,所有品目已开具发票
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',请指定一个有效的“从案号”
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,进一步的成本中心可以根据组进行，但项可以对非组进行
 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 +920,Production Orders Created: {0},生产订单创建：{0}
 DocType: Branch,Branch,分支
 DocType: Guardian,Mobile Number,手机号码
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,印刷及品牌
@@ -2005,7 +2143,8 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,序列号{0}未找到
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,学生批
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,您的客户
-apps/erpnext/erpnext/projects/doctype/project/project.py +183,You have been invited to collaborate on the project: {0},您已被邀请在项目上进行合作：{0}
+apps/erpnext/erpnext/utilities/activation.py +120,Make Student,使学生
+apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},您已被邀请在项目上进行合作：{0}
 DocType: Leave Block List Date,Block Date,禁离日期
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,现在申请
 DocType: Sales Order,Not Delivered,未交付
@@ -2018,7 +2157,7 @@
 DocType: Timesheet Detail,Costing Amount,成本核算金额
 DocType: Student Admission,Application Fee,报名费
 DocType: Process Payroll,Submit Salary Slip,提交工资单
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,品目{0}的最大折扣为 {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +166,Maxiumm discount for Item {0} is {1}%,品目{0}的最大折扣为 {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,进口散装
 DocType: Sales Partner,Address & Contacts,地址及联系方式
 DocType: SMS Log,Sender Name,发件人名称
@@ -2026,7 +2165,7 @@
 DocType: SMS Log,Sent To,发给
 DocType: Payment Request,Make Sales Invoice,创建销售发票
 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,接下来跟日期不能过去
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,接下来跟日期不能过去
 DocType: Company,For Reference Only.,仅供参考。
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},无效的{0}：{1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
@@ -2040,12 +2179,13 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,No Item with Barcode {0},没有条码为{0}的品目
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,箱号不能为0
 DocType: Item,Show a slideshow at the top of the page,在页面顶部显示幻灯片
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +444,Boms,物料清单
 apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,仓库
 DocType: Serial No,Delivery Time,交货时间
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,账龄基于
 DocType: Item,End of Life,寿命结束
-apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,旅游
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,No active or default Salary Structure found for employee {0} for the given dates,发现员工{0}对于给定的日期没有活动或默认的薪酬结构
+apps/erpnext/erpnext/demo/setup/setup_data.py +318,Travel,旅游
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,No active or default Salary Structure found for employee {0} for the given dates,发现员工{0}对于给定的日期没有活动或默认的薪酬结构
 DocType: Leave Block List,Allow Users,允许用户(多个)
 DocType: Purchase Order,Customer Mobile No,客户手机号码
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,跟踪独立收入和支出进行产品垂直或部门。
@@ -2053,10 +2193,10 @@
 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 +735,Transfer Material,转印材料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,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 +189,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 +957,Please set recurring after saving,请设置保存后复发
+apps/erpnext/erpnext/public/js/controllers/transaction.js +991,Please set recurring after saving,请设置保存后复发
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,Select change amount account,选择变化量账户
 DocType: Purchase Invoice,Price List Currency,价格表货币
 DocType: Naming Series,User must always select,用户必须始终选择
@@ -2076,22 +2216,24 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Source of Funds (Liabilities),资金来源（负债）
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},行{0}中的数量({1})必须等于生产数量{2}
 DocType: Appraisal,Employee,雇员
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1}已完全开票
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for treshold 0%,请定义treshold 0％品位
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,{0} {1} is fully billed,{0} {1}已完全开票
 DocType: Training Event,End Time,结束时间
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +61,Active Salary Structure {0} found for employee {1} for the given dates,主动薪酬结构找到{0}员工{1}对于给定的日期
 DocType: Payment Entry,Payment Deductions or Loss,付款扣除或损失
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,销售或采购的标准合同条款。
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Voucher,基于凭证分组
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,销售渠道
 DocType: Student Batch Student,Student Batch Student,学生批学生
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},请薪酬部分设置默认帐户{0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Please set default account in Salary Component {0},请薪酬部分设置默认帐户{0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,要求在
 DocType: Rename Tool,File to Rename,文件重命名
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},请行选择BOM为项目{0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},要求项目Purchse订单号{0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +208,Purchse Order number required for Item {0},要求项目Purchse订单号{0}
 apps/erpnext/erpnext/controllers/buying_controller.py +266,Specified BOM {0} does not exist for Item {1},品目{1}指定的BOM{0}不存在
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +199,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消维护计划{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +212,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消维护计划{0}
 DocType: Notification Control,Expense Claim Approved,报销批准
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,Salary Slip of employee {0} already created for this period,员工的工资单{0}已为这一时期创建
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +316,Salary Slip of employee {0} already created for this period,员工的工资单{0}已为这一时期创建
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +117,Pharmaceutical,医药
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,采购品目成本
 DocType: Selling Settings,Sales Order Required,销售订单为必须项
@@ -2107,14 +2249,14 @@
 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 +791,Please specify Company to proceed,请注明公司进行
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +846,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,已接受
 DocType: SG Creation Tool Course,Student Group Name,学生组名称
-apps/erpnext/erpnext/setup/doctype/company/company.js +46,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.,请确保你真的要删除这家公司的所有交易。主数据将保持原样。这个动作不能撤消。
+apps/erpnext/erpnext/setup/doctype/company/company.js +47,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 +93,Invalid reference {0} {1},无效的参考{0} {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +92,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})
 DocType: Shipping Rule,Shipping Rule Label,配送规则标签
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,用户论坛
@@ -2122,10 +2264,11 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,如果任何条目中引用了BOM，你不能更改其税率
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.py +24,Student Group exists with same name,学生组存在同名
 DocType: Employee,Previous Work Experience,以前的工作经验
 DocType: Stock Entry,For Quantity,对于数量
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},请输入计划数量的项目{0}在行{1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{0} {1} is not submitted,{0} {1}未提交
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +229,{0} {1} is not submitted,{0} {1}未提交
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,请求的项目。
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,独立的生产订单将每个成品项目被创建。
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0}必须返回文档中负
@@ -2140,6 +2283,7 @@
 DocType: Student Admission,Naming Series (for Student Applicant),命名系列（面向学生申请人）
 DocType: Delivery Note,Transporter Name,转运名称
 DocType: Authorization Rule,Authorized Value,授权值
+DocType: BOM,Show Operations,显示操作
 ,Minutes to First Response for Opportunity,分钟的机会第一个反应
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,共缺席
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,Item or Warehouse for row {0} does not match Material Request,行{0}中的项目或仓库与物料申请不符合
@@ -2151,7 +2295,7 @@
 DocType: Operation,Default Workstation,默认工作台
 DocType: Notification Control,Expense Claim Approved Message,报销批准消息
 DocType: Payment Entry,Deductions or Loss,扣除或损失
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{0} {1} is closed,{0} {1} 已关闭
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +235,{0} {1} is closed,{0} {1} 已关闭
 DocType: Email Digest,How frequently?,多经常？
 DocType: Purchase Receipt,Get Current Stock,获取当前库存
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,物料清单树
@@ -2173,15 +2317,16 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,审批与被审批用户不能相同
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),基础利率（按库存计量单位）
 DocType: SMS Log,No of Requested SMS,请求短信数量
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,Leave Without Pay does not match with approved Leave Application records,停薪留职不批准请假的记录相匹配
+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 +697,Please supply the specified items at the best possible rates,请在提供最好的利率规定的项目
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,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 +82,End Year,结束年份
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,合同结束日期必须大于加入的日期
 DocType: Delivery Note,DN-,DN-
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,授权销售公司产品的第三方分销商/经销商/授权代理商/分支机构/转销商
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{0} against Purchase Order {1},{0}不允许采购订单{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Purchase Order {1},{0}不允许采购订单{1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","请输入静态的URL参数(例如 sender=ERPNext, username=ERPNext, password=1234 etc.)"
 DocType: Task,Actual Start Date (via Time Sheet),实际开始日期（通过时间表）
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,这是一个示例网站从ERPNext自动生成
@@ -2224,8 +2369,9 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +526,Stock Entry {0} is not submitted,库存记录{0}不提交
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +527,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,接着联系到不能相同铅邮箱地址
 DocType: Tax Rule,Billing City,结算城市
 DocType: Asset,Manual,手册
 DocType: Salary Component Account,Salary Component Account,薪金部分账户
@@ -2254,7 +2400,7 @@
 DocType: Salary Structure,Total Earning,总盈利
 DocType: Purchase Receipt,Time at which materials were received,收到材料在哪个时间
 DocType: Stock Ledger Entry,Outgoing Rate,传出率
-apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,组织分支主。
+apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,组织分支主。
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,或
 DocType: Sales Order,Billing Status,账单状态
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,报告问题
@@ -2286,35 +2432,42 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,收到文件必须提交
 DocType: Purchase Invoice Item,Received Qty,收到数量
 DocType: Stock Entry Detail,Serial No / Batch,序列号/批次
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +297,Not Paid and Not Delivered,没有支付，未送达
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,没有支付，未送达
 DocType: Product Bundle,Parent Item,父项目
 DocType: Account,Account Type,账户类型
 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',维护计划没有为所有品目生成，请点击“生产计划”
 ,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}也必须包括
+apps/erpnext/erpnext/utilities/activation.py +102,Make User,使用户
 DocType: Packing Slip,Identification of the package for the delivery (for print),打包品目的名称
 DocType: Bin,Reserved Quantity,保留数量
 DocType: Landed Cost Voucher,Purchase Receipt Items,采购入库项目
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,自定义表单
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +36,Arrear,拖欠
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,期间折旧额
 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 +777,Delivery,交货
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,交货
 DocType: Stock Reconciliation Item,Current Qty,目前数量
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",参见成本部分的“材料价格基于”
 DocType: Appraisal Goal,Key Responsibility Area,关键责任区
+apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students",学生批帮助您跟踪学生的出勤，评估和费用
 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 +768,"LocalStorage is full, did not save",localStorage的是满的，没救
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,Row {0}: UOM Conversion Factor is mandatory,行{0}：计量单位转换系数是必需的
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,参考
 DocType: Budget,Cost Center,成本中心
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,凭证 #
 DocType: Notification Control,Purchase Order Message,采购订单的消息
 DocType: Tax Rule,Shipping Country,航运国家
+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.",定价规则是由覆盖价格表/定义折扣百分比，基于某些条件。
@@ -2334,37 +2487,41 @@
 DocType: Task,% Progress,％进展
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Gain/Loss on Asset Disposal,在资产处置收益/损失
 DocType: Training Event,Will send an email about the event to employees with status 'Open',会发邮件有关该事件员工状态“打开”
+DocType: Task,Depends on Tasks,取决于任务
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,管理客户群组
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,新建成本中心名称
 DocType: Leave Control Panel,Leave Control Panel,假期控制面板
 DocType: Project,Task Completion,任务完成
-apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,没存货
+apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,断货
 DocType: Appraisal,HR User,HR用户
 DocType: Purchase Invoice,Taxes and Charges Deducted,已扣除税费
-apps/erpnext/erpnext/hooks.py +110,Issues,问题
+apps/erpnext/erpnext/hooks.py +116,Issues,问题
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},状态必须是{0}中的一个
 DocType: Sales Invoice,Debit To,入借
 DocType: Delivery Note,Required only for sample item.,只对样品项目所需。
 DocType: Stock Ledger Entry,Actual Qty After Transaction,事务后实际数量
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},没有找到之间的工资单{0}和{1}
 ,Pending SO Items For Purchase Request,待处理的SO项目对于采购申请
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,学生入学
 apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is disabled,{0} {1}已禁用
 DocType: Supplier,Billing Currency,结算货币
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,特大号
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Leaves,叶总
 ,Profit and Loss Statement,损益表
 DocType: Bank Reconciliation Detail,Cheque Number,支票号码
 ,Sales Browser,销售列表
 DocType: Journal Entry,Total Credit,总积分
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Warning: Another {0} # {1} exists against stock entry {2},警告：针对库存记录{2}存在另一个{0}＃{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +530,Warning: Another {0} # {1} exists against stock entry {2},警告：针对库存记录{2}存在另一个{0}＃{1}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Local,当地
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),贷款及垫款（资产）
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,债务人
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Large,大
 DocType: Homepage Featured Product,Homepage Featured Product,首页推荐产品
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,所有评估组
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,新仓库名称
-apps/erpnext/erpnext/accounts/report/financial_statements.py +219,Total {0} ({1}),总{0}（{1}）
+apps/erpnext/erpnext/accounts/report/financial_statements.py +218,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,请注明无需访问
 DocType: Stock Settings,Default Valuation Method,默认估值方法
@@ -2376,14 +2533,15 @@
 DocType: Student Applicant,Application Status,应用现状
 DocType: Fees,Fees,费用
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,指定货币兑换的汇率
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,报价{0}已被取消
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Quotation {0} is cancelled,报价{0}已被取消
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,未偿还总额
 DocType: Sales Partner,Targets,目标
 DocType: Price List,Price List Master,价格表大师
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,所有的销售交易都可以标记多个**销售人员**，方便你设置和监控目标。
 ,S.O. No.,销售订单号
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},请牵头建立客户{0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},请牵头建立客户{0}
 DocType: Price List,Applicable for Countries,适用于国家
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,只留下地位的申请“已批准”和“拒绝”，就可以提交
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +38,Student Group Name is mandatory in row {0},学生组名称是强制性的行{0}
 DocType: Homepage,Products to be shown on website homepage,在网站首页中显示的产品
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,ERPNext是一个开源的基于Web的ERP系统通过网络注技术私人有限公司向提供集成的工具，在一个小的组织管理大多数进程。有关Web注释，或购买托管楝更多信息，请访问
@@ -2392,7 +2550,7 @@
 DocType: Employee Education,Graduate,研究生
 DocType: Leave Block List,Block Days,禁离天数
 DocType: Journal Entry,Excise Entry,Excise分录
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +66,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},警告：销售订单{0}已经存在针对客户的采购订单{1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +69,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},警告：销售订单{0}已经存在针对客户的采购订单{1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2407,16 +2565,20 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.",可以添加至销售或采购的标准条款和条件。例如：1. 报价有效期。 2.付款条件(预付款，赊购，部分预付款)。3.其他，例如安全/使用警告，退货政策，配送条款，争议/赔偿/责任仲裁方式，贵公司的地址和联系方式。
 DocType: Attendance,Leave Type,假期类型
+DocType: Purchase Invoice,Supplier Invoice Details,供应商发票明细
 apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,开支/差异帐户({0})必须是一个“益损”账户
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,Name error: {0},名称错误：{0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,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/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,薪酬注册
 DocType: Warehouse,Parent Warehouse,家长仓库
 DocType: C-Form Invoice Detail,Net Total,总净
+apps/erpnext/erpnext/config/hr.py +163,Define various loan types,定义不同的贷款类型
 DocType: Bin,FCFS Rate,FCFS率
 DocType: Payment Reconciliation Invoice,Outstanding Amount,未偿还的金额
+apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),时间（分钟）
 DocType: Project Task,Working,工作
 DocType: Stock Ledger Entry,Stock Queue (FIFO),库存队列(先进先出)
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +39,{0} does not belong to Company {1},{0}不属于公司{1}
@@ -2424,18 +2586,19 @@
 DocType: Account,Round Off,四舍五入
 ,Requested Qty,请求数量
 DocType: Tax Rule,Use for Shopping Cart,使用的购物车
-apps/erpnext/erpnext/controllers/item_variant.py +73,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},值{0}的属性{1}不在有效的项目列表中存在的属性值项{2}
+apps/erpnext/erpnext/controllers/item_variant.py +98,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",费用会根据你选择的品目数量和金额按比例分配。
 DocType: Maintenance Visit,Purposes,用途
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,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}，分解成运行多个操作
 ,Requested,要求
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,No Remarks,暂无说明
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,No Remarks,暂无说明
 DocType: Purchase Invoice,Overdue,过期的
 DocType: Account,Stock Received But Not Billed,已收货未开单的库存
 apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,根帐户必须是一组
 DocType: Fees,FEE.,费用。
+DocType: Employee Loan,Repaid/Closed,偿还/关闭
 DocType: Item,Total Projected Qty,预计总数量
 DocType: Monthly Distribution,Distribution Name,分配名称
 DocType: Course,Course Code,课程代码
@@ -2452,12 +2615,13 @@
 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.,折扣百分比可以应用于一个或所有的价目表。
 DocType: Purchase Invoice,Half-yearly,半年一次
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +391,Accounting Entry for Stock,库存的会计分录
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +399,Accounting Entry for Stock,库存的会计分录
 DocType: Vehicle Service,Engine Oil,机油
 DocType: Sales Invoice,Sales Team1,销售团队1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,项目{0}不存在
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,产品{0}不存在
 DocType: Attendance Tool Student,Attendance Tool Student,考勤工具学生
 DocType: Sales Invoice,Customer Address,客户地址
+DocType: Employee Loan,Loan Details,贷款详情
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,行{0}：已完成数量必须大于零。
 DocType: Purchase Invoice,Apply Additional Discount On,收取额外折扣
 DocType: Account,Root Type,根类型
@@ -2475,25 +2639,26 @@
 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 +706,Warning: Material Requested Qty is less than Minimum Order Qty,警告：物料请求的数量低于最低起订量
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,Warning: Material Requested Qty is less than Minimum Order Qty,警告：物料请求的数量低于最低起订量
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +212,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/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,佣金率不能大于100
+apps/erpnext/erpnext/controllers/selling_controller.py +131,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}第一
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +64,No replies from,从没有回复
 DocType: Production Order Operation,Actual End Time,实际结束时间
 DocType: Production Planning Tool,Download Materials Required,下载所需物料
-DocType: Item,Manufacturer Part Number,制造商零件编号
+DocType: Item Manufacturer,Manufacturer Part Number,制造商零件编号
 DocType: Production Order Operation,Estimated Time and Cost,预计时间和成本
 DocType: Bin,Bin,仓位
 DocType: SMS Log,No of Sent SMS,发送短信数量
 DocType: Account,Expense Account,开支帐户
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,软件
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Colour,颜色
+DocType: Assessment Plan Criteria,Assessment Plan Criteria,评估计划标准
 DocType: Training Event,Scheduled,已计划
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,询价。
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",请选择项，其中“正股项”是“否”和“是销售物品”是“是”，没有其他产品捆绑
@@ -2509,12 +2674,16 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,项目开始日期
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,直到
 DocType: Rename Tool,Rename Log,重命名日志
+DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,维护发票时间和工作时间的时间表相同
 DocType: Maintenance Visit Purpose,Against Document No,对文档编号
 DocType: BOM,Scrap,废料
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,管理销售合作伙伴。
 DocType: Quality Inspection,Inspection Type,检验类型
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,Warehouses with existing transaction can not be converted to group.,与现有的交易仓库不能转换为组。
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},请选择{0}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,与现有的交易仓库不能转换为组。
+DocType: Assessment Result Tool,Result HTML,结果HTML
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,到期
+apps/erpnext/erpnext/utilities/activation.py +118,Add Students,新增学生
+apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},请选择{0}
 DocType: C-Form,C-Form No,C-表编号
 DocType: BOM,Exploded_items,展开品目
 DocType: Employee Attendance Tool,Unmarked Attendance,无标记考勤
@@ -2529,13 +2698,14 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,序列号{0}已创建
 DocType: Homepage,Company Description for website homepage,公司介绍了网站的首页
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",为方便客户，这些代码可以在打印格式(如发票和送货单)中使用
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Suplier名称
 DocType: Sales Invoice,Time Sheet List,时间表列表
 DocType: Employee,You can enter any date manually,您可以手动输入日期
 DocType: Asset Category Account,Depreciation Expense Account,折旧费用帐户
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Probationary Period,试用期
 DocType: Customer Group,Only leaf nodes are allowed in transaction,只有叶节点中允许交易
 DocType: Expense Claim,Expense Approver,开支审批人
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,行{0}：提前对客户必须是信用
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +124,Row {0}: Advance against Customer must be credit,行{0}：提前对客户必须是信用
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,非集团集团
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,采购入库项目提供
 DocType: Payment Entry,Pay,付
@@ -2548,7 +2718,6 @@
 DocType: Item,Inspection Required before Delivery,分娩前检查所需
 DocType: Item,Inspection Required before Purchase,购买前检查所需
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,待活动
-DocType: Payment Gateway,Gateway,网关
 DocType: Fee Component,Fees Category,费用类别
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,请输入解除日期。
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,金额
@@ -2576,6 +2745,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py +198,Limit Crossed,限制交叉
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,创业投资
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,这个“学年”一个学期{0}和“术语名称”{1}已经存在。请修改这些条目，然后再试一次。
+apps/erpnext/erpnext/stock/doctype/item/item.py +466,"As there are existing transactions against item {0}, you can not change the value of {1}",由于有对项目{0}现有的交易，你不能改变的值{1}
 DocType: UOM,Must be Whole Number,必须是整数
 DocType: Leave Control Panel,New Leaves Allocated (In Days),新调配的假期(天数)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,序列号{0}不存在
@@ -2599,6 +2769,7 @@
 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,员工考勤工具
+DocType: Guardian Student,Guardian Student,学生监护人
 DocType: Supplier,Credit Limit,信用额度
 DocType: Production Plan Sales Order,Salse Order Date,Salse订单日期
 DocType: Salary Component,Salary Component,薪金部分
@@ -2612,8 +2783,9 @@
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,条款或合同模板。
 DocType: Purchase Invoice,Address and Contact,地址和联系方式
 DocType: Cheque Print Template,Is Account Payable,为应付账款
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +261,Stock cannot be updated against Purchase Receipt {0},库存不能对外购入库单进行更新{0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +269,Stock cannot be updated against Purchase Receipt {0},库存不能对外购入库单进行更新{0}
 DocType: Supplier,Last Day of the Next Month,下个月的最后一天
+DocType: Support Settings,Auto close Issue after 7 days,7天之后自动关闭问题
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",假，不是之前分配{0}，因为休假余额已经结转转发在未来的假期分配记录{1}
 apps/erpnext/erpnext/accounts/party.py +302,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),注意：到期日/计入日已超过客户信用日期{0}天。
 apps/erpnext/erpnext/schools/doctype/program/program.js +9,Student Applicant,学生申请
@@ -2630,14 +2802,14 @@
 DocType: Quality Inspection,Outgoing,传出
 DocType: Material Request,Requested For,对于要求
 DocType: Quotation Item,Against Doctype,对文档类型
-apps/erpnext/erpnext/controllers/buying_controller.py +380,{0} {1} is cancelled or closed,{0} {1}被取消或关闭
+apps/erpnext/erpnext/controllers/buying_controller.py +391,{0} {1} is cancelled or closed,{0} {1}被取消或关闭
 DocType: Delivery Note,Track this Delivery Note against any Project,跟踪此送货单反对任何项目
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,从投资净现金
 ,Is Primary Address,是主地址
 DocType: Production Order,Work-in-Progress Warehouse,在制品仓库
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,资产{0}必须提交
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},考勤记录{0}存在针对学生{1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},参考＃ {0}记载日期为{1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +62,Attendance Record {0} exists against Student {1},考勤记录{0}存在针对学生{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,Reference #{0} dated {1},参考＃ {0}记载日期为{1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,折旧淘汰因处置资产
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,管理地址
 DocType: Asset,Item Code,项目编号
@@ -2647,7 +2819,7 @@
 DocType: Lead,Market Segment,市场分类
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +867,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 +235,Closing (Dr),结算(借记)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +238,Closing (Dr),结算(借记)
 DocType: Cheque Print Template,Cheque Size,支票大小
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,序列号{0}无库存
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,销售业务的税务模板。
@@ -2655,6 +2827,7 @@
 DocType: Student Batch Creation Tool,Student Batch Creation Tool,学生批量制作工具
 DocType: Stock Settings,Default Stock UOM,默认库存计量单位
 DocType: Asset,Number of Depreciations Booked,预订折旧数
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},对员工贷款：{0}
 DocType: Landed Cost Item,Receipt Document,收到文件
 DocType: Production Planning Tool,Create Material Requests,创建物料需要
 DocType: Employee Education,School/University,学校/大学
@@ -2663,30 +2836,35 @@
 DocType: Sales Invoice Item,Available Qty at Warehouse,库存可用数量
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,已开票金额
 DocType: Asset,Double Declining Balance,双倍余额递减
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Closed order cannot be cancelled. Unclose to cancel.,关闭的定单不能被取消。 Unclose取消。
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +170,Closed order cannot be cancelled. Unclose to cancel.,关闭的定单不能被取消。 Unclose取消。
 DocType: Student Guardian,Father,父亲
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,固定资产销售不能选择“更新库存”
 DocType: Bank Reconciliation,Bank Reconciliation,银行对帐
+DocType: Attendance,On Leave,休假
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,获取更新
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}帐户{2}不属于公司{3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,物料申请{0}已取消或已停止
 apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,添加了一些样本记录
-apps/erpnext/erpnext/config/hr.py +304,Leave Management,离开管理
+apps/erpnext/erpnext/config/hr.py +301,Leave Management,离开管理
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,基于账户分组
 DocType: Sales Order,Fully Delivered,完全交付
 DocType: Lead,Lower Income,较低收益
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},行{0}中的源和目标仓库不能相同
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",差异帐户必须是资产/负债类型的帐户，因为此库存盘点在期初进行
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,Purchase Order number required for Item {0},所需物品的采购订单号{0}
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},支付额不能超过贷款金额较大的{0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +86,Purchase Order number required for Item {0},所需物品的采购订单号{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +871,Production Order not created,生产订单未创建
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',“起始日期”必须早于'终止日期'
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},无法改变地位的学生{0}与学生申请链接{1}
 DocType: Asset,Fully Depreciated,已提足折旧
 ,Stock Projected Qty,预计库存量
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,Customer {0} does not belong to project {1},客户{0}不属于项目{1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,显着的考勤HTML
+apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers",语录是建议，你已经发送到你的客户提高出价
 DocType: Sales Order,Customer's Purchase Order,客户采购订单
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,序列号和批次
 DocType: Warranty Claim,From Company,源公司
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +52,Sum of Scores of Assessment Criteria needs to be {0}.,评估标准的得分之和必须是{0}。
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,请设置折旧数预订
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,价值或数量
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,制作订单不能上调：
@@ -2694,14 +2872,15 @@
 DocType: Purchase Invoice,Purchase Taxes and Charges,购置税和费
 ,Qty to Receive,接收数量
 DocType: Leave Block List,Leave Block List Allowed,禁离日例外用户
+DocType: Grading Scale Interval,Grading Scale Interval,分级分度值
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},报销车辆登录{0}
 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 +106,Credit To account must be a Balance Sheet account,信用帐户必须是资产负债表科目
+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 +128,All Supplier Types,所有供应商类型
 DocType: Global Defaults,Disable In Words,禁用词
 apps/erpnext/erpnext/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,项目编号是必须项，因为项目没有自动编号
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},报价{0} 不属于{1}类型
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Quotation {0} not of type {1},报价{0} 不属于{1}类型
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,维护计划品目
 DocType: Sales Order,%  Delivered,％已交付
 DocType: Production Order,PRO-,PRO-
@@ -2709,6 +2888,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,创建工资单
 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,编辑投稿时间
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},请设置在资产类别{0}或公司折旧相关帐户{1}
 DocType: Academic Term,Academic Year,学年
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,期初余额权益
@@ -2723,6 +2903,7 @@
 DocType: Project,Total Purchase Cost (via Purchase Invoice),总购买成本（通过采购发票）
 DocType: Training Event,Start Time,开始时间
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,选择数量
+DocType: Customs Tariff Number,Customs Tariff Number,海关税则号
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,审批与被审批角色不能相同
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,从该电子邮件摘要退订
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,消息已发送
@@ -2744,8 +2925,9 @@
 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 +123,Delivery warehouse required for stock item {0},需要的库存项目交割仓库{0}
+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),包的总重量，通常是净重+包装材料的重量。 （用于打印）
 apps/erpnext/erpnext/schools/doctype/course/course.js +3,Program,程序
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,拥有此角色的用户可以设置冻结账户和创建/修改冻结账户的会计分录
@@ -2774,20 +2956,23 @@
 ,Welcome to ERPNext,欢迎使用ERPNext
 apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,导致报价
 DocType: Lead,From Customer,源客户
-apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,电话
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,Calls,电话
 DocType: Project,Total Costing Amount (via Time Logs),总成本核算金额（通过时间日志）
 DocType: Purchase Order Item Supplied,Stock UOM,库存计量单位
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,采购订单{0}未提交
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +226,Purchase Order {0} is not submitted,采购订单{0}未提交
+DocType: Customs Tariff Number,Tariff Number,税则号
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,预计
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},序列号{0}不属于仓库{1}
 apps/erpnext/erpnext/controllers/status_updater.py +162,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,注意：系统将不会为品目{0}检查超额发货或超额预订，因为其数量或金额为0
 DocType: Notification Control,Quotation Message,报价信息
+DocType: Employee Loan,Employee Loan Application,职工贷款申请
 DocType: Issue,Opening Date,开幕日期
-apps/erpnext/erpnext/schools/api.py +67,Attendance has been marked successfully.,出席已成功标记。
+apps/erpnext/erpnext/schools/api.py +69,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/config/hr.py +55,Leaves and Holiday,叶子度假
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,客户&gt;客户组&gt;领地
 DocType: Sales Order,Not Billed,未开票
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +147,Both Warehouse must belong to same Company,两个仓库必须属于同一公司
 apps/erpnext/erpnext/public/js/templates/contact_list.html +37,No contacts added yet.,暂无联系人。
@@ -2797,6 +2982,7 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,折扣金额
 DocType: Purchase Invoice,Return Against Purchase Invoice,回到对采购发票
 DocType: Item,Warranty Period (in days),保修期限（天数）
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +50,Relation with Guardian1,与关系Guardian1
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,在股票数量Acutal
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,从运营的净现金
 apps/erpnext/erpnext/public/js/setup_wizard.js +230,e.g. VAT,例如增值税
@@ -2807,14 +2993,17 @@
 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 +1542,Please select customer,请选择客户
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1868,Please select customer,请选择客户
 DocType: C-Form,I,I
 DocType: Company,Asset Depreciation Cost Center,资产折旧成本中心
 DocType: Sales Order Item,Sales Order Date,销售订单日期
 DocType: Sales Invoice Item,Delivered Qty,已交付数量
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.",如果选中，各个生产项目的所有孩子将被列入材料请求。
+DocType: Assessment Plan,Assessment Plan,评估计划
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,仓库{0}必须指定公司
+DocType: Stock Settings,Limit Percent,限制百分比
 ,Payment Period Based On Invoice Date,已经提交。
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,产品编号&gt;项目组&gt;品牌
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},{0}没有货币汇率
 DocType: Assessment Plan,Examiner,检查员
 DocType: Student,Siblings,兄弟姐妹
@@ -2823,10 +3012,11 @@
 DocType: C-Form,C-FORM-,C-形式 -
 DocType: Vehicle,Insurance Details,保险详情
 DocType: Account,Payable,支付
-apps/erpnext/erpnext/shopping_cart/cart.py +350,Debtors ({0}),债务人（{0}）
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,请输入还款期
+apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),债务人（{0}）
 DocType: Pricing Rule,Margin,利润
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,新客户
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,毛利％
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,毛利％
 DocType: Appraisal Goal,Weightage (%),权重（％）
 DocType: Bank Reconciliation Detail,Clearance Date,清拆日期
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,总消费金额是强制性
@@ -2846,12 +3036,14 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +47,Min Qty can not be greater than Max Qty,最小数量不能大于最大数量
 DocType: Account,Accumulated Depreciation,累计折旧
 DocType: Stock Entry,Customer or Supplier Details,客户或供应商详细信息
+DocType: Employee Loan Application,Required by Date,按日期必填
 DocType: Lead,Lead Owner,线索所有者
 DocType: Bin,Requested Quantity,要求的数量
 DocType: Employee,Marital Status,婚姻状况
 DocType: Stock Settings,Auto Material Request,汽车材料要求
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,在从仓库可用的批次数量
 DocType: Customer,CUST-,CUST-
+DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,工资总额 - 扣除总额 - 贷款还款
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,当前BOM和新BOM不能相同
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,工资单编号
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,退休日期必须大于入职日期
@@ -2860,12 +3052,13 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}％交付
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,项目{0}：有序数量{1}不能低于最低订货量{2}（项中定义）。
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,月度分布比例
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,请安装员工在人力资源命名系统&gt; HR设置
 DocType: Territory,Territory Targets,区域目标
 DocType: Delivery Note,Transporter Info,转运信息
 apps/erpnext/erpnext/accounts/utils.py +501,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 +29,Same supplier has been entered multiple times,同一个供应商已多次输入
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,Gross Profit / Loss,总利润/亏损
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,总利润/亏损
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,采购订单项目提供
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,公司名称不能为公司
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,打印模板的信头。
@@ -2891,7 +3084,7 @@
 DocType: Expense Claim,Task,任务
 DocType: Purchase Taxes and Charges,Reference Row #,参考行＃
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},品目{0}必须指定批次号
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,您可以通过选择备份频率启动和\
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,这是一个root销售人员，无法被编辑。
 ,Stock Ledger,库存总帐
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},价格：{0}
 DocType: Company,Exchange Gain / Loss Account,兑换收益/损失帐户
@@ -2921,18 +3114,19 @@
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,国家的默认地址模板
 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 +174,Next Date must be greater than Posting Date,下一个日期必须大于过帐日期更大
-apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,展会税分手
+apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,下一个日期必须大于过帐日期更大
+apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Show tax break-up,展会税分手
 apps/erpnext/erpnext/accounts/party.py +305,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/program_enrollment_tool/program_enrollment_tool.py +29,No students Found,没有发现学生
+apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +39,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 +530,Please select Posting Date before selecting Party,在选择之前，甲方请选择发布日期
+DocType: Program Enrollment,School House,学校议院
 DocType: Serial No,Out of AMC,出资产管理公司
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,预订折旧数不能超过折旧总数更大
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,Make Maintenance Visit,创建维护访问
@@ -2941,9 +3135,9 @@
 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/stock/dashboard/item_dashboard.js +166,Add more items or open full form,添加更多项目或全开放形式
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,Please enter 'Expected Delivery Date',请输入“预产期”
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,取消这个销售订单之前必须取消送货单{0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +76,Paid amount + Write Off Amount can not be greater than Grand Total,支付的金额+写的抵销金额不能大于总计
+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}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +77,Paid amount + Write Off Amount can not be greater than Grand Total,支付的金额+写的抵销金额不能大于总计
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0}不是物料{1}的有效批次号
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Note: There is not enough leave balance for Leave Type {0},注意：假期类型{0}的余量不足
 DocType: Training Event,Seminar,研讨会
@@ -2961,7 +3155,8 @@
 DocType: Company,Create Chart Of Accounts Based On,创建图表的帐户根据
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,出生日期不能大于今天。
 ,Stock Ageing,库存账龄
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,时间表
+apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},学生{0}存在针对学生申请{1}
+apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,时间表
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0}“{1}”被禁用
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,设置为打开
 DocType: Cheque Print Template,Scanned Cheque,支票扫描
@@ -2987,57 +3182,64 @@
 DocType: Sales Order,Partly Billed,天色帐单
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,项目{0}必须是固定资产项目
 DocType: Item,Default BOM,默认的BOM
-apps/erpnext/erpnext/setup/doctype/company/company.js +44,Please re-type company name to confirm,请确认重新输入公司名称
+apps/erpnext/erpnext/setup/doctype/company/company.js +45,Please re-type company name to confirm,请确认重新输入公司名称
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +67,Total Outstanding Amt,总街货量金额
 DocType: Journal Entry,Printing Settings,打印设置
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},总借记必须等于总积分。
+DocType: Sales Invoice,Include Payment (POS),包括支付（POS）
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +280,Total Debit must be equal to Total Credit. The difference is {0},总借记必须等于总积分。
 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 +46,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: ,有现货
 DocType: Notification Control,Custom Message,自定义消息
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,投资银行业务
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +72,Cash or Bank Account is mandatory for making payment entry,“现金”或“银行账户”是付款分录的必须项
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +73,Cash or Bank Account is mandatory for making payment entry,“现金”或“银行账户”是付款分录的必须项
 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 +1438,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/config/stock.py +190,"e.g. Kg, Unit, Nos, m",如公斤，单元，号数，米
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,Reference No is mandatory if you entered Reference Date,如果输入参考日期，参考编号是强制输入的
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +110,Reference No is mandatory if you entered Reference Date,如果输入参考日期，参考编号是强制输入的
 DocType: Bank Reconciliation Detail,Payment Document,付款单据
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date of Joining must be greater than Date of Birth,入职日期必须大于出生日期
 DocType: Salary Slip,Salary Structure,薪酬结构
 DocType: Account,Bank,银行
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,航空公司
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,Issue Material,发料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,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 +663,You are in offline mode. You will not be able to reload until you have network.,您在离线模式。您将无法重新加载，直到你有网络。
+apps/erpnext/erpnext/accounts/page/pos/pos.js +665,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 +31,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,请输入您的详细维护性第一
 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 +1474,Enter value must be positive,输入值必须为正
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1797,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 +25,Student is already enrolled.,学生已经注册。
 DocType: Fiscal Year,Year Name,年度名称
 DocType: Process Payroll,Process Payroll,处理工资
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,这个月的假期比工作日多。
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +234,There are more holidays than working days this month.,这个月的假期比工作日多。
 DocType: Product Bundle Item,Product Bundle Item,产品包项目
 DocType: Sales Partner,Sales Partner Name,销售合作伙伴名称
-apps/erpnext/erpnext/hooks.py +105,Request for Quotations,索取报价
+apps/erpnext/erpnext/hooks.py +111,Request for Quotations,索取报价
 DocType: Payment Reconciliation,Maximum Invoice Amount,最大发票额
-apps/erpnext/erpnext/config/selling.py +23,Customers,顾客
+DocType: Item,Device Package Code,器件封装代码
+DocType: Student Language,Student Language,学生语言
+apps/erpnext/erpnext/config/selling.py +23,Customers,客户
 DocType: Student Sibling,Institution,机构
 DocType: Asset,Partially Depreciated,部分贬抑
 DocType: Issue,Opening Time,开放时间
@@ -3046,6 +3248,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +642,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 +872,No Items with Bill of Materials to Manufacture,不与物料清单的项目，以制造
 DocType: Assessment Plan,Supervisor Name,主管名称
 DocType: Grading Structure,Grading Structure,分级结构
 DocType: Purchase Taxes and Charges,Valuation and Total,估值与总计
@@ -3077,6 +3280,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,有交易的成本中心不能转化为总账
 DocType: Department,Days for which Holidays are blocked for this department.,此部门的禁离日
 ,Produced,生产
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +121,Created Salary Slips,创建工资单
 DocType: Item,Item Code for Suppliers,对于供应商项目编号
 DocType: Issue,Raised By (Email),提出（电子邮件）
 DocType: Training Event,Trainer Name,培训师姓名
@@ -3098,6 +3302,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),共（AMT）
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,娱乐休闲
 DocType: Quality Inspection,Item Serial No,项目序列号
+apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,建立员工档案
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,总现
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,会计报表
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,小时
@@ -3106,7 +3311,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,新序列号不能有仓库，仓库只能通过库存记录和采购收据设置。
 DocType: Lead,Lead Type,线索类型
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,您无权批准叶子座日期
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,All these items have already been invoiced,这些品目都已开具发票
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +364,All these items have already been invoiced,这些品目都已开具发票
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},可以被{0}的批准
 DocType: Item,Default Material Request Type,默认材料请求类型
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,未知
@@ -3122,17 +3327,20 @@
 DocType: Student,Middle Name,中间名字
 DocType: C-Form,Invoices,发票
 DocType: Job Opening,Job Title,职位
+apps/erpnext/erpnext/utilities/activation.py +100,Create Users,创建用户
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,公克
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +375,Quantity to Manufacture must be greater than 0.,量生产必须大于0。
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,量生产必须大于0。
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,保养电话的现场报告。
 DocType: Stock Entry,Update Rate and Availability,更新率和可用性
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,百分比你被允许接收或传递更多针对订购的数量。例如：如果您订购100个单位。和你的津贴是10％，那么你被允许接收110个单位。
 DocType: POS Customer Group,Customer Group,客户群组
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Expense account is mandatory for item {0},品目{0}必须指定开支账户
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Expense account is mandatory for item {0},品目{0}必须指定开支账户
 DocType: BOM,Website Description,网站简介
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,在净资产收益变化
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +152,Please cancel Purchase Invoice {0} first,请取消采购发票{0}第一
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"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,收据
 ,Sales Register,销售记录
 DocType: Daily Work Summary Settings Company,Send Emails At,发送电子邮件在
 DocType: Quotation,Quotation Lost Reason,报价丧失原因
@@ -3142,13 +3350,14 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,本月和待活动总结
 DocType: Customer Group,Customer Group Name,客户群组名称
 apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,现金流量表
+apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},贷款额不能超过最高贷款额度{0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +21,License,执照
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Please remove this Invoice {0} from C-Form {1},请删除此发票{0}从C-表格{1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,请选择结转，如果你还需要包括上一会计年度的资产负债叶本财年
 DocType: GL Entry,Against Voucher Type,对凭证类型
 DocType: Item,Attributes,属性
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,获取品目
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,Please enter Write Off Account,请输入核销帐户
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +672,Get Items,获取品目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,Please enter Write Off Account,请输入核销帐户
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,最后订购日期
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},帐户{0}不属于公司{1}
 DocType: Student,Guardian Details,卫详细
@@ -3164,18 +3373,20 @@
 DocType: Project,Expected End Date,预计结束日期
 DocType: Budget Account,Budget Amount,预算额
 DocType: Appraisal Template,Appraisal Template Title,评估模板标题
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Commercial,广告
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +37,From Date {0} for Employee {1} cannot be before employee's joining Date {2},从日期{0}为雇员{1}不能雇员的接合日期之前{2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Commercial,商业
 DocType: Payment Entry,Account Paid To,账户付至
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,父项{0}不能是库存产品
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,所有的产品或服务。
 DocType: Expense Claim,More Details,更多详情
 DocType: Supplier Quotation,Supplier Address,供应商地址
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} 账户{1}对于{2}{3}的预算是{4}. 预期增加{5}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +657,Row {0}# Account must be of type 'Fixed Asset',行{0}＃账户的类型必须是&#39;固定资产&#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +665,Row {0}# Account must be of type 'Fixed Asset',行{0}＃账户的类型必须是&#39;固定资产&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,输出数量
 apps/erpnext/erpnext/config/accounts.py +278,Rules to calculate shipping amount for a sale,用来计算销售运输量的规则
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,系列是必须项
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,金融服务
+DocType: Student Sibling,Student ID,学生卡
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,活动类型的时间记录
 DocType: Tax Rule,Sales,销售
 DocType: Stock Entry Detail,Basic Amount,基本金额
@@ -3186,10 +3397,10 @@
 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 +812,Fetch exploded BOM (including sub-assemblies),获取展开BOM（包括子品目）
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +863,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 +57,Increment for Attribute {0} cannot be 0,增量属性{0}不能为0
+apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,增量属性{0}不能为0
 DocType: Journal Entry,Pay To / Recd From,支付/ RECD从
 DocType: Naming Series,Setup Series,设置系列
 DocType: Payment Reconciliation,To Invoice Date,要发票日期
@@ -3203,8 +3414,9 @@
 DocType: Cheque Print Template,Message to show,信息显示
 DocType: Company,Retail,零售
 DocType: Attendance,Absent,缺席
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,产品包
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: Invalid reference {1},行{0}：无效参考{1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,产品包
+DocType: Purchase Invoice Item,Is Sample Item,是例题
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +200,Row {0}: Invalid reference {1},行{0}：无效参考{1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,购置税和费模板
 DocType: Upload Attendance,Download Template,下载模板
 DocType: Timesheet,TS-,TS-
@@ -3213,18 +3425,21 @@
 DocType: Payment Entry,Account Paid From,帐户支付从
 DocType: Purchase Order Item Supplied,Raw Material Item Code,原料产品编号
 DocType: Journal Entry,Write Off Based On,核销基于
+apps/erpnext/erpnext/utilities/activation.py +66,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 +710,Send Supplier Emails,发送电子邮件供应商
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,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,卫利息
-apps/erpnext/erpnext/config/hr.py +158,Training,训练
+apps/erpnext/erpnext/config/hr.py +177,Training,训练
 DocType: Timesheet,Employee Detail,员工详细信息
-apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,下一个日期的一天，重复上月的天必须相等
+apps/erpnext/erpnext/controllers/recurring_document.py +190,Next Date's day and Repeat on Day of Month must be equal,下一个日期的一天，重复上月的天必须相等
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,对网站的主页设置
 DocType: Offer Letter,Awaiting Response,正在等待回应
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,以上
-apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},无效的属性{0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +216,Invalid attribute {0} {1},无效的属性{0} {1}
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +13,Please select Student Group or Student Batch,请选择学生组或学生批
 DocType: Salary Slip,Earning & Deduction,盈余及扣除
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,可选。此设置将被应用于各种交易进行过滤。
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,负评估价格是不允许的
@@ -3240,9 +3455,10 @@
 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 +225,{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 +603,Get Items from Product Bundle,获取从产品捆绑项目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,获取从产品捆绑项目
 DocType: Asset,Straight Line,直线
 DocType: Project User,Project User,项目用户
 DocType: GL Entry,Is Advance,是否预付款
@@ -3254,11 +3470,13 @@
 DocType: Program Enrollment Tool,Get Students From,让学生从
 DocType: Hub Settings,Seller Country,卖家国家
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,公布于网页上的项目
+apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,一群学生在分批
 DocType: Authorization Rule,Authorization Rule,授权规则
 DocType: Sales Invoice,Terms and Conditions Details,条款和条件详情
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,产品规格
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,营业税金及费用模板
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),总（信用）
+DocType: Repayment Schedule,Payment Date,付款日期
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,服装及配饰
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,订购次数
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML或横幅，将显示在产品列表的顶部。
@@ -3275,7 +3493,9 @@
 DocType: Purchase Order Item,Expected Delivery Date,预计交货日期
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,借贷{0}＃不等于{1}。不同的是{2}。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,娱乐费用
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +192,Sales Invoice {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消销售发票{0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +47,Make Material Request,制作材料要求
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +19,Open Item {0},打开项目{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +205,Sales Invoice {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消销售发票{0}
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +60,Age,账龄
 DocType: Sales Invoice Timesheet,Billing Amount,开票金额
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,项目{0}的数量无效，应为大于0的数字。
@@ -3292,8 +3512,8 @@
 DocType: Email Digest,Open Notifications,打开通知
 DocType: Payment Entry,Difference Amount (Company Currency),差异金额（公司币种）
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,直接开支
-apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
-						Email Address'",{0}在“通知\电子邮件地址”无效的电子邮件地址
+apps/erpnext/erpnext/controllers/recurring_document.py +213,"{0} is an invalid email address in 'Notification \
+						Email Address'",{0}是在“提醒\电子邮件地址”中无效的电子邮件地址
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,新客户收入
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,差旅费
 DocType: Maintenance Visit,Breakdown,细目
@@ -3301,13 +3521,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 +60,Successfully deleted all transactions related to this company!,成功删除与该公司相关的所有交易！
+apps/erpnext/erpnext/setup/doctype/company/company.js +61,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 +769,Return / Credit Note,返回/信用票据
 DocType: Stock Settings,Auto insert Price List rate if missing,自动插入价目表率，如果丢失
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,总支付金额
 DocType: Production Order Item,Transferred Qty,转让数量
@@ -3321,6 +3542,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +235,Quantity should be greater than 0,量应大于0
 DocType: Journal Entry,Cash Entry,现金分录
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,子节点可以在&#39;集团&#39;类型的节点上创建
+DocType: Leave Application,Half Day Date,半天日期
 DocType: Academic Year,Academic Year Name,学年名称
 DocType: Sales Partner,Contact Desc,联系人倒序
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.",叶似漫不经心，生病等类型
@@ -3329,9 +3551,10 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,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,应付职工薪酬
 DocType: Buying Settings,Default Supplier Type,默认供应商类别
 DocType: Production Order,Total Operating Cost,总营运成本
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,注意：品目{0}已多次输入
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +152,Note: Item {0} entered multiple times,注意：品目{0}已多次输入
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,所有联系人。
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Company Abbreviation,公司缩写
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} does not exist,用户{0}不存在
@@ -3352,7 +3575,7 @@
 ,Territory Target Variance Item Group-Wise,按物件组的区域目标波动
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,All Customer Groups,所有客户群组
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,每月累计
-apps/erpnext/erpnext/controllers/accounts_controller.py +644,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}是必填项。可能是没有由{1}到{2}的货币转换记录。
+apps/erpnext/erpnext/controllers/accounts_controller.py +644,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}是必填项。{1}和{2}的货币转换记录可能还未生成。
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +39,Tax Template is mandatory.,税务模板是强制性的。
 apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not exist,科目{0}的上级科目{1}不存在
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),价格列表费率（公司货币）
@@ -3373,14 +3596,14 @@
 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 +841,Supplier Quotation,供应商报价
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +892,Supplier Quotation,供应商报价
 DocType: Quotation,In Words will be visible once you save the Quotation.,大写金额将在报价单保存后显示。
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,收费
 DocType: Attendance,ATT-,ATT-
 apps/erpnext/erpnext/stock/doctype/item/item.py +449,Barcode {0} already used in Item {1},条码{0}已被品目{1}使用
 DocType: Lead,Add to calendar on this date,将此日期添加至日历
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,规则增加运输成本。
-DocType: Item,Opening Stock,打开股票
+DocType: Item,Opening Stock,期初库存
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,客户是必须项
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0}是退货单的必填项
 DocType: Purchase Order,To Receive,接受
@@ -3403,7 +3626,7 @@
 DocType: Serial No,Out of Warranty,超出保修期
 DocType: BOM Replace Tool,Replace,更换
 DocType: Production Order,Unstopped,通畅了
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{0} against Sales Invoice {1},{0}不允许销售发票{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,{0} against Sales Invoice {1},{0}不允许销售发票{1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,项目名称
 DocType: Supplier,Mention if non-standard receivable account,提到如果不规范应收账款
@@ -3415,7 +3638,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,所得税资产
 DocType: BOM Item,BOM No,BOM编号
 DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +153,Journal Entry {0} does not have account {1} or already matched against other voucher,日记帐分录{0}没有科目{1}或已经匹配其他凭证
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,Journal Entry {0} does not have account {1} or already matched against other voucher,日记帐分录{0}没有科目{1}或已经匹配其他凭证
 DocType: Item,Moving Average,移动平均
 DocType: BOM Replace Tool,The BOM which will be replaced,此物料清单将被替换
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,电子设备
@@ -3433,7 +3656,7 @@
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,允许以下用户批准在禁离日请假的申请。
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,报销的类型。
 DocType: Item,Taxes,税
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +301,Paid and Not Delivered,支付和未送达
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,支付和未送达
 DocType: Project,Default Cost Center,默认成本中心
 DocType: Purchase Invoice,End Date,结束日期
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,库存交易
@@ -3441,15 +3664,18 @@
 DocType: Employee,Internal Work History,内部工作经历
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,累计折旧额
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,私募股权投资
+DocType: Employee Loan,Fully Disbursed,全额支付
 DocType: Maintenance Visit,Customer Feedback,客户反馈
 DocType: Account,Expense,开支
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,分数不能超过最高得分更大
 DocType: Item Attribute,From Range,从范围
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Syntax error in formula or condition: {0},式或条件语法错误：{0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Syntax error in formula or condition: {0},式或条件语法错误：{0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,每日工作总结公司的设置
-apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,项目{0}因忽略，因为它不是库存项目
+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 +34,Submit this Production Order for further processing.,提交此生产订单以进行下一步处理。
+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.",要在一个特定的交易不适用于定价规则，所有适用的定价规则应该被禁用。
+DocType: Assessment Group,Parent Assessment Group,家长评估小组
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,工作
 ,Sales Order Trends,销售订单趋势
 DocType: Employee,Held On,举行日期
@@ -3459,17 +3685,18 @@
 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 +731,Make Supplier Quotation,创建供应商报价
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +784,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",将用户添加到您的组织，除了自己
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,发布日期不能是未来的日期
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +63,Posting Date cannot be future date,发布日期不能是未来的日期
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},行＃{0}：序列号{1}不相匹配{2} {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,事假
 DocType: Batch,Batch ID,批次ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},注： {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +368,Note: {0},注： {0}
 ,Delivery Note Trends,送货单趋势
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,本周的总结
+,In Stock Qty,库存量
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,科目{0}只能通过库存处理更新
 DocType: Student Group Creation Tool,Get Courses,获取课程
 DocType: GL Entry,Party,一方
@@ -3479,31 +3706,38 @@
 DocType: Request for Quotation Item,Request for Quotation Item,询价项目
 DocType: Purchase Order,To Bill,比尔
 DocType: Material Request,% Ordered,%  已排序
+DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date",用逗号分隔的输入电子邮件地址，发票就会自动在特定日期邮寄
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,计件工作
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,平均买入价
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Avg. Buying Rate,平均买入价
 DocType: Task,Actual Time (in Hours),实际时间（小时）
 DocType: Employee,History In Company,公司内历史
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,简讯
 DocType: Stock Ledger Entry,Stock Ledger Entry,存库分类帐分录
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,同一项目已进入多次
 DocType: Department,Leave Block List,禁离日列表
-DocType: Customer,Tax ID,税号
+DocType: Sales Invoice,Tax ID,税号
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,项目{0}没有设置序列号，序列号必须留空
 DocType: Accounts Settings,Accounts Settings,账户设置
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,批准
 DocType: Customer,Sales Partner and Commission,销售合作伙伴及佣金
+DocType: Employee Loan,Rate of Interest (%) / Year,利息（％）/年的速率
 ,Project Quantity,工程量
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",共有{0}所有项目为零，可能是你应该“基于分布式费用”改变
 DocType: Opportunity,To Discuss,为了讨论
 apps/erpnext/erpnext/stock/stock_ledger.py +365,{0} units of {1} needed in {2} to complete this transaction.,{0}单位{1}在{2}完成此交易所需。
+DocType: Loan Type,Rate of Interest (%) Yearly,利息率的比例（％）年
 DocType: SMS Settings,SMS Settings,短信设置
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Temporary Accounts,临时账户
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +169,Black,黑
 DocType: BOM Explosion Item,BOM Explosion Item,BOM展开品目
 DocType: Account,Auditor,审计员
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,生产{0}项目
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +62,{0} items produced,{0}项目已经产生
 DocType: Cheque Print Template,Distance from top edge,从顶边的距离
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled or does not exist,价格表{0}禁用或不存在
 DocType: Purchase Invoice,Return,回报
 DocType: Production Order Operation,Production Order Operation,生产订单操作
 DocType: Pricing Rule,Disable,禁用
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,付款方式需要进行付款
 DocType: Project Task,Pending Review,待审核
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +106,"Asset {0} cannot be scrapped, as it is already {1}",资产{0}不能被废弃，因为它已经是{1}
 DocType: Task,Total Expense Claim (via Expense Claim),总费用报销（通过费用报销）
@@ -3514,10 +3748,11 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Sales Order {0} is not submitted,销售订单{0}未提交
 DocType: Homepage,Tag Line,标语
 DocType: Fee Component,Fee Component,收费组件
-apps/erpnext/erpnext/config/hr.py +176,Fleet Management,车队的管理
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,Add items from,添加的项目
+apps/erpnext/erpnext/config/hr.py +195,Fleet Management,车队的管理
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,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％
 DocType: BOM,Last Purchase Rate,最后采购价格
 DocType: Account,Asset,资产
 DocType: Project Task,Task ID,任务ID
@@ -3528,30 +3763,36 @@
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,立即注册ERPNext中心
 DocType: Monthly Distribution,Monthly Distribution Percentages,月度分布比例
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,所选项目不能有批次
+apps/erpnext/erpnext/stock/stock_ledger.py +447,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",估值率未找到项{0}，这是需要做用于记帐条目{1} {2}。如果该项目交易作为样本项目{1}，请提及的是，在{1}项目表。否则，请创建传入股票的交易在项目记录的项目或提估价率，然后尝试submiting /取消此条
 DocType: Delivery Note,% of materials delivered against this Delivery Note,此出货单% 的材料已交货。
 DocType: Project,Customer Details,客户详细信息
 DocType: Employee,Reports to,报告以
+,Unpaid Expense Claim,未付费用报销
 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 +690,Online,线上
+apps/erpnext/erpnext/accounts/page/pos/pos.js +692,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 +845,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 +40,Item {0} has been disabled,项目{0}已被禁用
+DocType: Employee Loan,Repay Fixed Amount per Period,偿还每期固定金额
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},请输入量的项目{0}
 DocType: Employee External Work History,Employee External Work History,雇员外部就职经历
 DocType: Tax Rule,Purchase,采购
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,余额数量
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +20,Goals cannot be empty,目标不能为空
 DocType: Item Group,Parent Item Group,父项目组
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} {1}
 apps/erpnext/erpnext/setup/doctype/company/company.js +20,Cost Centers,成本中心
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,供应商的货币转换为公司的基础货币后的单价
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},行＃{0}：与排时序冲突{1}
 DocType: Training Event Employee,Invited,邀请
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,Multiple active Salary Structures found for employee {0} for the given dates,发现员工{0}对于给定的日期多个活动薪金结构
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Multiple active Salary Structures found for employee {0} for the given dates,发现员工{0}对于给定的日期多个活动薪金结构
 DocType: Opportunity,Next Contact,下一页联系
 apps/erpnext/erpnext/config/accounts.py +272,Setup Gateway accounts.,设置网关帐户。
 DocType: Employee,Employment Type,就职类型
@@ -3560,17 +3801,17 @@
 ,Cash Flow,现金周转
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,Application period cannot be across two alocation records,申请期间不能跨两个alocation记录
 DocType: Item Group,Default Expense Account,默认支出账户
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,学生批处理或课程表是强制性
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +27,Student Batch or Course Schedule is mandatory,学生批处理或课程表是强制性
 DocType: Employee,Notice (days),通告（天）
 DocType: Tax Rule,Sales Tax Template,销售税模板
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,Select items to save the invoice,选取要保存发票
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2298,Select items to save the invoice,选取要保存发票
 DocType: Employee,Encashment Date,兑现日期
 DocType: Training Event,Internet,互联网
 DocType: Account,Stock Adjustment,库存调整
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},默认情况下存在作业成本的活动类型 -  {0}
 DocType: Production Order,Planned Operating Cost,计划运营成本
-DocType: Academic Term,Term Start Date,期限起始日期
-apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},随函附上{0}＃{1}
+DocType: Academic Term,Term Start Date,合同起始日期
+apps/erpnext/erpnext/controllers/recurring_document.py +136,Please find attached {0} #{1},随函附上{0}＃{1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,银行对账单余额按总帐
 DocType: Job Applicant,Applicant Name,申请人姓名
 DocType: Authorization Rule,Customer / Item Name,客户/项目名称
@@ -3587,12 +3828,13 @@
 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/config/selling.py +153,Default settings for selling transactions.,销售业务的默认设置。
+DocType: Guardian,Guardian Of ,守护者
+DocType: Grading Scale Interval,Threshold,阈
 DocType: BOM Replace Tool,Current BOM,当前BOM
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,添加序列号
-apps/erpnext/erpnext/config/support.py +22,Warranty,保证
+apps/erpnext/erpnext/config/support.py +22,Warranty,质量保证
 DocType: Purchase Invoice,Debit Note Issued,借记发行说明
 DocType: Production Order,Warehouses,仓库
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationary,印刷和文具
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0}资产不得转让
 DocType: Workstation,per hour,每小时
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,购买
@@ -3607,18 +3849,21 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,品目{0}的最大折扣为 {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,净资产值作为
 DocType: Account,Receivable,应收账款
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,行＃{0}：不能更改供应商的采购订单已经存在
+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/accounts/page/pos/pos.js +842,"Master data syncing, it might take some time",主数据同步，这可能需要一些时间
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +904,Select Items to Manufacture,选择项目，以制造
+apps/erpnext/erpnext/accounts/page/pos/pos.js +909,"Master data syncing, it might take some time",主数据同步，这可能需要一些时间
 DocType: Item,Material Issue,发料
 DocType: Hub Settings,Seller Description,卖家描述
 DocType: Employee Education,Qualification,学历
 DocType: Item Price,Item Price,项目价格
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,肥皂和洗涤剂
+DocType: BOM,Show Items,显示项目
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +39,From Time cannot be greater than To Time.,从时间不能超过结束时间大。
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,影视业
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,订购
 DocType: Salary Detail,Component,零件
+DocType: Assessment Criteria,Assessment Criteria Group,评估标准组
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},打开累计折旧必须小于等于{0}
 DocType: Warehouse,Warehouse Name,仓库名称
 DocType: Naming Series,Select Transaction,选择交易
@@ -3628,11 +3873,13 @@
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,客户支持分析
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +141,Uncheck all,取消所有
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},仓库{0}缺少公司
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +40,Student {0}: {1} does not belong to Student Group {2},学生{0}：{1}不属于学生组{2}
 DocType: POS Profile,Terms and Conditions,条款和条件
 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}已经存在
+DocType: Employee Loan,Disbursement Date,支付日期
 DocType: Vehicle,Vehicle,车辆
 DocType: Purchase Invoice,In Words,大写金额
 DocType: POS Profile,Item Groups,项目组
@@ -3649,10 +3896,12 @@
 DocType: Email Digest,Add/Remove Recipients,添加/删除收件人
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,Transaction not allowed against stopped Production Order {0},交易不反对停止生产订单允许{0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",要设置这个财政年度为默认值，点击“设为默认”
-apps/erpnext/erpnext/projects/doctype/project/project.py +185,Join,加入
+apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,加入
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,短缺数量
 apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item variant {0} exists with same attributes,项目变体{0}存在具有相同属性
+DocType: Employee Loan,Repay from Salary,从工资偿还
 DocType: Leave Application,LAP/,LAP /
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +334,Requesting payment against {0} {1} for amount {2},请求对付款{0} {1}量{2}
 DocType: Salary Slip,Salary Slip,工资单
 DocType: Lead,Lost Quotation,失落的报价
 DocType: Pricing Rule,Margin Rate or Amount,保证金税率或税额
@@ -3660,13 +3909,14 @@
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",生成要发货品目的装箱单，包括包号，内容和重量。
 DocType: Sales Invoice Item,Sales Order Item,销售订单品目
 DocType: Salary Slip,Payment Days,金天
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,Warehouses with child nodes cannot be converted to ledger,与子节点仓库不能转换为分类账
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +221,Warehouses with child nodes cannot be converted to ledger,与子节点仓库不能转换为分类账
 DocType: BOM,Manage cost of operations,管理流程成本
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.",当所选的业务状态更改为“已提交”时，自动打开一个弹出窗口向有关的联系人编写邮件，业务将作为附件添加。用户可以选择发送或者不发送邮件。
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,全局设置
+DocType: 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 +896,It is needed to fetch Item Details.,这是需要获取项目详细信息。
+apps/erpnext/erpnext/public/js/controllers/transaction.js +930,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}已收到过
@@ -3675,6 +3925,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 +1252,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 +211,Invalid {0},无效的{0}
@@ -3683,8 +3934,9 @@
 DocType: Delivery Note,Billing Address Name,帐单地址名称
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,百货
 DocType: Warehouse,PIN,销
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,设置你的ERPNext学校
 DocType: Sales Invoice,Base Change Amount (Company Currency),基地涨跌额（公司币种）
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +310,No accounting entries for the following warehouses,没有以下仓库的会计分录
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +311,No accounting entries for the following warehouses,没有以下仓库的会计分录
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,首先保存文档。
 DocType: Account,Chargeable,应课
 DocType: Company,Change Abbreviation,更改缩写
@@ -3698,13 +3950,14 @@
 DocType: Purchase Invoice,Raw Materials Supplied,供应的原料
 DocType: Purchase Invoice,Recurring Print Format,常用打印格式
 DocType: C-Form,Series,系列
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,预计交货日期不能早于采购订单日期
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Expected Delivery Date cannot be before Purchase Order Date,预计交货日期不能早于采购订单日期
 DocType: Appraisal,Appraisal Template,评估模板
 DocType: Item Group,Item Classification,项目分类
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Business Development Manager,业务发展经理
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,维护访问目的
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +16,Period,期
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +18,General Ledger,总帐
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},雇员{0}上离开{1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,查看信息
 DocType: Program Enrollment Tool,New Program,新程序
 DocType: Item Attribute Value,Attribute Value,属性值
@@ -3735,13 +3988,13 @@
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +380,Operation Time must be greater than 0 for Operation {0},运行时间必须大于0的操作{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},运行时间必须大于0的操作{0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,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 +368,Production Order cannot be raised against a Item Template,生产订单不能对一个项目提出的模板
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,生产订单不能对一个项目提出的模板
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,费用会在每个品目的采购收据中更新
 DocType: Warranty Claim,Resolved By,议决
 DocType: Appraisal,Start Date,开始日期
@@ -3749,6 +4002,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,支票及存款不正确清除
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,科目{0}不能是自己的上级科目
 DocType: Purchase Invoice Item,Price List Rate,价格列表费率
+apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,创建客户报价
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",根据此仓库显示“有库存”或“无库存”状态。
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),材料清单(BOM)
 DocType: Item,Average time taken by the supplier to deliver,采取供应商的平均时间交付
@@ -3783,6 +4037,7 @@
 DocType: Cheque Print Template,Cheque Print Template,支票打印模板
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,成本中心表
 ,Requested Items To Be Ordered,要求项目要订购
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Warehouse company must be same as Account company,仓库的公司必须同客户公司
 DocType: Price List,Price List Name,价格列表名称
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},每日工作总结{0}
 DocType: Employee Loan,Totals,总计
@@ -3790,9 +4045,10 @@
 ,Ordered Items To Be Delivered,订购项目交付
 DocType: Account,Income,收益
 DocType: Industry Type,Industry Type,行业类型
-apps/erpnext/erpnext/templates/includes/cart.js +141,Something went wrong!,发现错误！
+apps/erpnext/erpnext/templates/includes/cart.js +149,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 +245,Sales Invoice {0} has already been submitted,销售发票{0}已提交过
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +247,Sales Invoice {0} has already been submitted,销售发票{0}已提交过
+DocType: Assessment Result Detail,Score,得分了
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,会计年度{0}不存在
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,完成日期
 DocType: Purchase Invoice Item,Amount (Company Currency),金额（公司货币）
@@ -3800,7 +4056,7 @@
 DocType: Fee Structure,Student Category,学生组
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,强制性费尔德 - 让学生从
 DocType: Announcement,Student,学生
-apps/erpnext/erpnext/config/hr.py +212,Organization unit (department) master.,组织单位（部门）的主人。
+apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,组织单位（部门）的主人。
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +26,Please enter valid mobile nos,请输入有效的手机号
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,在发送前，请填写留言
 DocType: Email Digest,Pending Quotations,待语录
@@ -3815,12 +4071,13 @@
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,大于160个字符的消息将被分割为多条消息
 DocType: Purchase Receipt Item,Received and Accepted,收到并接受
 ,Serial No Service Contract Expiry,序列号/年度保养合同过期
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,你不能同时将一个账户设为借方和贷方。
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +287,You cannot credit and debit same account at the same time,您不可以将一个账户同时设置为借方和贷方。
 DocType: Naming Series,Help HTML,HTML帮助
 DocType: Student Group Creation Tool,Student Group Creation Tool,学生组创建工具
+DocType: Item,Variant Based On,基于变异对
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},分配的总权重应为100 ％ 。这是{0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,您的供应商
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +55,Cannot set as Lost as Sales Order is made.,不能更改状态为丧失，因为已有销售订单。
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,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,从......收到
@@ -3828,18 +4085,19 @@
 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/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},行＃{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 +172,Website Image {0} attached to Item {1} cannot be found,网站图像{0}附加到物品{1}无法找到
 DocType: Issue,Content Type,内容类型
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,电脑
 DocType: Item,List this Item in multiple groups on the website.,在网站上的多个组中显示此品目
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,Please check Multi Currency option to allow accounts with other currency,请检查多币种选项，允许帐户与其他货币
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +311,Please check Multi Currency option to allow accounts with other currency,请检查多币种选项，允许帐户与其他货币
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +86,Item: {0} does not exist in the system,项目{0}不存在
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,您没有权限设定冻结值
 DocType: Payment Reconciliation,Get Unreconciled Entries,获取未调节分录
 DocType: Payment Reconciliation,From Invoice Date,从发票日期
 apps/erpnext/erpnext/accounts/party.py +254,Billing currency must be equal to either default comapany's currency or party account currency,结算币种必须等于要么默认业公司的货币或一方账户货币
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,离开兑现
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,贵公司的标语
 DocType: Delivery Note,To Warehouse,到仓库
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,所有学生入学
@@ -3847,11 +4105,13 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +410,'Has Serial No' can not be 'Yes' for non-stock item,非库存项目不能勾选'是否有序列号'
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +39,Attendance can not be marked for future dates,考勤不能标记为未来的日期
 DocType: Pricing Rule,Pricing Rule Help,定价规则说明
+DocType: School House,House Name,房名
 DocType: Purchase Taxes and Charges,Account Head,账户头
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,更新额外费用以计算到岸成本
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,电气
+apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,添加您的组织的其余部分用户。您还可以添加邀请客户到您的门户网站通过从联系人中添加它们
 DocType: Stock Entry,Total Value Difference (Out - In),总价值差（输出 - ）
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Row {0}: Exchange Rate is mandatory,行{0}：汇率是必须的
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Row {0}: Exchange Rate is mandatory,行{0}：汇率是必须的
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},员工设置{0}为设置用户ID
 DocType: Vehicle,Vehicle Value,汽车衡
 DocType: Stock Entry,Default Source Warehouse,默认源仓库
@@ -3870,13 +4130,13 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,送货单{0}不能提交
 DocType: Notification Control,Sales Invoice Message,销售发票信息
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,关闭帐户{0}的类型必须是负债/权益
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,Salary Slip of employee {0} already created for time sheet {1},员工的工资单{0}已为时间表创建{1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},员工的工资单{0}已为时间表创建{1}
 DocType: Vehicle Log,Odometer,里程表
 DocType: Sales Order Item,Ordered Qty,订购数量
 apps/erpnext/erpnext/stock/doctype/item/item.py +694,Item {0} is disabled,项目{0}无效
 DocType: Stock Settings,Stock Frozen Upto,库存冻结止
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,BOM不包含任何库存项目
-apps/erpnext/erpnext/controllers/recurring_document.py +169,Period From and Period To dates mandatory for recurring {0},期间从和周期要日期强制性的经常性{0}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +876,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,加油详情
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,生成工资条
@@ -3885,7 +4145,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,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 +467,Default BOM for {0} not found,默认BOM {0}未找到
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,默认BOM {0}未找到
 apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,行＃{0}：请设置再订购数量
 DocType: Fees,Program Enrollment,招生计划
 DocType: Landed Cost Voucher,Landed Cost Voucher,到岸成本凭证
@@ -3897,7 +4157,7 @@
 DocType: Employee External Work History,Salary,工资
 DocType: Serial No,Delivery Document Type,交货文档类型
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,根据上述所选条件提交工资单
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0}个物料已同步
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0}项已同步
 DocType: Sales Order,Partly Delivered,部分交付
 DocType: Email Digest,Receivables,应收款
 DocType: Lead Source,Lead Source,线索来源
@@ -3911,7 +4171,7 @@
 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 ##### 
 如果设置了序列但是没有在交易中输入序列号，那么系统会根据序列自动生产序列号。如果要强制手动输入序列号，请不要勾选此项。"
 DocType: Upload Attendance,Upload Attendance,上传考勤记录
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,BOM和生产量是必需的
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +302,BOM and Manufacturing Quantity are required,BOM和生产量是必需的
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,账龄范围2
 DocType: SG Creation Tool Course,Max Strength,最大力量
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM已替换
@@ -3919,7 +4179,8 @@
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},可用{0}
 DocType: Manufacturing Settings,Manufacturing Settings,生产设置
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,设置电子邮件
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +97,Please enter default currency in Company Master,请在公司主输入默认货币
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Guardian1 Mobile No,Guardian1手机号码
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +98,Please enter default currency in Company Master,请在公司主输入默认货币
 DocType: Stock Entry Detail,Stock Entry Detail,库存记录详情
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,每日提醒
 DocType: Products Settings,Home Page is Products,首页显示产品
@@ -3940,6 +4201,8 @@
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,业务会计的默认设置。
 DocType: Maintenance Visit,MV,MV
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,预计日期不能早于物料申请时间
+DocType: Production Order,Source Warehouse (for reserving Items),源数据仓库（用于保留项目）
+DocType: Employee Loan,Repayment Period in Months,在月还款期
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,错误：没有有效的身份证？
 DocType: Naming Series,Update Series Number,更新序列号
 DocType: Account,Equity,权益
@@ -3950,14 +4213,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Engineer,工程师
 DocType: Journal Entry,Total Amount Currency,总金额币种
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,搜索子组件
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +401,Item Code required at Row No {0},行{0}中的项目编号是必须项
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Item Code required at Row No {0},行{0}中的项目编号是必须项
 DocType: Sales Partner,Partner Type,合作伙伴类型
 DocType: Purchase Taxes and Charges,Actual,实际
 DocType: Authorization Rule,Customerwise Discount,客户折扣
 apps/erpnext/erpnext/config/projects.py +35,Timesheet for tasks.,时间表的任务。
 DocType: Purchase Invoice,Against Expense Account,对开支账目
 DocType: Production Order,Production Order,生产订单
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,安装单{0}已经提交过
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +254,Installation Note {0} has already been submitted,安装单{0}已经提交过
 DocType: Bank Reconciliation,Get Payment Entries,获取付款项
 DocType: Quotation Item,Against Docname,对文档名称
 DocType: SMS Center,All Employee (Active),所有员工（活动）
@@ -3983,10 +4246,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,对账/盘点成功
 DocType: Request for Quotation Supplier,Download PDF,下载PDF
 DocType: Production Order,Planned End 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/config/stock.py +184,Where items are stored.,物件的存储位置。
 DocType: Request for Quotation,Supplier Detail,供应商详细
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Error in formula or condition: {0},公式或条件错误:{0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,已开票金额
 DocType: Attendance,Attendance,考勤
+apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,库存产品
 DocType: BOM,Materials,物料
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",如果未选中，此列表将需要手动添加到部门。
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,源和目标仓库不能相同
@@ -3999,21 +4265,20 @@
 DocType: Task,Review Date,评论日期
 DocType: Purchase Invoice,Advance Payments,预付款
 DocType: Purchase Taxes and Charges,On Net Total,基于净总计
-apps/erpnext/erpnext/controllers/item_variant.py +67,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},为属性{0}值必须的范围内{1}到{2}中的增量{3}为项目{4}
+apps/erpnext/erpnext/controllers/item_variant.py +92,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},为属性{0}值必须的范围内{1}到{2}中的增量{3}为项目{4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,Target warehouse in row {0} must be same as Production Order,行{0}的目标仓库必须与生产订单的仓库相同
-apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,循环%s中未指定“通知电子邮件地址”
+apps/erpnext/erpnext/controllers/recurring_document.py +217,'Notification Email Addresses' not specified for recurring %s,循环%s中未指定“通知电子邮件地址”
 apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Currency can not be changed after making entries using some other currency,货币不能使用其他货币进行输入后更改
 DocType: Vehicle Service,Clutch Plate,离合器压盘
 DocType: Company,Round Off Account,四舍五入账户
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +91,Administrative Expenses,行政开支
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,咨询
 DocType: Customer Group,Parent Customer Group,母公司集团客户
-DocType: Vehicle Service,Change,变化
 DocType: Purchase Invoice,Contact Email,联络人电邮
 DocType: Appraisal Goal,Score Earned,已得分数
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,通知期
 DocType: Asset Category,Asset Category Name,资产类别名称
-apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,集团或Ledger ，借方或贷方，是特等帐户
+apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,这是一个root区域，无法被编辑。
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,新销售人员的姓名
 DocType: Packing Slip,Gross Weight UOM,毛重计量单位
 DocType: Delivery Note Item,Against Sales Invoice,对销售发票
@@ -4034,6 +4299,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,折旧日期
 apps/erpnext/erpnext/controllers/buying_controller.py +80,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,税项类型不能是“估值”或“估值和总计”，因为所有的物件都不是库存物件
 DocType: Issue,Support Team,支持团队
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +36,Expiry (In Days),过期(按天计算)
 DocType: Appraisal,Total Score (Out of 5),总分（满分5分）
 DocType: Fee Structure,FS.,FS。
 DocType: Batch,Batch,批次
@@ -4041,24 +4307,27 @@
 DocType: Room,Seating Capacity,座位数
 DocType: Issue,ISS-,ISS-
 DocType: Project,Total Expense Claim (via Expense Claims),总费用报销（通过费用报销）
+DocType: Assessment Result,Total Score,总得分
 DocType: Journal Entry,Debit Note,借项通知单
 DocType: Stock Entry,As per Stock UOM,按库存计量单位
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,未过期
 DocType: Student Log,Achievement,成就
 DocType: Journal Entry,Total Debit,总借记
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,默认成品仓库
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,销售人员
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +78,Sales Person,销售人员
 DocType: SMS Parameter,SMS Parameter,短信参数
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,预算和成本中心
 DocType: Vehicle Service,Half Yearly,半年度
 DocType: Lead,Blog Subscriber,博客订阅者
 DocType: Guardian,Alternate Number,备用号码
+DocType: Assessment Plan Criteria,Maximum Score,最大比分
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,创建规则，根据属性值来限制交易。
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",如果勾选，工作日总数将包含假期，这将会降低“日工资”的值。
 DocType: Purchase Invoice,Total Advance,总垫款
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,该期限结束日期不能超过期限开始日期。请更正日期，然后再试一次。
+,BOM Stock Report,BOM库存报告
 DocType: Stock Reconciliation Item,Quantity Difference,数量差异
-apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,处理工资单
+apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,处理工资单
 DocType: Opportunity Item,Basic Rate,基础税率
 DocType: GL Entry,Credit Amount,信贷金额
 DocType: Cheque Print Template,Signatory Position,签署的位置
@@ -4071,43 +4340,44 @@
 DocType: Tax Rule,Tax Rule,税务规则
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,在整个销售周期使用同一价格
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,规划工作站工作时间以外的时间日志。
+apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,在排队的客户
 DocType: Student,Nationality,国籍
 ,Items To Be Requested,要申请的项目
 DocType: Purchase Order,Get Last Purchase Rate,获取最新的采购税率
 DocType: Company,Company Info,公司简介
-apps/erpnext/erpnext/accounts/page/pos/pos.js +981,Select or add new customer,选择或添加新客户
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1284,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/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,借方科目
-DocType: Fiscal Year,Year Start Date,今年开始日期
+DocType: Fiscal Year,Year Start Date,年度起始日期
 DocType: Attendance,Employee Name,雇员姓名
 DocType: Sales Invoice,Rounded Total (Company Currency),圆润的总计（公司货币）
 apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Cannot covert to Group because Account Type is selected.,不能转换到组，因为你选择的是帐户类型。
 DocType: Purchase Common,Purchase Common,购买普通
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +218,{0} {1} has been modified. Please refresh.,{0} {1}已被修改过，请刷新。
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +231,{0} {1} has been modified. Please refresh.,{0} {1}已被修改过，请刷新。
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,禁止用户在以下日期提交假期申请。
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,购买金额
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +209,Supplier Quotation {0} created,供应商报价{0}创建
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +215,Supplier Quotation {0} created,供应商报价{0}创建
 apps/erpnext/erpnext/accounts/report/financial_statements.py +85,End Year cannot be before Start Year,结束年份不能启动年前
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,员工福利
-DocType: Sales Invoice,Is POS,是否POS机
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},盒装数量必须等于量项目{0}行{1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +236,Packed quantity must equal quantity for Item {0} in row {1},盒装数量必须等于量项目{0}行{1}
 DocType: Production Order,Manufactured Qty,已生产数量
 DocType: Purchase Receipt Item,Accepted Quantity,已接收数量
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},请设置一个默认的假日列表为员工{0}或公司{1}
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}：{1}不存在
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,对客户开出的账单。
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,项目编号
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +521,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},行无{0}：金额不能大于金额之前对报销{1}。待审核金额为{2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +522,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},行无{0}：金额不能大于金额之前对报销{1}。待审核金额为{2}
 DocType: Maintenance Schedule,Schedule,计划任务
 DocType: Account,Parent Account,父帐户
 DocType: Quality Inspection Reading,Reading 3,阅读3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,凭证类型
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,Price List not found or disabled,价格表未找到或禁用
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1563,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 +248,Employee relieved on {0} must be set as 'Left',{0}的假期批准后，雇员的状态必须设置为“离开”
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',{0}的假期批准后，雇员的状态必须设置为“离开”
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",选择“Yes”将为此品目的所有实体创建唯一标识，你可以在序列号大师中查看他们的序列好。
 DocType: Guardian,Guardian,监护人
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,雇员{1}的限期评估{0}已经创建
@@ -4119,7 +4389,7 @@
 DocType: Delivery Note Item,Available Qty at From Warehouse,可用数量从仓库
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,请选择员工记录第一。
 DocType: POS Profile,Account for Change Amount,帐户涨跌额
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},行{0}：甲方/客户不与匹配{1} / {2} {3} {4}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,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 +240,Please enter Expense Account,请输入您的费用帐户
 DocType: Account,Stock,库存
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +984,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",行＃{0}：参考文件类型必须是采购订单之一，购买发票或日记帐分录
@@ -4140,7 +4410,7 @@
 DocType: Stock Entry,Default Target Warehouse,默认目标仓库
 DocType: Purchase Invoice,Net Total (Company Currency),总净金额（公司货币）
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.py +14,The Year End Date cannot be earlier than the Year Start Date. Please correct the dates and try again.,年末日期不能超过年度开始日期。请更正日期，然后再试一次。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,行{0}：党的类型和党的只适用对应收/应付帐户
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +93,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,行{0}：党的类型和党的只适用对应收/应付帐户
 DocType: Notification Control,Purchase Receipt Message,外购入库单信息
 DocType: BOM,Scrap Items,废物品
 DocType: Production Order,Actual Start Date,实际开始日期
@@ -4160,7 +4430,7 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,转让资产
 DocType: POS Profile,POS Profile,POS简介
 DocType: Training Event,Event Name,事件名称
-apps/erpnext/erpnext/config/schools.py +36,Admission,入场
+apps/erpnext/erpnext/config/schools.py +43,Admission,入场
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},招生{0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.",设置季节性的预算，目标等。
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants",项目{0}是一个模板，请选择它的一个变体
@@ -4171,8 +4441,9 @@
 DocType: Assessment Plan,Room,房间
 DocType: Purchase Order,Advance Paid,已支付的预付款
 DocType: Item,Item Tax,项目税项
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,材料到供应商
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,Excise Invoice,消费税发票
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,材料到供应商
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +362,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,雇员的邮件地址
 DocType: Employee Attendance Tool,Marked Attendance,显着的出席
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +136,Current Liabilities,流动负债
@@ -4181,6 +4452,7 @@
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,考虑税收或收费
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,实际数量是必须项
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,学生团体创建的。
+DocType: Employee Loan,Loan Type,贷款类型
 DocType: Scheduling Tool,Scheduling Tool,调度工具
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,信用卡
 DocType: BOM,Item to be manufactured or repacked,要生产或者重新包装的项目
@@ -4190,7 +4462,7 @@
 DocType: Sales Invoice Item,Drop Ship,落船
 DocType: Training Event,Attendees,与会者
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",在这里，您可以维系家庭的详细信息，如姓名的父母，配偶和子女及职业
-DocType: Academic Term,Term End Date,期限结束日期
+DocType: Academic Term,Term End Date,合同结束日期
 DocType: Hub Settings,Seller Name,卖家名称
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),已扣除税费（公司货币）
 DocType: Item Group,General Settings,常规设置
@@ -4199,16 +4471,18 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,在继续之前，您必须保存表单
 DocType: Item Attribute,Numeric Values,数字值
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,附加标志
+apps/erpnext/erpnext/stock/doctype/item/item.js +239,Stock Levels,库存水平
 DocType: Customer,Commission Rate,佣金率
-apps/erpnext/erpnext/stock/doctype/item/item.js +285,Make Variant,在Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +323,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/config/selling.py +179,Analytics,Analytics（分析）
-apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,车是空的
+apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,购物车是空的
 DocType: Vehicle,Model,模型
 DocType: Production Order,Actual Operating Cost,实际运行成本
 DocType: Payment Entry,Cheque/Reference No,支票/参考编号
 apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,根不能被编辑。
+DocType: Item,Units of Measure,测量的单位
 DocType: Manufacturing Settings,Allow Production on Holidays,允许在假日生产
 DocType: Sales Order,Customer's Purchase Order Date,客户的采购订单日期
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,股本
@@ -4217,12 +4491,13 @@
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,支付完成后重定向用户选择的页面。
 DocType: Company,Existing Company,现有的公司
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,请选择一个csv文件
+DocType: Student Leave Application,Mark as Present,标记为现
 DocType: Purchase Order,To Receive and Bill,接收和比尔
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,特色产品
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,Designer,设计师
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,条款和条件模板
 DocType: Serial No,Delivery Details,交货细节
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +476,Cost Center is required in row {0} in Taxes table for type {1},类型{1}税费表的行{0}必须有成本中心
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +484,Cost Center is required in row {0} in Taxes table for type {1},类型{1}税费表的行{0}必须有成本中心
 DocType: Program,Program Code,程序代码
 DocType: Terms and Conditions,Terms and Conditions Help,条款和条件帮助
 ,Item-wise Purchase Register,逐项采购记录
@@ -4237,21 +4512,23 @@
 DocType: Supplier,Credit Days,信用期
 DocType: Student Batch Creation Tool,Make Student Batch,让学生批
 DocType: Leave Type,Is Carry Forward,是否顺延假期
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,Get Items from BOM,从物料清单获取品目
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,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 +562,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,请在上表中输入销售订单
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +186,Not Submitted Salary Slips,未提交工资单
 ,Stock Summary,库存摘要
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,从一个仓库转移资产到另一
 DocType: Vehicle,Petrol,汽油
 apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,材料清单
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Row {0}: Party Type and Party is required for Receivable / Payable account {1},行{0}：党的类型和党的需要应收/应付帐户{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Row {0}: Party Type and Party is required for Receivable / Payable account {1},行{0}：党的类型和党的需要应收/应付帐户{1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,参考日期
 DocType: Employee,Reason for Leaving,离职原因
 DocType: BOM Operation,Operating Cost(Company Currency),营业成本（公司货币）
+DocType: Employee Loan Application,Rate of Interest,利率
 DocType: Expense Claim Detail,Sanctioned Amount,已批准金额
 DocType: GL Entry,Is Opening,是否起始
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: Debit entry can not be linked with a {1},行{0}：借记条目不能与连接的{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +184,Row {0}: Debit entry can not be linked with a {1},行{0}：借记条目不能与连接的{1}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,科目{0}不存在
 DocType: Account,Cash,现金
 DocType: Employee,Short biography for website and other publications.,在网站或其他出版物使用的个人简介。