diff --git a/erpnext/translations/zh-cn.csv b/erpnext/translations/zh-cn.csv
index 7c24347..547237b 100644
--- a/erpnext/translations/zh-cn.csv
+++ b/erpnext/translations/zh-cn.csv
@@ -1,7 +1,7 @@
 DocType: Employee,Salary Mode,薪酬模式
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.",如果需要按季节跟踪的话请选择“月度分布”。
 DocType: Employee,Divorced,离婚
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Warning: Same item has been entered multiple times.,警告：相同项目已经输入多次。
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,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}
@@ -23,7 +23,8 @@
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,压实加烧结
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},价格表{0}需要制定货币
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,*将被计算在该交易内。
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +541,From Material Request,来自物料申请
+DocType: Purchase Order,Customer Contact,客户联系
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,来自物料申请
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} 树
 DocType: Job Applicant,Job Applicant,求职者
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,没有更多结果。
@@ -38,7 +39,7 @@
 DocType: Sales Invoice,Customer Name,客户名称
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.",所有和出口相关的字段，例如货币，汇率，出口总额，出口总计等，都可以在送货单，POS，报价单，销售发票，销售订单等系统里面找到。
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,会计分录和维护余额操作针对的组(头)
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),杰出的{0}不能小于零（ {1} ）
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),杰出的{0}不能小于零（ {1} ）
 DocType: Manufacturing Settings,Default 10 mins,默认为10分钟
 DocType: Leave Type,Leave Type Name,假期类型名称
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,系列已成功更新
@@ -49,9 +50,8 @@
 DocType: SMS Center,All Supplier Contact,所有供应商联系人
 DocType: Quality Inspection Reading,Parameter,参数
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,预计结束日期不能小于预期开始日期
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +251,Do really want to unstop production order:,确认要重新开始生产订单吗：
 apps/erpnext/erpnext/utilities/transaction_base.py +104,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 +190,New Leave Application,新建假期申请
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,新建假期申请
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,银行汇票
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1。为了保持客户明智的项目代码，并使其搜索根据自己的代码中使用这个选项
 DocType: Mode of Payment Account,Mode of Payment Account,付款方式账户
@@ -59,24 +59,24 @@
 DocType: Sales Invoice Item,Quantity,数量
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),借款（负债）
 DocType: Employee Education,Year of Passing,按年排序
-sites/assets/js/erpnext.min.js +27,In Stock,库存
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +604,Can only make payment against unbilled Sales Order,只能使支付对未付款的销售订单
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,库存
 DocType: Designation,Designation,指派
 DocType: Production Plan Item,Production Plan Item,生产计划项目
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},用户{0}已经被分配给员工{1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,使新的POS简介
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,医疗保健
 DocType: Purchase Invoice,Monthly,每月
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +487,Invoice,发票
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),延迟支付（天）
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,发票
 DocType: Maintenance Schedule Item,Periodicity,周期性
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,邮件提醒
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Defense
 DocType: Company,Abbr,缩写
 DocType: Appraisal Goal,Score (0-5),得分（0-5）
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: {1} {2} does not match with {3},行{0}：{1} {2}不相匹配{3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},行{0}：{1} {2}不相匹配{3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,行＃{0}：
 DocType: Delivery Note,Vehicle No,车辆编号
-sites/assets/js/erpnext.min.js +55,Please select Price List,请选择价格表
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,请选择价格表
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,木工
 DocType: Production Order Operation,Work In Progress,在制品
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D打印
@@ -101,13 +101,14 @@
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,千克
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,开放的工作。
 DocType: Item Attribute,Increment,增量
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,选择仓库...
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,广告
 DocType: Employee,Married,已婚
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},送货单{0}不能更新库存
 DocType: Payment Reconciliation,Reconcile,调和
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,杂货
 DocType: Quality Inspection Reading,Reading 1,阅读1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Make Bank Entry,创建银行分录
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,创建银行分录
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,养老基金
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,类型为仓库的账户必须指定仓库
 DocType: SMS Center,All Sales Person,所有的销售人员
@@ -120,7 +121,7 @@
 DocType: Warehouse,Warehouse Detail,仓库详细信息
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},客户{0} 的信用额度已经越过 {1} / {2}
 DocType: Tax Rule,Tax Type,税收类型
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},你没有权限在{0}前添加或更改分录。
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},你没有权限在{0}前添加或更改分录。
 DocType: Item,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）*实际操作时间
@@ -130,7 +131,7 @@
 DocType: Quality Inspection,Get Specification Details,获取详细规格
 DocType: Lead,Interested,有兴趣
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,物料清单
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,开盘
+apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,开盘
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},从{0}至 {1}
 DocType: Item,Copy From Item Group,从品目组复制
 DocType: Journal Entry,Opening Entry,开放报名
@@ -140,7 +141,7 @@
 DocType: Lead,Product Enquiry,产品查询
 DocType: Standard Reply,Owner,业主
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,请先输入公司
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +354,Please select Company first,请首先选择公司
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,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 +22,Target On,目标类型
 DocType: BOM,Total Cost,总成本
@@ -158,6 +159,7 @@
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,耗材
 DocType: Upload Attendance,Import Log,导入日志
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,发送
+DocType: Sales Invoice Item,Delivered By Supplier,交付供应商
 DocType: SMS Center,All Contact,所有联系人
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,年薪
 DocType: Period Closing Voucher,Closing Fiscal Year,结算财年
@@ -167,14 +169,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,显示的时间记录
 DocType: Journal Entry Account,Credit in Company Currency,信用在公司货币
 DocType: Delivery Note,Installation Status,安装状态
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +114,Accepted + Rejected Qty must be equal to Received quantity for Item {0},已接受+已拒绝的数量必须等于品目{0}的接收数量
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},已接受+已拒绝的数量必须等于品目{0}的接收数量
 DocType: Item,Supply Raw Materials for Purchase,供应原料采购
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,品目{0}必须是采购品目
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",下载此模板，填写相应的数据后上传。所有的日期和员工出勤记录将显示在模板里。
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +444,Item {0} is not active or end of life has been reached,品目{0}处于非活动或寿命终止状态
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,品目{0}处于非活动或寿命终止状态
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,销售发票提交后将会更新。
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",要包括税款，行{0}项率，税收行{1}也必须包括在内
+apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",要包括税款，行{0}项率，税收行{1}也必须包括在内
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,人力资源模块的设置
 DocType: SMS Center,SMS Center,短信中心
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,直
@@ -199,11 +201,10 @@
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,规则适用的定价和折扣。
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},与此时间登录冲突{0} {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,房产价格必须适用于购买或出售
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},品目{0}的安装日期不能早于交付日期
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},品目{0}的安装日期不能早于交付日期
 DocType: Pricing Rule,Discount on Price List Rate (%),折扣价目表率（％）
-sites/assets/js/form.min.js +279,Start,开始
+apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,开始
 DocType: User,First Name,姓
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,您的设置就完成了。正在刷新。
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,全模铸造
 DocType: Offer Letter,Select Terms and Conditions,选择条款和条件
 DocType: Production Planning Tool,Sales Orders,销售订单
@@ -229,6 +230,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,对销售发票项目
 ,Production Orders in Progress,在建生产订单
 DocType: Lead,Address & Contact,地址及联系方式
+DocType: Leave Allocation,Add unused leaves from previous allocations,添加未使用的叶子从以前的分配
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},周期{0}下次创建时间为{1}
 DocType: Newsletter List,Total Subscribers,用户总数
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,联系人姓名
@@ -236,19 +238,19 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,依上述条件创建工资单
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,请求您的报价。
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,双人房
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,只有选择的休假审批者可以提交此请假
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,只有选择的休假审批者可以提交此请假
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,解除日期必须大于加入的日期
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,每年叶
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,请设置命名序列{0}通过设置&gt;设置&gt;命名系列
 DocType: Time Log,Will be updated when batched.,批处理后将会更新。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,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 +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,行{0}：请检查'是推进'对帐户{1}，如果这是一个进步条目。
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},仓库{0}不属于公司{1}
 DocType: Bulk Email,Message,信息
 DocType: Item Website Specification,Item Website Specification,品目网站规格
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox的Key
 DocType: Payment Tool,Reference No,参考编号
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,已禁止请假
-apps/erpnext/erpnext/stock/doctype/item/item.py +476,Item {0} has reached its end of life on {1},品目{0}已经到达寿命终止日期{1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,已禁止请假
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},品目{0}已经到达寿命终止日期{1}
 apps/erpnext/erpnext/accounts/utils.py +339,Annual,全年
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,库存盘点品目
 DocType: Stock Entry,Sales Invoice No,销售发票编号
@@ -260,8 +262,8 @@
 DocType: Pricing Rule,Supplier Type,供应商类型
 DocType: Item,Publish in Hub,在发布中心
 ,Terretory,区域
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Item {0} is cancelled,品目{0}已取消
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +589,Material Request,物料申请
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,品目{0}已取消
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,物料申请
 DocType: Bank Reconciliation,Update Clearance Date,更新清拆日期
 DocType: Item,Purchase Details,购买详情
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},项目{0}未发现“原材料提供&#39;表中的采购订单{1}
@@ -277,7 +279,7 @@
 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/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},请输入父帐户组仓库{0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,Payment against {0} {1} cannot be greater than Outstanding Amount {2},对支付{0} {1}不能大于未偿还{2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,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,生成时间表
@@ -303,10 +305,8 @@
 DocType: Period Closing Voucher,Closing Account Head,结算帐户头
 DocType: Employee,External Work History,外部就职经历
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,循环引用错误
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +652,Do you really want to STOP,你真的要停止
 DocType: Communication,Closed,已关闭
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,大写金额（出口）将在送货单保存后显示。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +734,Are you sure you want to STOP ,您确定要停止
 DocType: Lead,Industry,行业
 DocType: Employee,Job Profile,工作简介
 DocType: Newsletter,Newsletter,通讯
@@ -321,7 +321,7 @@
 DocType: Dropbox Backup,Allow Dropbox Access,允许访问Dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,建立税
 apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,付款项被修改，你把它之后。请重新拉。
-apps/erpnext/erpnext/stock/doctype/item/item.py +281,{0} entered twice in Item Tax,{0}输入两次项税
+apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0}输入两次项税
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,本周和待活动总结
 DocType: Workstation,Rent Cost,租金成本
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,请选择年份和月份
@@ -338,10 +338,10 @@
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,速率客户货币转换成客户的基础货币
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet",可在物料清单，送货单，采购发票，生产订单，采购订单，采购收据，销售发票，销售订单，仓储记录，时间表里面找到
 DocType: Item Tax,Tax Rate,税率
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Select Item,选择项目
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,选择项目
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"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 +258,Purchase Invoice {0} is already submitted,采购发票{0}已经提交
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,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/account/account.js +54,Convert to non-Group,转换为非集团
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,购买收据必须提交
@@ -349,7 +349,7 @@
 apps/erpnext/erpnext/config/stock.py +53,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 +220,There can only be 1 Account per Company in {0} {1},只能有每公司1帐户{0} {1}
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},只能有每公司1帐户{0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,您的电子邮件地址
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,请参阅附件
 DocType: Purchase Order,% Received,％已收货
@@ -359,7 +359,7 @@
 DocType: Delivery Note,Instructions,说明
 DocType: Quality Inspection,Inspected By,验货人
 DocType: Maintenance Visit,Maintenance Type,维护类型
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +69,Serial No {0} does not belong to Delivery Note {1},序列号{0}不属于送货单{1}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},序列号{0}不属于送货单{1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,品目质量检验参数
 DocType: Leave Application,Leave Approver Name,假期审批人姓名
 ,Schedule Date,计划任务日期
@@ -378,7 +378,7 @@
 ,Purchase Register,购买注册
 DocType: Landed Cost Item,Applicable Charges,适用费用
 DocType: Workstation,Consumable Cost,耗材成本
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} {1}必须有“假期审批人”的角色
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} {1}必须有“假期审批人”的角色
 DocType: Purchase Receipt,Vehicle Date,车日期
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,医药
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,原因丢失
@@ -399,6 +399,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,请先输入公司名称
 DocType: BOM,Item Desription,品目说明
 DocType: Purchase Invoice,Supplier Name,供应商名称
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,阅读ERPNext手册
 DocType: Account,Is Group,是集团
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,自动设置序列号的基础上FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,检查供应商发票编号唯一性
@@ -414,13 +415,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,所有生产流程的全局设置。
 DocType: Accounts Settings,Accounts Frozen Upto,账户被冻结到...为止
 DocType: SMS Log,Sent On,发送日期
