diff --git a/erpnext/translations/zh-cn.csv b/erpnext/translations/zh-cn.csv
index d912b15..16d1ddb 100644
--- a/erpnext/translations/zh-cn.csv
+++ b/erpnext/translations/zh-cn.csv
@@ -21,6 +21,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +171,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",停止生产订单无法取消，首先Unstop它取消
 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/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,请安装员工在人力资源命名系统&gt; HR设置
 DocType: Purchase Order,Customer Contact,客户联系
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} 树
 DocType: Job Applicant,Job Applicant,求职者
@@ -48,12 +49,11 @@
 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/utilities/transaction_base.py +107,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 +228,New Leave Application,新建假期申请
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +630,Error: {0} &gt; {1},错误：{0}&gt; {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +229,New Leave Application,新建假期申请
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,银行汇票
 DocType: Mode of Payment Account,Mode of Payment Account,付款方式账户
 apps/erpnext/erpnext/stock/doctype/item/item.js +49,Show Variants,显示变体
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +479,Quantity,数量
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,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,按年排序
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,库存
@@ -64,7 +64,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,医疗保健
 DocType: Purchase Invoice,Monthly,每月
 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 +612,Invoice,发票
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +642,Invoice,发票
 DocType: Maintenance Schedule Item,Periodicity,周期性
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,会计年度{0}是必需的
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defense
@@ -81,7 +81,7 @@
 DocType: Cost Center,Stock User,股票用户
 DocType: Company,Phone No,电话号码
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.",用户对任务的操作记录，可以用来追踪时间和付款。
-apps/erpnext/erpnext/controllers/recurring_document.py +130,New {0}: #{1},新{0}：#{1}
+apps/erpnext/erpnext/controllers/recurring_document.py +131,New {0}: #{1},新{0}：#{1}
 ,Sales Partners Commission,销售合作伙伴佣金
 apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,缩写不能超过5个字符
 DocType: Payment Request,Payment Request,付钱请求
@@ -93,7 +93,7 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name",附加.csv文件有两列，一为旧名称，一个用于新名称
 DocType: Packed Item,Parent Detail docname,家长可采用DocName细节
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Kg,千克
-apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,开放的工作。
+apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,开放的工作。
 DocType: Item Attribute,Increment,增量
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +39,PayPal Settings missing,贝宝设置丢失
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,选择仓库...
@@ -102,7 +102,7 @@
 DocType: Employee,Married,已婚
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},不允许{0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +441,Get items from,从获得项目
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +399,Stock cannot be updated against Delivery Note {0},送货单{0}不能更新库存
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +397,Stock cannot be updated against Delivery Note {0},送货单{0}不能更新库存
 DocType: Payment Reconciliation,Reconcile,对账
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,杂货
 DocType: Quality Inspection Reading,Reading 1,阅读1
@@ -114,6 +114,7 @@
 DocType: Sales Invoice Item,Sales Invoice Item,销售发票品目
 DocType: Account,Credit,贷方
 DocType: POS Profile,Write Off Cost Center,核销成本中心
+apps/erpnext/erpnext/config/stock.py +32,Stock Reports,股票报告
 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,税收类型
@@ -126,7 +127,6 @@
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,在{0}这个节日之间没有从日期和结束日期
 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/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},从{0}至 {1}
 DocType: Item,Copy From Item Group,从品目组复制
@@ -164,42 +164,42 @@
 DocType: Delivery Note,Installation Status,安装状态
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +108,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 +123,Item {0} must be a Purchase Item,品目{0}必须是采购品目
+apps/erpnext/erpnext/stock/get_item_details.py +140,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 +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 +510,"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 +98,Settings for HR Module,人力资源模块的设置
+apps/erpnext/erpnext/controllers/accounts_controller.py +507,"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 +170,Settings for HR Module,人力资源模块的设置
 DocType: SMS Center,SMS Center,短信中心
 DocType: BOM Replace Tool,New BOM,新建物料清单
-apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,批处理的时间记录进行计费。
+apps/erpnext/erpnext/config/projects.py +40,Batch Time Logs for billing.,批处理的时间记录进行计费。
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,通讯已发送过
 DocType: Lead,Request Type,请求类型
 DocType: Leave Application,Reason,原因
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,使员工
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,广播
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,执行
-apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,生产操作详情。
+apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,生产操作详情。
 DocType: Serial No,Maintenance Status,维护状态
-apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,项目和定价
+apps/erpnext/erpnext/config/stock.py +62,Items and Pricing,项目和定价
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},起始日期应该在财年之内。财年起始日是{0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,选择该评估的雇员对象。
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,Cost Center {0} does not belong to Company {1},成本中心{0}不属于公司{1}
 DocType: Customer,Individual,个人
-apps/erpnext/erpnext/config/support.py +23,Plan for maintenance visits.,规划维护访问。
+apps/erpnext/erpnext/config/support.py +27,Plan for maintenance visits.,规划维护访问。
 DocType: SMS Settings,Enter url parameter for message,请输入消息的URL参数
-apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,规则适用的定价和折扣。
+apps/erpnext/erpnext/config/stock.py +102,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 +79,Installation date cannot be before delivery date for Item {0},品目{0}的安装日期不能早于交付日期
 DocType: Pricing Rule,Discount on Price List Rate (%),折扣价目表率（％）
 DocType: Offer Letter,Select Terms and Conditions,选择条款和条件
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,Out Value,输出值
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,输出值
 DocType: Production Planning Tool,Sales Orders,销售订单
 DocType: Purchase Taxes and Charges,Valuation,估值
 ,Purchase Order Trends,采购订单趋势
-apps/erpnext/erpnext/config/hr.py +86,Allocate leaves for the year.,调配一年的假期。
+apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,调配一年的假期。
 DocType: Earning Type,Earning Type,盈余类型
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,禁用容量规划和时间跟踪
 DocType: Bank Reconciliation,Bank Account,银行帐户
@@ -221,13 +221,13 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,从融资净现金
 DocType: Lead,Address & Contact,地址及联系方式
 DocType: Leave Allocation,Add unused leaves from previous allocations,添加未使用的叶子从以前的分配
-apps/erpnext/erpnext/controllers/recurring_document.py +210,Next Recurring {0} will be created on {1},周期{0}下次创建时间为{1}
+apps/erpnext/erpnext/controllers/recurring_document.py +217,Next Recurring {0} will be created on {1},周期{0}下次创建时间为{1}
 DocType: Newsletter List,Total Subscribers,用户总数
 ,Contact Name,联系人姓名
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,依上述条件创建工资单
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,未提供描述
-apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,请求您的报价。
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +195,Only the selected Leave Approver can submit this Leave Application,只有选择的休假审批者可以提交此请假
+apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,请求您的报价。
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +196,Only the selected Leave Approver can submit this Leave Application,只有选择的休假审批者可以提交此请假
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Relieving Date must be greater than Date of Joining,解除日期必须大于加入的日期
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,每年叶
 DocType: Time Log,Will be updated when batched.,批处理后将会更新。
@@ -235,7 +235,7 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},仓库{0}不属于公司{1}
 DocType: Item Website Specification,Item Website Specification,品目网站规格
 DocType: Payment Tool,Reference No,参考编号
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +420,Leave Blocked,已禁止请假
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +427,Leave Blocked,已禁止请假
 apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},品目{0}已经到达寿命终止日期{1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Bank Entries,银行条目
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,全年
@@ -249,13 +249,13 @@
 DocType: Item,Publish in Hub,在发布中心
 ,Terretory,区域
 apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,品目{0}已取消
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,物料申请
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +706,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}
 DocType: Employee,Relation,关系
 DocType: Shipping Rule,Worldwide Shipping,全球航运
-apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,确认客户订单。
+apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,确认客户订单。
 DocType: Purchase Receipt Item,Rejected Quantity,拒绝数量
 DocType: Features Setup,"Field available in Delivery Note, Quotation, Sales Invoice, Sales Order",字段在送货单，报价单，销售发票，销售订单可用
 DocType: SMS Settings,SMS Sender Name,短信发送者名称
@@ -275,10 +275,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,Max 5 characters,最多5个字符
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,假期审批人列表的第一个将被设为默认审批人
 apps/erpnext/erpnext/config/desktop.py +83,Learn,学习
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,供应商&gt;供应商类型
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,每个员工活动费用
 DocType: Accounts Settings,Settings for Accounts,帐户设置
-apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,管理销售人员。
+apps/erpnext/erpnext/config/crm.py +110,Manage Sales Person Tree.,管理销售人员。
 DocType: Job Applicant,Cover Letter,求职信
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Outstanding Cheques and Deposits to clear,杰出的支票及存款清除
 DocType: Item,Synced With Hub,与Hub同步
@@ -295,7 +294,7 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,自动创建物料申请时通过邮件通知
 DocType: Journal Entry,Multi Currency,多币种
 DocType: Payment Reconciliation Invoice,Invoice Type,发票类型
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Delivery Note,送货单
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Delivery Note,送货单
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,建立税
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,付款项被修改，你把它之后。请重新拉。
 apps/erpnext/erpnext/stock/doctype/item/item.py +381,{0} entered twice in Item Tax,{0}输入两次税项
@@ -307,21 +306,21 @@
 DocType: Shipping Rule,Valid for Countries,有效的国家
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.",所有和进口相关的字段，例如货币，汇率，进口总额，进口总计等，都可以在采购收据，供应商报价，采购发票，采购订单等系统里面找到。
 apps/erpnext/erpnext/stock/doctype/item/item.js +48,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,这个项目是一个模板，并且可以在交易不能使用。项目的属性将被复制到变型，除非“不复制”设置
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,总订货考虑
-apps/erpnext/erpnext/config/hr.py +118,"Employee designation (e.g. CEO, Director etc.).",雇员指派(例如总裁，总监等) 。
-apps/erpnext/erpnext/controllers/recurring_document.py +203,Please enter 'Repeat on Day of Month' field value,请输入“重复上月的一天'字段值
+apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,总订货考虑
+apps/erpnext/erpnext/config/hr.py +190,"Employee designation (e.g. CEO, Director etc.).",雇员指派(例如总裁，总监等) 。
+apps/erpnext/erpnext/controllers/recurring_document.py +210,Please enter 'Repeat on Day of Month' field value,请输入“重复上月的一天'字段值
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,客户货币转换为客户的基础货币后的单价
 DocType: 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/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0}已分配给员工{1}的时期{2}到{3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +644,Select Item,选择项目
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +674,Select Item,选择项目
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"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 +254,Purchase Invoice {0} is already submitted,采购发票{0}已经提交
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +90,Row # {0}: Batch No must be same as {1} {2},行＃{0}：批号必须与{1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +65,Convert to non-Group,转换为非集团
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,购买收据必须提交
-apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,产品批次(patch)/批(lot)。
+apps/erpnext/erpnext/config/stock.py +118,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 +223,There can only be 1 Account per Company in {0} {1},只能有每公司1帐户{0} {1}
@@ -338,7 +337,7 @@
 DocType: Leave Application,Leave Approver Name,假期审批人姓名
 ,Schedule Date,计划任务日期
 DocType: Packed Item,Packed Item,盒装产品
-apps/erpnext/erpnext/config/buying.py +54,Default settings for buying transactions.,采购业务的默认设置。
+apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,采购业务的默认设置。
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},存在活动费用为员工{0}对活动类型 -  {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,请不要创建客户和供应商帐户。他们是直接从客户/供应商的主人创建的。
 DocType: Currency Exchange,Currency Exchange,货币兑换
@@ -353,7 +352,7 @@
 ,Purchase Register,购买注册
 DocType: Landed Cost Item,Applicable Charges,适用费用
 DocType: Workstation,Consumable Cost,耗材成本
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +191,{0} ({1}) must have role 'Leave Approver',{0} {1}必须有“假期审批人”的角色
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +192,{0} ({1}) must have role 'Leave Approver',{0} {1}必须有“假期审批人”的角色
 DocType: Purchase Receipt,Vehicle Date,车日期
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,医药
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Reason for losing,原因丢失
@@ -384,16 +383,16 @@
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,自定义作为邮件一部分的简介文本，每个邮件的简介文本是独立的。
 DocType: Stock Reconciliation Item,Do not include symbols (ex. $),不包括符号（例如$）
 DocType: Sales Taxes and Charges Template,Sales Master Manager,销售经理大师
-apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,所有生产流程的全局设置。
+apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,所有生产流程的全局设置。
 DocType: Accounts Settings,Accounts Frozen Upto,账户被冻结到...为止
 DocType: SMS Log,Sent On,发送日期
 apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,属性{0}多次选择在属性表
 DocType: HR Settings,Employee record is created using selected field. ,使用所选字段创建员工记录。
 DocType: Sales Order,Not Applicable,不适用
-apps/erpnext/erpnext/config/hr.py +148,Holiday master.,假期大师
+apps/erpnext/erpnext/config/hr.py +70,Holiday master.,假期大师
 DocType: Material Request Item,Required Date,所需时间
 DocType: Delivery Note,Billing Address,帐单地址
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +737,Please enter Item Code.,请输入产品编号。
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,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,总数量
@@ -406,7 +405,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,总叶分配是必须的
 DocType: Job Opening,Description of a Job Opening,空缺职位的说明
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,今天待定活动
-apps/erpnext/erpnext/config/hr.py +28,Attendance record.,考勤记录。
+apps/erpnext/erpnext/config/hr.py +24,Attendance record.,考勤记录。
 DocType: Bank Reconciliation,Journal Entries,日记帐分录
 DocType: Sales Order Item,Used for Production Plan,用于生产计划
 DocType: Manufacturing Settings,Time Between Operations (in mins),时间操作之间（以分钟）
@@ -424,7 +423,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +308,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 +381,Please enter Warehouse for which Material Request will be raised,请重新拉。
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +378,Please enter Warehouse for which Material Request will be raised,请重新拉。
 DocType: Production Order,Additional Operating Cost,额外的运营成本
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,化妆品
 apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items",若要合并，以下属性必须为这两个项目是相同的
@@ -435,8 +434,7 @@
 DocType: Purchase Invoice Item,Item,品目
 DocType: Journal Entry,Difference (Dr - Cr),差异(贷方-借方)
 DocType: Account,Profit and Loss,损益
-apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,管理转包
-apps/erpnext/erpnext/utilities/doctype/address/address.py +96,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,无缺省地址模板中。请创建设置&gt;打印和品牌&gt;地址模板一个新的。
+apps/erpnext/erpnext/config/stock.py +315,Managing Subcontracting,管理转包
 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,价目表货币转换为公司的基础货币后的单价
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},科目{0}不属于公司：{1}
@@ -444,7 +442,7 @@
 DocType: Selling Settings,Default Customer Group,默认客户群组
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",如果禁用，“舍入总计”字段将不在交易中显示
 DocType: BOM,Operating Cost,营业成本
-,Gross Profit,毛利
+DocType: Sales Order Item,Gross Profit,毛利
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,增量不能为0
 DocType: Production Planning Tool,Material Requirement,物料需求
 DocType: Company,Delete Company Transactions,删除公司事务
@@ -469,7 +467,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**",如果你有季节性的业务，**月度分配**将帮助你按月分配预算。要使用这种分配方式，请在**成本中心**内设置**月度分配**。
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,没有在发票表中找到记录
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,请选择公司和党的第一型
-apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,财务/会计年度。
+apps/erpnext/erpnext/config/accounts.py +230,Financial / accounting year.,财务/会计年度。
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,累积值
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",抱歉，序列号无法合并
 DocType: Project Task,Project Task,项目任务