-apps/erpnext/erpnext/stock/doctype/item/item.py +453,Attribute {0} selected multiple times in Attributes Table,属性{0}多次选择在属性表
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,属性{0}多次选择在属性表
 DocType: Sales Order,Not Applicable,不适用
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,假期大师
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,外壳成型
 DocType: Material Request Item,Required Date,所需时间
 DocType: Delivery Note,Billing Address,帐单地址
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +613,Please enter Item Code.,请输入产品编号。
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,请输入产品编号。
 DocType: BOM,Costing,成本核算
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",如果勾选，税金将被当成已包括在打印税率/打印总额内。
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,总数量
@@ -443,31 +444,30 @@
 DocType: Customer,Buyer of Goods and Services.,产品和服务购买者。
 DocType: Journal Entry,Accounts Payable,应付帐款
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,添加订阅
-sites/assets/js/erpnext.min.js +5,""" does not exists",“不存在
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",“不存在
 DocType: Pricing Rule,Valid Upto,有效期至
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,列出一些你的客户，他们可以是组织或个人。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,直接收益
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account",按科目分类后不能根据科目过滤
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,行政主任
 DocType: Payment Tool,Received Or Paid,收到或支付
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +338,Please select Company,请选择公司
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,请选择公司
 DocType: Stock Entry,Difference Account,差异科目
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,不能因为其依赖的任务{0}没有关闭关闭任务。
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,请重新拉。
 DocType: Production Order,Additional Operating Cost,额外的运营成本
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,化妆品
 DocType: DocField,Type,类型
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"To merge, following properties must be same for both items",若要合并，以下属性必须为这两个项目是相同的
+apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items",若要合并，以下属性必须为这两个项目是相同的
 DocType: Communication,Subject,主题
 DocType: Shipping Rule,Net Weight,净重
 DocType: Employee,Emergency Phone,紧急电话
 ,Serial No Warranty Expiry,序列号/保修到期
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +624,Do you really want to STOP this Material Request?,确认要停止此物料申请吗？
 DocType: Sales Order,To Deliver,为了提供
 DocType: Purchase Invoice Item,Item,品目
 DocType: Journal Entry,Difference (Dr - Cr),差异(贷方-借方)
 DocType: Account,Profit and Loss,损益
-apps/erpnext/erpnext/config/learn.py +147,Managing Subcontracting,管理转包
+apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,管理转包
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,新计量单位的类型不能是整数
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,factory furniture and fixtures
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,速率价目表货币转换为公司的基础货币
@@ -487,7 +487,7 @@
 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_for_party/trial_balance_for_party.py +169,Closing (Cr),结算(信用)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),结算(信用)
 DocType: Serial No,Warranty Period (Days),保修期限（天数）
 DocType: Installation Note Item,Installation Note Item,安装单品目
 ,Pending Qty,待定数量
@@ -519,8 +519,9 @@
 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/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,以前
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,Sales Return,销售退货
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,销售退货
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,选择该生产订单的源销售订单。
+DocType: Item,Delivered by Supplier (Drop Ship),由供应商交货（直接发运）
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,工资构成部分。
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,潜在客户数据库。
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,客户数据库。
@@ -531,7 +532,7 @@
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,翻筋斗
 DocType: Purchase Order Item,Billed Amt,已开票金额
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,库存记录针对的逻辑仓库。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},参考号与参考日期须为{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},参考号与参考日期须为{0}
 DocType: Event,Wednesday,星期三
 DocType: Sales Invoice,Customer's Vendor,客户的供应商
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,生产订单是强制性
@@ -564,8 +565,8 @@
 DocType: SMS Settings,Receiver Parameter,接收机参数
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,“根据”和“分组依据”不能相同
 DocType: Sales Person,Sales Person Targets,销售人员目标
-sites/assets/js/form.min.js +271,To,到
-apps/frappe/frappe/templates/base.html +143,Please enter email address,请输入您的电子邮件地址
+apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,到
+apps/frappe/frappe/templates/base.html +145,Please enter email address,请输入您的电子邮件地址
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,尾管成型
 DocType: Production Order Operation,In minutes,已分钟为单位
 DocType: Issue,Resolution Date,决议日期
@@ -582,7 +583,7 @@
 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 +198,{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 +202,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消维护访问{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消维护访问{0}
 DocType: Material Request,Material Transfer,物料转移
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),开幕（博士）
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},发布时间标记必须经过{0}
@@ -590,9 +591,9 @@
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,到岸成本税费
 DocType: Production Order Operation,Actual Start Time,实际开始时间
 DocType: BOM Operation,Operation Time,操作时间
-sites/assets/js/list.min.js +5,More,更多
+apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,更多
 DocType: Pricing Rule,Sales Manager,销售经理
-sites/assets/js/desk.min.js +7673,Rename,重命名
+apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,重命名
 DocType: Journal Entry,Write Off Amount,核销金额
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,弯曲
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,允许用户
@@ -608,13 +609,13 @@
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,直剪
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,在基于其序列号的销售和采购文件跟踪的项目。这也可以用来跟踪商品的保修细节。
 DocType: Purchase Receipt Item Supplied,Current Stock,当前库存
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Rejected Warehouse is mandatory against regected item,拒绝仓库是必须反对regected项目
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,拒绝仓库是必须反对regected项目
 DocType: Account,Expenses Included In Valuation,开支计入估值
 DocType: Employee,Provide email id registered in company,提供的电子邮件ID在公司注册
 DocType: Hub Settings,Seller City,卖家城市
 DocType: Email Digest,Next email will be sent on:,下次邮件发送时间：
 DocType: Offer Letter Term,Offer Letter Term,报价函期限
-apps/erpnext/erpnext/stock/doctype/item/item.py +433,Item has variants.,项目已变种。
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,项目已变种。
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,品目{0}未找到
 DocType: Bin,Stock Value,库存值
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,树类型
@@ -629,11 +630,10 @@
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,欢迎
 DocType: Journal Entry,Credit Card Entry,信用卡分录
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,任务主题
-apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,来自供应商的已收入成品。
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,来自供应商的已收入成品。
 DocType: Communication,Open,开
 DocType: Lead,Campaign Name,活动名称
 ,Reserved,保留的
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +663,Do you really want to UNSTOP,确认要重新开始吗
 DocType: Purchase Order,Supply Raw Materials,供应原料
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,下一次发票生成的日期，提交时将会生成。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,流动资产
@@ -649,7 +649,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,客户的采购订单号
 DocType: Employee,Cell Number,手机号码
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,丧失
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,You can not enter current voucher in 'Against Journal Entry' column,“对日记账分录”不能选择此凭证。
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,“对日记账分录”不能选择此凭证。
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,能源
 DocType: Opportunity,Opportunity From,从机会
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,月度工资结算
@@ -710,7 +710,7 @@
 DocType: Account,Liability,负债
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,制裁金额不能大于索赔额行{0}。
 DocType: Company,Default Cost of Goods Sold Account,销货账户的默认成本
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List not selected,价格列表没有选择
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,价格列表没有选择
 DocType: Employee,Family Background,家庭背景
 DocType: Process Payroll,Send Email,发送电​​子邮件
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,无此权限
@@ -721,7 +721,7 @@
 DocType: Item,Items with higher weightage will be shown higher,具有较高权重的项目将显示更高的可
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,银行对帐详细
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,我的发票
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,未找到任何雇员
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,未找到任何雇员
 DocType: Purchase Order,Stopped,已停止
 DocType: Item,If subcontracted to a vendor,如果分包给供应商
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,选择BOM展开
@@ -730,7 +730,6 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,立即发送
 ,Support Analytics,客户支持分析
 DocType: Item,Website Warehouse,网站仓库
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Do you really want to stop production order:,你真的要停止生产订单：
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",每月自动生成发票的日期，例如5号，28号等
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,得分必须小于或等于5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-表记录
@@ -740,12 +739,12 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",为了使“销售点”的特点
 DocType: Bin,Moving Average Rate,移动平均价格
 DocType: Production Planning Tool,Select Items,选择品目
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,{0} against Bill {1} dated {2},{0}对日期为{2}的账单{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0}对日期为{2}的账单{1}
 DocType: Comment,Reference Name,参考名称
 DocType: Maintenance Visit,Completion Status,完成状态
 DocType: Sales Invoice Item,Target Warehouse,目标仓库
 DocType: Item,Allow over delivery or receipt upto this percent,允许在交付或接收高达百分之这
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +48,Expected Delivery Date cannot be before Sales Order Date,预计交货日期不能早于销售订单日期
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,预计交货日期不能早于销售订单日期
 DocType: Upload Attendance,Import Attendance,导入考勤记录
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,所有品目群组
 DocType: Process Payroll,Activity Log,活动日志
@@ -753,7 +752,8 @@
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,在提交交易时自动编写信息。
 DocType: Production Order,Item To Manufacture,要生产的品目
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,永久模铸造
-apps/erpnext/erpnext/config/learn.py +167,Purchase Order to Payment,采购订单到付款
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1}的状态为{2}
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,采购订单到付款
 DocType: Sales Order Item,Projected Qty,预计数量
 DocType: Sales Invoice,Payment Due Date,付款到期日
 DocType: Newsletter,Newsletter Manager,通讯经理
@@ -777,8 +777,8 @@
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,绩效考核。
 DocType: Sales Invoice Item,Stock Details,股票详细信息
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,项目价值
-apps/erpnext/erpnext/config/learn.py +112,Point-of-Sale,销售点
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},无法顺延{0}
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,销售点
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},无法顺延{0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",账户余额已设置为'贷方'，不能设置为'借方'
 DocType: Account,Balance must be,余额必须是
 DocType: Hub Settings,Publish Pricing,发布定价
@@ -800,7 +800,7 @@
 DocType: Purchase Invoice Item,Purchase Receipt,外购入库单
 ,Received Items To Be Billed,收到的项目要被收取
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,喷砂
-sites/assets/js/desk.min.js +3938,Ms,女士
+DocType: Employee,Ms,女士
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,货币汇率大师
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},找不到时隙在未来{0}天操作{1}
 DocType: Production Order,Plan material for sub-assemblies,计划材料为子组件
@@ -822,29 +822,31 @@
 DocType: Supplier,Default Payable Accounts,默认应付账户(多个)
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,雇员{0}非活动或不存在
 DocType: Features Setup,Item Barcode,品目条码
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Item Variants {0} updated,品目变种{0}已更新
+apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,品目变种{0}已更新
 DocType: Quality Inspection Reading,Reading 6,6阅读
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,购买发票提前
 DocType: Address,Shop,商店
 DocType: Hub Settings,Sync Now,立即同步
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +166,Row {0}: Credit entry can not be linked with a {1},行{0}：信用记录无法被链接的{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},行{0}：信用记录无法被链接的{1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,选择此模式时POS发票的银行/现金账户将会被自动更新。
 DocType: Employee,Permanent Address Is,永久地址
 DocType: Production Order Operation,Operation completed for how many finished goods?,操作完成多少成品？
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,你的品牌
-apps/erpnext/erpnext/controllers/status_updater.py +154,Allowance for over-{0} crossed for Item {1}.,品目{1}已经超过允许的超额{0}。
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,品目{1}已经超过允许的超额{0}。
 DocType: Employee,Exit Interview Details,退出面试细节
 DocType: Item,Is Purchase Item,是否采购品目
 DocType: Journal Entry Account,Purchase Invoice,购买发票
 DocType: Stock Ledger Entry,Voucher Detail No,凭证详情编号
 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,索取资料
 DocType: Payment Tool,Paid,付费
 DocType: Salary Slip,Total in words,总字
 DocType: Material Request Item,Lead Time Date,交货时间日期
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,是强制性的。也许外币兑换记录没有创建
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},行＃{0}：请注明序号为项目{1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",对于“产品包”的物品，仓库，序列号和批号将被从“装箱单”表考虑。如果仓库和批次号是相同的任何“产品包”项目的所有包装物品，这些值可以在主项表中输入，值将被复制到“装箱单”表。
-apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,向客户发货。
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,向客户发货。
 DocType: Purchase Invoice Item,Purchase Order Item,采购订单项目
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,间接收益
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,将付款金额=未偿还
@@ -852,13 +854,14 @@
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,方差
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,公司名称
 DocType: SMS Center,Total Message(s),总信息（s ）
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +507,Select Item for Transfer,对于转让项目选择
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,对于转让项目选择
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,查看所有帮助影片名单
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,请选择支票存入的银行账户头。
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,允许用户编辑交易中的价目表率。
 DocType: Pricing Rule,Max Qty,最大数量
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,行{0}：付款方式对销售/采购订单应始终被标记为提前
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,行{0}：付款方式对销售/采购订单应始终被标记为提前
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,化学品
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +691,All items have already been transferred for this Production Order.,所有品目都已经转移到这个生产订单。
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,所有品目都已经转移到这个生产订单。
 DocType: Process Payroll,Select Payroll Year and Month,选择薪资年和月
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",转到相应的组（通常资金运用&gt;流动资产&gt;银行帐户，并创建一个新帐户（通过点击添加类型的儿童），“银行”
 DocType: Workstation,Electricity Cost,电力成本
@@ -873,7 +876,7 @@
 DocType: SMS Center,All Lead (Open),所有潜在客户（开放）
 DocType: Purchase Invoice,Get Advances Paid,获取已付预付款
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,附上你的照片
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +509,Make ,使
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,使
 DocType: Journal Entry,Total Amount in Words,总金额词
 DocType: Workflow State,Stop,停止
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,发生了错误，一个可能的原因可能是您没有保存表单。如果问题仍然存在请联系管理员或support@erpnext.com。
@@ -897,7 +900,7 @@
 DocType: POS Profile,Cash/Bank Account,现金/银行账户
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,删除的项目在数量或价值没有变化。
 DocType: Delivery Note,Delivery To,交货对象
-apps/erpnext/erpnext/stock/doctype/item/item.py +450,Attribute table is mandatory,属性表是强制性的
+apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,属性表是强制性的
 DocType: Production Planning Tool,Get Sales Orders,获取销售订单
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0}不能为负
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,备案
@@ -908,12 +911,13 @@
 DocType: Project,Internal,内部
 DocType: Task,Urgent,加急
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},请指定行{0}在表中的有效行ID {1}
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,转到桌面和开始使用ERPNext
 DocType: Item,Manufacturer,制造商
 DocType: Landed Cost Item,Purchase Receipt Item,采购入库项目
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,在销售订单/成品仓库保留仓库
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,销售金额
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,时间日志
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,You are the Expense Approver for this record. Please Update the 'Status' and Save,你是本条目的开支审批人，请更新并保存其状态。
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,你是本条目的开支审批人，请更新并保存其状态。
 DocType: Serial No,Creation Document No,创建文档编号
 DocType: Issue,Issue,问题
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.",品目变体的属性。如大小，颜色等。
@@ -928,8 +932,9 @@
 DocType: GL Entry,Against,针对
 DocType: Item,Default Selling Cost Center,默认销售成本中心
 DocType: Sales Partner,Implementation Partner,实施合作伙伴
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},销售订单{0} {1}
 DocType: Opportunity,Contact Info,联系方式
-apps/erpnext/erpnext/config/learn.py +132,Making Stock Entries,制作Stock条目
+apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,制作Stock条目
 DocType: Packing Slip,Net Weight UOM,净重计量单位
 DocType: Item,Default Supplier,默认供应商
 DocType: Manufacturing Settings,Over Production Allowance Percentage,对生产补贴比例
@@ -938,7 +943,7 @@
 DocType: Holiday List,Get Weekly Off Dates,获取周末日期
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,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 +166,Dr,借方
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,借方
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,从供应商收到的报价。
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},{0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,通过时间更新日志
@@ -966,7 +971,7 @@
 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 +208,Production Order {0} must be cancelled before cancelling this Sales Order,生产订单{0}必须取消这个销售订单之前被取消
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,生产订单{0}必须取消这个销售订单之前被取消
 ,Ordered Items To Be Billed,订购物品被标榜
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,从范围必须小于要范围
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,选择时间记录然后提交来创建一个新的销售发票。
@@ -1014,7 +1019,7 @@
 DocType: Lead,Lead,线索
 DocType: Email Digest,Payables,应付账款
 DocType: Account,Warehouse,仓库
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Row #{0}: Rejected Qty can not be entered in Purchase Return,行＃{0}：驳回采购退货数量不能进入
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,行＃{0}：驳回采购退货数量不能进入
 ,Purchase Order Items To Be Billed,采购订单的项目被标榜
 DocType: Purchase Invoice Item,Net Rate,净费率
 DocType: Purchase Invoice Item,Purchase Invoice Item,采购发票项目
@@ -1029,11 +1034,11 @@
 DocType: Global Defaults,Current Fiscal Year,当前财年
 DocType: Global Defaults,Disable Rounded Total,禁用总计化整
 DocType: Lead,Call,通话
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +379,'Entries' cannot be empty,“分录”不能为空
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,“分录”不能为空
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},重复的行{0}同{1}
 ,Trial Balance,试算表
-apps/erpnext/erpnext/config/learn.py +203,Setting up Employees,建立职工
-sites/assets/js/erpnext.min.js +5,"Grid """,网格“
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,建立职工
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,网格“
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,请选择前缀第一
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,研究
 DocType: Maintenance Visit Purpose,Work Done,已完成工作