@@ -483,12 +481,12 @@
 DocType: Job Applicant,Resume Attachment,简历附
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,回头客
 DocType: Leave Control Panel,Allocate,调配
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +633,Sales Return,销售退货
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,销售退货
 DocType: Item,Delivered by Supplier (Drop Ship),由供应商交货（直接发运）
-apps/erpnext/erpnext/config/hr.py +128,Salary components.,工资构成部分。
+apps/erpnext/erpnext/config/hr.py +115,Salary components.,工资构成部分。
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,潜在客户数据库。
 DocType: Authorization Rule,Customer or Item,客户或项目
-apps/erpnext/erpnext/config/crm.py +17,Customer database.,客户数据库。
+apps/erpnext/erpnext/config/crm.py +22,Customer database.,客户数据库。
 DocType: Quotation,Quotation To,报价对象
 DocType: Lead,Middle Income,中等收入
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),开幕（CR ）
@@ -499,10 +497,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},{0}需要参考编号与参考日期
 DocType: Sales Invoice,Customer's Vendor,客户的供应商
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +211,Production Order is Mandatory,生产订单是强制性
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",转到相应的组（通常是基金的流动资产应用&gt;&gt;银行账户，并创建一个新帐户（点击添加子）类型的“银行”
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,提案写作
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,另外销售人员{0}存在具有相同员工ID
+apps/erpnext/erpnext/config/accounts.py +70,Masters,大师
+apps/erpnext/erpnext/config/accounts.py +127,Update Bank Transaction Dates,更新银行交易日期
 apps/erpnext/erpnext/stock/stock_ledger.py +337,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},负库存错误({6})。品目{0}，仓库{1}，提交时间{2}{3}，凭证类型{4}，凭证编号{5}
+apps/erpnext/erpnext/config/projects.py +30,Time Tracking,时间跟踪
 DocType: Fiscal Year Company,Fiscal Year Company,公司财政年度
 DocType: Packing Slip Item,DN Detail,送货单详情
 DocType: Time Log,Billed,已开票
@@ -511,14 +511,14 @@
 DocType: Sales Invoice,Sales Taxes and Charges,销售税费
 DocType: Employee,Organization Profile,组织简介
 DocType: Employee,Reason for Resignation,原因辞职
-apps/erpnext/erpnext/config/hr.py +158,Template for performance appraisals.,绩效考核模板。
+apps/erpnext/erpnext/config/hr.py +151,Template for performance appraisals.,绩效考核模板。
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,发票/日记帐分录详细信息
 apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0}“ {1}”不属于{2}财年
 DocType: Buying Settings,Settings for Buying Module,采购模块的设置
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,请第一次进入购买收据
 DocType: Buying Settings,Supplier Naming By,供应商命名方式
 DocType: Activity Type,Default Costing Rate,默认成本核算率
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +653,Maintenance Schedule,维护计划
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +660,Maintenance Schedule,维护计划
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.",然后定价规则将基于客户，客户组，地区，供应商，供应商类型，活动，销售合作伙伴等条件过滤。
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,在库存净变动
 DocType: Employee,Passport Number,护照号码