@@ -1043,14 +1048,15 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,查看总帐
 DocType: File,Lft,Lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,最早
-apps/erpnext/erpnext/stock/doctype/item/item.py +332,"An Item Group exists with same name, please change the item name or rename the item group",同名品目群组已经存在，请更名
+apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group",同名品目群组已经存在，请更名
 DocType: Communication,Delivery Status,交货状态
 DocType: Production Order,Manufacture against Sales Order,按销售订单生产
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +515,Rest Of The World,世界其他地区
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,世界其他地区
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,物件{0}不能有批次
 ,Budget Variance Report,预算差异报告
 DocType: Salary Slip,Gross Pay,工资总额
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,股利支付
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,会计总帐
 DocType: Stock Reconciliation,Difference Amount,差额
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,留存收益
 DocType: BOM Item,Item Description,品目说明
@@ -1064,15 +1070,17 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,临时开通
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,雇员假期余量
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},账户{0}的余额必须总是{1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},账户{0}的余额必须总是{1}
 DocType: Address,Address Type,地址类型
 DocType: Purchase Receipt,Rejected Warehouse,拒绝仓库
 DocType: GL Entry,Against Voucher,对凭证
 DocType: Item,Default Buying Cost Center,默认采购成本中心
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.",为了获得最好ERPNext，我们建议您花一些时间和观看这些帮助视频。
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,品目{0}必须是销售品目
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,至
 DocType: Item,Lead Time in days,在天交货期
 ,Accounts Payable Summary,应付帐款摘要
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},无权修改冻结帐户{0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},无权修改冻结帐户{0}
 DocType: Journal Entry,Get Outstanding Invoices,获取未清发票
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,销售订单{0}无效
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged",抱歉，公司不能合并
@@ -1088,7 +1096,7 @@
 DocType: Employee,Place of Issue,签发地点
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,合同
 DocType: Report,Disabled,已禁用
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +488,UOM coversion factor required for UOM: {0} in Item: {1},物件{1}的计量单位{0}需要单位换算系数
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},物件{1}的计量单位{0}需要单位换算系数
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,间接支出
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,行{0}：数量是强制性的
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,农业
@@ -1097,13 +1105,13 @@
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,请先输入项目
 DocType: Journal Entry Account,Purchase Order,采购订单
 DocType: Warehouse,Warehouse Contact Info,仓库联系方式
-sites/assets/js/form.min.js +190,Name is required,名称是必须项
+apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,名称是必须项
 DocType: Purchase Invoice,Recurring Type,经常性类型
 DocType: Address,City/Town,市/镇
 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 +112,"For {0}, only credit accounts can be linked against another debit entry",对于{0}，贷方分录只能选择贷方账户
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",对于{0}，贷方分录只能选择贷方账户
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,送货单{0}未提交
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,品目{0}必须是外包品目
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,资本设备
@@ -1114,14 +1122,14 @@
 DocType: Appraisal Goal,Goal,目标
 DocType: Sales Invoice Item,Edit Description,编辑说明
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,预计交付日期比计划开始日期较小。
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +571,For Supplier,对供应商
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,对供应商
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,设置帐户类型有助于在交易中选择该帐户。
 DocType: Purchase Invoice,Grand Total (Company Currency),总计（公司货币）
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,即将离任的总
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",“至值”为0或为空的运输规则条件最多只能有一个
 DocType: Authorization Rule,Transaction,交易
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,注：此成本中心是一个组，会计分录不能对组录入。
-apps/erpnext/erpnext/config/projects.py +43,Tools,工具
+apps/frappe/frappe/config/desk.py +7,Tools,工具
 DocType: Item,Website Item Groups,网站物件组
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,生产订单号码是强制性的股票入门目的制造
 DocType: Purchase Invoice,Total (Company Currency),总（公司货币）
@@ -1131,7 +1139,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,邮件摘要：
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM{0}不属于品目{1}
 DocType: Sales Partner,Target Distribution,目标分布
-sites/assets/js/desk.min.js +7652,Comments,评论
+apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,评论
 DocType: Salary Slip,Bank Account No.,银行账号
 DocType: Naming Series,This is the number of the last created transaction with this prefix,这就是以这个前缀的最后一个创建的事务数
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},物件{0}需要估值率
@@ -1146,7 +1154,7 @@
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,特权休假
 DocType: Purchase Invoice,Supplier Invoice Date,供应商发票日期
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,您需要启用购物车
-sites/assets/js/form.min.js +212,No Data,无数据
+apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,无数据
 DocType: Appraisal Template Goal,Appraisal Template Goal,评估目标模板
 DocType: Salary Slip,Earning,盈余
 DocType: Payment Tool,Party Account Currency,党的账户币种
@@ -1154,7 +1162,7 @@
 DocType: Purchase Taxes and Charges,Add or Deduct,添加或扣除
 DocType: Company,If Yearly Budget Exceeded (for expense account),如果年度预算超出（用于报销）
 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 +174,Against Journal Entry {0} is already adjusted against some other voucher,日记帐分录{0}已经被其他凭证调整
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,日记帐分录{0}已经被其他凭证调整
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,总订单价值
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,食品
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,账龄范围3
@@ -1162,11 +1170,11 @@
 DocType: Maintenance Schedule Item,No of Visits,访问数量
 DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",发给联系人和潜在客户的通讯
+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}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,操作不能留空。
 ,Delivered Items To Be Billed,无开账单的已交付品目
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,仓库不能为序​​列号变更
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +101,Status updated to {0},状态已更新为{0}
 DocType: DocField,Description,描述
 DocType: Authorization Rule,Average Discount,平均折扣
 DocType: Letter Head,Is Default,是否默认
@@ -1194,7 +1202,7 @@
 DocType: Item,Maintain Stock,维持股票
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,生产订单已创建Stock条目
 DocType: Leave Control Panel,Leave blank if considered for all designations,如果针对所有 职位请留空
-apps/erpnext/erpnext/controllers/accounts_controller.py +497,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}中的收取类型“实际”不能有“品目税率”
+apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}中的收取类型“实际”不能有“品目税率”
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},最大值：{0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,起始时间日期
 DocType: Email Digest,For Company,对公司
@@ -1204,7 +1212,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,科目表
 DocType: Material Request,Terms and Conditions Content,条款和条件内容
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,不能大于100
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item {0} is not a stock Item,品目{0}不是库存品目
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,品目{0}不是库存品目
 DocType: Maintenance Visit,Unscheduled,计划外
 DocType: Employee,Owned,资
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,依赖于无薪休假
@@ -1217,7 +1225,7 @@
 DocType: GL Entry,GL Entry,总账分录
 DocType: HR Settings,Employee Settings,雇员设置
 ,Batch-Wise Balance History,批次余额历史
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +69,To Do List,待办事项列表
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,待办事项列表
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,学徒
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,负数量是不允许的
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -1249,13 +1257,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,办公室租金
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,短信网关的设置
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,导入失败！
-sites/assets/js/erpnext.min.js +24,No address added yet.,未添加地址。
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,未添加地址。
 DocType: Workstation Working Hour,Workstation Working Hour,工作站工作时间
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,分析员
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},行{0}：分配量{1}必须小于或等于合资量{2}
 DocType: Item,Inventory,库存
 DocType: Features Setup,"To enable ""Point of Sale"" view",为了让观“销售点”
-sites/assets/js/erpnext.min.js +50,Payment cannot be made for empty cart,付款方式不能为空购物车制造
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,付款方式不能为空购物车制造
 DocType: Item,Sales Details,销售详情
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,钢钉
 DocType: Opportunity,With Items,随着项目
@@ -1265,7 +1273,7 @@
 ",在这接下来的发票将生成的日期。它在提交生成。
 DocType: Item Attribute,Item Attribute,品目属性
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,政府
-apps/erpnext/erpnext/config/stock.py +273,Item Variants,项目变体
+apps/erpnext/erpnext/config/stock.py +268,Item Variants,项目变体
 DocType: Company,Services,服务
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),总计（{0}）
 DocType: Cost Center,Parent Cost Center,父成本中心
@@ -1275,11 +1283,11 @@
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,财政年度开始日期
 DocType: Employee External Work History,Total Experience,总经验
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,扩孔
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +269,Packing Slip(s) cancelled,装箱单（ S）取消
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,装箱单（ S）取消
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,货运及转运费
 DocType: Material Request Item,Sales Order No,销售订单编号
 DocType: Item Group,Item Group Name,品目群组名称
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,已经过
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,已经过
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,转移制造材料
 DocType: Pricing Rule,For Price List,对价格表
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,猎头
@@ -1288,8 +1296,7 @@
 DocType: Purchase Invoice Item,Net Amount,净额
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM详情编号
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),额外的优惠金额（公司货币）
-DocType: Period Closing Voucher,CoA Help,CoA帮助
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +528,Error: {0} > {1},错误： {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},错误： {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,请从科目表创建新帐户。
 DocType: Maintenance Visit,Maintenance Visit,维护访问
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,客户>客户群组>地区
@@ -1300,6 +1307,7 @@
 DocType: Event,Tuesday,星期二
 DocType: Leave Block List,Block Holidays on important days.,禁止重要日子的假期。
 ,Accounts Receivable Summary,应收账款汇总
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},叶为已分配给员工{1}的期间类型{0} {2}  -  {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,请在员工记录设置员工角色设置用户ID字段
 DocType: UOM,UOM Name,计量单位名称
 DocType: Top Bar Item,Target,目标
@@ -1320,19 +1328,19 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},会计分录为{0}只能在货币进行：{1}
 DocType: Pricing Rule,Pricing Rule,定价规则
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,开槽
-apps/erpnext/erpnext/config/learn.py +162,Material Request to Purchase Order,材料要求采购订单
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,材料要求采购订单
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},行＃{0}：返回的项目{1}不存在{2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,银行账户
 ,Bank Reconciliation Statement,银行对帐表
 DocType: Address,Lead Name,线索姓名
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,期初存货余额
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,期初存货余额
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0}只能出现一次
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},不允许转院更多{0}不是{1}对采购订单{2}
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},已成功为{0}调配假期
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},已成功为{0}调配假期
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,未选择品目
 DocType: Shipping Rule Condition,From Value,起始值
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,生产数量为必须项
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,生产数量为必须项
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,银行无记录的数额
 DocType: Quality Inspection Reading,Reading 4,4阅读
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,公司开支报销
@@ -1345,19 +1353,20 @@
 DocType: Production Planning Tool,Select Sales Orders,选择销售订单
 ,Material Requests for which Supplier Quotations are not created,无供应商报价的物料申请
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,要使用条形码跟踪项目。您将能够通过扫描物品条码，进入交货单和销售发票的项目。
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,标记为交付
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,请报价
 DocType: Dependent Task,Dependent Task,相关任务
-apps/erpnext/erpnext/stock/doctype/item/item.py +244,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 +142,Leave of type {0} cannot be longer than {1},类型为{0}的假期不能长于{1}天
+apps/erpnext/erpnext/stock/doctype/item/item.py +300,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 +141,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,停止生日提醒
 DocType: SMS Center,Receiver List,接收器列表
 DocType: Payment Tool Detail,Payment Amount,付款金额
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,消耗量
-sites/assets/js/erpnext.min.js +51,{0} View,{0}查看
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0}查看
 DocType: Salary Structure Deduction,Salary Structure Deduction,薪酬结构扣款
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,选择性激光烧结
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Unit of Measure {0} has been entered more than once in Conversion Factor Table,计量单位{0}已经在换算系数表内
+apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,计量单位{0}已经在换算系数表内
 apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,导入成功！
 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 +185,Quantity must not be more than {0},数量不能超过{0}
@@ -1378,7 +1387,7 @@
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.",网上购物车，如配送规则，价格表等的设置
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,安装完成
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}％帐单
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +16,Reserved Qty,保留数量
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,保留数量
 DocType: Party Account,Party Account,党的帐户
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,人力资源
 DocType: Lead,Upper Income,高收入
@@ -1421,11 +1430,12 @@
 DocType: Shopping Cart Settings,Enable Shopping Cart,启用购物车
 DocType: Employee,Permanent Address,永久地址
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,品目{0}必须是服务品目
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +222,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",推动打击{0} {1}不能大于付出\超过总计{2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,请选择商品代码
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),减少扣除停薪留职（LWP）
 DocType: Territory,Territory Manager,区域经理
+DocType: Delivery Note Item,To Warehouse (Optional),仓库（可选）
 DocType: Sales Invoice,Paid Amount (Company Currency),支付的金额（公司货币）
 DocType: Purchase Invoice,Additional Discount,更多优惠
 DocType: Selling Settings,Selling Settings,销售设置
@@ -1448,7 +1458,7 @@
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,矿业
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,树脂浇注
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,同名的客户群组已经存在，请更改客户姓名或重命名客户集团
-sites/assets/js/erpnext.min.js +37,Please select {0} first.,请选择{0}第一。
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,请选择{0}第一。
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},文字{0}
 DocType: Territory,Parent Territory,家长领地
 DocType: Quality Inspection Reading,Reading 2,阅读2