@@ -530,7 +530,7 @@
 DocType: Production Order Operation,In minutes,已分钟为单位
 DocType: Issue,Resolution Date,决议日期
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +239,Please set a Holiday List for either the Employee or the Company,请设置一个假期名单无论是员工还是公司
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +676,Please set default Cash or Bank account in Mode of Payment {0},请设置默认的现金或银行账户的付款方式{0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +674,Please set default Cash or Bank account in Mode of Payment {0},请设置默认的现金或银行账户的付款方式{0}
 DocType: Selling Settings,Customer Naming By,客户命名方式
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +69,Convert to Group,转换为组
 DocType: Activity Cost,Activity Type,活动类型
@@ -538,13 +538,13 @@
 DocType: Supplier,Fixed Days,固定天
 DocType: Quotation Item,Item Balance,项目平衡
 DocType: Sales Invoice,Packing List,包装清单
-apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,购买给供应商的订单。
+apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,购买给供应商的订单。
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,出版
 DocType: Activity Cost,Projects User,项目用户
 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 +141,{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 +204,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消维护访问{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,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}
@@ -563,7 +563,7 @@
 DocType: Purchase Receipt,Other Details,其他详细信息
 DocType: Account,Accounts,会计
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,市场营销
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +220,Payment Entry is already created,已创建付款输入
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +223,Payment Entry is already created,已创建付款输入
 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/buying/doctype/supplier/supplier.js +67,Total billing this year,今年的总账单
@@ -585,8 +585,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,航天
 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 +33,Goods received from Suppliers.,来自供应商的已收入成品。
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,In Value,在数值
+apps/erpnext/erpnext/config/accounts.py +40,Company and Accounts,公司与账户
+apps/erpnext/erpnext/config/stock.py +22,Goods received from Suppliers.,来自供应商的已收入成品。
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,在数值
 DocType: Lead,Campaign Name,活动名称
 ,Reserved,保留的
 DocType: Purchase Order,Supply Raw Materials,供应原料
@@ -605,11 +606,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,You can not enter current voucher in 'Against Journal Entry' column,您不能在“对日记账分录”列中选择此凭证。
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,能源
 DocType: Opportunity,Opportunity From,从机会
-apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,月度工资结算
+apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,月度工资结算
 DocType: Item Group,Website Specifications,网站规格
 apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},有一个在你的地址模板错误{0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account,新建账户
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +22,{0}: From {0} of type {1},{0}：申请者{0} 假期类型{1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}：申请者{0} 假期类型{1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,行{0}：转换系数是强制性的
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",海报价格规则，同样的标准存在，请分配优先级解决冲突。价格规则：{0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,会计分录可对叶节点。对组参赛作品是不允许的。
@@ -617,7 +618,7 @@
 DocType: Opportunity,Maintenance,维护
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},所需物品交易收据号码{0}
 DocType: Item Attribute Value,Item Attribute Value,品目属性值
-apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,销售活动。
+apps/erpnext/erpnext/config/crm.py +84,Sales campaigns.,销售活动。
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -650,19 +651,19 @@
 8. 输入行： 如果选择了“基于前一行的总计/金额”，你可以选择此税项基于的行数(默认为前一行)。
 9. 基本税率是否包含此税费？：勾选此项则意味着此税项不会显示在品目表下，但会出现在品目主表的标注费率内。如果你需要向客户提供一个统一售价(即包含所有税费)，这个选项会很有用。"
 DocType: Employee,Bank A/C No.,银行账号
-DocType: Expense Claim,Project,项目
+DocType: Purchase Invoice Item,Project,项目
 DocType: Quality Inspection Reading,Reading 7,阅读7
 DocType: Address,Personal,个人
 DocType: Expense Claim Detail,Expense Claim Type,报销类型
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,购物车的默认设置
-apps/erpnext/erpnext/controllers/accounts_controller.py +323,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",日记帐分录{0}和订单{1}关联，请确认它是不是本发票的预付款。
+apps/erpnext/erpnext/controllers/accounts_controller.py +320,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",日记帐分录{0}和订单{1}关联，请确认它是不是本发票的预付款。
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,生物技术
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,办公维护费用
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +111,Please enter Item first,没有客户或供应商帐户发现。账户是根据\确定
 DocType: Account,Liability,负债
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +60,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 +256,Price List not selected,价格列表没有选择
+apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,价格列表没有选择
 DocType: Employee,Family Background,家庭背景
 DocType: Process Payroll,Send Email,发送电子邮件
 apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},警告：无效的附件{0}
@@ -673,22 +674,22 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Nos,Nos
 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 +668,My Invoices,我的发票
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +666,My Invoices,我的发票
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,未找到任何雇员
 DocType: Supplier Quotation,Stopped,已停止
 DocType: Item,If subcontracted to a vendor,如果分包给供应商
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,选择BOM展开
 DocType: SMS Center,All Customer Contact,所有的客户联系人
-apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,通过CSV文件上传库存余额
+apps/erpnext/erpnext/config/stock.py +149,Upload stock balance via csv.,通过CSV文件上传库存余额
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,立即发送
 ,Support Analytics,客户支持分析
 DocType: Item,Website Warehouse,网站仓库
 DocType: Payment Reconciliation,Minimum Invoice Amount,最小发票金额
 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 +179,C-Form records,C-表记录
-apps/erpnext/erpnext/config/selling.py +294,Customer and Supplier,客户和供应商
+apps/erpnext/erpnext/config/accounts.py +267,C-Form records,C-表记录
+apps/erpnext/erpnext/config/selling.py +301,Customer and Supplier,客户和供应商
 DocType: Email Digest,Email Digest Settings,邮件摘要设置
-apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,来自客户的支持记录。
+apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,来自客户的支持记录。
 DocType: Features Setup,"To enable ""Point of Sale"" features",为了使“销售点”的特点
 DocType: Bin,Moving Average Rate,移动平均价格
 DocType: Production Planning Tool,Select Items,选择品目
@@ -725,10 +726,10 @@
 DocType: Pricing Rule,Price or Discount,价格或折扣
 DocType: Sales Team,Incentives,奖励
 DocType: SMS Log,Requested Numbers,请求号码
-apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,绩效考核。
+apps/erpnext/erpnext/config/hr.py +146,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/selling.py +304,Point-of-Sale,销售点
+apps/erpnext/erpnext/config/selling.py +311,Point-of-Sale,销售点
 apps/erpnext/erpnext/accounts/doctype/account/account.py +115,"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,发布定价
@@ -746,12 +747,13 @@
 DocType: Supplier Quotation,Is Subcontracted,是否外包
 DocType: Item Attribute,Item Attribute Values,品目属性值
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,查看订阅
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +585,Purchase Receipt,外购入库单
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +618,Purchase Receipt,外购入库单
 ,Received Items To Be Billed,要支付的已收项目
 DocType: Employee,Ms,女士
-apps/erpnext/erpnext/config/accounts.py +158,Currency exchange rate master.,货币汇率大师
+apps/erpnext/erpnext/config/accounts.py +240,Currency exchange rate master.,货币汇率大师
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +263,Unable to find Time Slot in the next {0} days for Operation {1},找不到时隙在未来{0}天操作{1}
 DocType: Production Order,Plan material for sub-assemblies,计划材料为子组件
+apps/erpnext/erpnext/config/selling.py +99,Sales Partners and Territory,销售合作伙伴和地区
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,BOM{0}处于非活动状态
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,请选择文档类型第一
 apps/erpnext/erpnext/templates/generators/item.html +74,Goto Cart,转到车
@@ -762,7 +764,7 @@
 DocType: Bank Reconciliation,Total Amount,总金额
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,互联网出版
 DocType: Production Planning Tool,Production Orders,生产订单
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Balance Value,余额值
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,余额值
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,销售价格表
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,发布同步项目
 DocType: Bank Reconciliation,Account Currency,账户币种
@@ -794,16 +796,16 @@
 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 +110,Row #{0}: Please specify Serial No for Item {1},行＃{0}：请注明序号为项目{1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +532,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",对于“产品包”的物品，仓库，序列号和批号将被从“装箱单”表考虑。如果仓库和批次号是相同的任何“产品包”项目的所有包装物品，这些值可以在主项表中输入，值将被复制到“装箱单”表。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +539,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",对于“产品包”的物品，仓库，序列号和批号将被从“装箱单”表考虑。如果仓库和批次号是相同的任何“产品包”项目的所有包装物品，这些值可以在主项表中输入，值将被复制到“装箱单”表。
 DocType: Job Opening,Publish on website,发布在网站上
-apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,向客户发货。
+apps/erpnext/erpnext/config/stock.py +17,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,将付款金额=未偿还
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,方差
 ,Company Name,公司名称
 DocType: SMS Center,Total Message(s),总信息（s ）
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +642,Select Item for Transfer,对于转让项目选择
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +672,Select Item for Transfer,对于转让项目选择
 DocType: Purchase Invoice,Additional Discount Percentage,额外折扣百分比
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,查看所有帮助影片名单
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,请选择支票存入的银行账户头。
@@ -824,7 +826,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,白
 DocType: SMS Center,All Lead (Open),所有潜在客户（开放）
 DocType: Purchase Invoice,Get Advances Paid,获取已付预付款
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Make ,使
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Make ,使
 DocType: Journal Entry,Total Amount in Words,总金额词
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,发生了错误，一个可能的原因可能是您没有保存表单。如果问题仍然存在请联系管理员或support@erpnext.com。
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,我的购物车
@@ -836,7 +838,7 @@
 DocType: Journal Entry Account,Expense Claim,报销
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +180,Qty for {0},{0}数量
 DocType: Leave Application,Leave Application,假期申请
-apps/erpnext/erpnext/config/hr.py +85,Leave Allocation Tool,假期调配工具
+apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,假期调配工具
 DocType: Leave Block List,Leave Block List Dates,禁离日列表日期
 DocType: Company,If Monthly Budget Exceeded (for expense account),如果每月超出预算（用于报销）
 DocType: Workstation,Net Hour Rate,净小时价格
@@ -867,9 +869,10 @@
 DocType: Serial No,Creation Document No,创建文档编号
 DocType: Issue,Issue,问题
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,客户不与公司匹配
-apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.",品目变体的属性。如大小，颜色等。
+apps/erpnext/erpnext/config/stock.py +191,"Attributes for Item Variants. e.g Size, Color etc.",品目变体的属性。如大小，颜色等。
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,在制品仓库
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +181,Serial No {0} is under maintenance contract upto {1},序列号{0}截至至{1}之前在年度保养合同内。
+apps/erpnext/erpnext/config/hr.py +35,Recruitment,招聘
 DocType: BOM Operation,Operation,操作
 DocType: Lead,Organization Name,组织名称
 DocType: Tax Rule,Shipping State,运输状态
@@ -881,7 +884,7 @@
 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/stock.py +273,Making Stock Entries,制作Stock条目
+apps/erpnext/erpnext/config/stock.py +300,Making Stock Entries,制作Stock条目
 DocType: Packing Slip,Net Weight UOM,净重计量单位
 DocType: Item,Default Supplier,默认供应商
 DocType: Manufacturing Settings,Over Production Allowance Percentage,对生产补贴比例
@@ -891,17 +894,16 @@
 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 +145,Dr,借方
-apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,从供应商收到的报价。
+apps/erpnext/erpnext/config/buying.py +18,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,通过时间更新日志
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,平均年龄
 DocType: Opportunity,Your sales person who will contact the customer in future,联系客户的销售人员
 apps/erpnext/erpnext/public/js/setup_wizard.js +235,List a few of your suppliers. They could be organizations or individuals.,列出一些你的供应商，他们可以是组织或个人。
 DocType: Company,Default Currency,默认货币
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,客户&gt;客户组&gt;领地
 DocType: Contact,Enter designation of this Contact,输入联系人的职务
 DocType: Expense Claim,From Employee,来自员工
-apps/erpnext/erpnext/controllers/accounts_controller.py +337,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告： 因为{1}中的物件{0}为零，系统将不会检查超额
+apps/erpnext/erpnext/controllers/accounts_controller.py +334,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告： 因为{1}中的物件{0}为零，系统将不会检查超额
 DocType: Journal Entry,Make Difference Entry,创建差异分录
 DocType: Upload Attendance,Attendance From Date,考勤起始日期
 DocType: Appraisal Template Goal,Key Performance Area,关键绩效区
@@ -917,8 +919,8 @@
 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 +210,Production Order {0} must be cancelled before cancelling this Sales Order,生产订单{0}必须取消这个销售订单之前被取消
-apps/erpnext/erpnext/public/js/controllers/transaction.js +926,Please set 'Apply Additional Discount On',请设置“收取额外折扣”
+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/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',请设置“收取额外折扣”
 ,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.,选择时间记录然后提交来创建一个新的销售发票。
@@ -933,10 +935,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,完成项目{0}必须为制造类条目进入
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,打开会计平衡
 DocType: Sales Invoice Advance,Sales Invoice Advance,销售发票预付款
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,Nothing to request,没有申请内容
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +473,Nothing to request,没有申请内容
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',“实际开始日期”不能大于“实际结束日期'
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,管理人员
-apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,活动的考勤表类型
+apps/erpnext/erpnext/config/projects.py +45,Types of activities for Time Sheets,活动的考勤表类型
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},{0}需要指定借方或贷方金额
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""",这将追加到变异的项目代码。例如，如果你的英文缩写为“SM”，而该项目的代码是“T-SHIRT”，该变种的项目代码将是“T-SHIRT-SM”
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,保存工资单后会显示净支付金额(大写)。
@@ -951,12 +953,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS简介{0}已经为用户创建：{1}和公司{2}
 DocType: Purchase Order Item,UOM Conversion Factor,计量单位换算系数
 DocType: Stock Settings,Default Item Group,默认品目群组
-apps/erpnext/erpnext/config/buying.py +13,Supplier database.,供应商数据库。
+apps/erpnext/erpnext/config/buying.py +33,Supplier database.,供应商数据库。
 DocType: Account,Balance Sheet,资产负债表
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +573,Cost Center For Item with Item Code ',成本中心：品目代码‘
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',成本中心：品目代码‘
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,您的销售人员将在此日期收到联系客户的提醒
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,"Further accounts can be made under Groups, but entries can be made against non-Groups",进一步帐户可以根据组进行，但条目可针对非组进行
-apps/erpnext/erpnext/config/hr.py +133,Tax and other salary deductions.,税项及其他扣款。
+apps/erpnext/erpnext/config/hr.py +120,Tax and other salary deductions.,税项及其他扣款。
 DocType: Lead,Lead,线索
 DocType: Email Digest,Payables,应付账款
 DocType: Account,Warehouse,仓库
@@ -976,7 +978,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +410,'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/hr.py +220,Setting up Employees,建立职工
+apps/erpnext/erpnext/config/hr.py +242,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/setup_wizard/install_fixtures.py +138,Research,研究
@@ -1044,12 +1046,13 @@
 DocType: Journal Entry Account,Purchase Order,采购订单
 DocType: Warehouse,Warehouse Contact Info,仓库联系方式
 DocType: Address,City/Town,市/镇
+DocType: Address,Is Your Company Address,是你的公司地址
 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 +118,"For {0}, only credit accounts can be linked against another debit entry",对于{0}，贷方分录只能选择贷方账户
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +484,Delivery Note {0} is not submitted,送货单{0}未提交
-apps/erpnext/erpnext/stock/get_item_details.py +126,Item {0} must be a Sub-contracted Item,品目{0}必须是外包品目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +482,Delivery Note {0} is not submitted,送货单{0}未提交
+apps/erpnext/erpnext/stock/get_item_details.py +143,Item {0} must be a Sub-contracted Item,品目{0}必须是外包品目
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,资本设备
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",定价规则是第一选择是基于“应用在”字段，可以是项目，项目组或品牌。
 DocType: Hub Settings,Seller Website,卖家网站
@@ -1058,7 +1061,7 @@
 DocType: Appraisal Goal,Goal,目标
 DocType: Sales Invoice Item,Edit Description,编辑说明
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Expected Delivery Date is lesser than Planned Start Date.,预计交付日期比计划开始日期较小。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +757,For Supplier,对供应商
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +750,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,即将离任的总
@@ -1095,12 +1098,12 @@
 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 +167,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/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,总订单价值
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,食品
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,账龄范围3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +136,You can make a time log only against a submitted production order,您只能对已提交的生产订单进行时间日志记录
 DocType: Maintenance Schedule Item,No of Visits,访问数量
-apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",发给联系人和潜在客户的通讯
+apps/erpnext/erpnext/config/crm.py +68,"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}
 DocType: Project,Start and End Dates,开始和结束日期
@@ -1112,7 +1115,7 @@
 DocType: Purchase Invoice Item,Accounting,会计
 DocType: Features Setup,Features Setup,功能设置
 DocType: Item,Is Service Item,是否服务品目
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +83,Application period cannot be outside leave allocation period,申请期间不能请假外分配周期
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be outside leave allocation period,申请期间不能请假外分配周期
 DocType: Activity Cost,Projects,项目
 DocType: Payment Request,Transaction Currency,交易货币
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},来自{0} | {1} {2}
@@ -1132,16 +1135,16 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +210,Stock Entries already created for Production Order ,生产订单已创建库存条目
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,在固定资产净变动
 DocType: Leave Control Panel,Leave blank if considered for all designations,如果针对所有 职位请留空
-apps/erpnext/erpnext/controllers/accounts_controller.py +516,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}中的收取类型“实际”不能有“品目税率”
+apps/erpnext/erpnext/controllers/accounts_controller.py +513,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}中的收取类型“实际”不能有“品目税率”
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,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,对公司
-apps/erpnext/erpnext/config/support.py +38,Communication log.,通信日志。
+apps/erpnext/erpnext/config/support.py +17,Communication log.,通信日志。
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,采购数量
 DocType: Sales Invoice,Shipping Address Name,送货地址姓名
 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 +465,cannot be greater than 100,不能大于100
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +472,cannot be greater than 100,不能大于100
 apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,品目{0}不是库存品目
 DocType: Maintenance Visit,Unscheduled,计划外
 DocType: Employee,Owned,资
@@ -1163,11 +1166,11 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +156,Employee cannot report to himself.,雇员不能向自己报告。
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",如果科目被冻结，则只有特定用户才能创建分录。
 DocType: Email Digest,Bank Balance,银行存款余额
-apps/erpnext/erpnext/controllers/accounts_controller.py +450,Accounting Entry for {0}: {1} can only be made in currency: {2},会计分录为{0}：{1}只能在货币做：{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +447,Accounting Entry for {0}: {1} can only be made in currency: {2},会计分录为{0}：{1}只能在货币做：{2}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +44,No active Salary Structure found for employee {0} and the month,发现员工{0}，而该月没有活动的薪酬结构
 DocType: Job Opening,"Job profile, qualifications required etc.",工作概况，要求的学历等。
 DocType: Journal Entry Account,Account Balance,账户余额
-apps/erpnext/erpnext/config/accounts.py +122,Tax Rule for transactions.,税收规则进行的交易。
+apps/erpnext/erpnext/config/accounts.py +167,Tax Rule for transactions.,税收规则进行的交易。
 DocType: Rename Tool,Type of document to rename.,的文件类型进行重命名。
 apps/erpnext/erpnext/public/js/setup_wizard.js +276,We buy this Item,我们购买这些物件
 DocType: Address,Billing,账单
@@ -1180,7 +1183,7 @@
 DocType: Shipping Rule Condition,To Value,To值
 DocType: Supplier,Stock Manager,库存管理
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +142,Source warehouse is mandatory for row {0},行{0}中源仓库为必须项
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +593,Packing Slip,装箱单
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +600,Packing Slip,装箱单
 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!,导入失败！
@@ -1197,7 +1200,7 @@
 DocType: Notification Control,Expense Claim Rejected,报销拒绝
 DocType: Item Attribute,Item Attribute,品目属性
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,政府
-apps/erpnext/erpnext/config/stock.py +263,Item Variants,项目变体
+apps/erpnext/erpnext/config/stock.py +290,Item Variants,项目变体
 DocType: Company,Services,服务
 apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),总计（{0}）
 DocType: Cost Center,Parent Cost Center,父成本中心
@@ -1220,19 +1223,21 @@
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM详情编号
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),额外的优惠金额（公司货币）
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,请从科目表创建新帐户。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +652,Maintenance Visit,维护访问
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +659,Maintenance Visit,维护访问
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,可用的批次数量在仓库
 DocType: Time Log Batch Detail,Time Log Batch Detail,时间日志批量详情
 DocType: Landed Cost Voucher,Landed Cost Help,到岸成本帮助
+DocType: Purchase Invoice,Select Shipping Address,选择送货地址
 DocType: Leave Block List,Block Holidays on important days.,禁止重要日子的假期。
 ,Accounts Receivable Summary,应收账款汇总
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +194,Please set User ID field in an Employee record to set Employee Role,请在员工记录设置员工角色设置用户ID字段
 DocType: UOM,UOM Name,计量单位名称
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,贡献金额
-DocType: Sales Invoice,Shipping Address,送货地址
+DocType: Purchase Invoice,Shipping Address,送货地址
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,此工具可帮助您更新或修复系统中的库存数量和价值。它通常被用于同步系统值和实际存在于您的仓库。
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,大写金额将在送货单保存后显示。
-apps/erpnext/erpnext/config/stock.py +115,Brand master.,主要品牌
+apps/erpnext/erpnext/config/stock.py +196,Brand master.,主要品牌
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,供应商&gt;供应商类型
 DocType: Sales Invoice Item,Brand Name,品牌名称
 DocType: Purchase Receipt,Transporter Details,转运详细
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,箱
@@ -1250,7 +1255,7 @@
 ,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 +295,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 +62,Leaves Allocated Successfully for {0},已成功为{0}调配假期
@@ -1258,18 +1263,19 @@
 DocType: Shipping Rule Condition,From Value,起始值
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +540,Manufacturing Quantity is mandatory,生产数量为必须项
 DocType: Quality Inspection Reading,Reading 4,阅读4
-apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,公司开支报销
+apps/erpnext/erpnext/config/hr.py +131,Claims for company expense.,公司开支报销
 DocType: Company,Default Holiday List,默认假期列表
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,库存负债
 DocType: Purchase Receipt,Supplier Warehouse,供应商仓库
 DocType: Opportunity,Contact Mobile No,联系人手机号码
 ,Material Requests for which Supplier Quotations are not created,无供应商报价的物料申请
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +119,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,这一天（S）对你所申请休假的假期。你不需要申请许可。
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +120,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,这一天（S）对你所申请休假的假期。你不需要申请许可。
 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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,重新发送付款电子邮件
+apps/erpnext/erpnext/config/selling.py +210,Other Reports,其他报告
 DocType: Dependent Task,Dependent Task,相关任务
 apps/erpnext/erpnext/stock/doctype/item/item.py +344,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 +179,Leave of type {0} cannot be longer than {1},类型为{0}的假期不能长于{1}天
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +180,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,接收人列表
@@ -1287,7 +1293,7 @@
 DocType: Account,Account Name,帐户名称
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,起始日期不能大于结束日期
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,序列号{0}的数量{1}不能是分数
-apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,主要的供应商类型。
+apps/erpnext/erpnext/config/buying.py +38,Supplier Type master.,主要的供应商类型。
 DocType: Purchase Order Item,Supplier Part Number,供应商零件编号
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,汇率不能为0或1
 DocType: Purchase Invoice,Reference Document,参考文献
@@ -1319,7 +1325,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,应付账款净额变化
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,请验证您的电子邮件ID
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',”客户折扣“需要指定客户
-apps/erpnext/erpnext/config/accounts.py +58,Update bank payment dates with journals.,用日记账更新银行付款时间
+apps/erpnext/erpnext/config/accounts.py +129,Update bank payment dates with journals.,用日记账更新银行付款时间
 DocType: Quotation,Term Details,条款详情
 DocType: Manufacturing Settings,Capacity Planning For (Days),容量规划的期限（天）
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,没有一个项目无论在数量或价值的任何变化。
@@ -1331,8 +1337,9 @@
 DocType: Maintenance Visit,Partially Completed,部分完成
 DocType: Leave Type,Include holidays within leaves as leaves,叶叶子中包括节假日
 DocType: Sales Invoice,Packed Items,盒装项目
-apps/erpnext/erpnext/config/support.py +18,Warranty Claim against Serial No.,针对序列号提出的保修申请
+apps/erpnext/erpnext/config/support.py +48,Warranty Claim against Serial No.,针对序列号提出的保修申请
 DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM",在它使用的所有其他材料明细表替换特定的BOM。它将取代旧的BOM链接，更新成本和再生“BOM爆炸物品”表按照新的BOM
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +56,'Total',&#39;总&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,启用购物车
 DocType: Employee,Permanent Address,永久地址
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
@@ -1351,11 +1358,11 @@
 ,Item Shortage Report,品目短缺报告
 apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量被提及，\n请注明“重量计量单位”
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,创建此库存记录的物料申请
-apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,此品目的一件。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',时间日志批量{0}必须是'提交'
+apps/erpnext/erpnext/config/support.py +53,Single unit of an Item.,此品目的一件。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +215,Time Log Batch {0} must be 'Submitted',时间日志批量{0}必须是'提交'
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,为每个库存变动创建会计分录
 DocType: Leave Allocation,Total Leaves Allocated,分配的总叶
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +394,Warehouse required at Row No {0},在行无需仓库{0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,Warehouse required at Row No {0},在行无需仓库{0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +55,Please enter valid Financial Year Start and End Dates,请输入有效的财政年度开始和结束日期
 DocType: Employee,Date Of Retirement,退休日期
 DocType: Upload Attendance,Get Template,获取模板
@@ -1384,7 +1391,7 @@
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +29,Shopping Cart is enabled,购物车启用
 DocType: Job Applicant,Applicant for a Job,求职申请
 DocType: Production Plan Material Request,Production Plan Material Request,生产计划申请材料
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,暂无生产订单
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +232,No Production Orders created,暂无生产订单
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +151,Salary Slip of employee {0} already created for this month,雇员的本月工资单{0}已经创建过
 DocType: Stock Reconciliation,Reconciliation JSON,基于JSON格式对账
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,太多的列。导出报表，并使用电子表格应用程序进行打印。
@@ -1398,38 +1405,40 @@
 DocType: Employee,Leave Encashed?,假期已使用？
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,从机会是必选项
 DocType: Item,Variants,变种
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +766,Make Purchase Order,创建采购订单
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,创建采购订单
 DocType: SMS Center,Send To,发送到
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,There is not enough leave balance for Leave Type {0},假期类型{0}的余额不足了
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,There is not enough leave balance for Leave Type {0},假期类型{0}的余额不足了
 DocType: Payment Reconciliation Payment,Allocated amount,分配量
 DocType: Sales Team,Contribution to Net Total,贡献净总计
 DocType: Sales Invoice Item,Customer's Item Code,客户的品目编号
 DocType: Stock Reconciliation,Stock Reconciliation,库存盘点
 DocType: Territory,Territory Name,区域名称
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,提交前需要指定在制品仓库
-apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,求职申请。
+apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,求职申请。
 DocType: Purchase Order Item,Warehouse and Reference,仓库及参考
 DocType: Supplier,Statutory info and other general information about your Supplier,供应商的注册信息和其他一般信息
 apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,地址
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +142,Against Journal Entry {0} does not have any unmatched {1} entry,日记帐分录{0}没有不符合的{1}分录
+apps/erpnext/erpnext/config/hr.py +141,Appraisals,估价
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},品目{0}的序列号重复
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,发货规则的一个条件
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +337,Item is not allowed to have Production Order.,项目是不允许有生产订单。
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +147,Please set filter based on Item or Warehouse,根据项目或仓库请设置过滤器
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),此打包的净重。（根据内容物件的净重自动计算）
 DocType: Sales Order,To Deliver and Bill,为了提供与比尔
 DocType: GL Entry,Credit Amount in Account Currency,在账户币金额
-apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,时间日志制造。
+apps/erpnext/erpnext/config/manufacturing.py +27,Time Logs for manufacturing.,时间日志制造。
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,BOM{0}未提交
 DocType: Authorization Control,Authorization Control,授权控制
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},行＃{0}：拒绝仓库是强制性的反对否决项{1}
-apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,时间日志中的任务。
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +562,Payment,付款
+apps/erpnext/erpnext/config/projects.py +35,Time Log for tasks.,时间日志中的任务。
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,付款
 DocType: Production Order Operation,Actual Time and Cost,实际时间和成本
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},销售订单{2}中品目{1}的最大物流申请量为{0}
 DocType: Employee,Salutation,称呼
 DocType: Pricing Rule,Brand,品牌
 DocType: Item,Will also apply for variants,会同时应用于变体
-apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,在销售时捆绑品目。
+apps/erpnext/erpnext/config/stock.py +72,Bundle items at time of sale.,在销售时捆绑品目。
 DocType: Quotation Item,Actual Qty,实际数量
 DocType: Sales Invoice Item,References,参考
 DocType: Quality Inspection Reading,Reading 10,阅读10
@@ -1456,7 +1465,7 @@
 DocType: Sales Order Item,Delivery Warehouse,交货仓库
 DocType: Stock Settings,Allowance Percent,限额百分比
 DocType: SMS Settings,Message Parameter,消息参数
-apps/erpnext/erpnext/config/accounts.py +111,Tree of financial Cost Centers.,财务成本中心的树。
+apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,财务成本中心的树。
 DocType: Serial No,Delivery Document No,交货文档编号
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,从购买收据获取品目
 DocType: Serial No,Creation Date,创建日期
@@ -1471,7 +1480,7 @@
 DocType: Sales Person,Parent Sales Person,母公司销售人员
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,请在公司主及全球默认指定默认货币
 DocType: Purchase Invoice,Recurring Invoice,常用发票
-apps/erpnext/erpnext/config/projects.py +79,Managing Projects,项目管理
+apps/erpnext/erpnext/config/projects.py +78,Managing Projects,项目管理
 DocType: Supplier,Supplier of Goods or Services.,提供商品或服务的供应商。
 DocType: Budget Detail,Fiscal Year,财政年度
 DocType: Cost Center,Budget,预算
@@ -1488,7 +1497,7 @@
 ,Amount to Deliver,量交付
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,A Product or Service,产品或服务
 DocType: Naming Series,Current Value,当前值
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0}已创建
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +230,{0} created,{0}已创建
 DocType: Delivery Note Item,Against Sales Order,对销售订单
 ,Serial No Status,序列号状态
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +448,Item table can not be blank,品目表不能为空
@@ -1507,7 +1516,7 @@
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,将在网站显示的物件表
 DocType: Purchase Order Item Supplied,Supplied Qty,附送数量
 DocType: Production Order,Material Request Item,物料申请品目
-apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,树的项目组。
+apps/erpnext/erpnext/config/stock.py +85,Tree of Item Groups.,树的项目组。
 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/setup_wizard/install_fixtures.py +152,Red,红
@@ -1522,19 +1531,19 @@
 DocType: Issue,Resolution Details,详细解析
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,分配
 DocType: Quality Inspection Reading,Acceptance Criteria,验收标准
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +162,Please enter Material Requests in the above table,请输入在上表请求材料
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +160,Please enter Material Requests in the above table,请输入在上表请求材料
 DocType: Item Attribute,Attribute Name,属性名称
 DocType: Item Group,Show In Website,在网站上显示
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,组
 DocType: Task,Expected Time (in hours),预期时间（以小时计）
 ,Qty to Order,订购数量
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No",在下列文件送货单，机遇，材料要求，项目，采购订单，采购凭证，买方收货，报价单，销售发票，产品捆绑，销售订单，序列号跟踪名牌
-apps/erpnext/erpnext/config/projects.py +51,Gantt chart of all tasks.,所有任务的甘特图。
+apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,所有任务的甘特图。
 DocType: Appraisal,For Employee Name,对员工姓名
 DocType: Holiday List,Clear Table,清除表格
 DocType: Features Setup,Brands,品牌
 DocType: C-Form Invoice Detail,Invoice No,发票号码
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +94,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",离开不能应用/前{0}取消，因为假平衡已经被搬入转发在未来休假分配记录{1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +95,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",离开不能应用/前{0}取消，因为假平衡已经被搬入转发在未来休假分配记录{1}
 DocType: Activity Cost,Costing Rate,成本率
 ,Customer Addresses And Contacts,客户的地址和联系方式
 DocType: Employee,Resignation Letter Date,辞职信日期
@@ -1550,12 +1559,11 @@
 ,Maintenance Schedules,维护计划
 ,Quotation Trends,报价趋势
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},品目{0}的品目群组没有设置
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +310,Debit To account must be a Receivable account,入借帐户必须是应收账科目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +308,Debit To account must be a Receivable account,入借帐户必须是应收账科目
 DocType: Shipping Rule Condition,Shipping Amount,发货数量
 ,Pending Amount,待审核金额
 DocType: Purchase Invoice Item,Conversion Factor,转换系数
 DocType: Purchase Order,Delivered,已交付
-apps/erpnext/erpnext/config/hr.py +168,Setup incoming server for jobs email id. (e.g. jobs@example.com),设置接收简历的电子邮件地址 。 （例如jobs@example.com ）
 DocType: Purchase Receipt,Vehicle Number,车号
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,共分配叶{0}不能小于已经批准叶{1}期间
 DocType: Journal Entry,Accounts Receivable,应收帐款
@@ -1565,7 +1573,7 @@
 DocType: Bank Reconciliation,Include Reconciled Entries,包括核销分录
 DocType: Leave Control Panel,Leave blank if considered for all employee types,如果针对所有雇员类型请留空
 DocType: Landed Cost Voucher,Distribute Charges Based On,费用分配基于
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +320,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,因为账项{1}是一个资产条目，所以科目{0}的类型必须为“固定资产”
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +318,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,因为账项{1}是一个资产条目，所以科目{0}的类型必须为“固定资产”
 DocType: HR Settings,HR Settings,人力资源设置
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +127,Expense Claim is pending approval. Only the Expense Approver can update status.,报销正在等待批准。只有开支审批人才能更改其状态。
 DocType: Purchase Invoice,Additional Discount Amount,额外的折扣金额
@@ -1575,7 +1583,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,体育
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,实际总
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Unit,单位
-apps/erpnext/erpnext/stock/get_item_details.py +107,Please specify Company,请注明公司
+apps/erpnext/erpnext/stock/get_item_details.py +124,Please specify Company,请注明公司
 ,Customer Acquisition and Loyalty,客户获得和忠诚度
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,维护拒收物件的仓库
 apps/erpnext/erpnext/public/js/setup_wizard.js +42,Your financial year ends on,您的会计年度结束于
@@ -1590,12 +1598,12 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +49,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},批次{0}中，仓库{3}中品目{2}的库存余额将变为{1}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.",显示或隐藏如序列号，POS等特性。
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,下列资料的要求已自动根据项目的重新排序水平的提高
-apps/erpnext/erpnext/controllers/accounts_controller.py +252,Account {0} is invalid. Account Currency must be {1},帐户{0}是无效的。帐户货币必须是{1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +249,Account {0} is invalid. Account Currency must be {1},帐户{0}是无效的。帐户货币必须是{1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},行{0}计量单位换算系数是必须项
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +56,Clearance date cannot be before check date in row {0},行{0}中清拆日期不能在支票日期前
 DocType: Salary Slip,Deduction,扣款
-apps/erpnext/erpnext/stock/get_item_details.py +243,Item Price added for {0} in Price List {1},加入项目价格为{0}价格表{1}
+apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},加入项目价格为{0}价格表{1}
 DocType: Address Template,Address Template,地址模板
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,请输入这个销售人员的员工标识
 DocType: Territory,Classification of Customers by region,客户按区域分类
@@ -1626,7 +1634,7 @@
 DocType: Appraisal,Calculate Total Score,计算总分
 DocType: Supplier Quotation,Manufacturing Manager,生产经理
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +178,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/config/stock.py +154,Split Delivery Note into packages.,分裂送货单成包。
 apps/erpnext/erpnext/hooks.py +71,Shipments,发货
 DocType: Purchase Order Item,To be delivered to customer,要传送给客户
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +44,Time Log Status must be Submitted.,时间日志状态必须被提交。
@@ -1638,7 +1646,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,杂项开支
 DocType: Global Defaults,Default Company,默认公司
 apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,品目{0}必须指定开支/差异账户。
-apps/erpnext/erpnext/controllers/accounts_controller.py +353,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",不能为行{1}的{0}开具超过{2}的超额账单。要允许超额账单请更改仓储设置。
+apps/erpnext/erpnext/controllers/accounts_controller.py +350,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",不能为行{1}的{0}开具超过{2}的超额账单。要允许超额账单请更改仓储设置。
 DocType: Employee,Bank Name,银行名称
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-以上
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +139,User {0} is disabled,用户{0}已禁用
@@ -1646,10 +1654,9 @@
 DocType: Email Digest,Note: Email will not be sent to disabled users,注意：邮件不会发送给已禁用用户
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,选择公司...
 DocType: Leave Control Panel,Leave blank if considered for all departments,如果针对所有部门请留空
-apps/erpnext/erpnext/config/hr.py +103,"Types of employment (permanent, contract, intern etc.).",就业（永久，合同，实习生等）的类型。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +363,{0} is mandatory for Item {1},品目{1}必须有{0}
+apps/erpnext/erpnext/config/hr.py +175,"Types of employment (permanent, contract, intern etc.).",就业（永久，合同，实习生等）的类型。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +361,{0} is mandatory for Item {1},品目{1}必须有{0}
 DocType: Currency Exchange,From Currency,源货币
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",转到相应的组（通常是基金&gt;流动负债&gt;税和关税的来源，并创建一个新帐户（类型为“税”点击添加子），并做提税率。
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",请ATLEAST一行选择分配金额，发票类型和发票号码
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},销售订单为品目{0}的必须项
 DocType: Purchase Invoice Item,Rate (Company Currency),单价（公司货币）
@@ -1658,23 +1665,25 @@
 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,第一行的“收取类型”不能是“基于上一行的金额”或者“前一行的总计”
+apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,子项不应该是一个产品包。请删除项目`{0}`和保存
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,银行业
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,请在“生成表”点击获取时间表
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +296,New Cost Center,新建成本中心
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds &gt; Current Liabilities &gt; Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",转到相应的组（通常是基金&gt;流动负债&gt;税和关税的来源，并创建一个新帐户（类型为“税”点击添加子），并做提税率。
 DocType: Bin,Ordered Quantity,订购数量
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""",例如“建筑工人的建筑工具！”
 DocType: Quality Inspection,In Process,进行中
 DocType: Authorization Rule,Itemwise Discount,品目特定的折扣