@@ -1476,11 +1486,11 @@
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,允许多个销售订单对客户的采购订单
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,主
 DocType: DocPerm,Delete,删除
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,变体
-sites/assets/js/desk.min.js +7971,New {0},新建{0}
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,变体
+apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},新建{0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,为交易设置编号系列的前缀
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Stopped order cannot be cancelled. Unstop to cancel.,已停止的订单无法取消，请先点击“重新开始”
-apps/erpnext/erpnext/stock/doctype/item/item.py +261,Default BOM ({0}) must be active for this item or its template,默认BOM（{0}）必须是活动的这个项目或者其模板
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,已停止的订单无法取消，请先点击“重新开始”
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,默认BOM（{0}）必须是活动的这个项目或者其模板
 DocType: Employee,Leave Encashed?,假期已使用？
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,机会从字段是强制性的
 DocType: Item,Variants,变种
@@ -1498,7 +1508,7 @@
 DocType: Country,Country,国家
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,地址
 DocType: Communication,Received,收到
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Against Journal Entry {0} does not have any unmatched {1} entry,日记帐分录{0}没有不符合的{1}分录
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,日记帐分录{0}没有不符合的{1}分录
 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,航运规则的一个条件
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,项目是不允许有生产订单。
@@ -1519,7 +1529,6 @@
 DocType: Communication,Rejected,拒绝
 DocType: Pricing Rule,Brand,品牌
 DocType: Item,Will also apply for variants,会同时应用于变体
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +582,% Delivered,％已交付
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,在销售时捆绑品目。
 DocType: Sales Order Item,Actual Qty,实际数量
 DocType: Sales Invoice Item,References,参考
@@ -1557,14 +1566,13 @@
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,剪毛
 DocType: Item,Has Variants,有变体
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,单击“创建销售发票”按钮来创建一个新的销售发票。
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,期间从和周期要强制日期为重复％S
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,包装和标签
 DocType: Monthly Distribution,Name of the Monthly Distribution,月度分布名称
 DocType: Sales Person,Parent Sales Person,母公司销售人员
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,请在公司主及全球默认指定默认货币
 DocType: Dropbox Backup,Dropbox Access Secret,Dropbox的密码
 DocType: Purchase Invoice,Recurring Invoice,经常性发票
-apps/erpnext/erpnext/config/learn.py +228,Managing Projects,项目管理
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,项目管理
 DocType: Supplier,Supplier of Goods or Services.,提供商品或服务的供应商。
 DocType: Budget Detail,Fiscal Year,财政年度
 DocType: Cost Center,Budget,预算
@@ -1593,11 +1601,11 @@
 DocType: Pricing Rule,Selling,销售
 DocType: Employee,Salary Information,薪资信息
 DocType: Sales Person,Name and Employee ID,姓名和雇员ID
-apps/erpnext/erpnext/accounts/party.py +272,Due Date cannot be before Posting Date,到期日不能前于过账日期
+apps/erpnext/erpnext/accounts/party.py +275,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 +170,Duties and Taxes,关税与税项
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +305,Please enter Reference date,参考日期请输入
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,{0} payment entries can not be filtered by {1},{0}付款项不能由过滤{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,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,附送数量
 DocType: Material Request Item,Material Request Item,物料申请品目
@@ -1605,7 +1613,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,此收取类型不能引用大于或等于本行的数据。
 ,Item-wise Purchase History,品目特定的采购历史
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,红
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +227,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},请点击“生成表”来获取序列号增加了对项目{0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},请点击“生成表”来获取序列号增加了对项目{0}
 DocType: Account,Frozen,冻结的
 ,Open Production Orders,清生产订单
 DocType: Installation Note,Installation Time,安装时间
@@ -1649,13 +1657,13 @@
 ,Quotation Trends,报价趋势
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},品目{0}的品目群组没有设置
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,入借帐户必须是应收账科目
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,"As Production Order can be made for this item, it must be a stock item.",此品目必须是库存品目，因为它可以生成生产订单
+apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.",此品目必须是库存品目，因为它可以生成生产订单
 DocType: Shipping Rule Condition,Shipping Amount,发货数量
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,加盟
 DocType: Authorization Rule,Above Value,上述值
 ,Pending Amount,待审核金额
 DocType: Purchase Invoice Item,Conversion Factor,转换系数
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,Delivered,已交付
+DocType: Purchase Order,Delivered,已交付
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),设置接收简历的电子邮件地址 。 （例如jobs@example.com ）
 DocType: Purchase Receipt,Vehicle Number,车号
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,经常性发票终止日期
@@ -1672,10 +1680,10 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,因为账项{1}是一个资产项目，所以科目{0}的类型必须为“固定资产”
 DocType: HR Settings,HR Settings,人力资源设置
 apps/frappe/frappe/config/setup.py +130,Printing,印花
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +113,Expense Claim is pending approval. Only the Expense Approver can update status.,报销正在等待批准。只有开支审批人才能更改其状态。
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,报销正在等待批准。只有开支审批人才能更改其状态。
 DocType: Purchase Invoice,Additional Discount Amount,额外的折扣金额
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,你要申请的假期位于假日内，无需请假。
-sites/assets/js/desk.min.js +7805,and,和
+apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,和
 DocType: Leave Block List Allow,Leave Block List Allow,例外用户
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,缩写不能为空或空间
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,体育
@@ -1712,7 +1720,6 @@
 DocType: Salary Slip,Total Deduction,扣除总额
 DocType: Quotation,Maintenance User,维护用户
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,成本更新
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +749,Are you sure you want to UNSTOP,确定要重新开始吗
 DocType: Employee,Date of Birth,出生日期
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,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**.,**财年**表示财政年度。所有的会计分录和其他重大交易将根据**财年**跟踪。
@@ -1728,13 +1735,14 @@
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",追踪销售活动。追踪来自活动的潜在客户，报价，销售订单等，统计投资回报率。
 DocType: Expense Claim,Approver,审批者
 ,SO Qty,销售订单数量
-apps/erpnext/erpnext/accounts/doctype/account/account.py +153,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",此库存记录已经出现在仓库{0}中，所以你不能重新指定或更改仓库
+apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",此库存记录已经出现在仓库{0}中，所以你不能重新指定或更改仓库
 DocType: Appraisal,Calculate Total Score,计算总分
 DocType: Supplier Quotation,Manufacturing Manager,生产经理
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},序列号{0}截至至{1}之前在保修内。
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,分裂送货单成包。
 apps/erpnext/erpnext/hooks.py +84,Shipments,发货
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,浸成型
+DocType: Purchase Order,To be delivered to customer,要传送给客户
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,时间日志状态必须被提交。
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,序列号{0}不属于任何仓库
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,正在设置
@@ -1759,11 +1767,11 @@
 DocType: Currency Exchange,From Currency,源货币
 DocType: DocField,Name,名称
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",请ATLEAST一行选择分配金额，发票类型和发票号码
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +102,Sales Order required for Item {0},销售订单为品目{0}的必须项
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},销售订单为品目{0}的必须项
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,系统无记录的数额
 DocType: Purchase Invoice Item,Rate (Company Currency),率（公司货币）
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,他人
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,设为停​​止
+apps/erpnext/erpnext/templates/includes/product_page.js +80,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/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,第一行的“收取类型”不能是“基于上一行的金额”或者“前一行的总计”
@@ -1772,19 +1780,20 @@
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,拉床
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,银行业
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,请在“生成表”点击获取时间表
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,New Cost Center,新建成本中心
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,新建成本中心
 DocType: Bin,Ordered Quantity,订购数量
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",例如“建筑工人的建筑工具！”
 DocType: Quality Inspection,In Process,进行中
 DocType: Authorization Rule,Itemwise Discount,品目特定的折扣
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +313,{0} against Sales Order {1},{0}对销售订单{1}
+DocType: Purchase Order Item,Reference Document Type,参考文档类型
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0}对销售订单{1}
 DocType: Account,Fixed Asset,固定资产
-apps/erpnext/erpnext/config/learn.py +137,Serialized Inventory,序列化库存
+apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,序列化库存
 DocType: Activity Type,Default Billing Rate,默认计费率
 DocType: Time Log Batch,Total Billing Amount,总结算金额
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,应收账款
 ,Stock Balance,库存余额
-apps/erpnext/erpnext/config/learn.py +107,Sales Order to Payment,销售订单到付款
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,销售订单到付款
 DocType: Expense Claim Detail,Expense Claim Detail,报销详情
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,时间日志创建：
 DocType: Item,Weight UOM,重量计量单位
@@ -1820,10 +1829,9 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,入贷科目必须是一个“应付”科目
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,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 +115,"For {0}, only debit accounts can be linked against another credit entry",对于{0}，借方分录只能选择借方账户
-apps/erpnext/erpnext/stock/get_item_details.py +258,Price List {0} is disabled,价格表{0}被禁用
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry",对于{0}，借方分录只能选择借方账户
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,价格表{0}被禁用
 DocType: Manufacturing Settings,Allow Overtime,允许加班
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is stopped,销售订单{0}的状态为已停止
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0}需要的产品序列号{1}。您所提供{2}。
 DocType: Stock Reconciliation Item,Current Valuation Rate,目前的估值价格
 DocType: Item,Customer Item Codes,客户项目代码
@@ -1832,9 +1840,9 @@
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,焊接
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,新库存计量单位是必须项
 DocType: Quality Inspection,Sample Size,样本大小
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +438,All items have already been invoiced,所有品目已开具发票
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,所有品目已开具发票
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',请指定一个有效的“从案号”
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +288,Further cost centers can be made under Groups but entries can be made against non-Groups,进一步的成本中心可以根据组进行，但项可以对非组进行
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,进一步的成本中心可以根据组进行，但项可以对非组进行
 DocType: Project,External,外部
 DocType: Features Setup,Item Serial Nos,品目序列号
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,用户和权限
@@ -1861,7 +1869,7 @@
 DocType: Sales Partner,Address & Contacts,地址及联系方式
 DocType: SMS Log,Sender Name,发件人名称
 DocType: Page,Title,标题
-sites/assets/js/list.min.js +104,Customize,定制
+apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,定制
 DocType: POS Profile,[Select],[选择]
 DocType: SMS Log,Sent To,发给
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,创建销售发票
@@ -1886,12 +1894,13 @@
 DocType: Item,End of Life,寿命结束
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,旅游
 DocType: Leave Block List,Allow Users,允许用户(多个)
+DocType: Purchase Order,Customer Mobile No,客户手机号码
 DocType: Sales Invoice,Recurring,经常性
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,跟踪独立收入和支出进行产品垂直或部门。
 DocType: Rename Tool,Rename Tool,重命名工具
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,更新成本
 DocType: Item Reorder,Item Reorder,品目重新排序
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Transfer Material,转印材料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,转印材料
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",设定流程，操作成本及向流程指定唯一的流程编号
 DocType: Purchase Invoice,Price List Currency,价格表货币
 DocType: Naming Series,User must always select,用户必须始终选择
@@ -1914,7 +1923,7 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,导入电子邮件发件人
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,邀请成为用户
 DocType: Features Setup,After Sale Installations,售后安装
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,{0} {1} is fully billed,{0} {1}已完全开票
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1}已完全开票
 DocType: Workstation Working Hour,End Time,结束时间
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,销售或采购的标准合同条款。
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,基于凭证分组
@@ -1923,8 +1932,9 @@
 DocType: Page,Standard,标准
 DocType: Rename Tool,File to Rename,文件重命名
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},要求项目Purchse订单号{0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,显示支付
 apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},品目{1}指定的BOM{0}不存在
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消维护计划{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消维护计划{0}
 apps/frappe/frappe/desk/page/backups/backups.html +13,Size,尺寸
 DocType: Notification Control,Expense Claim Approved,报销批准
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,医药
@@ -1943,8 +1953,8 @@
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),设置接收销售信息的电子邮件地址 。 （例如sales@example.com ）
 DocType: Warranty Claim,Raised By,提出
 DocType: Payment Tool,Payment Account,付款帐号
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +706,Please specify Company to proceed,请注明公司进行
-sites/assets/js/list.min.js +23,Draft,草稿
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,请注明公司进行
+apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,草稿
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,补假
 DocType: Quality Inspection Reading,Accepted,已接受
 DocType: User,Female,女
@@ -1957,14 +1967,15 @@
 DocType: Shipping Rule,Shipping Rule Label,配送规则标签
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,原材料不能为空。
 DocType: Newsletter,Test,测试
-apps/erpnext/erpnext/stock/doctype/item/item.py +302,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'",由于有存量交易为这个项目，\你不能改变的值&#39;有序列号&#39;，&#39;有批号&#39;，&#39;是股票项目“和”评估方法“
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,快速日记帐分录
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,BOM被引用后你不能更改其税率
 DocType: Employee,Previous Work Experience,以前的工作经验
 DocType: Stock Entry,For Quantity,对于数量
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},请输入计划数量的项目{0}在行{1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +207,{0} {1} is not submitted,{0} {1}未提交
-apps/erpnext/erpnext/config/stock.py +13,Requests for items.,请求的项目。
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1}未提交
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,请求的项目。
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,独立的生产订单将每个成品项目被创建。
 DocType: Purchase Invoice,Terms and Conditions1,条款和条件1
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,完成安装
@@ -1976,7 +1987,7 @@
 DocType: Delivery Note,Transporter Name,转运名称
 DocType: Contact,Enter department to which this Contact belongs,输入此联系人所属的部门
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,共缺席
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +744,Item or Warehouse for row {0} does not match Material Request,行{0}中的品目或仓库与物料申请不符合
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,行{0}中的品目或仓库与物料申请不符合
 apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,计量单位
 DocType: Fiscal Year,Year End Date,年度开始日期
 DocType: Task Depends On,Task Depends On,任务取决于
@@ -2002,7 +2013,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,合同结束日期必须大于加入的日期
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,销售公司产品的第三方分销商/经销商/代理商/分支机构/分销商
 DocType: Customer Group,Has Child Node,有子节点
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +325,{0} against Purchase Order {1},{0}对采购订单{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{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.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1}在没有任何活动的会计年度。详情查看{2}。
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,这是一个示例网站从ERPNext自动生成
@@ -2045,11 +2056,9 @@
 DocType: Purchase Receipt Item,Recd Quantity,RECD数量
 DocType: Email Account,Email Ids,电子邮件ID
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},不能生产超过销售订单数量{1}的品目{0}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,设为堵塞通
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Stock Entry {0} is not submitted,股票输入{0}不提交
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,股票输入{0}不提交
 DocType: Payment Reconciliation,Bank / Cash Account,银行/现金账户
 DocType: Tax Rule,Billing City,结算城市
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,这请假申请正在等待批准。只有请假审批者可以更新状态。
 DocType: Global Defaults,Hide Currency Symbol,隐藏货币符号
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card",例如：银行，现金，信用卡
 DocType: Journal Entry,Credit Note,贷项通知单