-apps/erpnext/erpnext/config/accounts.py +46,Tree of financial accounts.,财务账目的树。
+apps/erpnext/erpnext/config/accounts.py +58,Tree of financial accounts.,财务账目的树。
 DocType: Purchase Order Item,Reference Document Type,参考文档类型
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,{0} against Sales Order {1},{0}不允许销售订单{1}
 DocType: Account,Fixed Asset,固定资产
-apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,序列化库存
+apps/erpnext/erpnext/config/stock.py +305,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,应收账款
 DocType: Quotation Item,Stock Balance,库存余额
-apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,销售订单到付款
+apps/erpnext/erpnext/config/selling.py +306,Sales Order to Payment,销售订单到付款
 DocType: Expense Claim Detail,Expense Claim Detail,报销详情
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +281,Time Logs created:,时间日志创建：
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,请选择正确的帐户
@@ -1689,12 +1698,12 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,电子
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,当库存达到再订购点时提出物料请求
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,全职
-DocType: Purchase Invoice,Contact Details,联系人详情
+DocType: Employee,Contact Details,联系人详情
 DocType: C-Form,Received Date,收到日期
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.",如果您已经创建了销售税和费模板标准模板，选择一个，然后点击下面的按钮。
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,请指定一个国家的这种运输规则或检查全世界运输
 DocType: Stock Entry,Total Incoming Value,总传入值
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +304,Debit To is required,借记是必需的
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To is required,借记是必需的
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,采购价格表
 DocType: Offer Letter Term,Offer Term,要约期限
 DocType: Quality Inspection,Quality Manager,质量经理
@@ -1703,8 +1712,8 @@
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Incharge Person's name,请选择Incharge人的名字
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,技术
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,报价函
-apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,生成材料要求(MRP)和生产订单。
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,总开票金额
+apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,生成材料要求(MRP)和生产订单。
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +62,Total Invoiced Amt,总开票金额
 DocType: Time Log,To Time,要时间
 DocType: Authorization Rule,Approving Role (above authorized value),批准角色（上述授权值）
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.",要添加子节点，探索树，然后单击要在其中添加更多节点的节点上。
@@ -1712,13 +1721,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +234,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 +121,"For {0}, only debit accounts can be linked against another credit entry",对于{0}，借方分录只能选择借方账户
-apps/erpnext/erpnext/stock/get_item_details.py +254,Price List {0} is disabled,价格表{0}被禁用
+apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,价格表{0}被禁用
 DocType: Manufacturing Settings,Allow Overtime,允许加班
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,品目{1}需要{0}的序列号。您已提供{2}。
 DocType: Stock Reconciliation Item,Current Valuation Rate,目前的估值价格
 DocType: Item,Customer Item Codes,客户项目代码
 DocType: Opportunity,Lost Reason,丧失原因
-apps/erpnext/erpnext/config/accounts.py +73,Create Payment Entries against Orders or Invoices.,创建订单或发票的支付分录。
+apps/erpnext/erpnext/config/accounts.py +123,Create Payment Entries against Orders or Invoices.,创建订单或发票的支付分录。
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,新地址
 DocType: Quality Inspection,Sample Size,样本大小
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +488,All items have already been invoiced,所有品目已开具发票
@@ -1759,7 +1768,7 @@
 DocType: Employee,Employment Details,就职信息
 DocType: Employee,New Workplace,新建工作地点
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,设置为关闭
-apps/erpnext/erpnext/stock/get_item_details.py +97,No Item with Barcode {0},没有条码为{0}的品目
+apps/erpnext/erpnext/stock/get_item_details.py +114,No Item with Barcode {0},没有条码为{0}的品目
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,箱号不能为0
 DocType: Features Setup,If you have Sales Team and Sale Partners (Channel Partners)  they can be tagged and maintain their contribution in the sales activity,如果你有销售团队和销售合作伙伴（渠道合作伙伴），你可以对其进行标记，同时管理他们的贡献。
 DocType: Item,Show a slideshow at the top of the page,在页面顶部显示幻灯片
@@ -1777,10 +1786,10 @@
 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 +575,Transfer Material,转印材料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +608,Transfer Material,转印材料
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be a Sales Item in {1},项{0}必须在销售物料{1}
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",设定流程，操作成本及向流程指定唯一的流程编号
-apps/erpnext/erpnext/public/js/controllers/transaction.js +843,Please set recurring after saving,请设置保存后复发
+apps/erpnext/erpnext/public/js/controllers/transaction.js +839,Please set recurring after saving,请设置保存后复发
 DocType: Purchase Invoice,Price List Currency,价格表货币
 DocType: Naming Series,User must always select,用户必须始终选择
 DocType: Stock Settings,Allow Negative Stock,允许负库存
@@ -1804,13 +1813,14 @@
 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,基于凭证分组
+apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,销售渠道
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,要求在
 DocType: Sales Invoice,Mass Mailing,邮件群发
 DocType: Rename Tool,File to Rename,文件重命名
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},请行选择BOM为项目{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +201,Please select BOM for Item in Row {0},请行选择BOM为项目{0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchse Order number required for Item {0},要求项目Purchse订单号{0}
 apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},品目{1}指定的BOM{0}不存在
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +198,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消维护计划{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消维护计划{0}
 DocType: Notification Control,Expense Claim Approved,报销批准
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,医药
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,采购品目成本
@@ -1824,10 +1834,9 @@
 DocType: Buying Settings,Buying Settings,采购设置
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,成品品目的BOM编号
 DocType: Upload Attendance,Attendance To Date,考勤结束日期
-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 Gateway Account,Payment Account,付款帐号
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +730,Please specify Company to proceed,请注明公司进行
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,请注明公司进行
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,应收账款净额变化
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,补假
 DocType: Quality Inspection Reading,Accepted,已接受
@@ -1837,7 +1846,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} {1}不能大于生产订单{3}的计划数量({2})
 DocType: Shipping Rule,Shipping Rule Label,配送规则标签
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Raw Materials cannot be blank.,原材料不能为空。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.",无法更新库存，发票包含下降航运项目。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +423,"Could not update stock, invoice contains drop shipping item.",无法更新库存，发票包含下降航运项目。
 DocType: Newsletter,Test,测试
 apps/erpnext/erpnext/stock/doctype/item/item.py +402,"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'",由于有存量交易为这个项目，\你不能改变的值'有序列号'，'有批号'，'是库存项目“和”评估方法“
@@ -1845,9 +1854,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,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 +209,Please enter Planned Qty for Item {0} at row {1},请输入计划数量的项目{0}在行{1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +206,Please enter Planned Qty for Item {0} at row {1},请输入计划数量的项目{0}在行{1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1}未提交
-apps/erpnext/erpnext/config/stock.py +18,Requests for items.,请求的项目。
+apps/erpnext/erpnext/config/stock.py +27,Requests for items.,请求的项目。
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,独立的生产订单将每个成品项目被创建。
 DocType: Purchase Invoice,Terms and Conditions1,条款和条件1
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",会计分录冻结截止至此日期，除了以下角色禁止录入/修改。
@@ -1855,13 +1864,13 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,项目状态
 DocType: UOM,Check this to disallow fractions. (for Nos),要对编号禁止分数，请勾选此项。
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +366,The following Production Orders were created:,创建以下生产订单：
-apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,时事通讯录
+apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,时事通讯录
 DocType: Delivery Note,Transporter Name,转运名称
 DocType: Authorization Rule,Authorized Value,授权值
 DocType: Contact,Enter department to which this Contact belongs,输入此联系人所属的部门
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,共缺席
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +734,Item or Warehouse for row {0} does not match Material Request,行{0}中的品目或仓库与物料申请不符合
-apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,计量单位
+apps/erpnext/erpnext/config/stock.py +185,Unit of Measure,计量单位
 DocType: Fiscal Year,Year End Date,年度结束日期
 DocType: Task Depends On,Task Depends On,任务取决于
 DocType: Lead,Opportunity,机会
@@ -1872,7 +1881,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1}关闭
 DocType: Email Digest,How frequently?,多经常？
 DocType: Purchase Receipt,Get Current Stock,获取当前库存
-apps/erpnext/erpnext/config/manufacturing.py +63,Tree of Bill of Materials,物料清单树
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds &gt; Current Assets &gt; Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",转到相应的组（通常是基金的流动资产应用&gt;&gt;银行账户，并创建一个新帐户（点击添加子）类型的“银行”
+apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,物料清单树
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,马克现在
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +185,Maintenance start date can not be before delivery date for Serial No {0},序列号为{0}的开始日期不能早于交付日期
 DocType: Production Order,Actual End Date,实际结束日期
@@ -1933,7 +1943,7 @@
 DocType: Payment Reconciliation,Bank / Cash Account,银行/现金账户
 DocType: Tax Rule,Billing City,结算城市
 DocType: Global Defaults,Hide Currency Symbol,隐藏货币符号
-apps/erpnext/erpnext/config/accounts.py +174,"e.g. Bank, Cash, Credit Card",例如：银行，现金，信用卡
+apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card",例如：银行，现金，信用卡
 DocType: Journal Entry,Credit Note,贷项通知单
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +218,Completed Qty cannot be more than {0} for operation {1},完成数量不能超过{0}操作{1}
 DocType: Features Setup,Quality,质量
@@ -1956,8 +1966,8 @@
 DocType: Purchase Receipt,Time at which materials were received,收到材料在哪个时间
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,我的地址
 DocType: Stock Ledger Entry,Outgoing Rate,传出率
-apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,组织分支主。
-apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,或
+apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,组织分支主。
+apps/erpnext/erpnext/controllers/accounts_controller.py +250, 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 +65,90-Above,90以上
@@ -1979,15 +1989,16 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},重复的条目，请检查授权规则{0}
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +25,Global POS Profile {0} already created for company {1},全球POS档案{0}的公司已经创建{1}
 DocType: Purchase Order,Ref SQ,参考SQ
-apps/erpnext/erpnext/config/manufacturing.py +56,Replace Item / BOM in all BOMs,更换项目/物料清单中的所有材料明细表
+apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,更换项目/物料清单中的所有材料明细表
 DocType: Purchase Order Item,Received Qty,收到数量
 DocType: Stock Entry Detail,Serial No / Batch,序列号/批次
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +297,Not Paid and Not Delivered,没有支付，未送达
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +295,Not Paid and Not Delivered,没有支付，未送达
 DocType: Product Bundle,Parent Item,父项目
 DocType: Account,Account Type,账户类型
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,休假类型{0}不能随身转发
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',维护计划没有为所有品目生成，请点击“生产计划”
 ,To Produce,以生产
+apps/erpnext/erpnext/config/hr.py +93,Payroll,工资表
 apps/erpnext/erpnext/accounts/doctype/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),打包品目的名称
 DocType: Bin,Reserved Quantity,保留数量
@@ -1996,7 +2007,7 @@
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,自定义表单
 DocType: Account,Income Account,收益账户
 DocType: Payment Request,Amount in customer's currency,量客户的货币
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +647,Delivery,交货
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +654,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,关键责任区
@@ -2015,19 +2026,19 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,营销和销售主管
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,所得税
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.",如果选择的定价规则是由为'价格'，它将覆盖价目表。定价规则价格是最终价格，所以没有进一步的折扣应适用。因此，在像销售订单，采购订单等交易，这将是“速度”字段进账，而不是“价格单率”字段。
-apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,轨道信息通过行业类型。
+apps/erpnext/erpnext/config/selling.py +168,Track Leads by Industry Type.,轨道信息通过行业类型。
 DocType: Item Supplier,Item Supplier,品目供应商
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +326,Please enter Item Code to get batch no,请输入产品编号，以获得批号
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +658,Please select a value for {0} quotation_to {1},请选择一个值{0} quotation_to {1}
-apps/erpnext/erpnext/config/selling.py +33,All Addresses.,所有地址。
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +665,Please select a value for {0} quotation_to {1},请选择一个值{0} quotation_to {1}
+apps/erpnext/erpnext/config/selling.py +47,All Addresses.,所有地址。
 DocType: Company,Stock Settings,库存设置
 apps/erpnext/erpnext/accounts/doctype/account/account.py +218,"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/config/crm.py +92,Manage Customer Group Tree.,管理客户群组
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +298,New Cost Center Name,新建成本中心名称
 DocType: Leave Control Panel,Leave Control Panel,假期控制面板
 DocType: Appraisal,HR User,HR用户
 DocType: Purchase Invoice,Taxes and Charges Deducted,已扣除税费
-apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,问题
+apps/erpnext/erpnext/config/support.py +7,Issues,问题
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},状态必须是{0}中的一个
 DocType: Sales Invoice,Debit To,入借
 DocType: Delivery Note,Required only for sample item.,只对样品项目所需。
@@ -2047,10 +2058,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,大
 DocType: C-Form Invoice Detail,Territory,区域
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please mention no of visits required,请注明无需访问
-DocType: Purchase Order,Customer Address Display,客户地址显示
 DocType: Stock Settings,Default Valuation Method,默认估值方法
 DocType: Production Order Operation,Planned Start Time,计划开始时间
-apps/erpnext/erpnext/config/accounts.py +68,Close Balance Sheet and book Profit or Loss.,关闭资产负债表，打开损益表。
+apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,关闭资产负债表，打开损益表。
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,指定货币兑换的汇率
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +142,Quotation {0} is cancelled,报价{0}已被取消
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,未偿还总额
@@ -2118,7 +2128,7 @@
 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/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,管理区域
+apps/erpnext/erpnext/config/crm.py +101,Manage Territory Tree.,管理区域
 DocType: Journal Entry Account,Sales Invoice,销售发票
 DocType: Journal Entry Account,Party Balance,党平衡
 DocType: Sales Invoice Item,Time Log Batch,时间日志批
@@ -2144,9 +2154,10 @@
 DocType: BOM,Item UOM,品目计量单位
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),税额后，优惠金额（公司货币）
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +148,Target warehouse is mandatory for row {0},行{0}必须指定目标仓库
+DocType: Purchase Invoice,Select Supplier Address,选择供应商地址
 DocType: Quality Inspection,Quality Inspection,质量检验
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,超小
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +546,Warning: Material Requested Qty is less than Minimum Order Qty,警告：物料请求的数量低于最低起订量
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Warning: Material Requested Qty is less than Minimum Order Qty,警告：物料请求的数量低于最低起订量
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +190,Account {0} is frozen,科目{0}已冻结
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,属于本机构的，带独立科目表的法人/附属机构。
 DocType: Payment Request,Mute Email,静音电子邮件
@@ -2156,7 +2167,7 @@
 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}第一
+apps/erpnext/erpnext/public/js/utils/party.js +124,Please enter {0} first,请输入{0}第一
 DocType: Production Order Operation,Actual End Time,实际结束时间
 DocType: Production Planning Tool,Download Materials Required,下载所需物料
 DocType: Item,Manufacturer Part Number,制造商零件编号
@@ -2169,26 +2180,26 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,颜色
 DocType: Maintenance Visit,Scheduled,已计划
 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",请选择项，其中“正股项”是“否”和“是销售物品”是“是”，没有其他产品捆绑
-apps/erpnext/erpnext/controllers/accounts_controller.py +408,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),总的超前（{0}）对二阶{1}不能大于总计（{2}）
+apps/erpnext/erpnext/controllers/accounts_controller.py +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),总的超前（{0}）对二阶{1}不能大于总计（{2}）
 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 +275,Price List Currency not selected,价格表货币没有选择
+apps/erpnext/erpnext/stock/get_item_details.py +294,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 +157,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 +158,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,重命名日志
 DocType: Installation Note Item,Against Document No,对文档编号
-apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,管理销售合作伙伴。
+apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,管理销售合作伙伴。
 DocType: Quality Inspection,Inspection Type,检验类型
-apps/erpnext/erpnext/controllers/recurring_document.py +168,Please select {0},请选择{0}
+apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},请选择{0}
 DocType: C-Form,C-Form No,C-表编号
 DocType: BOM,Exploded_items,展开品目
 DocType: Employee Attendance Tool,Unmarked Attendance,无标记考勤
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,研究员
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,请在发送之前保存通讯
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,姓名或电子邮件是强制性
-apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,来料质量检验。
+apps/erpnext/erpnext/config/stock.py +159,Incoming quality inspection.,来料质量检验。
 DocType: Purchase Order Item,Returned Qty,返回的数量
 DocType: Employee,Exit,退出
 apps/erpnext/erpnext/accounts/doctype/account/account.py +155,Root Type is mandatory,根类型是强制性的
@@ -2204,13 +2215,13 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +356,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/config/crm.py +132,Logs for maintaining sms delivery status,日志维护短信发送状态
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,待活动
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,确认
 DocType: Payment Gateway,Gateway,网关
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Please enter relieving date.,请输入解除日期。
-apps/erpnext/erpnext/controllers/trends.py +138,Amt,金额
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,只留下带有状态的应用“已批准” ，可以提交
+apps/erpnext/erpnext/controllers/trends.py +141,Amt,金额
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,Only Leave Applications with status 'Approved' can be submitted,只留下带有状态的应用“已批准” ，可以提交
 apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,地址标题是必须项。
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,如果询价的来源是活动的话请输入活动名称。
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,报纸出版商
@@ -2228,7 +2239,7 @@
 DocType: Sales Invoice,Sales Team,销售团队
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,重复的条目
 DocType: Serial No,Under Warranty,在保修期内
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +408,[Error],[错误]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +410,[Error],[错误]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,大写金额将在销售订单保存后显示。
 ,Employee Birthday,雇员生日
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,创业投资
@@ -2260,9 +2271,9 @@
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,选择交易类型
 DocType: GL Entry,Voucher No,凭证编号
 DocType: Leave Allocation,Leave Allocation,假期调配
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,Material Requests {0} created,物料申请{0}已创建
-apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,条款或合同模板。
-DocType: Customer,Address and Contact,地址和联系方式
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +471,Material Requests {0} created,物料申请{0}已创建
+apps/erpnext/erpnext/config/selling.py +158,Template of terms or contract.,条款或合同模板。
+DocType: Purchase Invoice,Address and Contact,地址和联系方式
 DocType: Supplier,Last Day of the Next Month,下个月的最后一天
 DocType: Employee,Feedback,反馈
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",假，不是之前分配{0}，因为休假余额已经结转转发在未来的假期分配记录{1}
@@ -2294,7 +2305,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +226,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.,销售业务的税务模板。
+apps/erpnext/erpnext/config/selling.py +163,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,会计经理
@@ -2306,12 +2317,12 @@
 DocType: Payment Request,Reference Details,详细参考信息
 DocType: Sales Invoice Item,Available Qty at Warehouse,库存可用数量
 ,Billed Amount,已开票金额
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,Closed order cannot be cancelled. Unclose to cancel.,关闭的定单不能被取消。 Unclose取消。
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +163,Closed order cannot be cancelled. Unclose to cancel.,关闭的定单不能被取消。 Unclose取消。
 DocType: Bank Reconciliation,Bank Reconciliation,银行对帐
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,获取更新
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +135,Material Request {0} is cancelled or stopped,物料申请{0}已取消或已停止
 apps/erpnext/erpnext/public/js/setup_wizard.js +287,Add a few sample records,添加了一些样本记录