@@ -2070,7 +2079,7 @@
 DocType: Installation Note Item,Installed Qty,已安装数量
 DocType: Lead,Fax,传真
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-sites/assets/js/list.min.js +26,Submitted,已提交
+apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,已提交
 DocType: Salary Structure,Total Earning,总盈利
 DocType: Purchase Receipt,Time at which materials were received,收到材料在哪个时间
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,我的地址
@@ -2079,7 +2088,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,要么
 DocType: Sales Order,Billing Status,账单状态
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,基础设施费用
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,90-Above,90以上
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90以上
 DocType: Buying Settings,Default Buying Price List,默认采购价格表
 ,Download Backups,下载备份
 DocType: Notification Control,Sales Order Message,销售订单信息
@@ -2088,7 +2097,7 @@
 DocType: Process Payroll,Select Employees,选择雇员
 DocType: Bank Reconciliation,To Date,至今
 DocType: Opportunity,Potential Sales Deal,潜在的销售交易
-sites/assets/js/form.min.js +308,Details,详细信息
+apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,详细信息
 DocType: Purchase Invoice,Total Taxes and Charges,总营业税金及费用
 DocType: Employee,Emergency Contact,紧急联络人
 DocType: Item,Quality Parameters,质量参数
@@ -2103,7 +2112,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,序列号/批次
 DocType: Product Bundle,Parent Item,父项目
 DocType: Account,Account Type,账户类型
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +212,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',维护计划没有为所有品目生成，请点击“生产计划”
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',维护计划没有为所有品目生成，请点击“生产计划”
 ,To Produce,以生产
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",对于行{0} {1}。以包括{2}中的档案速率，行{3}也必须包括
 DocType: Packing Slip,Identification of the package for the delivery (for print),打包品目的名称
@@ -2114,7 +2123,7 @@
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,压扁
 DocType: Account,Income Account,收益账户
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,模
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +625,Delivery,交货
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,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,关键责任区
@@ -2145,9 +2154,9 @@
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,所有地址。
 DocType: Company,Stock Settings,库存设置
 DocType: User,Bio,生物
-apps/erpnext/erpnext/accounts/doctype/account/account.py +192,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",合并是唯一可能的，如果以下属性中均有记载相同。是集团，根型，公司
+apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",合并是唯一可能的，如果以下属性中均有记载相同。是集团，根型，公司
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,管理客户群组
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +286,New Cost Center Name,新建成本中心名称
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,新建成本中心名称
 DocType: Leave Control Panel,Leave Control Panel,假期控制面板
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,没有找到默认的地址模板。请从设置 > 打印和品牌 >地址模板中创建一个。
 DocType: Appraisal,HR User,HR用户
@@ -2166,24 +2175,24 @@
 DocType: Payment Tool Detail,Payment Tool Detail,支付工具的详细信息
 ,Sales Browser,销售列表
 DocType: Journal Entry,Total Credit,总积分
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +469,Warning: Another {0} # {1} exists against stock entry {2},警告：另一个{0}＃{1}存在对股票入门{2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +457,Local,当地
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},警告：另一个{0}＃{1}存在对股票入门{2}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,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/page/setup_wizard/install_fixtures.py +147,Large,大
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,未找到任何雇员！
 DocType: C-Form Invoice Detail,Territory,区域
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,请注明无需访问
+DocType: Purchase Order,Customer Address Display,客户地址显示
 DocType: Stock Settings,Default Valuation Method,默认估值方法
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,抛光
 DocType: Production Order Operation,Planned Start Time,计划开始时间
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,已调配
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,关闭资产负债表，打开损益表。
-apps/erpnext/erpnext/stock/doctype/item/item.py +599,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.",测度项目的默认单位{0}不能直接改变，因为\你已经做了一些交易（S）与其他计量单位。要更改默认的计量单位，\使用“计量单位更换工具”下的股票模块工具。
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,指定货币兑换的汇率
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,报价{0}已被取消
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,报价{0}已被取消
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,未偿还总额
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,雇员{0}在{1}日休假，不能标记考勤。
 DocType: Sales Partner,Targets,目标
@@ -2198,12 +2207,12 @@
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,ERPNext是一个开源的基于Web的ERP系统通过网络注技术私人有限公司向提供集成的工具，在一个小的组织管理大多数进程。有关Web注释，或购买托管楝更多信息，请访问
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,请设置您的会计科目表你开始会计分录前
 DocType: Purchase Invoice,Ignore Pricing Rule,忽略定价规则
-sites/assets/js/list.min.js +24,Cancelled,已取消
+apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,已取消
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,从薪酬结构日期不能高于员工加入日期较小。
 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 +61,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},警告：销售订单{0}已经存在针对客户的采购订单{1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,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:
@@ -2248,17 +2257,17 @@
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,工资总额+欠费金额+兑现金额-总扣款金额
 DocType: Monthly Distribution,Distribution Name,分配名称
 DocType: Features Setup,Sales and Purchase,销售及采购
-DocType: Purchase Order Item,Material Request No,物料申请编号
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +217,Quality Inspection required for Item {0},品目{0}要求质量检验
+DocType: Supplier Quotation Item,Material Request No,物料申请编号
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},品目{0}要求质量检验
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,速率客户的货币转换为公司的基础货币
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0}已经从这个名单退订成功！
 DocType: Purchase Invoice Item,Net Rate (Company Currency),净利率（公司货币）
-apps/frappe/frappe/templates/base.html +132,Added,添加
+apps/frappe/frappe/templates/base.html +134,Added,添加
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,管理区域
 DocType: Journal Entry Account,Sales Invoice,销售发票
 DocType: Journal Entry Account,Party Balance,党平衡
 DocType: Sales Invoice Item,Time Log Batch,时间日志批
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,请选择适用的折扣
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,请选择适用的折扣
 DocType: Company,Default Receivable Account,默认应收账户
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,为上述选择条件支付的工资总计创建银行分录
 DocType: Stock Entry,Material Transfer for Manufacture,用于生产的物料转移
@@ -2269,7 +2278,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,库存的会计分录
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,铸币
 DocType: Sales Invoice,Sales Team1,销售团队1
-apps/erpnext/erpnext/stock/doctype/item/item.py +353,Item {0} does not exist,品目{0}不存在
+apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,品目{0}不存在
 DocType: Sales Invoice,Customer Address,客户地址
 apps/frappe/frappe/desk/query_report.py +136,Total,总
 DocType: Purchase Invoice,Apply Additional Discount On,收取额外折扣
@@ -2284,13 +2293,15 @@
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,超小
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,喷射成形
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,警告：物料请求的数量低于最低起订量
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,科目{0}已冻结
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,科目{0}已冻结
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,属于本机构的，带独立科目表的法人/附属机构。
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco",食品，饮料与烟草
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL或BS
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},只能使支付对未付款的{0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,佣金率不能大于100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,最低库存水平
 DocType: Stock Entry,Subcontract,外包
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,请输入{0}第一
 DocType: Production Planning Tool,Get Items From Sales Orders,从销售订单获取品目
 DocType: Production Order Operation,Actual End Time,实际结束时间
 DocType: Production Planning Tool,Download Materials Required,下载所需物料
@@ -2307,9 +2318,9 @@
 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",请选择项，其中“正股项”是“否”和“是销售物品”是“是”，没有其他产品捆绑
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,如果要不规则的按月分配，请选择“月度分布”。
 DocType: Purchase Invoice Item,Valuation Rate,估值率
-apps/erpnext/erpnext/stock/get_item_details.py +279,Price List Currency not selected,价格表货币没有选择
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,价格表货币没有选择
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,品目行{0}：采购收据{1}不存在于采购收据表中
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},雇员{0}申请了{1}，时间是{2}至{3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},雇员{0}申请了{1}，时间是{2}至{3}
 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,重命名日志
@@ -2336,13 +2347,13 @@
 DocType: Customer Group,Only leaf nodes are allowed in transaction,只有叶节点中允许交易
 DocType: Expense Claim,Expense Approver,开支审批人
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,采购入库项目提供
-sites/assets/js/erpnext.min.js +48,Pay,付
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,付
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,以日期时间
 DocType: SMS Settings,SMS Gateway URL,短信网关的URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,日志维护短信发送状态
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,磨碎
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,收缩包装
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +35,Pending Activities,待活动
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,待活动
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,确认
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,供应商 > 供应商类型
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,请输入解除日期。
@@ -2353,7 +2364,6 @@
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,报纸出版商
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,选择财政年度
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,熔炼
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +40,You are the Leave Approver for this record. Please Update the 'Status' and Save,你是本条目的假期审批人，请更新并保存其状态。
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,重新排序级别
 DocType: Attendance,Attendance Date,考勤日期
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,基于收入和扣款的工资明细。
@@ -2389,6 +2399,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,有交易的成本中心不能转化为组
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,折旧
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),供应商
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,无效的时期
 DocType: Customer,Credit Limit,信用额度
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,选择交易类型
 DocType: GL Entry,Voucher No,凭证编号
@@ -2398,8 +2409,8 @@
 DocType: Customer,Address and Contact,地址和联系方式
 DocType: Customer,Last Day of the Next Month,下个月的最后一天
 DocType: Employee,Feedback,反馈
-apps/erpnext/erpnext/accounts/party.py +281,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),注意：到期日/计入日已超过客户信用日期{0}天。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +602,Maint. Schedule,维护手册。计划
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),注意：到期日/计入日已超过客户信用日期{0}天。
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,维护手册。计划
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,磨料喷射加工
 DocType: Stock Settings,Freeze Stock Entries,冻结仓储记录
 DocType: Website Settings,Website Settings,网站设置
@@ -2413,11 +2424,11 @@
 DocType: Material Request,Requested For,对于要求
 DocType: Quotation Item,Against Doctype,对文档类型
 DocType: Delivery Note,Track this Delivery Note against any Project,跟踪此送货单反对任何项目
-apps/erpnext/erpnext/accounts/doctype/account/account.py +167,Root account can not be deleted,root帐号不能被删除
+apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,root帐号不能被删除
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,显示库存记录
 ,Is Primary Address,是主地址
 DocType: Production Order,Work-in-Progress Warehouse,在制品仓库
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Reference #{0} dated {1},参考＃ {0}于{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},参考＃ {0}于{1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,管理地址
 DocType: Pricing Rule,Item Code,品目编号
 DocType: Production Planning Tool,Create Production Orders,创建生产订单
@@ -2426,14 +2437,14 @@
 DocType: Lead,Market Segment,市场分类
 DocType: Communication,Phone,电话
 DocType: Employee Internal Work History,Employee Internal Work History,雇员内部就职经历
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +163,Closing (Dr),结算(借记)
+apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),结算(借记)
 DocType: Contact,Passive,被动
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,序列号{0}无库存
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,销售业务的税务模板。
 DocType: Sales Invoice,Write Off Outstanding Amount,核销未付金额
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.",如果需要自动周期性发票的话请勾选，在提交销售发票后，周期部分将可见。
 DocType: Account,Accounts Manager,会计经理
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +38,Time Log {0} must be 'Submitted',时间日志{0}必须是'提交'
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',时间日志{0}必须是'提交'
 DocType: Stock Settings,Default Stock UOM,默认库存计量单位
 DocType: Time Log,Costing Rate based on Activity Type (per hour),成本核算房价为活动类型（每小时）
 DocType: Production Planning Tool,Create Material Requests,创建物料需要
@@ -2444,7 +2455,7 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,获取更新
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,物料申请{0}已取消或已停止
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,添加了一些样本记录
-apps/erpnext/erpnext/config/learn.py +208,Leave Management,离开管理
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,离开管理
 DocType: Event,Groups,组
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,基于账户分组
 DocType: Sales Order,Fully Delivered,完全交付
@@ -2456,11 +2467,10 @@
 DocType: Features Setup,Sales Extras,销售额外选项
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} 成本中心{2}账户{1}的预算将超过{3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",差异帐户必须是资产/负债类型的帐户，因为此股票和解是一个进入开幕
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +137,Purchase Order number required for Item {0},所需物品的采购订单号{0}
-DocType: Leave Allocation,Carry Forwarded Leaves,顺延假期
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},所需物品的采购订单号{0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',“起始日期”必须早于'终止日期'
 ,Stock Projected Qty,预计库存量
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +145,Customer {0} does not belong to project {1},客户{0}不属于项目{1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},客户{0}不属于项目{1}
 DocType: Sales Order,Customer's Purchase Order,客户采购订单
 DocType: Warranty Claim,From Company,源公司
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,价值或数量
@@ -2473,13 +2483,12 @@
 DocType: Sales Partner,Retailer,零售商
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,信用帐户必须是资产负债表科目
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,所有供应商类型
-apps/erpnext/erpnext/stock/doctype/item/item.py +36,Item Code is mandatory because Item is not automatically numbered,品目编号是必须项，因为品目没有自动编号
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},报价{0} 不属于{1}类型
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,品目编号是必须项，因为品目没有自动编号
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},报价{0} 不属于{1}类型
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,维护计划品目
 DocType: Sales Order,%  Delivered,％已交付
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,银行透支账户
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,创建工资单
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +495,Unstop,重新开始
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,浏览BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,抵押贷款
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,优质产品
@@ -2489,7 +2498,7 @@
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,失模铸造
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,图纸
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,日期重复
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Leave approver must be one of {0},假期审批人有{0}的角色
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},假期审批人有{0}的角色
 DocType: Hub Settings,Seller Email,卖家电子邮件
 DocType: Project,Total Purchase Cost (via Purchase Invoice),总购买成本（通过采购发票）
 DocType: Workstation Working Hour,Start Time,开始时间
@@ -2503,8 +2512,8 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),净金额（公司货币）
 DocType: BOM Operation,Hour Rate,时薪
 DocType: Stock Settings,Item Naming By,品目命名方式
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,From Quotation,来自报价
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},在{1}之后另一个年终结束分录{0}已经被录入
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,来自报价
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},在{1}之后另一个年终结束分录{0}已经被录入
 DocType: Production Order,Material Transferred for Manufacturing,材料移送制造
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,科目{0}不存在
 DocType: Purchase Receipt Item,Purchase Order Item No,采购订单编号
@@ -2517,11 +2526,11 @@
 DocType: Purchase Invoice Item,PR Detail,PR详细
 DocType: Sales Order,Fully Billed,完全开票
 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 +71,Delivery warehouse required for stock item {0},需要的库存项目交割仓库{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,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),包的总重量，通常是净重+包装材料的重量。 （用于打印）
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,拥有此角色的用户可以设置冻结账户和创建/修改冻结账户的会计分录
 DocType: Serial No,Is Cancelled,是否注销
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +274,My Shipments,我的出货量
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,我的出货量
 DocType: Journal Entry,Bill Date,账单日期
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",有多个最高优先级定价规则时使用以下的内部优先级：
 DocType: Supplier,Supplier Details,供应商详情
@@ -2534,7 +2543,7 @@
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,电汇
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,请选择银行帐户
 DocType: Newsletter,Create and Send Newsletters,创建和发送新闻邮件
-sites/assets/js/report.min.js +107,From Date must be before To Date,起始日期日期必须在结束日期之前
+apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,起始日期日期必须在结束日期之前
 DocType: Sales Order,Recurring Order,经常订购
 DocType: Company,Default Income Account,默认收益账户
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,客户群组/客户
@@ -2549,31 +2558,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,采购订单{0}未提交
 ,Projected,预计
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},序列号{0}不属于仓库{1}
-apps/erpnext/erpnext/controllers/status_updater.py +127,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,注意：系统将不会为品目{0}检查超额发货或超额预订，因为其数量或金额为0
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,注意：系统将不会为品目{0}检查超额发货或超额预订，因为其数量或金额为0
 DocType: Notification Control,Quotation Message,报价信息
 DocType: Issue,Opening Date,开幕日期
 DocType: Journal Entry,Remark,备注
 DocType: Purchase Receipt Item,Rate and Amount,率及金额
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,无聊
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +660,From Sales Order,来自销售订单
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,来自销售订单
 DocType: Blog Category,Parent Website Route,父网站路线
 DocType: Sales Order,Not Billed,未开票
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,两个仓库必须属于同一公司
-sites/assets/js/erpnext.min.js +25,No contacts added yet.,暂无联系人。
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,暂无联系人。
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,非活动
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +50,Against Invoice Posting Date,对发票过账日期
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,到岸成本凭证金额
 DocType: Time Log,Batched for Billing,已为账单批次化
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,供应商开出的账单
 DocType: POS Profile,Write Off Account,核销帐户
-sites/assets/js/erpnext.min.js +26,Discount Amount,折扣金额
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,折扣金额
 DocType: Purchase Invoice,Return Against Purchase Invoice,回到对采购发票
 DocType: Item,Warranty Period (in days),保修期限（天数）
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,例如增值税
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,项目4
 DocType: Journal Entry Account,Journal Entry Account,日记帐分录帐号
 DocType: Shopping Cart Settings,Quotation Series,报价系列
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item",具有名称 {0} 的品目已存在，请更名
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item",具有名称 {0} 的品目已存在，请更名
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,铁水形成气
 DocType: Sales Order Item,Sales Order Date,销售订单日期
 DocType: Sales Invoice Item,Delivered Qty,已交付数量
@@ -2605,10 +2613,11 @@
 DocType: Stock Entry,Customer or Supplier Details,客户或供应商详细信息
 apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,设置
 DocType: Lead,Lead Owner,线索所有者
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +249,Warehouse is required,仓库是必需的
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,仓库是必需的
 DocType: Employee,Marital Status,婚姻状况
 DocType: Stock Settings,Auto Material Request,汽车材料要求
 DocType: Time Log,Will be updated when billed.,出账被会更新。
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,在从仓库可用的批次数量
 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/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,退休日期必须大于入职日期
 DocType: Sales Invoice,Against Income Account,对收益账目
@@ -2625,12 +2634,12 @@
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,超精研
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,不同计量单位的项目会导致不正确的（总）净重值。请确保每个品目的净重使用同一个计量单位。
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM税率
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,请送货单拉项目
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,请送货单拉项目
 apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,日记帐分录{0}没有关联
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.",类型电子邮件，电话，聊天，访问等所有通信记录
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,请提及公司舍入成本中心
 DocType: Purchase Invoice,Terms,条款
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +243,Create New,创建新的
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,创建新的
 DocType: Buying Settings,Purchase Order Required,购货订单要求
 ,Item-wise Sales History,品目特定的销售历史
 DocType: Expense Claim,Total Sanctioned Amount,总被制裁金额
@@ -2647,16 +2656,17 @@
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,便签
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,请先选择一个组节点。
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},目的必须是一个{0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Fill the form and save it,填写表格并保存
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,填写表格并保存
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,下载一个包含所有原材料及其库存状态的报告
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,面对
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,社区论坛
 DocType: Leave Application,Leave Balance Before Application,申请前假期余量
 DocType: SMS Center,Send SMS,发送短信
 DocType: Company,Default Letter Head,默认信头
 DocType: Time Log,Billable,可开票
 DocType: Authorization Rule,This will be used for setting rule in HR module,这将用于在人力资源模块的设置规则
 DocType: Account,Rate at which this tax is applied,速率此税适用
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reorder Qty,再订购数量
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,再订购数量
 DocType: Company,Stock Adjustment Account,库存调整账户
 DocType: Journal Entry,Write Off,抹杀
 DocType: Time Log,Operation ID,操作ID
@@ -2667,12 +2677,15 @@
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice",折扣字段在采购订单，采购收据，采购发票可用。
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,新帐户的名称。注：请不要创建帐户的客户和供应商
 DocType: Report,Report Type,报告类型
-apps/frappe/frappe/core/doctype/user/user.js +134,Loading,载入中
+apps/frappe/frappe/core/doctype/user/user.js +130,Loading,载入中
 DocType: BOM Replace Tool,BOM Replace Tool,BOM替换工具
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,国家的默认地址模板
-apps/erpnext/erpnext/accounts/party.py +284,Due / Reference Date cannot be after {0},到期/参照日期不能迟于{0}
+DocType: Sales Order Item,Supplier delivers to Customer,供应商提供给客户
+apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,展会税分手
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},到期/参照日期不能迟于{0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,数据导入和导出
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',如果贵司涉及生产活动，将启动品目的“是否生产”属性
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,发票发布日期
 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 ％
@@ -2683,8 +2696,8 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,请联系，谁拥有硕士学位的销售经理{0}角色的用户
 DocType: Company,Default Cash Account,默认现金账户
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,公司(非客户或供应商)大师。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +105,Please enter 'Expected Delivery Date',请输入“预产期”
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +181,Delivery Notes {0} must be cancelled before cancelling this Sales Order,取消这个销售订单之前必须取消送货单{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',请输入“预产期”
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,取消这个销售订单之前必须取消送货单{0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,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 +109,Note: There is not enough leave balance for Leave Type {0},注意：假期类型{0}的余量不足
@@ -2706,11 +2719,12 @@
 					Available Qty: {4}, Transfer Qty: {5}","行{0}：数量不是在仓库avalable {1} {2} {3}。
 可用数量：{4}，转让数量：{5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,项目3
+DocType: Purchase Order,Customer Contact Email,客户联系电子邮件
 DocType: Event,Sunday,星期天
 DocType: Sales Team,Contribution (%),贡献（％）
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注意：付款分录不会创建，因为“现金或银行账户”没有指定
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,职责
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,模板
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,模板
 DocType: Sales Person,Sales Person Name,销售人员姓名
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,请在表中输入ATLEAST 1发票
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,添加用户
@@ -2719,7 +2733,7 @@
 DocType: Stock Reconciliation Item,Before reconciliation,前和解
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),已添加的税费（公司货币）
-apps/erpnext/erpnext/stock/doctype/item/item.py +278,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,品目税项的行{0}中必须指定类型为税项/收益/支出/应课的账户。
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,品目税项的行{0}中必须指定类型为税项/收益/支出/应课的账户。
 DocType: Sales Order,Partly Billed,天色帐单
 DocType: Item,Default BOM,默认的BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
@@ -2727,12 +2741,11 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,总街货量金额
 DocType: Time Log Batch,Total Hours,总时数
 DocType: Journal Entry,Printing Settings,打印设置
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +264,Total Debit must be equal to Total Credit. The difference is {0},总借记必须等于总积分。
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},总借记必须等于总积分。
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,汽车
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},类型为{0}已经在财年{0}为中员工{1}调配过
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,品目是必须项
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,金属注射成型
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +677,From Delivery Note,来自送货单
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,来自送货单
 DocType: Time Log,From Time,起始时间
 DocType: Notification Control,Custom Message,自定义消息
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,投资银行业务
@@ -2748,17 +2761,17 @@
 DocType: Stock Entry,From BOM,从BOM
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,基本
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,早于{0}的库存事务已冻结
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +216,Please click on 'Generate Schedule',请点击“生成表”
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,日期应该是一样的起始日期为半天假
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',请点击“生成表”
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,日期应该是一样的起始日期为半天假
 apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m",如公斤，单元，号数，米
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,参考编号是强制性的，如果你输入的参考日期
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,参考编号是强制性的，如果你输入的参考日期
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,入职日期必须大于出生日期
 DocType: Salary Structure,Salary Structure,薪酬结构
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}",存在多个符合条件的价格列表，请指定优先级来解决冲突。价格列表{0}
 DocType: Account,Bank,银行
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,航空公司
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +501,Issue Material,发料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,发料
 DocType: Material Request Item,For Warehouse,对仓库
 DocType: Employee,Offer Date,报价有效期
 DocType: Hub Settings,Access Token,访问令牌
@@ -2781,6 +2794,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,必须指定起始和结束日期
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,证券及商品交易
 DocType: Shipping Rule,Calculate Based On,计算基于
+DocType: Delivery Note Item,From Warehouse,从仓库
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,钻孔
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,吹塑
 DocType: Purchase Taxes and Charges,Valuation and Total,估值与总计
@@ -2802,11 +2816,12 @@
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,原料
 DocType: Leave Application,Follow via Email,通过电子邮件关注
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,税额折后金额
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Child account exists for this account. You can not delete this account.,此科目有子科目，无法删除。
+apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,此科目有子科目，无法删除。
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,需要指定目标数量和金额
-apps/erpnext/erpnext/stock/get_item_details.py +447,No default BOM exists for Item {0},品目{0}没有默认的BOM
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +355,Please select Posting Date first,请选择发布日期第一
-DocType: Leave Allocation,Carry Forward,顺延
+apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},品目{0}没有默认的BOM
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,请选择发布日期第一
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,开业日期应该是截止日期之前，
+DocType: Leave Control Panel,Carry Forward,顺延
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,有交易的成本中心不能转化为总账
 DocType: Department,Days for which Holidays are blocked for this department.,此部门的禁离日
 ,Produced,生产
@@ -2827,16 +2842,16 @@
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,娱乐休闲
 DocType: Purchase Order,The date on which recurring order will be stop,经常性发票终止日期
 DocType: Quality Inspection,Item Serial No,品目序列号
-apps/erpnext/erpnext/controllers/status_updater.py +133,{0} must be reduced by {1} or you should increase overflow tolerance,{0}必须通过{1}会减少或应增加溢出宽容
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0}必须通过{1}会减少或应增加溢出宽容
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,总现
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,小时
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",序列化的品目{0}不能被“库存盘点”更新
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +481,Transfer Material to Supplier,转印材料供应商
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,转印材料供应商
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,新序列号不能有仓库，仓库只能通过库存记录和采购收据设置。
 DocType: Lead,Lead Type,线索类型
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,创建报价
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +299,All these items have already been invoiced,这些品目都已开具发票
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,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: Shipping Rule,Shipping Rule Conditions,配送规则条件
 DocType: BOM Replace Tool,The new BOM after replacement,更换后的物料清单
@@ -2884,7 +2899,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,操作ID没有设置
 DocType: Production Order,Planned Start Date,计划开始日期
 DocType: Serial No,Creation Document Type,创建文件类型
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,Maint. Visit,维护手册。访
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,维护手册。访
 DocType: Leave Type,Is Encash,是否兑现
 DocType: Purchase Invoice,Mobile No,手机号码
 DocType: Payment Tool,Make Journal Entry,创建日记帐分录
@@ -2892,7 +2907,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,项目明智的数据不适用于报价
 DocType: Project,Expected End Date,预计结束日期
 DocType: Appraisal Template,Appraisal Template Title,评估模板标题
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Commercial,广告
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,广告
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,父项{0}不能是库存产品
 DocType: Cost Center,Distribution Id,分配标识
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,优质服务
@@ -2908,14 +2923,15 @@
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},为属性{0}值必须的范围内{1}到{2}中的增量{3}
 DocType: Tax Rule,Sales,销售
 DocType: Stock Entry Detail,Basic Amount,基本金额
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Warehouse required for stock Item {0},物件{0}需要指定仓库
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +166,Cr,信用
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},物件{0}需要指定仓库
+DocType: Leave Allocation,Unused leaves,未使用的叶子
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,信用
 DocType: Customer,Default Receivable Accounts,默认应收账户(多个)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,锯切
 DocType: Tax Rule,Billing State,计费状态
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,层压
 DocType: Item Reorder,Transfer,转让
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +557,Fetch exploded BOM (including sub-assemblies),获取展开BOM（包括子品目）
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),获取展开BOM（包括子品目）
 DocType: Authorization Rule,Applicable To (Employee),适用于(员工)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,截止日期是强制性的
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,增量属性{0}不能为0
@@ -2931,6 +2947,7 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,客户{0}不存在
 DocType: Attendance,Absent,缺席
 DocType: Product Bundle,Product Bundle,产品包
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},行{0}：无效参考{1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,破碎
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,购置税和费模板
 DocType: Upload Attendance,Download Template,下载模板
@@ -2938,16 +2955,16 @@
 DocType: Purchase Order Item Supplied,Raw Material Item Code,原料产品编号
 DocType: Journal Entry,Write Off Based On,核销基于
 DocType: Features Setup,POS View,POS机查看
-apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,一个序列号的安装记录
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,一个序列号的安装记录
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,连铸
-sites/assets/js/erpnext.min.js +10,Please specify a,请指定一个
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,请指定一个
 DocType: Offer Letter,Awaiting Response,正在等待回应
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,以上
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,冷上浆
 DocType: Salary Slip,Earning & Deduction,盈余及扣除
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,科目{0}不能为组
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,区域
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,可选。此设置将被应用于各种交易进行过滤。
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,可选。此设置将被应用于各种交易进行过滤。
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,负评估价格是不允许的
 DocType: Holiday List,Weekly Off,周末
 DocType: Fiscal Year,"For e.g. 2012, 2012-13",对例如2012，2012-13
@@ -2991,12 +3008,12 @@
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,挺着
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,蒸发图案铸造
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,娱乐费用
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,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 +51,Age,账龄
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,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 +61,Age,账龄
 DocType: Time Log,Billing Amount,开票金额
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,品目{0}的数量无效，应为大于0的数字。
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,假期申请。
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Account with existing transaction can not be deleted,有交易的科目不能被删除
+apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,有交易的科目不能被删除
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,法律费用
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc",每月自动生成发票的日期，例如5号，28号等
 DocType: Sales Invoice,Posting Time,发布时间
@@ -3005,9 +3022,8 @@
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,要用户手动选择序列的话请勾选。勾选此项后将不会选择默认序列。
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},没有序列号为{0}的品目
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +92,Open Notifications,打开通知
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,打开通知
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,直接开支
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to UNSTOP this Material Request?,确认要重新开始此物料申请吗？
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,新客户收入
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,差旅费
 DocType: Maintenance Visit,Breakdown,细目