-apps/erpnext/erpnext/config/hr.py +225,Leave Management,离开管理
+apps/erpnext/erpnext/config/hr.py +247,Leave Management,离开管理
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,基于账户分组
 DocType: Sales Order,Fully Delivered,完全交付
 DocType: Lead,Lower Income,较低收益
@@ -2328,6 +2339,7 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +137,Customer {0} does not belong to project {1},客户{0}不属于项目{1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,显着的考勤HTML
 DocType: Sales Order,Customer's Purchase Order,客户采购订单
+apps/erpnext/erpnext/config/stock.py +108,Serial No and Batch,序列号和批次
 DocType: Warranty Claim,From Company,源公司
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,价值或数量
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +368,Productions Orders cannot be raised for:,制作订单不能上调：
@@ -2351,7 +2363,7 @@
 DocType: Appraisal,Appraisal,评估
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,日期重复
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,授权签字人
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +186,Leave approver must be one of {0},假期审批人有{0}的角色
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +187,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,开始时间
@@ -2371,7 +2383,7 @@
 DocType: Purchase Receipt Item,Purchase Order Item No,采购订单编号
 DocType: Project,Project Type,项目类型
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,需要指定目标数量和金额。
-apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,各种活动的费用
+apps/erpnext/erpnext/config/projects.py +50,Cost of various activities,各种活动的费用
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +103,Not allowed to update stock transactions older than {0},不允许对早于{0}的库存交易进行更新
 DocType: Item,Inspection Required,需要检验
 DocType: Purchase Invoice Item,PR Detail,PR详细
@@ -2397,6 +2409,7 @@
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,客户群组/客户
 DocType: Payment Gateway Account,Default Payment Request Message,默认的付款请求消息
 DocType: Item Group,Check this if you want to show in website,要显示在网站上，请勾选此项。
+apps/erpnext/erpnext/config/accounts.py +118,Banking and Payments,银行和支付
 ,Welcome to ERPNext,欢迎使用ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,凭证详情编号
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,导致报价
@@ -2412,19 +2425,20 @@
 DocType: Issue,Opening Date,开幕日期
 DocType: Journal Entry,Remark,备注
 DocType: Purchase Receipt Item,Rate and Amount,单价及小计
+apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,叶子度假
 DocType: Sales Order,Not Billed,未开票
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,两个仓库必须属于同一公司
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,暂无联系人。
 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.,供应商开出的账单
+apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,供应商开出的账单
 DocType: POS Profile,Write Off Account,核销帐户
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,折扣金额
 DocType: Purchase Invoice,Return Against Purchase Invoice,回到对采购发票
 DocType: Item,Warranty Period (in days),保修期限（天数）
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,从运营的净现金
 apps/erpnext/erpnext/public/js/setup_wizard.js +199,e.g. VAT,例如增值税
-apps/erpnext/erpnext/config/hr.py +65,Mark Employee Attendance in Bulk,马克员工考勤散装
+apps/erpnext/erpnext/config/hr.py +18,Mark Employee Attendance in Bulk,马克员工考勤散装
 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,报价系列
@@ -2447,7 +2461,7 @@
 DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,要在提交工资单后将工资单通过邮件发送至各个雇员，请勾选
 DocType: Lead,Address Desc,地址倒序
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,必须至少选择'销售'或'采购'其中的一项
-apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,生产流程进行的地方。
+apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,生产流程进行的地方。
 DocType: Stock Entry Detail,Source Warehouse,源仓库
 DocType: Installation Note,Installation Date,安装日期
 DocType: Employee,Confirmation Date,确认日期
@@ -2482,7 +2496,7 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM税率
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,请送货单拉项目
 apps/erpnext/erpnext/accounts/utils.py +270,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/config/crm.py +73,"Record of all communications of type email, phone, chat, visit, etc.",包含电子邮件，电话，聊天，访问等所有通信记录
 DocType: Manufacturer,Manufacturers used in Items,在项目中使用制造商
 apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,请提及公司舍入成本中心
 DocType: Purchase Invoice,Terms,条款
@@ -2500,7 +2514,9 @@
 apps/erpnext/erpnext/templates/pages/order.html +67,Rate: {0},价格：{0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,工资单扣款
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,Select a group node first.,请先选择一个组节点。
+apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,员工考勤
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +73,Purpose must be one of {0},目的必须是一个{0}
+apps/erpnext/erpnext/utilities/doctype/address/address.py +78,"Remove reference of customer, supplier, sales partner and lead, as it is your company address",删除客户，供应商，销售伙伴和铅的参考，因为它是你的公司地址
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,Fill the form and save it,填写表格并保存
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,下载一个包含所有原材料及其库存状态的报告
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,社区论坛
@@ -2523,7 +2539,8 @@
 DocType: BOM Replace Tool,BOM Replace Tool,BOM替换工具
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,国家的默认地址模板
 DocType: Sales Order Item,Supplier delivers to Customer,供应商提供给客户
-apps/erpnext/erpnext/public/js/controllers/transaction.js +770,Show tax break-up,展会税分手
+apps/erpnext/erpnext/controllers/recurring_document.py +173,Next Date must be greater than Posting Date,下一个日期必须大于过帐日期更大
+apps/erpnext/erpnext/public/js/controllers/transaction.js +766,Show tax break-up,展会税分手
 apps/erpnext/erpnext/accounts/party.py +283,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',如果贵司涉及生产活动，将启动品目的“是否生产”属性
@@ -2536,12 +2553,12 @@
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,创建维护访问
 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 +84,Company (not Customer or Supplier) master.,公司(非客户或供应商)大师。
+apps/erpnext/erpnext/config/accounts.py +45,Company (not Customer or Supplier) master.,公司(非客户或供应商)大师。
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Please enter 'Expected Delivery Date',请输入“预产期”
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +183,Delivery Notes {0} must be cancelled before cancelling this Sales Order,取消这个销售订单之前必须取消送货单{0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +381,Paid amount + Write Off Amount can not be greater than Grand Total,支付的金额+写的抵销金额不能大于总计
+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/accounts/doctype/sales_invoice/sales_invoice.py +379,Paid amount + Write Off Amount can not be greater than Grand Total,支付的金额+写的抵销金额不能大于总计
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +80,{0} is not a valid Batch Number for Item {1},{0}不是品目{1}的有效批次号
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,Note: There is not enough leave balance for Leave Type {0},注意：假期类型{0}的余量不足
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +128,Note: There is not enough leave balance for Leave Type {0},注意：假期类型{0}的余量不足
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.",注意：如果付款没有任何参考，请手动创建一个日记账分录。
 DocType: Item,Supplier Items,供应商品目
 DocType: Opportunity,Opportunity Type,机会类型
@@ -2553,7 +2570,7 @@
 DocType: Hub Settings,Publish Availability,发布房源
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +109,Date of Birth cannot be greater than today.,出生日期不能大于今天。
 ,Stock Ageing,库存账龄
-apps/erpnext/erpnext/controllers/accounts_controller.py +216,{0} '{1}' is disabled,{0}“{1}”被禁用
+apps/erpnext/erpnext/controllers/accounts_controller.py +213,{0} '{1}' is disabled,{0}“{1}”被禁用
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,设置为打开
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,交易提交时自动向联系人发送电子邮件。
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +229,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2563,14 +2580,13 @@
 DocType: Purchase Order,Customer Contact Email,客户联系电子邮件
 DocType: Warranty Claim,Item and Warranty Details,项目和保修细节
 DocType: Sales Team,Contribution (%),贡献（％）
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注意：付款分录不会创建，因为“现金或银行账户”没有指定
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注意：付款分录不会创建，因为“现金或银行账户”没有指定
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,职责
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,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/public/js/setup_wizard.js +161,Add Users,添加用户
 DocType: Pricing Rule,Item Group,品目群组
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,请设置命名为系列{0}通过设置&gt;设置&gt;命名系列
 DocType: Task,Actual Start Date (via Time Logs),实际开始日期（通过时间日志）
 DocType: Stock Reconciliation Item,Before reconciliation,在对账前
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
@@ -2579,7 +2595,7 @@
 DocType: Sales Order,Partly Billed,天色帐单
 DocType: Item,Default BOM,默认的BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Please re-type company name to confirm,请确认重新输入公司名称
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,总街货量金额
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +64,Total Outstanding Amt,总街货量金额
 DocType: Time Log Batch,Total Hours,总时数
 DocType: Journal Entry,Printing Settings,打印设置
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},总借记必须等于总积分。
@@ -2588,7 +2604,7 @@
 DocType: Time Log,From Time,起始时间
 DocType: Notification Control,Custom Message,自定义消息
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,投资银行业务
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,Cash or Bank Account is mandatory for making payment entry,“现金”或“银行账户”是付款分录的必须项
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +375,Cash or Bank Account is mandatory for making payment entry,“现金”或“银行账户”是付款分录的必须项
 DocType: Purchase Invoice,Price List Exchange Rate,价目表汇率
 DocType: Purchase Invoice Item,Rate,单价
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,实习生
@@ -2597,14 +2613,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,基本
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +96,Stock transactions before {0} are frozen,早于{0}的库存事务已冻结
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,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 +105,"e.g. Kg, Unit, Nos, m",如公斤，单元，号数，米
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,日期应该是一样的起始日期为半天假
+apps/erpnext/erpnext/config/stock.py +186,"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/hr/doctype/employee/employee.py +112,Date of Joining must be greater than Date of Birth,入职日期必须大于出生日期
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +26,Salary Structure,薪酬结构
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +29,Salary Structure,薪酬结构
 DocType: Account,Bank,银行
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,航空公司
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,发料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +612,Issue Material,发料
 DocType: Material Request Item,For Warehouse,对仓库
 DocType: Employee,Offer Date,报价有效期
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,语录
@@ -2624,6 +2640,7 @@
 DocType: Sales Partner,Sales Partner Name,销售合作伙伴名称
 DocType: Payment Reconciliation,Maximum Invoice Amount,最大发票额
 DocType: Purchase Invoice Item,Image View,图像查看
+apps/erpnext/erpnext/config/selling.py +23,Customers,顾客
 DocType: Issue,Opening Time,开放时间
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,必须指定起始和结束日期
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,证券及商品交易
@@ -2642,14 +2659,14 @@
 DocType: Journal Entry,Print Heading,打印标题
 DocType: Quotation,Maintenance Manager,维护经理
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,总不能为零
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,“ 最后的订单到目前的天数”必须大于或等于零
+apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,“ 最后的订单到目前的天数”必须大于或等于零
 DocType: C-Form,Amended From,修订源
 apps/erpnext/erpnext/public/js/setup_wizard.js +269,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 +198,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 +466,No default BOM exists for Item {0},品目{0}没有默认的BOM
+apps/erpnext/erpnext/stock/get_item_details.py +486,No default BOM exists for Item {0},品目{0}没有默认的BOM
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,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,顺延
@@ -2663,11 +2680,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',分类是“估值”或“估值和总计”的时候不能扣税。
 apps/erpnext/erpnext/public/js/setup_wizard.js +191,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.",列出你的头税（如增值税，关税等，它们应该具有唯一的名称）及其标准费率。这将创建一个标准的模板，你可以编辑和多以后添加。
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},序列化的品目{0}必须指定序列号
+apps/erpnext/erpnext/config/accounts.py +133,Match Payments with Invoices,匹配付款与发票
 DocType: Journal Entry,Bank Entry,银行记录
 DocType: Authorization Rule,Applicable To (Designation),适用于(指定)
 apps/erpnext/erpnext/templates/generators/item.html +68,Add to Cart,加入购物车
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,分组基于
-apps/erpnext/erpnext/config/accounts.py +153,Enable / disable currencies.,启用/禁用货币。
+apps/erpnext/erpnext/config/accounts.py +235,Enable / disable currencies.,启用/禁用货币。
 DocType: Production Planning Tool,Get Material Request,获取材质要求
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,邮政费用
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),共（AMT）
@@ -2675,18 +2693,18 @@
 DocType: Quality Inspection,Item Serial No,品目序列号
 apps/erpnext/erpnext/controllers/status_updater.py +143,{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 +56,Total Present,总现
+apps/erpnext/erpnext/config/accounts.py +89,Accounting Statements,会计报表
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Hour,小时
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",序列化的品目{0}不能被“库存盘点”更新
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,新序列号不能有仓库，仓库只能通过库存记录和采购收据设置。
 DocType: Lead,Lead Type,线索类型
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,You are not authorized to approve leaves on Block Dates,您无权批准叶子座日期
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +112,You are not authorized to approve leaves on Block Dates,您无权批准叶子座日期
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +353,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,更换后的物料清单
 DocType: Features Setup,Point of Sale,销售点
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +28,Please setup Employee Naming System in Human Resource &gt; HR Settings,请安装员工在人力资源命名系统&gt; HR设置
 DocType: Account,Tax,税项
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},行{0}：{1}不是有效的{2}
 DocType: Production Planning Tool,Production Planning Tool,生产规划工具
@@ -2696,7 +2714,7 @@
 DocType: Features Setup,Item Groups in Details,详细品目群组
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Quantity to Manufacture must be greater than 0.,量生产必须大于0。
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),起点的销售终端（POS）
-apps/erpnext/erpnext/config/support.py +28,Visit report for maintenance call.,保养电话的现场报告。
+apps/erpnext/erpnext/config/support.py +32,Visit report for maintenance call.,保养电话的现场报告。
 DocType: Stock Entry,Update Rate and Availability,更新率和可用性
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,百分比你被允许接收或传递更多针对订购的数量。例如：如果您订购100个单位。和你的津贴是10％，那么你被允许接收110个单位。
 DocType: Pricing Rule,Customer Group,客户群组
@@ -2710,14 +2728,13 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,无需编辑。
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,本月和待活动总结
 DocType: Customer Group,Customer Group Name,客户群组名称
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,Please remove this Invoice {0} from C-Form {1},请删除此发票{0}从C-表格{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,Please remove this Invoice {0} from C-Form {1},请删除此发票{0}从C-表格{1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,请选择结转，如果你还需要包括上一会计年度的资产负债叶本财年
 DocType: GL Entry,Against Voucher Type,对凭证类型
 DocType: Item,Attributes,属性
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +486,Get Items,获取品目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +519,Get Items,获取品目
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,请输入核销帐户
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,产品编号&gt;项目组&gt;品牌
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,最后订购日期
+apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,最后订购日期
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},帐户{0}不属于公司{1}
 DocType: C-Form,C-Form,C-表
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +143,Operation ID not set,操作ID没有设置
@@ -2728,17 +2745,18 @@
 DocType: Purchase Invoice,Mobile No,手机号码
 DocType: Payment Tool,Make Journal Entry,创建日记帐分录
 DocType: Leave Allocation,New Leaves Allocated,新调配的假期
-apps/erpnext/erpnext/controllers/trends.py +258,Project-wise data is not available for Quotation,项目明智的数据不适用于报价
+apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,项目明智的数据不适用于报价
 DocType: Project,Expected End Date,预计结束日期
 DocType: Appraisal Template,Appraisal Template Title,评估模板标题
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +343,Commercial,广告
-apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,父项{0}不能是库存产品
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} &gt; {1},错误：{0}&gt; {1}
+apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,父项{0}不能是库存产品
 DocType: Cost Center,Distribution Id,分配标识
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,优质服务
-apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,所有的产品或服务。
-DocType: Purchase Invoice,Supplier Address,供应商地址
+apps/erpnext/erpnext/config/manufacturing.py +52,All Products or Services.,所有的产品或服务。
+DocType: Supplier Quotation,Supplier Address,供应商地址
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,输出数量
-apps/erpnext/erpnext/config/accounts.py +138,Rules to calculate shipping amount for a sale,用来计算销售运输量的规则
+apps/erpnext/erpnext/config/accounts.py +251,Rules to calculate shipping amount for a sale,用来计算销售运输量的规则
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,系列是必须项
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,金融服务
 apps/erpnext/erpnext/controllers/item_variant.py +62,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},为属性{0}值必须的范围内{1}到{2}中的增量{3}
@@ -2749,15 +2767,16 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,信用
 DocType: Customer,Default Receivable Accounts,默认应收账户(多个)
 DocType: Tax Rule,Billing State,计费状态
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,转让
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +646,Fetch exploded BOM (including sub-assemblies),获取展开BOM（包括子品目）
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +637,Transfer,转让
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),获取展开BOM（包括子品目）
 DocType: Authorization Rule,Applicable To (Employee),适用于(员工)
-apps/erpnext/erpnext/controllers/accounts_controller.py +95,Due Date is mandatory,截止日期是强制性的
+apps/erpnext/erpnext/controllers/accounts_controller.py +92,Due Date is mandatory,截止日期是强制性的
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,增量属性{0}不能为0
 DocType: Journal Entry,Pay To / Recd From,支付/ RECD从
 DocType: Naming Series,Setup Series,设置系列
 DocType: Payment Reconciliation,To Invoice Date,要发票日期
 DocType: Supplier,Contact HTML,联系HTML
+,Inactive Customers,不活跃的客户
 DocType: Landed Cost Voucher,Purchase Receipts,购买收据
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,定价规则如何被应用？
 DocType: Quality Inspection,Delivery Note No,送货单编号
@@ -2772,7 +2791,8 @@
 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 +38,Installation record for a Serial No.,一个序列号的安装记录
+apps/erpnext/erpnext/config/stock.py +123,Installation record for a Serial No.,一个序列号的安装记录
+apps/erpnext/erpnext/controllers/recurring_document.py +176,Next Date's day and Repeat on Day of Month must be equal,下一个日期的一天，重复上月的天必须相等
 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,以上
@@ -2793,7 +2813,8 @@
 ,Monthly Attendance Sheet,每月考勤表
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,未找到记录
 apps/erpnext/erpnext/controllers/stock_controller.py +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}：成本中心是品目{2}的必须项
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +468,Get Items from Product Bundle,获取从产品捆绑项目
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,请设置通过设置编号系列考勤&gt;编号系列
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,获取从产品捆绑项目
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} is inactive,科目{0}已停用
 DocType: GL Entry,Is Advance,是否预付款
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,必须指定考勤起始日期和结束日期
@@ -2808,13 +2829,13 @@
 apps/erpnext/erpnext/templates/generators/item.html +83,Specifications,产品规格
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,营业税金及费用模板
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,服装及配饰
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,订购次数
+apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,订购次数
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML或横幅，将显示在产品列表的顶部。
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,指定用来计算运费金额的条件
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +117,Add Child,添加子项
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,角色允许设置冻结帐户和编辑冷冻项
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,不能将成本中心转换为总账，因为它有子项。
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +45,Opening Value,开度值
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,开度值
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,序列号
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,销售佣金
 DocType: Offer Letter Term,Value / Description,值/说明
@@ -2823,11 +2844,11 @@
 DocType: Production Order,Expected Delivery Date,预计交货日期
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,借贷{0}＃不等于{1}。不同的是{2}。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,娱乐费用
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +191,Sales Invoice {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消销售发票{0}
+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 +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/config/hr.py +60,Applications for leave.,假期申请。
 apps/erpnext/erpnext/accounts/doctype/account/account.py +196,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 Invoice,Posting Time,发布时间
@@ -2835,15 +2856,15 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,电话费
 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 +101,No Item with Serial No {0},没有序列号为{0}的品目
+apps/erpnext/erpnext/stock/get_item_details.py +118,No Item with Serial No {0},没有序列号为{0}的品目
 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/controllers/recurring_document.py +192,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +200,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0}在“通知\电子邮件地址”无效的电子邮件地址
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,新客户收入
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,差旅费
 DocType: Maintenance Visit,Breakdown,细目
-apps/erpnext/erpnext/controllers/accounts_controller.py +530,Account: {0} with currency: {1} can not be selected,帐号：{0}币种：{1}不能选择
+apps/erpnext/erpnext/controllers/accounts_controller.py +527,Account: {0} with currency: {1} can not be selected,帐号：{0}币种：{1}不能选择
 DocType: Bank Reconciliation Detail,Cheque Date,支票日期
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},科目{0}的上级科目{1}不属于公司{2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +60,Successfully deleted all transactions related to this company!,成功删除与该公司相关的所有交易！
@@ -2863,7 +2884,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,量应大于0
 DocType: Journal Entry,Cash Entry,现金分录
 DocType: Sales Partner,Contact Desc,联系人倒序
-apps/erpnext/erpnext/config/hr.py +143,"Type of leaves like casual, sick etc.",叶似漫不经心，生病等类型
+apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.",叶似漫不经心，生病等类型
 DocType: Email Digest,Send regular summary reports via Email.,通过电子邮件发送定期汇总报告。
 DocType: Brand,Item Manager,项目经理
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,添加新行为科目设定年度预算。
@@ -2878,7 +2899,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +71,Raw material cannot be same as main Item,原料不能和主项相同
 DocType: Item Attribute Value,Abbreviation,缩写
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,不允许，因为{0}超出范围
-apps/erpnext/erpnext/config/hr.py +123,Salary template master.,薪资模板大师。
+apps/erpnext/erpnext/config/hr.py +110,Salary template master.,薪资模板大师。
 DocType: Leave Type,Max Days Leave Allowed,允许的最长假期天数
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,购物车设置税收规则
 DocType: Payment Tool,Set Matching Amounts,设置相同的金额
@@ -2887,11 +2908,11 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,缩写是强制性的
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,感谢您的关注中订阅我们的更新
 ,Qty to Transfer,转移数量
-apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,向潜在客户或客户发出的报价。
+apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,向潜在客户或客户发出的报价。
 DocType: Stock Settings,Role Allowed to edit frozen stock,角色可以编辑冻结库存
 ,Territory Target Variance Item Group-Wise,按物件组的区域目标波动
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,所有客户群组
-apps/erpnext/erpnext/controllers/accounts_controller.py +491,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}是必填项。可能是没有由{1}到{2}的货币转换记录。
+apps/erpnext/erpnext/controllers/accounts_controller.py +488,{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 +44,Account {0}: Parent account {1} does not exist,科目{0}的上级科目{1}不存在
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),价格列表费率（公司货币）
@@ -2910,11 +2931,11 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +94,Row # {0}: Serial No is mandatory,行＃{0}：序列号是必需的
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,品目特定的税项详情
 ,Item-wise Price List Rate,品目特定的价目表率
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,Supplier Quotation,供应商报价
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +721,Supplier Quotation,供应商报价
 DocType: Quotation,In Words will be visible once you save the Quotation.,大写金额将在报价单保存后显示。
 apps/erpnext/erpnext/stock/doctype/item/item.py +390,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/config/stock.py +97,Rules for adding shipping costs.,规则增加运输成本。
 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,客户是必须项
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,快速入门
@@ -2930,9 +2951,9 @@
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",单位为分钟，通过“时间日志”更新
 DocType: Customer,From Lead,来自潜在客户
-apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,发布生产订单。
+apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,发布生产订单。
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,选择财政年度...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,需要POS资料，使POS进入
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,POS Profile required to make POS Entry,需要POS资料，使POS进入
 DocType: Hub Settings,Name Token,名称令牌
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Selling,标准销售
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +136,Atleast one warehouse is mandatory,必须选择至少一个仓库
@@ -2940,7 +2961,7 @@
 DocType: BOM Replace Tool,Replace,更换
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Invoice {1},{0}不允许销售发票{1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +59,Please enter default Unit of Measure,请输入缺省的计量单位
-DocType: Purchase Invoice Item,Project Name,项目名称
+DocType: Project,Project Name,项目名称
 DocType: Supplier,Mention if non-standard receivable account,提到如果不规范应收账款
 DocType: Journal Entry Account,If Income or Expense,收入或支出
 DocType: Features Setup,Item Batch Nos,品目批号
@@ -2955,7 +2976,7 @@
 DocType: Account,Debit,借方
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,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/config/hr.py +29,Upload attendance from a .csv file,由.csv文件上传考勤记录
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,优秀的金额
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,为销售人员设置品次群组特定的目标
 DocType: Stock Settings,Freeze Stocks Older Than [Days],冻结老于此天数的库存
@@ -2963,16 +2984,18 @@
 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.,允许以下用户批准在禁离日请假的申请。
-apps/erpnext/erpnext/config/hr.py +163,Types of Expense Claim.,报销的类型。
+apps/erpnext/erpnext/config/hr.py +136,Types of Expense Claim.,报销的类型。
 DocType: Item,Taxes,税
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +301,Paid and Not Delivered,支付和未送达
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +299,Paid and Not Delivered,支付和未送达
 DocType: Project,Default Cost Center,默认成本中心
 DocType: Sales Invoice,End Date,结束日期
+apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,证券交易
 DocType: Employee,Internal Work History,内部工作经历
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,私募股权投资
 DocType: Maintenance Visit,Customer Feedback,客户反馈
 DocType: Account,Expense,开支
 DocType: Sales Invoice,Exhibition,展览
+apps/erpnext/erpnext/utilities/doctype/address/address.py +76,"Company is mandatory, as it is your company address",公司是强制性的，因为它是你的公司地址
 DocType: Item Attribute,From Range,从范围
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,品目{0}因忽略，因为它不是库存品目
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,提交此生产订单以进行下一步处理。
@@ -3035,8 +3058,8 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,马克缺席
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +107,To Time must be greater than From Time,到时间必须大于从时间
 DocType: Journal Entry Account,Exchange Rate,汇率
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Sales Order {0} is not submitted,销售订单{0}未提交
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +689,Add items from,添加的项目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +479,Sales Order {0} is not submitted,销售订单{0}未提交
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +719,Add items from,添加的项目
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},仓库{0}的上级账户{1}不属于公司{2}
 DocType: BOM,Last Purchase Rate,最后采购价格
 DocType: Account,Asset,资产
@@ -3067,15 +3090,14 @@
 DocType: Item Group,Parent Item Group,父项目组
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} {1}
 apps/erpnext/erpnext/setup/doctype/company/company.js +20,Cost Centers,成本中心
-apps/erpnext/erpnext/config/stock.py +110,Warehouses.,仓库。
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,供应商的货币转换为公司的基础货币后的单价
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},行＃{0}：与排时序冲突{1}
 DocType: Opportunity,Next Contact,下一页联系
-apps/erpnext/erpnext/config/accounts.py +94,Setup Gateway accounts.,设置网关帐户。
+apps/erpnext/erpnext/config/accounts.py +245,Setup Gateway accounts.,设置网关帐户。
 DocType: Employee,Employment Type,就职类型
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,固定资产
 ,Cash Flow,现金周转
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +86,Application period cannot be across two alocation records,申请期间不能跨两个alocation记录
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be across two alocation records,申请期间不能跨两个alocation记录
 DocType: Item Group,Default Expense Account,默认支出账户
 DocType: Employee,Notice (days),通告（天）
 DocType: Tax Rule,Sales Tax Template,销售税模板
@@ -3085,7 +3107,7 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},默认情况下存在作业成本的活动类型 -  {0}
 DocType: Production Order,Planned Operating Cost,计划运营成本
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,新建{0}名称
-apps/erpnext/erpnext/controllers/recurring_document.py +131,Please find attached {0} #{1},随函附上{0}＃{1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,Please find attached {0} #{1},随函附上{0}＃{1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Bank Statement balance as per General Ledger,银行对账单余额按总帐
 DocType: Job Applicant,Applicant Name,申请人姓名
 DocType: Authorization Rule,Customer / Item Name,客户/项目名称
@@ -3101,14 +3123,17 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,请从指定/至范围
 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.,销售业务的默认设置。
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,客户&gt;客户组&gt;领地
+apps/erpnext/erpnext/config/selling.py +147,Default settings for selling transactions.,销售业务的默认设置。
 DocType: BOM Replace Tool,Current BOM,当前BOM
-apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,添加序列号
+apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,添加序列号
+apps/erpnext/erpnext/config/support.py +43,Warranty,保证
 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,组节点
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Update Finished Goods,更新成品
 DocType: Workstation,per hour,每小时
+apps/erpnext/erpnext/config/buying.py +7,Purchasing,购买
 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,分配
@@ -3117,7 +3142,7 @@
 apps/erpnext/erpnext/setup/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: Account,Receivable,应收账款
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +264,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,行＃{0}：不能更改供应商的采购订单已经存在
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,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。否则会将半成品当作原材料。
@@ -3153,7 +3178,6 @@
 DocType: Email Digest,Add/Remove Recipients,添加/删除收件人
 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 +19,Shortage Qty,短缺数量
 apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,项目变种{0}存在具有相同属性
 DocType: Salary Slip,Salary Slip,工资单
@@ -3166,18 +3190,19 @@
 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 +786,It is needed to fetch Item Details.,这是需要获取项目详细信息。
+apps/erpnext/erpnext/public/js/controllers/transaction.js +782,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}已收到过
 ,Requested Items To Be Transferred,要求要传输的项目
 DocType: Customer,Sales Team Details,销售团队详情
 DocType: Expense Claim,Total Claimed Amount,总索赔额
-apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,销售的潜在机会
+apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,销售的潜在机会
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},无效的{0}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,病假
 DocType: Email Digest,Email Digest,邮件摘要
 DocType: Delivery Note,Billing Address Name,帐单地址名称
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,请设置命名为系列{0}通过设置&gt;设置&gt;命名系列
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,百货
 apps/erpnext/erpnext/controllers/stock_controller.py +72,No accounting entries for the following warehouses,没有以下仓库的会计分录
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,首先保存文档。
@@ -3185,7 +3210,7 @@
 DocType: Company,Change Abbreviation,更改缩写
 DocType: Expense Claim Detail,Expense Date,报销日期
 DocType: Item,Max Discount (%),最大折扣(%)
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,最后订单金额
+apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,最后订单金额
 DocType: Company,Warn,警告
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",任何其他言论，值得一提的努力，应该在记录中。
 DocType: BOM,Manufacturing User,生产用户
@@ -3240,10 +3265,10 @@
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +153,Maintenance Schedule {0} exists against {0},维护计划{0}已存在{0}中
 DocType: Stock Entry Detail,Actual Qty (at source/target),实际数量（源/目标）
 DocType: Item Customer Detail,Ref Code,参考代码
-apps/erpnext/erpnext/config/hr.py +13,Employee records.,雇员记录。
+apps/erpnext/erpnext/config/hr.py +12,Employee records.,雇员记录。
 DocType: Payment Gateway,Payment Gateway,支付网关
 DocType: HR Settings,Payroll Settings,薪资设置
-apps/erpnext/erpnext/config/accounts.py +63,Match non-linked Invoices and Payments.,匹配无链接的发票和付款。
+apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,匹配无链接的发票和付款。
 apps/erpnext/erpnext/templates/pages/cart.html +22,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...,选择品牌...