@@ -3018,7 +3034,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,随着对日
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,珩磨
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,缓刑
-apps/erpnext/erpnext/stock/doctype/item/item.py +202,Default Warehouse is mandatory for stock Item.,库存品目必须指定默认仓库。
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,库存品目必须指定默认仓库。
 DocType: Feed,Full Name,全名
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,铆
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},支付工资的月{0}和年{1}
@@ -3041,7 +3057,7 @@
 DocType: Buying Settings,Default Supplier Type,默认供应商类别
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,采石
 DocType: Production Order,Total Operating Cost,总营运成本
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +158,Note: Item {0} entered multiple times,注意：品目{0}已多次输入
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,注意：品目{0}已多次输入
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,所有联系人。
 DocType: Newsletter,Test Email Id,测试电子邮件Id
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,公司缩写
@@ -3065,11 +3081,10 @@
 DocType: Stock Settings,Role Allowed to edit frozen stock,角色可以编辑冻结股票
 ,Territory Target Variance Item Group-Wise,按物件组的区域目标波动
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,所有客户群组
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}是必须项。可能是没有由{1}到{2}的货币转换记录。
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}是必须项。可能是没有由{1}到{2}的货币转换记录。
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,税务模板是强制性的。
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,科目{0}的上级科目{1}不存在
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),价格列表费率（公司货币）
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +84,{0} {1} status is 'Stopped',{0} {1}的状态为“已停止”
 DocType: Account,Temporary,临时
 DocType: Address,Preferred Billing Address,首选帐单地址
 DocType: Monthly Distribution Percentage,Percentage Allocation,百分比分配
@@ -3087,13 +3102,14 @@
 DocType: Purchase Order Item,Supplier Quotation,供应商报价
 DocType: Quotation,In Words will be visible once you save the Quotation.,大写金额将在报价单保存后显示。
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,熨衣服
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +213,{0} {1} is stopped,{0} {1}已停止
-apps/erpnext/erpnext/stock/doctype/item/item.py +290,Barcode {0} already used in Item {1},条码{0}已被品目{1}使用
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1}已停止
+apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},条码{0}已被品目{1}使用
 DocType: Lead,Add to calendar on this date,将此日期添加至日历
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,规则增加运输成本。
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +39,Upcoming Events,即将举行的活动
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,即将举行的活动
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,客户是必须项
 DocType: Letter Head,Letter Head,信头
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,快速入门
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0}是强制性的回报
 DocType: Purchase Order,To Receive,接受
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,冷缩配合
@@ -3116,25 +3132,25 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,必须选择至少一个仓库
 DocType: Serial No,Out of Warranty,超出保修期
 DocType: BOM Replace Tool,Replace,更换
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +309,{0} against Sales Invoice {1},{0}对销售发票{1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +48,Please enter default Unit of Measure,请输入缺省的计量单位
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0}对销售发票{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,请输入缺省的计量单位
 DocType: Purchase Invoice Item,Project Name,项目名称
 DocType: Supplier,Mention if non-standard receivable account,提到如果不规范应收账款
 DocType: Workflow State,Edit,编辑
 DocType: Journal Entry Account,If Income or Expense,收入或支出
 DocType: Features Setup,Item Batch Nos,品目批号
 DocType: Stock Ledger Entry,Stock Value Difference,库存值差异
-apps/erpnext/erpnext/config/learn.py +199,Human Resource,人力资源
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,人力资源
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,付款方式付款对账
 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: Contact Us Settings,Pincode,PIN代码
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,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 +128,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/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,新库存计量单位必须于当前单位不同
 DocType: Account,Debit,借方
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,假期天数必须为0.5的倍数
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,假期天数必须为0.5的倍数
 DocType: Production Order,Operation Cost,运营成本
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,由.csv文件上传考勤记录
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,优秀的金额
@@ -3142,7 +3158,6 @@
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.",要分配这个问题，请使用“分配”按钮，在侧边栏。
 DocType: Stock Settings,Freeze Stocks Older Than [Days],冻结老于此天数的库存
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.",如果存在多个价格规则，则会应用优先级别。优先权是一个介于0到20的数字，默认值是零（或留空）。数字越大，意味着优先级别越高。
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +49,Against Invoice,对发票
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,会计年度：{0}不存在
 DocType: Currency Exchange,To Currency,以货币
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,允许以下用户批准在禁离日请假的申请。
@@ -3171,7 +3186,7 @@
 DocType: Stock Entry Detail,Additional Cost,额外费用
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,财政年度结束日期
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher",按凭证分类后不能根据凭证编号过滤
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +492,Make Supplier Quotation,创建供应商报价
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,创建供应商报价
 DocType: Quality Inspection,Incoming,接收
 DocType: BOM,Materials Required (Exploded),所需物料（正展开）
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),降低盈利停薪留职（LWP）
@@ -3179,10 +3194,10 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},行＃{0}：序列号{1}不相匹配{2} {3}
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,事假
 DocType: Batch,Batch ID,批次ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +329,Note: {0},注： {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},注： {0}
 ,Delivery Note Trends,送货单趋势
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,本周的总结
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},行{1}中的{0}必须是“采购”或“转包”类型的品目
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},行{1}中的{0}必须是“采购”或“转包”类型的品目
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,科目{0}只能通过库存处理更新
 DocType: GL Entry,Party,一方
 DocType: Sales Order,Delivery Date,交货日期
@@ -3195,7 +3210,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,平均买入价
 DocType: Task,Actual Time (in Hours),实际时间（小时）
 DocType: Employee,History In Company,公司内历史
-apps/erpnext/erpnext/config/learn.py +92,Newsletters,简讯
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,简讯
 DocType: Address,Shipping,送货
 DocType: Stock Ledger Entry,Stock Ledger Entry,存库分类帐分录
 DocType: Department,Leave Block List,禁离日列表
@@ -3214,7 +3229,7 @@
 DocType: Purchase Order,End date of current order's period,当前订单周期的结束日期
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,使录取通知书
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,回报
-apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default Unit of Measure for Variant must be same as Template,测度变异的默认单位必须与模板
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,测度变异的默认单位必须与模板
 DocType: DocField,Fold,折叠
 DocType: Production Order Operation,Production Order Operation,生产订单操作
 DocType: Pricing Rule,Disable,禁用
@@ -3246,7 +3261,7 @@
 DocType: Employee,Reports to,报告以
 DocType: SMS Settings,Enter url parameter for receiver nos,请输入收件人编号的URL参数
 DocType: Sales Invoice,Paid Amount,支付的金额
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',结算帐户{0}必须是'负债'类型
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',结算帐户{0}必须是'负债'类型
 ,Available Stock for Packing Items,库存可用打包品目
 DocType: Item Variant,Item Variant,品目变体
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,将此地址模板设置为默认，因为没有其他的默认项
@@ -3254,7 +3269,7 @@
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,质量管理
 DocType: Production Planning Tool,Filter based on customer,根据客户筛选
 DocType: Payment Tool Detail,Against Voucher No,对凭证号码
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},请输入量的项目{0}
+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/stock_ledger/stock_ledger.py +34,Balance Qty,余额数量
@@ -3291,28 +3306,29 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},序列号是品目{0}的必须项
 DocType: Item Variant Attribute,Attribute,属性
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,请从指定/至范围
-sites/assets/js/desk.min.js +7652,Created By,创建人
+apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,创建人
 DocType: Serial No,Under AMC,在年度保养合同中
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,品目的评估价格将基于到岸成本凭证金额重新计算
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,销售业务的默认设置。
 DocType: BOM Replace Tool,Current BOM,当前BOM
-sites/assets/js/erpnext.min.js +8,Add Serial No,添加序列号
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,添加序列号
 DocType: Production Order,Warehouses,仓库
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,印刷和文具
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,组节点
 DocType: Payment Reconciliation,Minimum Amount,最低金额
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,更新成品
 DocType: Workstation,per hour,每小时
-apps/frappe/frappe/core/doctype/doctype/doctype.py +103,Series {0} already used in {1},系列{0}已经被{1}使用
+apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},系列{0}已经被{1}使用
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,仓库（永续盘存）的账户将在该帐户下创建。
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,无法删除，因为此仓库有库存分类账分录。
 DocType: Company,Distribution,分配
-sites/assets/js/erpnext.min.js +50,Amount Paid,已支付的款项
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,已支付的款项
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,项目经理
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,调度
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,品目{0}的最大折扣为 {1}%
 DocType: Customer,Default Taxes and Charges,默认税费
 DocType: Account,Receivable,应收账款
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,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.,作用是允许提交超过设定信用额度交易的。
 DocType: Sales Invoice,Supplier Reference,供应商推荐
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.",如果勾选，获取原材料时将考虑半成品的BOM。否则会将半成品当作原材料。
@@ -3349,8 +3365,8 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,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/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),设置接收支持的电子邮件地址。 （例如support@example.com ）
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Shortage Qty,短缺数量
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,Item variant {0} exists with same attributes,项目变种{0}存在具有相同属性
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,短缺数量
+apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,项目变种{0}存在具有相同属性
 DocType: Salary Slip,Salary Slip,工资单
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,打磨
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,“结束日期”必需设置
@@ -3363,6 +3379,7 @@
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.",当所选的业务状态更改为“已提交”时，自动打开一个弹出窗口向有关的联系人编写邮件，业务将作为附件添加。用户可以选择发送或者不发送邮件。
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,全局设置
 DocType: Employee Education,Employee Education,雇员教育
+apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,这是需要获取项目详细信息。
 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}已收到过
@@ -3395,7 +3412,7 @@
 DocType: Purchase Order,Raw Materials Supplied,提供原料
 DocType: Purchase Invoice,Recurring Print Format,经常打印格式
 DocType: Communication,Series,系列
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Purchase Order Date,预计交货日期不能早于采购订单日期
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,预计交货日期不能早于采购订单日期
 DocType: Appraisal,Appraisal Template,评估模板
 DocType: Communication,Email,邮件
 DocType: Item Group,Item Classification,品目分类
@@ -3451,6 +3468,7 @@
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,匹配无链接的发票和付款。
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,下订单
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,根本不能有一个父成本中心
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,选择品牌...
 DocType: Sales Invoice,C-Form Applicable,C-表格适用
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},运行时间必须大于0的操作{0}
 DocType: Supplier,Address and Contacts,地址和联系方式
@@ -3461,7 +3479,7 @@
 DocType: Payment Tool,Get Outstanding Vouchers,获取未清凭证
 DocType: Warranty Claim,Resolved By,议决
 DocType: Appraisal,Start Date,开始日期
-sites/assets/js/desk.min.js +7629,Value,值
+apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,值
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,调配一段时间假期。
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,点击这里核实
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,科目{0}不能是自己的上级科目
@@ -3477,14 +3495,14 @@
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox访问已允许
 DocType: Dropbox Backup,Weekly,每周
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,例如：smsgateway.com/API/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +478,Receive,接受
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,接受
 DocType: Maintenance Visit,Fully Completed,全部完成
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}％已完成
 DocType: Employee,Educational Qualification,学历
 DocType: Workstation,Operating Costs,运营成本
 DocType: Employee Leave Approver,Employee Leave Approver,雇员假期审批者
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0}已成功添加到我们的新闻列表。
-apps/erpnext/erpnext/stock/doctype/item/item.py +321,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：一个重新排序条目已存在这个仓库{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：一个重新排序条目已存在这个仓库{1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.",不能更改状态为丧失，因为已有报价。
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,电子束加工
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,采购经理大师
@@ -3497,7 +3515,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,添加/编辑价格
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,成本中心表
 ,Requested Items To Be Ordered,要求项目要订购
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,My Orders,我的订单
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,我的订单
 DocType: Price List,Price List Name,价格列表名称
 DocType: Time Log,For Manufacturing,对于制造业
 apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,总计
@@ -3508,7 +3526,7 @@
 DocType: Industry Type,Industry Type,行业类型
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,发现错误！
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,警告：申请的假期含有以下的禁离日
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +249,Sales Invoice {0} has already been submitted,销售发票{0}已提交过
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,销售发票{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),金额（公司货币）
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,压铸模具
@@ -3522,10 +3540,9 @@
 DocType: Company History,Year,年
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,简介销售点的
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,请更新短信设置
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +36,Time Log {0} already billed,时间日志{0}已结算
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,时间日志{0}已结算
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,无担保贷款
 DocType: Cost Center,Cost Center Name,成本中心名称
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,序列号为{1}的品目{0}已经安装
 DocType: Maintenance Schedule Detail,Scheduled Date,计划日期
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,数金额金额
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,大于160个字符的消息将被分割为多条消息
@@ -3533,10 +3550,10 @@
 ,Serial No Service Contract Expiry,序列号/年度保养合同过期
 DocType: Item,Unit of Measure Conversion,转换度量单位
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,雇员不能更改
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +255,You cannot credit and debit same account at the same time,你不能向一个账户同时输入贷方和借方记录。
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,你不能向一个账户同时输入贷方和借方记录。
 DocType: Naming Series,Help HTML,HTML帮助
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},分配的总权重应为100 ％ 。这是{0}
-apps/erpnext/erpnext/controllers/status_updater.py +131,Allowance for over-{0} crossed for Item {1},品目{1}已经超过允许的超额{0}
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},品目{1}已经超过允许的超额{0}
 DocType: Address,Name of person or organization that this address belongs to.,此地址所属的人或组织的名称
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,您的供应商
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,不能更改状态为丧失，因为已有销售订单。
@@ -3547,10 +3564,11 @@
 DocType: Item,Has Serial No,有序列号
 DocType: Employee,Date of Issue,签发日期
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}：申请者{0} 金额{1} 
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},行＃{0}：设置供应商项目{1}
 DocType: Issue,Content Type,内容类型
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/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 +279,Please check Multi Currency option to allow accounts with other currency,请检查多币种选项，允许帐户与其他货币
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,请检查多币种选项，允许帐户与其他货币
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,品目{0}不存在
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,您没有权限设定冻结值
 DocType: Payment Reconciliation,Get Unreconciled Entries,获取未调节分录