@@ -3258,20 +3283,20 @@
 DocType: Payment Tool,Get Outstanding Vouchers,获取未清凭证
 DocType: Warranty Claim,Resolved By,议决
 DocType: Appraisal,Start Date,开始日期
-apps/erpnext/erpnext/config/hr.py +138,Allocate leaves for a period.,调配一段时间假期。
+apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,调配一段时间假期。
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Cheques and Deposits incorrectly cleared,支票及存款不正确清除
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,点击这里核实
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,科目{0}不能是自己的上级科目
 DocType: Purchase Invoice Item,Price List Rate,价格列表费率
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",根据此仓库显示“有库存”或“无库存”状态。
-apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),材料清单(BOM)
+apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),材料清单(BOM)
 DocType: Item,Average time taken by the supplier to deliver,采取供应商的平均时间交付
 DocType: Time Log,Hours,小时
 DocType: Project,Expected Start Date,预计开始日期
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,删除项目，如果收费并不适用于该项目
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,例如：smsgateway.com/API/send_sms.cgi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Transaction currency must be same as Payment Gateway currency,交易货币必须与支付网关货币
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +603,Receive,接受
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +633,Receive,接受
 DocType: Maintenance Visit,Fully Completed,全部完成
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}％已完成
 DocType: Employee,Educational Qualification,学历
@@ -3284,13 +3309,12 @@
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,采购经理大师
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,生产订单{0}必须提交
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +137,Please select Start Date and End Date for Item {0},请选择开始日期和结束日期的项目{0}
-apps/erpnext/erpnext/config/stock.py +136,Main Reports,主报告
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,无效的主名称
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc的DocType
 apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,我的订单
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +313,My Orders,我的订单
 DocType: Price List,Price List Name,价格列表名称
 DocType: Time Log,For Manufacturing,对于制造业
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,总计
@@ -3299,22 +3323,22 @@
 DocType: Account,Income,收益
 DocType: Industry Type,Industry Type,行业类型
 apps/erpnext/erpnext/templates/includes/cart.js +136,Something went wrong!,发现错误！
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +102,Warning: Leave application contains following block dates,警告：申请的假期含有以下的禁离日
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +103,Warning: Leave application contains following block dates,警告：申请的假期含有以下的禁离日
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +241,Sales Invoice {0} has already been submitted,销售发票{0}已提交过
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,会计年度{0}不存在
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,完成日期
 DocType: Purchase Invoice Item,Amount (Company Currency),金额（公司货币）
-apps/erpnext/erpnext/config/hr.py +113,Organization unit (department) master.,组织单位（部门）的主人。
+apps/erpnext/erpnext/config/hr.py +185,Organization unit (department) master.,组织单位（部门）的主人。
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,请输入有效的手机号
 DocType: Budget Detail,Budget Detail,预算详情
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,在发送前，请填写留言
-apps/erpnext/erpnext/config/accounts.py +137,Point-of-Sale Profile,简介销售点的
+apps/erpnext/erpnext/config/accounts.py +250,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 +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,成本中心名称
 DocType: Maintenance Schedule Detail,Scheduled Date,计划日期
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,数金额金额
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,数金额金额
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,大于160个字符的消息将被分割为多条消息
 DocType: Purchase Receipt Item,Received and Accepted,收到并接受
 ,Serial No Service Contract Expiry,序列号/年度保养合同过期
@@ -3354,7 +3378,7 @@
 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/config/stock.py +164,Update additional costs to calculate landed cost of items,更新额外费用以计算到岸成本
 apps/erpnext/erpnext/setup/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 +318,Row {0}: Exchange Rate is mandatory,行{0}：汇率是必须的
@@ -3362,15 +3386,14 @@
 DocType: Stock Entry,Default Source Warehouse,默认源仓库
 DocType: Item,Customer Code,客户代码
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},{0}的生日提醒
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,自上次订购天数
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +307,Debit To account must be a Balance Sheet account,借记帐户必须是资产负债表科目
+apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,自上次订购天数
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,Debit To account must be a Balance Sheet account,借记帐户必须是资产负债表科目
 DocType: Buying Settings,Naming Series,命名系列
 DocType: Leave Block List,Leave Block List Name,禁离日列表名称
 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 +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,目标数量
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,请设置通过设置编号系列考勤&gt;编号系列
 DocType: Shopping Cart Settings,Checkout Settings,结帐设置
 DocType: Attendance,Present,现
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,送货单{0}不能提交
@@ -3380,9 +3403,9 @@
 DocType: Sales Order Item,Ordered Qty,订购数量
 apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} is disabled,项目{0}无效
 DocType: Stock Settings,Stock Frozen Upto,库存冻结止
-apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},期间从和周期要日期强制性的经常性{0}
-apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,项目活动/任务。
-apps/erpnext/erpnext/config/hr.py +78,Generate Salary Slips,生成工资条
+apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},期间从和周期要日期强制性的经常性{0}
+apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,项目活动/任务。
+apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,生成工资条
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}",“适用于”为{0}时必须勾选“采购”
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,折扣必须小于100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),核销金额（公司货币）
@@ -3430,14 +3453,14 @@
 DocType: Item,Thumbnail,缩略图
 DocType: Item Customer Detail,Item Customer Detail,品目客户详情
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,确认您的电子邮件
-apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,报价候选作业。
+apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,报价候选作业。
 DocType: Notification Control,Prompt for Email on Submission of,提示电子邮件的提交
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,分配的总叶多天的期限
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,Item {0} must be a stock Item,品目{0}必须是库存品目
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,默认工作正在进行仓库
-apps/erpnext/erpnext/config/accounts.py +117,Default settings for accounting transactions.,业务会计的默认设置。
+apps/erpnext/erpnext/config/accounts.py +225,Default settings for accounting transactions.,业务会计的默认设置。
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,预计日期不能早于物料申请时间
-apps/erpnext/erpnext/stock/get_item_details.py +115,Item {0} must be a Sales Item,品目{0}必须是销售品目
+apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sales Item,品目{0}必须是销售品目
 DocType: Naming Series,Update Series Number,更新序列号
 DocType: Account,Equity,权益
 DocType: Sales Order,Printing Details,印刷详情
@@ -3445,7 +3468,7 @@
 DocType: Sales Order Item,Produced Quantity,生产的产品数量
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,工程师
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,搜索子组件
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,Item Code required at Row No {0},行{0}中的品目编号是必须项
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,Item Code required at Row No {0},行{0}中的品目编号是必须项
 DocType: Sales Partner,Partner Type,合作伙伴类型
 DocType: Purchase Taxes and Charges,Actual,实际
 DocType: Authorization Rule,Customerwise Discount,客户折扣
@@ -3471,24 +3494,25 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +49,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},财政年度开始日期和结束日期已经在财年{0}中设置
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +115,Successfully Reconciled,对账/盘点成功
 DocType: Production Order,Planned End Date,计划的结束日期
-apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,物件的存储位置。
+apps/erpnext/erpnext/config/stock.py +180,Where items are stored.,物件的存储位置。
 DocType: Tax Rule,Validity,有效性
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,已开票金额
 DocType: Attendance,Attendance,考勤
+apps/erpnext/erpnext/config/projects.py +55,Reports,报告
 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 +508,Posting date and posting time is mandatory,发布日期和发布时间是必需的
-apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,采购业务的税项模板。
+apps/erpnext/erpnext/config/buying.py +71,Tax template for buying transactions.,采购业务的税项模板。
 ,Item Prices,品目价格
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,大写金额将在采购订单保存后显示。
 DocType: Period Closing Voucher,Period Closing Voucher,期末券
-apps/erpnext/erpnext/config/stock.py +120,Price List master.,主价格表。
+apps/erpnext/erpnext/config/stock.py +77,Price List master.,主价格表。
 DocType: Task,Review Date,评论日期
 DocType: Purchase Invoice,Advance Payments,预付款
 DocType: Purchase Taxes and Charges,On Net Total,基于净总计
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,Target warehouse in row {0} must be same as Production Order,行{0}的目标仓库必须与生产订单的仓库相同
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +99,No permission to use Payment Tool,没有使用付款工具的权限
-apps/erpnext/erpnext/controllers/recurring_document.py +196,'Notification Email Addresses' not specified for recurring %s,循环%s中未指定“通知电子邮件地址”
+apps/erpnext/erpnext/controllers/recurring_document.py +204,'Notification Email Addresses' not specified for recurring %s,循环%s中未指定“通知电子邮件地址”
 apps/erpnext/erpnext/accounts/doctype/account/account.py +123,Currency can not be changed after making entries using some other currency,货币不能使用其他货币进行输入后更改
 DocType: Company,Round Off Account,四舍五入账户
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,行政开支
@@ -3530,12 +3554,13 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,销售人员
 DocType: Sales Invoice,Cold Calling,冷推销
 DocType: SMS Parameter,SMS Parameter,短信参数
+apps/erpnext/erpnext/config/accounts.py +184,Budget and Cost Center,预算和成本中心
 DocType: Maintenance Schedule Item,Half Yearly,半年度
 DocType: Lead,Blog Subscriber,博客订阅者
 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/config/hr.py +235,Processing Payroll,处理工资单
+apps/erpnext/erpnext/config/hr.py +257,Processing Payroll,处理工资单
 DocType: Opportunity Item,Basic Rate,基础税率
 DocType: GL Entry,Credit Amount,信贷金额
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +139,Set as Lost,设置为丧失
@@ -3562,11 +3587,12 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,禁止用户在以下日期提交假期申请。
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,员工福利
 DocType: Sales Invoice,Is POS,是否POS机
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,产品编号&gt;项目组&gt;品牌
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,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.,对客户开出的账单。
+apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,对客户开出的账单。
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,项目编号
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +492,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}新增用户
@@ -3587,9 +3613,9 @@
 DocType: Employee,Current Address Is,当前地址是
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +219,"Optional. Sets company's default currency, if not specified.",可选。设置公司的默认货币，如果没有指定。
 DocType: Address,Office,办公室
-apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,会计记账分录。
+apps/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,会计记账分录。
 DocType: Delivery Note Item,Available Qty at From Warehouse,可用数量从仓库
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +248,Please select Employee Record first.,请选择员工记录第一。
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +249,Please select Employee Record first.,请选择员工记录第一。
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +190,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 +239,Please enter Expense Account,请输入您的费用帐户
@@ -3597,7 +3623,7 @@
 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/stock.py +283,Batch Inventory,批量库存
+apps/erpnext/erpnext/config/stock.py +310,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,基于上述标准拉销售订单（待定提供）
@@ -3615,7 +3641,7 @@
 DocType: Notification Control,Purchase Receipt Message,外购入库单信息
 DocType: Production Order,Actual Start Date,实际开始日期
 DocType: Sales Order,% of materials delivered against this Sales Order,此销售订单％的材料已交货。
-apps/erpnext/erpnext/config/stock.py +23,Record item movement.,移动记录项。
+apps/erpnext/erpnext/config/stock.py +12,Record item movement.,移动记录项。
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,通讯订户名单
 DocType: Hub Settings,Hub Settings,Hub设置
 DocType: Project,Gross Margin %,毛利率％
@@ -3628,28 +3654,28 @@
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,请ATLEAST一行输入付款金额
 DocType: POS Profile,POS Profile,POS简介
 DocType: Payment Gateway Account,Payment URL Message,付款URL信息
-apps/erpnext/erpnext/config/accounts.py +163,"Seasonality for setting budgets, targets etc.",设置季节性的预算，目标等。
+apps/erpnext/erpnext/config/accounts.py +204,"Seasonality for setting budgets, targets etc.",设置季节性的预算，目标等。
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +242,Row {0}: Payment Amount cannot be greater than Outstanding Amount,行{0}：付款金额不能大于杰出金额
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +69,Total Unpaid,总未付
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +32,Time Log is not billable,时间日志是不计费
-apps/erpnext/erpnext/stock/get_item_details.py +118,"Item {0} is a template, please select one of its variants",项目{0}是一个模板，请选择它的一个变体
+apps/erpnext/erpnext/stock/get_item_details.py +135,"Item {0} is a template, please select one of its variants",项目{0}是一个模板，请选择它的一个变体
 apps/erpnext/erpnext/public/js/setup_wizard.js +178,Purchaser,购买者
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,净支付金额不能为负数
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +109,Please enter the Against Vouchers manually,请手动输入对优惠券
 DocType: SMS Settings,Static Parameters,静态参数
 DocType: Purchase Order,Advance Paid,已支付的预付款
 DocType: Item,Item Tax,品目税项
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Material to Supplier,材料到供应商
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Material to Supplier,材料到供应商
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Excise Invoice,消费税发票
 DocType: Expense Claim,Employees Email Id,雇员的邮件地址
 DocType: Employee Attendance Tool,Marked Attendance,显着的出席
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,流动负债
-apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,向你的联系人群发短信。
+apps/erpnext/erpnext/config/crm.py +127,Send mass SMS to your contacts,向你的联系人群发短信。
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,考虑税收或收费
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +59,Actual Qty is mandatory,实际数量是必须项
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,信用卡
 DocType: BOM,Item to be manufactured or repacked,要生产或者重新包装的品目
-apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,仓储业务的默认设置。
+apps/erpnext/erpnext/config/stock.py +175,Default settings for stock transactions.,仓储业务的默认设置。
 DocType: Purchase Invoice,Next Date,下次日期
 DocType: Employee Education,Major/Optional Subjects,主修/选修科目
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,请输入税费
@@ -3665,9 +3691,11 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +149,Attach Logo,附加标志
 DocType: Customer,Commission Rate,佣金率
 apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,在Variant
-apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,按部门禁止假期申请。
+apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,按部门禁止假期申请。
+apps/erpnext/erpnext/config/stock.py +201,Analytics,Analytics（分析）
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,车是空的
 DocType: Production Order,Actual Operating Cost,实际运行成本
+apps/erpnext/erpnext/utilities/doctype/address/address.py +151,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,无缺省地址模板中。请创建设置&gt;打印和品牌&gt;地址模板一个新的。
 apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root cannot be edited.,根不能被编辑。
 apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,调配的数量不能超过未调配数量
 DocType: Manufacturing Settings,Allow Production on Holidays,允许在假日生产
@@ -3679,7 +3707,7 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,请选择一个csv文件
 DocType: Purchase Order,To Receive and Bill,接收和比尔
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,设计师
-apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,条款和条件模板
+apps/erpnext/erpnext/config/selling.py +157,Terms and Conditions Template,条款和条件模板
 DocType: Serial No,Delivery Details,交货细节
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,Cost Center is required in row {0} in Taxes table for type {1},类型{1}税费表的行{0}必须有成本中心
 ,Item-wise Purchase Register,品目特定的采购记录
@@ -3687,15 +3715,15 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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.,项目主。
+apps/erpnext/erpnext/config/projects.py +13,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 +402, (Half Day),（半天）
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +409, (Half Day),（半天）
 DocType: Supplier,Credit Days,信用期
 DocType: Leave Type,Is Carry Forward,是否顺延假期
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,从物料清单获取品目
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +599,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +126,Please enter Sales Orders in the above table,请在上表中输入销售订单
-apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,材料清单
+apps/erpnext/erpnext/config/manufacturing.py +33,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/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,参考日期
 DocType: Employee,Reason for Leaving,离职原因