@@ -3561,14 +3579,14 @@
 DocType: Delivery Note,To Warehouse,到仓库
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},科目{0}已多次输入财年{1}
 ,Average Commission Rate,平均佣金率
-apps/erpnext/erpnext/stock/doctype/item/item.py +251,'Has Serial No' can not be 'Yes' for non-stock item,非库存项目不能勾选'是否有序列号'
+apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,非库存项目不能勾选'是否有序列号'
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,考勤不能标记为未来的日期
 DocType: Pricing Rule,Pricing Rule Help,定价规则说明
 DocType: Purchase Taxes and Charges,Account Head,账户头
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,更新额外费用以计算到岸成本
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,电气
 DocType: Stock Entry,Total Value Difference (Out - In),总价值差（输出 - ）
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,Row {0}: Exchange Rate is mandatory,行{0}：汇率是必须的
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,行{0}：汇率是必须的
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},员工设置{0}为设置用户ID
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,喷丸
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,来自保修申请
@@ -3582,15 +3600,17 @@
 DocType: Leave Block List,Leave Block List Name,禁离日列表名称
 DocType: User,Enabled,已启用
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,库存资产
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},确认要提交所有{1}年{8}的所有工资单吗？
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},确认要提交所有{1}年{8}的所有工资单吗？
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,进口认购
 DocType: Target Detail,Target Qty,目标数量
 DocType: Attendance,Present,现
 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,销售发票信息
 DocType: Authorization Rule,Based On,基于
-,Ordered Qty,订购数量
+DocType: Sales Order Item,Ordered Qty,订购数量
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,项目{0}无效
 DocType: Stock Settings,Stock Frozen Upto,库存冻结止
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},期间从和周期要日期强制性的经常性{0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,项目活动/任务。
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,生成工资条
 apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0}不是有效的电子邮件地址
@@ -3630,7 +3650,7 @@
 DocType: Upload Attendance,Upload Attendance,上传考勤记录
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM和生产量是必需的
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,账龄范围2
-DocType: Journal Entry Account,Amount,量
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,量
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,铆
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM已替换
 ,Sales Analytics,销售分析
@@ -3657,7 +3677,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,预计日期不能早于物料申请时间
 DocType: Contact Us Settings,City,城市
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,超声波加工
-apps/frappe/frappe/templates/base.html +135,Error: Not a valid id?,错误：没有有效的身份证？
+apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,错误：没有有效的身份证？
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,品目{0}必须是销售品目
 DocType: Naming Series,Update Series Number,更新序列号
 DocType: Account,Equity,权益
@@ -3672,7 +3692,7 @@
 DocType: Authorization Rule,Customerwise Discount,客户折扣
 DocType: Purchase Invoice,Against Expense Account,对开支账目
 DocType: Production Order,Production Order,生产订单
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Installation Note {0} has already been submitted,安装单{0}已经提交过
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,安装单{0}已经提交过
 DocType: Quotation Item,Against Docname,对文档名称
 DocType: SMS Center,All Employee (Active),所有员工（活动）
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,立即查看
@@ -3680,14 +3700,14 @@
 DocType: BOM,Raw Material Cost,原材料成本
 DocType: Item,Re-Order Level,重新排序级别
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,输入要生产的品目和数量或者下载物料清单。
-sites/assets/js/list.min.js +174,Gantt Chart,甘特图
+apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,甘特图
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,兼任
 DocType: Employee,Applicable Holiday List,可申请假期列表
 DocType: Employee,Cheque,支票
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,系列已更新
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,报告类型是强制性的
 DocType: Item,Serial Number Series,序列号系列
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},行{1}中的物件{0}必须指定仓库
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},行{1}中的物件{0}必须指定仓库
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,零售及批发
 DocType: Issue,First Responded On,首次回复时间
 DocType: Website Item Group,Cross Listing of Item in multiple groups,多个群组品目交叉显示
@@ -3702,7 +3722,7 @@
 DocType: Page,No,No
 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/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,发布日期和发布时间是必需的
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,发布日期和发布时间是必需的
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,采购业务的税项模板。
 ,Item Prices,品目价格
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,大写金额将在采购订单保存后显示。
@@ -3722,9 +3742,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,行政开支
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,咨询
 DocType: Customer Group,Parent Customer Group,母公司集团客户
-sites/assets/js/erpnext.min.js +50,Change,变化
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,变化
 DocType: Purchase Invoice,Contact Email,联络人电邮
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +113,Purchase Order {0} is 'Stopped',采购订单{0} “停止”
 DocType: Appraisal Goal,Score Earned,已得分数
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",例如“XX有限责任公司”
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,通知期
@@ -3734,12 +3753,13 @@
 DocType: Email Digest,Receivables / Payables,应收/应付账款
 DocType: Delivery Note Item,Against Sales Invoice,对销售发票
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,冲压
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,信用账户
 DocType: Landed Cost Item,Landed Cost Item,到岸成本品目
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,显示零值
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,原材料被生产/重新打包后得到的品目数量
 DocType: Payment Reconciliation,Receivable / Payable Account,应收/应付账款
 DocType: Delivery Note Item,Against Sales Order Item,对销售订单项目
-apps/erpnext/erpnext/stock/doctype/item/item.py +462,Please specify Attribute Value for attribute {0},请指定属性值的属性{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},请指定属性值的属性{0}
 DocType: Item,Default Warehouse,默认仓库
 DocType: Task,Actual End Date (via Time Logs),实际结束日期（通过时间日志）
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},财政预算案不能对集团客户分配{0}
@@ -3753,7 +3773,7 @@
 DocType: Appraisal,Total Score (Out of 5),总分（满分5分）
 DocType: Contact Us Settings,State,状态
 DocType: Batch,Batch,批次
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,余额
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,余额
 DocType: Project,Total Expense Claim (via Expense Claims),总费用报销（通过费用报销）
 DocType: User,Gender,性别
 DocType: Journal Entry,Debit Note,借项通知单
@@ -3769,9 +3789,8 @@
 apps/erpnext/erpnext/config/setup.py +88,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/stock/doctype/material_request/material_request.js +533,Unstop Material Request,重新开始物料请求
 DocType: Workflow State,User,用户
-apps/erpnext/erpnext/config/learn.py +218,Processing Payroll,处理工资单
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,处理工资单
 DocType: Opportunity Item,Basic Rate,基础税率
 DocType: GL Entry,Credit Amount,信贷金额
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,设置为丧失
@@ -3779,7 +3798,7 @@
 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/buying/doctype/purchase_common/purchase_common.py +92,{0} {1} has already been submitted,{0} {1}已经提交过
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1}已经提交过
 ,Items To Be Requested,要申请的品目
 DocType: Purchase Order,Get Last Purchase Rate,获取最新的采购税率
 DocType: Time Log,Billing Rate based on Activity Type (per hour),根据活动类型计费率（每小时）
@@ -3788,6 +3807,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent",公司电子邮件ID没有找到，因此邮件无法发送
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),资金(资产)申请
 DocType: Production Planning Tool,Filter based on item,根据项目筛选
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,借方科目
 DocType: Fiscal Year,Year Start Date,今年开始日期
 DocType: Attendance,Employee Name,雇员姓名
 DocType: Sales Invoice,Rounded Total (Company Currency),圆润的总计（公司货币）
@@ -3799,14 +3819,14 @@
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,消隐
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,员工福利
 DocType: Sales Invoice,Is POS,是否POS机
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +238,Packed quantity must equal quantity for Item {0} in row {1},盒装数量必须等于量项目{0}行{1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,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/accounts/party.py +25,{0}: {1} does not exists,{0}：{1}不存在
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,对客户开出的账单。
 DocType: DocField,Default,默认
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,项目编号
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +461,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 +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},行无{0}：金额不能大于金额之前对报销{1}。待审核金额为{2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0}新增用户
 DocType: Maintenance Schedule,Schedule,计划任务
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""",定义预算这个成本中心。要设置预算的行动，请参阅“企业名录”
@@ -3814,7 +3834,7 @@
 DocType: Quality Inspection Reading,Reading 3,阅读3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,凭证类型
-sites/assets/js/erpnext.min.js +34,Price List not found or disabled,价格表未找到或禁用
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,价格表未找到或禁用
 DocType: Expense Claim,Approved,已批准
 DocType: Pricing Rule,Price,价格
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',{0}的假期批准后，雇员的状态必须设置为“离开”
@@ -3823,23 +3843,25 @@
 DocType: Employee,Education,教育
 DocType: Selling Settings,Campaign Naming By,活动命名：
 DocType: Employee,Current Address Is,当前地址是
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.",可选。设置公司的默认货币，如果没有指定。
 DocType: Address,Office,办公室
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,标准报告
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,会计记账分录。
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,请选择员工记录第一。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +181,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},行{0}：甲方/客户不与匹配{1} / {2} {3} {4}
+DocType: Delivery Note Item,Available Qty at From Warehouse,可用数量从仓库
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,请选择员工记录第一。
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},行{0}：甲方/客户不与匹配{1} / {2} {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,要创建一个纳税帐户
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,请输入您的费用帐户
 DocType: Account,Stock,库存
 DocType: Employee,Current Address,当前地址
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",如果品目为另一品目的变体，那么它的描述，图片，价格，税率等将从模板自动设置。你也可以手动设置。
 DocType: Serial No,Purchase / Manufacture Details,采购/制造详细信息
-apps/erpnext/erpnext/config/learn.py +142,Batch Inventory,批量库存
+apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,批量库存
 DocType: Employee,Contract End Date,合同结束日期
 DocType: Sales Order,Track this Sales Order against any Project,跟踪对任何项目这个销售订单
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,基于上述标准拉销售订单（待定提供）
 DocType: DocShare,Document Type,文档类型
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +557,From Supplier Quotation,来自供应商报价
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,来自供应商报价
 DocType: Deduction Type,Deduction Type,扣款类型
 DocType: Attendance,Half Day,半天
 DocType: Pricing Rule,Min Qty,最小数量
@@ -3850,20 +3872,21 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,对于数量（制造数量）是强制性的
 DocType: Stock Entry,Default Target Warehouse,默认目标仓库
 DocType: Purchase Invoice,Net Total (Company Currency),总净金额（公司货币）
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,行{0}：党的类型和党的只适用对应收/应付帐户
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,行{0}：党的类型和党的只适用对应收/应付帐户
 DocType: Notification Control,Purchase Receipt Message,外购入库单信息
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,分配的总叶多期
 DocType: Production Order,Actual Start Date,实际开始日期
 DocType: Sales Order,% of materials delivered against this Sales Order,此销售订单％的材料已交货。
-apps/erpnext/erpnext/config/stock.py +18,Record item movement.,记录项目的运动。
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,记录项目的运动。
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,通讯订户名单
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
 DocType: Email Account,Service,服务
 DocType: Hub Settings,Hub Settings,Hub设置
 DocType: Project,Gross Margin %,毛利率％
 DocType: BOM,With Operations,带工艺
-apps/erpnext/erpnext/accounts/party.py +229,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,会计分录已取得货币{0}为公司{1}。请选择一个应收或应付账户币种{0}。
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,会计分录已取得货币{0}为公司{1}。请选择一个应收或应付账户币种{0}。
 ,Monthly Salary Register,月度工资记录
-apps/frappe/frappe/website/template.py +123,Next,下一个
+apps/frappe/frappe/website/template.py +140,Next,下一个
 DocType: Warranty Claim,If different than customer address,如果客户地址不同的话
 DocType: BOM Operation,BOM Operation,BOM操作
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,电解
@@ -3894,6 +3917,7 @@
 DocType: Employee Education,Major/Optional Subjects,主修/选修科目
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,请输入税费
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,加工
+DocType: Sales Invoice Item,Drop Ship,落船
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",在这里，您可以维系家庭的详细信息，如姓名的父母，配偶和子女及职业
 DocType: Hub Settings,Seller Name,卖家名称
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),已扣除税费（公司货币）
@@ -3920,29 +3944,29 @@
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,设计师
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,条款和条件模板
 DocType: Serial No,Delivery Details,交货细节
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +382,Cost Center is required in row {0} in Taxes table for type {1},类型{1}税费表的行{0}必须有成本中心
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},类型{1}税费表的行{0}必须有成本中心
 DocType: Item,Automatically create Material Request if quantity falls below this level,自动创建材料，如果申请数量低于这个水平
 ,Item-wise Purchase Register,品目特定的采购记录
 DocType: Batch,Expiry Date,到期时间
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,"To set reorder level, item must be a Purchase Item or Manufacturing Item",要设置订货点水平，项目必须购买项目或生产项目
+apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item",要设置订货点水平，项目必须购买项目或生产项目
 ,Supplier Addresses and Contacts,供应商的地址和联系方式
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,属性是相同的两个记录。
 apps/erpnext/erpnext/config/projects.py +18,Project master.,项目主。
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,不要在货币旁显示货币代号，例如$等。
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +331, (Half Day),（半天）
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),（半天）
 DocType: Supplier,Credit Days,信用期
 DocType: Leave Type,Is Carry Forward,是否顺延假期
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +486,Get Items from BOM,从物料清单获取品目
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,从物料清单获取品目
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,交货天数
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,材料清单
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,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 +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},行{0}：党的类型和党的需要应收/应付帐户{1}
 DocType: Dropbox Backup,Send Notifications To,将通知发给
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,参考日期
 DocType: Employee,Reason for Leaving,离职原因
 DocType: Expense Claim Detail,Sanctioned Amount,已批准金额
 DocType: GL Entry,Is Opening,是否起始
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +163,Row {0}: Debit entry can not be linked with a {1},行{0}：借记条目不能与连接的{1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +186,Account {0} does not exist,科目{0}不存在
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},行{0}：借记条目不能与连接的{1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,科目{0}不存在
 DocType: Account,Cash,现金
 DocType: Employee,Short biography for website and other publications.,在网站或其他出版物使用的个人简介。
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},员工请建立薪酬结构{0}