[translations]
diff --git a/erpnext/translations/zh-cn.csv b/erpnext/translations/zh-cn.csv
index 16d1ddb..80eea83 100644
--- a/erpnext/translations/zh-cn.csv
+++ b/erpnext/translations/zh-cn.csv
@@ -18,10 +18,9 @@
 DocType: Sales Partner,Dealer,经销商
 DocType: Employee,Rented,租
 DocType: POS Profile,Applicable for User,适用于用户
-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/manufacturing/doctype/production_order/production_order.py +173,"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 > HR Settings,请安装员工在人力资源命名系统> 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,求职者
@@ -47,14 +46,14 @@
 ,Purchase Order Items To Be Received,采购订单项目可收
 DocType: SMS Center,All Supplier Contact,所有供应商联系人
 DocType: Quality Inspection Reading,Parameter,参数
-apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,预计结束日期不能小于预期开始日期
+apps/erpnext/erpnext/projects/doctype/project/project.py +44,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 +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 +512,Quantity,数量
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),借款(负债)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +515,Quantity,数量
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Loans (Liabilities),借款(负债)
 DocType: Employee Education,Year of Passing,按年排序
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,库存
 DocType: Designation,Designation,指派
@@ -64,7 +63,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 +642,Invoice,发票
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +645,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 +80,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 +131,New {0}: #{1},新{0}:#{1}
+apps/erpnext/erpnext/controllers/recurring_document.py +132,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,付钱请求
@@ -102,7 +101,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 +397,Stock cannot be updated against Delivery Note {0},送货单{0}不能更新库存
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,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
@@ -140,7 +139,7 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,目标类型
 DocType: BOM,Total Cost,总成本
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,活动日志:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +197,Item {0} does not exist in the system or has expired,品目{0}不存在于系统中或已过期
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +206,Item {0} does not exist in the system or has expired,品目{0}不存在于系统中或已过期
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,房地产
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,对账单
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,制药
@@ -156,7 +155,7 @@
 DocType: SMS Center,All Contact,所有联系人
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,年薪
 DocType: Period Closing Voucher,Closing Fiscal Year,结算财年
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,库存费用
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +72,Stock Expenses,库存费用
 DocType: Newsletter,Email Sent?,邮件已发送?
 DocType: Journal Entry,Contra Entry,对销分录
 DocType: Production Order Operation,Show Time Logs,显示的时间记录
@@ -164,12 +163,12 @@
 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 +140,Item {0} must be a Purchase Item,品目{0}必须是采购品目
+apps/erpnext/erpnext/stock/get_item_details.py +139,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 +507,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",要包括税款,行{0}项率,税收行{1}也必须包括在内
+apps/erpnext/erpnext/controllers/accounts_controller.py +533,"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,新建物料清单
@@ -208,11 +207,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,电视
 DocType: Production Order Operation,Updated via 'Time Log',通过“时间日志”更新
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} does not belong to Company {1},科目{0}不属于公司{1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},提前量不能大于{0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},提前量不能大于{0} {1}
 DocType: Naming Series,Series List for this Transaction,此交易的系列列表
 DocType: Sales Invoice,Is Opening Entry,是否期初分录
 DocType: Customer Group,Mention if non-standard receivable account applicable,何况,如果不规范应收账款适用
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,提交前必须选择仓库
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +156,For Warehouse is required before Submit,提交前必须选择仓库
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,收到的
 DocType: Sales Partner,Reseller,经销商
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,你不能输入行没有。大于或等于当前行没有。这种充电式
@@ -221,7 +220,7 @@
 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 +217,Next Recurring {0} will be created on {1},周期{0}下次创建时间为{1}
+apps/erpnext/erpnext/controllers/recurring_document.py +227,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.,依上述条件创建工资单
@@ -235,8 +234,8 @@
 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 +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/leave_application/leave_application.py +425,Leave Blocked,已禁止请假
+apps/erpnext/erpnext/stock/doctype/item/item.py +581,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,全年
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,库存盘点品目
@@ -248,8 +247,8 @@
 DocType: Pricing Rule,Supplier Type,供应商类型
 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 +706,Material Request,物料申请
+apps/erpnext/erpnext/stock/doctype/item/item.py +601,Item {0} is cancelled,品目{0}已取消
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +709,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}未发现“原材料提供'表中的采购订单{1}
@@ -264,7 +263,7 @@
 DocType: Notification Control,Notification Control,通知控制
 DocType: Lead,Suggestions,建议
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,为此区域设置品目群组特定的预算。你还可以设置“分布”,为预算启动季节性。
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},请输入父帐户组仓库{0}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +80,Please enter parent account group for warehouse {0},请输入父帐户组仓库{0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},对支付{0} {1}不能大于未偿还{2}
 DocType: Supplier,Address HTML,地址HTML
 DocType: Lead,Mobile No.,手机号码
@@ -283,7 +282,7 @@
 DocType: Item,Synced With Hub,与Hub同步
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,密码错误
 DocType: Item,Variant Of,变体自
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Completed Qty can not be greater than 'Qty to Manufacture',完成数量不能大于“生产数量”
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,Completed Qty can not be greater than 'Qty to Manufacture',完成数量不能大于“生产数量”
 DocType: Period Closing Voucher,Closing Account Head,结算帐户头
 DocType: Employee,External Work History,外部就职经历
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,循环引用错误
@@ -294,10 +293,10 @@
 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 +708,Delivery Note,送货单
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +751,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}输入两次税项
+apps/erpnext/erpnext/stock/doctype/item/item.py +386,{0} entered twice in Item Tax,{0}输入两次税项
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,本周和待活动总结
 DocType: Workstation,Rent Cost,租金成本
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +73,Please select month and year,请选择年份和月份
@@ -308,12 +307,12 @@
 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/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,请输入“重复上月的一天'字段值
+apps/erpnext/erpnext/controllers/recurring_document.py +220,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 +674,Select Item,选择项目
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +677,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}已经提交
@@ -335,9 +334,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},序列号{0}不属于送货单{1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,品目质量检验参数
 DocType: Leave Application,Leave Approver Name,假期审批人姓名
-,Schedule Date,计划任务日期
+DocType: Depreciation Schedule,Schedule Date,计划任务日期
 DocType: Packed Item,Packed Item,盒装产品
-apps/erpnext/erpnext/config/buying.py +60,Default settings for buying transactions.,采购业务的默认设置。
+apps/erpnext/erpnext/config/buying.py +65,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,货币兑换
@@ -386,13 +385,13 @@
 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}多次选择在属性表
+apps/erpnext/erpnext/stock/doctype/item/item.py +555,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 +70,Holiday master.,假期大师
-DocType: Material Request Item,Required Date,所需时间
+DocType: Request for Quotation Item,Required Date,所需时间
 DocType: Delivery Note,Billing Address,帐单地址
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +770,Please enter Item Code.,请输入产品编号。
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +773,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,总数量
@@ -416,17 +415,17 @@
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",“不存在
 DocType: Pricing Rule,Valid Upto,有效期至
 apps/erpnext/erpnext/public/js/setup_wizard.js +212,List a few of your customers. They could be organizations or individuals.,列出一些你的客户,他们可以是组织或个人。
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,直接收益
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +146,Direct Income,直接收益
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account",按科目分类后不能根据科目过滤
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,行政主任
 DocType: Payment Tool,Received Or Paid,收到或支付
 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 +378,Please enter Warehouse for which Material Request will be raised,请重新拉。
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +381,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",若要合并,以下属性必须为这两个项目是相同的
+apps/erpnext/erpnext/stock/doctype/item/item.py +459,"To merge, following properties must be same for both items",若要合并,以下属性必须为这两个项目是相同的
 DocType: Shipping Rule,Net Weight,净重
 DocType: Employee,Emergency Phone,紧急电话
 ,Serial No Warranty Expiry,序列号/保修到期
@@ -446,7 +445,7 @@
 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,删除公司事务
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +86,Item {0} is not Purchase Item,品目{0}不是采购品目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Item {0} is not Purchase Item,品目{0}不是采购品目
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,添加/编辑税金及费用
 DocType: Purchase Invoice,Supplier Invoice No,供应商发票编号
 DocType: Territory,For reference,供参考
@@ -457,7 +456,7 @@
 DocType: Production Plan Item,Pending Qty,待定数量
 DocType: Company,Ignore,忽略
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},短信发送至以下号码:{0}
-apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,外包采购收据必须指定供应商仓库
+apps/erpnext/erpnext/controllers/buying_controller.py +127,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,外包采购收据必须指定供应商仓库
 DocType: Pricing Rule,Valid From,有效期自
 DocType: Sales Invoice,Total Commission,总委员会
 DocType: Pricing Rule,Sales Partner,销售合作伙伴
@@ -467,13 +466,13 @@
 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 +230,Financial / accounting year.,财务/会计年度。
+apps/erpnext/erpnext/config/accounts.py +238,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,项目任务
 ,Lead Id,线索ID
 DocType: C-Form Invoice Detail,Grand Total,总计
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +35,Fiscal Year Start Date should not be greater than Fiscal Year End Date,财年开始日期应不大于结束日期
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +36,Fiscal Year Start Date should not be greater than Fiscal Year End Date,财年开始日期应不大于结束日期
 DocType: Warranty Claim,Resolution,决议
 apps/erpnext/erpnext/templates/pages/order.html +61,Delivered: {0},交货:{0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,应付帐款
@@ -481,7 +480,7 @@
 DocType: Job Applicant,Resume Attachment,简历附
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,回头客
 DocType: Leave Control Panel,Allocate,调配
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +640,Sales Return,销售退货
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +683,Sales Return,销售退货
 DocType: Item,Delivered by Supplier (Drop Ship),由供应商交货(直接发运)
 apps/erpnext/erpnext/config/hr.py +115,Salary components.,工资构成部分。
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,潜在客户数据库。
@@ -490,7 +489,7 @@
 DocType: Quotation,Quotation To,报价对象
 DocType: Lead,Middle Income,中等收入
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),开幕(CR )
-apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,测度项目的默认单位{0}不能直接改变,因为你已经做了一些交易(S)与其他计量单位。您将需要创建一个新的项目,以使用不同的默认计量单位。
+apps/erpnext/erpnext/stock/doctype/item/item.py +707,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,测度项目的默认单位{0}不能直接改变,因为你已经做了一些交易(S)与其他计量单位。您将需要创建一个新的项目,以使用不同的默认计量单位。
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,调配数量不能为负
 DocType: Purchase Order Item,Billed Amt,已开票金额
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,创建库存记录所依赖的逻辑仓库。
@@ -500,7 +499,7 @@
 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/config/accounts.py +135,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,公司财政年度
@@ -518,19 +517,18 @@
 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 +660,Maintenance Schedule,维护计划
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +703,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,护照号码
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,经理
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +220,Same item has been entered multiple times.,相同的品目已输入多次
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Same item has been entered multiple times.,相同的品目已输入多次
 DocType: SMS Settings,Receiver Parameter,接收人参数
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,“根据”和“分组依据”不能相同
 DocType: Sales Person,Sales Person Targets,销售人员目标
 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 +674,Please set default Cash or Bank account in Mode of Payment {0},请设置默认的现金或银行账户的付款方式{0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +699,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,7 +536,7 @@
 DocType: Supplier,Fixed Days,固定天
 DocType: Quotation Item,Item Balance,项目平衡
 DocType: Sales Invoice,Packing List,包装清单
-apps/erpnext/erpnext/config/buying.py +23,Purchase Orders given to Suppliers.,购买给供应商的订单。
+apps/erpnext/erpnext/config/buying.py +28,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,已消耗
@@ -572,7 +570,7 @@
 DocType: Hub Settings,Seller City,卖家城市
 DocType: Email Digest,Next email will be sent on:,下次邮件发送时间:
 DocType: Offer Letter Term,Offer Letter Term,报价函期限
-apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item has variants.,项目已变种。
+apps/erpnext/erpnext/stock/doctype/item/item.py +534,Item has variants.,项目已变种。
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,Item {0} not found,品目{0}未找到
 DocType: Bin,Stock Value,库存值
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,树类型
@@ -609,14 +607,14 @@
 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/accounts/page/accounts_browser/accounts_browser.js +207,New Account,新建账户
 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/controllers/buying_controller.py +275,Row {0}: Conversion Factor is mandatory,行{0}:转换系数是强制性的
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"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.,会计分录可对叶节点。对组参赛作品是不允许的。
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +362,Cannot deactivate or cancel BOM as it is linked with other BOMs,无法停用或取消BOM,因为它被其他BOM引用。
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +371,Cannot deactivate or cancel BOM as it is linked with other BOMs,无法停用或取消BOM,因为它被其他BOM引用。
 DocType: Opportunity,Maintenance,维护
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +188,Purchase Receipt number required for Item {0},所需物品交易收据号码{0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +190,Purchase Receipt number required for Item {0},所需物品交易收据号码{0}
 DocType: Item Attribute Value,Item Attribute Value,品目属性值
 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.
@@ -656,17 +654,17 @@
 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 +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/controllers/accounts_controller.py +333,"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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,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 +275,Price List not selected,价格列表没有选择
+apps/erpnext/erpnext/stock/get_item_details.py +274,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}
+apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid Attachment {0},警告:无效的附件{0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,无此权限
 DocType: Company,Default Bank Account,默认银行账户
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",要根据党的筛选,选择党第一类型
@@ -674,7 +672,7 @@
 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 +666,My Invoices,我的发票
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +691,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,如果分包给供应商
@@ -686,7 +684,7 @@
 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 +267,C-Form records,C-表记录
+apps/erpnext/erpnext/config/accounts.py +275,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 +12,Support queries from customers.,来自客户的支持记录。
@@ -710,7 +708,7 @@
 DocType: Quotation Item,Projected Qty,预计数量
 DocType: Sales Invoice,Payment Due Date,付款到期日
 DocType: Newsletter,Newsletter Manager,通讯经理
-apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,项目变种{0}已经具有相同属性的存在
+apps/erpnext/erpnext/stock/doctype/item/item.js +227,Item Variant {0} already exists with same attributes,项目变种{0}已经具有相同属性的存在
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',“打开”
 DocType: Notification Control,Delivery Note Message,送货单留言
 DocType: Expense Claim,Expenses,开支
@@ -747,14 +745,14 @@
 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 +618,Purchase Receipt,外购入库单
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Purchase Receipt,外购入库单
 ,Received Items To Be Billed,要支付的已收项目
 DocType: Employee,Ms,女士
-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}
+apps/erpnext/erpnext/config/accounts.py +248,Currency exchange rate master.,货币汇率大师
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,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/manufacturing/doctype/bom/bom.py +436,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,转到车
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,取消此上门保养之前请先取消物料访问{0}
@@ -773,7 +771,7 @@
 DocType: Supplier,Default Payable Accounts,默认应付账户(多个)
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,雇员{0}非活动或不存在
 DocType: Features Setup,Item Barcode,品目条码
-apps/erpnext/erpnext/stock/doctype/item/item.py +524,Item Variants {0} updated,品目变种{0}已更新
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item Variants {0} updated,品目变种{0}已更新
 DocType: Quality Inspection Reading,Reading 6,阅读6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,购买发票提前
 DocType: Address,Shop,商店
@@ -783,10 +781,10 @@
 DocType: Employee,Permanent Address Is,永久地址
 DocType: Production Order Operation,Operation completed for how many finished goods?,操作完成多少成品?
 apps/erpnext/erpnext/public/js/setup_wizard.js +139,The Brand,你的品牌
-apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,品目{1}已经超过允许的超额{0}。
+apps/erpnext/erpnext/controllers/status_updater.py +165,Allowance for over-{0} crossed for Item {1}.,品目{1}已经超过允许的超额{0}。
 DocType: Employee,Exit Interview Details,退出面试细节
 DocType: Item,Is Purchase Item,是否采购品目
-DocType: Journal Entry Account,Purchase Invoice,购买发票
+DocType: Asset,Purchase Invoice,购买发票
 DocType: Stock Ledger Entry,Voucher Detail No,凭证详情编号
 DocType: Stock Entry,Total Outgoing Value,即将离任的总价值
 apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,开幕日期和截止日期应在同一会计年度
@@ -796,16 +794,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 +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.",对于“产品包”的物品,仓库,序列号和批号将被从“装箱单”表考虑。如果仓库和批次号是相同的任何“产品包”项目的所有包装物品,这些值可以在主项表中输入,值将被复制到“装箱单”表。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +542,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",对于“产品包”的物品,仓库,序列号和批号将被从“装箱单”表考虑。如果仓库和批次号是相同的任何“产品包”项目的所有包装物品,这些值可以在主项表中输入,值将被复制到“装箱单”表。
 DocType: Job Opening,Publish on website,发布在网站上
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,向客户发货。
 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,间接收益
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,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 +672,Select Item for Transfer,对于转让项目选择
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +675,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.,请选择支票存入的银行账户头。
@@ -819,14 +817,14 @@
 DocType: HR Settings,Don't send Employee Birthday Reminders,不要发送员工生日提醒
 ,Employee Holiday Attendance,员工假日出勤
 DocType: Opportunity,Walk In,主动上门
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +64,Stock Entries,库存条目
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Stock Entries,库存条目
 DocType: Item,Inspection Criteria,检验标准
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,转移
 apps/erpnext/erpnext/public/js/setup_wizard.js +140,Upload your letter head and logo. (you can edit them later).,上传你的信头和logo。(您可以在以后对其进行编辑)。
 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 +595,Make ,使
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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 +834,7 @@
 DocType: Holiday List,Holiday List Name,假期列表名称
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,股票期权
 DocType: Journal Entry Account,Expense Claim,报销
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +180,Qty for {0},{0}数量
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},{0}数量
 DocType: Leave Application,Leave Application,假期申请
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,假期调配工具
 DocType: Leave Block List,Leave Block List Dates,禁离日列表日期
@@ -849,7 +847,7 @@
 DocType: POS Profile,Cash/Bank Account,现金/银行账户
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,删除的项目在数量或价值没有变化。
 DocType: Delivery Note,Delivery To,交货对象
-apps/erpnext/erpnext/stock/doctype/item/item.py +547,Attribute table is mandatory,属性表是强制性的
+apps/erpnext/erpnext/stock/doctype/item/item.py +552,Attribute table is mandatory,属性表是强制性的
 DocType: Production Planning Tool,Get Sales Orders,获取销售订单
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0}不能为负
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,折扣
@@ -864,20 +862,20 @@
 DocType: Landed Cost Item,Purchase Receipt Item,采购入库项目
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,在销售订单/成品仓库保留仓库
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,销售金额
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +79,Time Logs,时间日志
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +80,Time Logs,时间日志
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +125,You are the Expense Approver for this record. Please Update the 'Status' and Save,你是本记录的费用审批人,请更新‘状态’字段并保存。
 DocType: Serial No,Creation Document No,创建文档编号
 DocType: Issue,Issue,问题
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,客户不与公司匹配
 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/support/doctype/maintenance_schedule/maintenance_schedule.py +185,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,运输状态
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,品目必须要由“从采购收据获取品目”添加
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,销售费用
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Sales Expenses,销售费用
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +106,Standard Buying,标准采购
 DocType: GL Entry,Against,针对
 DocType: Item,Default Selling Cost Center,默认销售成本中心
@@ -894,7 +892,7 @@
 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 +18,Quotations received from Suppliers.,从供应商收到的报价。
+apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,从供应商收到的报价。
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},{0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,通过时间更新日志
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,平均年龄
@@ -903,7 +901,7 @@
 DocType: Company,Default Currency,默认货币
 DocType: Contact,Enter designation of this Contact,输入联系人的职务
 DocType: Expense Claim,From Employee,来自员工
-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}为零,系统将不会检查超额
+apps/erpnext/erpnext/controllers/accounts_controller.py +347,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,关键绩效区
@@ -911,7 +909,7 @@
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,和年份:
 DocType: Email Digest,Annual Expense,年费用
 DocType: SMS Center,Total Characters,总字符
-apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},请BOM字段中选择BOM的项目{0}
+apps/erpnext/erpnext/controllers/buying_controller.py +131,Please select BOM in BOM field for Item {0},请BOM字段中选择BOM的项目{0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-形式发票详细信息
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,付款发票对账
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +42,Contribution %,贡献%
@@ -920,7 +918,7 @@
 DocType: Sales Partner,Distributor,经销商
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,购物车配送规则
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Production Order {0} must be cancelled before cancelling this Sales Order,生产订单{0}必须取消这个销售订单之前被取消
-apps/erpnext/erpnext/public/js/controllers/transaction.js +930,Please set 'Apply Additional Discount On',请设置“收取额外折扣”
+apps/erpnext/erpnext/public/js/controllers/transaction.js +941,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.,选择时间记录然后提交来创建一个新的销售发票。
@@ -928,14 +926,14 @@
 DocType: Salary Slip,Deductions,扣款列表
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,此时日志批量一直标榜。
 DocType: Salary Slip,Leave Without Pay,无薪假期
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Capacity Planning Error,容量规划错误
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +270,Capacity Planning Error,容量规划错误
 ,Trial Balance for Party,试算表的派对
 DocType: Lead,Consultant,顾问
 DocType: Salary Slip,Earnings,盈余
 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 +473,Nothing to request,没有申请内容
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +476,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 +45,Types of activities for Time Sheets,活动的考勤表类型
@@ -946,18 +944,18 @@
 DocType: Purchase Invoice,Is Return,再来
 DocType: Price List Country,Price List Country,价目表国家
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,只能在“组”节点下新建节点
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +67,Please set Email ID,请设置电子邮件ID
+apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,请设置电子邮件ID
 DocType: Item,UOMs,计量单位
 apps/erpnext/erpnext/stock/utils.py +171,{0} valid serial nos for Item {1},品目{1}有{0}个有效序列号
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,品目编号不能因序列号改变
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +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 +33,Supplier database.,供应商数据库。
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,供应商数据库。
 DocType: Account,Balance Sheet,资产负债表
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,Cost Center For Item with Item Code ',成本中心:品目代码‘
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +623,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/accounts/page/accounts_browser/accounts_browser.js +212,"Further accounts can be made under Groups, but entries can be made against non-Groups",进一步帐户可以根据组进行,但条目可针对非组进行
 apps/erpnext/erpnext/config/hr.py +120,Tax and other salary deductions.,税项及其他扣款。
 DocType: Lead,Lead,线索
 DocType: Email Digest,Payables,应付账款
@@ -985,18 +983,18 @@
 DocType: Maintenance Visit Purpose,Work Done,已完成工作
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,请指定属性表中的至少一个属性
 DocType: Contact,User ID,用户ID
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +128,View Ledger,查看总帐
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +131,View Ledger,查看总帐
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,最早
-apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group",同名品目群组已存在,请修改品目名或群组名
+apps/erpnext/erpnext/stock/doctype/item/item.py +436,"An Item Group exists with same name, please change the item name or rename the item group",同名品目群组已存在,请修改品目名或群组名
 DocType: Production Order,Manufacture against Sales Order,按销售订单生产
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +412,Rest Of The World,世界其他地区
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +83,The Item {0} cannot have Batch,物件{0}不能有批次
 ,Budget Variance Report,预算差异报告
 DocType: Salary Slip,Gross Pay,工资总额
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,股利支付
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Dividends Paid,股利支付
 apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,会计总帐
 DocType: Stock Reconciliation,Difference Amount,差额
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,留存收益
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +195,Retained Earnings,留存收益
 DocType: BOM Item,Item Description,品目说明
 DocType: Payment Tool,Payment Mode,付款方式
 DocType: Purchase Invoice,Is Recurring,是否周期性
@@ -1004,7 +1002,7 @@
 DocType: Production Order,Qty To Manufacture,生产数量
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,在整个采购周期使用同一价格
 DocType: Opportunity Item,Opportunity Item,项目的机会
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,临时开通
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +64,Temporary Opening,临时开通
 ,Employee Leave Balance,雇员假期余量
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +127,Balance for Account {0} must always be {1},账户{0}的余额必须总是{1}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},行对项目所需的估值速率{0}
@@ -1019,8 +1017,8 @@
 ,Accounts Payable Summary,应付帐款摘要
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Not authorized to edit frozen Account {0},无权修改冻结帐户{0}
 DocType: Journal Entry,Get Outstanding Invoices,获取未清发票
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,销售订单{0}无效
-apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged",抱歉,公司不能合并
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,销售订单{0}无效
+apps/erpnext/erpnext/setup/doctype/company/company.py +168,"Sorry, companies cannot be merged",抱歉,公司不能合并
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +126,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",在材质要求总发行/传输量{0} {1} \不能超过请求的数量{2}的项目更大的{3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,小
@@ -1028,7 +1026,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},箱号已被使用,请尝试从{0}开始
 ,Invoiced Amount (Exculsive Tax),已开票金额(未含税)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,项目2
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,账户头{0}已创建
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +67,Account head {0} created,账户头{0}已创建
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,绿
 DocType: Item,Auto re-order,自动重新排序
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,总体上实现
@@ -1036,12 +1034,12 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,合同
 DocType: Email Digest,Add Quote,添加报价
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +493,UOM coversion factor required for UOM: {0} in Item: {1},物件{1}的计量单位{0}需要单位换算系数
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,间接支出
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +86,Indirect Expenses,间接支出
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,行{0}:数量是强制性的
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,农业
 apps/erpnext/erpnext/public/js/setup_wizard.js +257,Your Products or Services,您的产品或服务
 DocType: Mode of Payment,Mode of Payment,付款方式
-apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,网站形象应该是一个公共文件或网站网址
+apps/erpnext/erpnext/stock/doctype/item/item.py +126,Website Image should be a public file or website URL,网站形象应该是一个公共文件或网站网址
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,请先输入项目
 DocType: Journal Entry Account,Purchase Order,采购订单
 DocType: Warehouse,Warehouse Contact Info,仓库联系方式
@@ -1051,17 +1049,17 @@
 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 +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/sales_invoice/sales_invoice.py +486,Delivery Note {0} is not submitted,送货单{0}未提交
+apps/erpnext/erpnext/stock/get_item_details.py +142,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,卖家网站
 apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated percentage for sales team should be 100,对于销售团队总分配比例应为100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},生产订单状态为{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},生产订单状态为{0}
 DocType: Appraisal Goal,Goal,目标
 DocType: Sales Invoice Item,Edit Description,编辑说明
-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 +750,For Supplier,对供应商
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,Expected Delivery Date is lesser than Planned Start Date.,预计交付日期比计划开始日期较小。
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +617,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,即将离任的总
@@ -1071,10 +1069,10 @@
 DocType: Item,Website Item Groups,网站物件组
 DocType: Purchase Invoice,Total (Company Currency),总(公司货币)
 apps/erpnext/erpnext/stock/utils.py +166,Serial number {0} entered more than once,序列号{0}已多次输入
-DocType: Journal Entry,Journal Entry,日记帐分录
+DocType: Depreciation Schedule,Journal Entry,日记帐分录
 DocType: Workstation,Workstation Name,工作站名称
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,邮件摘要:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +433,BOM {0} does not belong to Item {1},BOM{0}不属于品目{1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} does not belong to Item {1},BOM{0}不属于品目{1}
 DocType: Sales Partner,Target Distribution,目标分布
 DocType: Salary Slip,Bank Account No.,银行账号
 DocType: Naming Series,This is the number of the last created transaction with this prefix,这就是以这个前缀的最后一个创建的事务数
@@ -1107,7 +1105,7 @@
 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,开始和结束日期
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +366,Operations cannot be left blank.,操作不能留空。
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +375,Operations cannot be left blank.,操作不能留空。
 ,Delivered Items To Be Billed,无开账单的已交付品目
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,仓库不能为序列号变更
 DocType: Authorization Rule,Average Discount,平均折扣
@@ -1118,10 +1116,10 @@
 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}
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},来自{0} | {1} {2}
 DocType: BOM Operation,Operation Description,操作说明
 DocType: Item,Will also apply to variants,会同时应用于变体
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +31,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,财年保存后便不能更改财年开始日期和结束日期
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +32,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,财年保存后便不能更改财年开始日期和结束日期
 DocType: Quotation,Shopping Cart,购物车
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,平均每日出货
 DocType: Pricing Rule,Campaign,活动
@@ -1135,8 +1133,8 @@
 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 +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/controllers/accounts_controller.py +539,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}中的收取类型“实际”不能有“品目税率”
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},最大值:{0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,起始时间日期
 DocType: Email Digest,For Company,对公司
 apps/erpnext/erpnext/config/support.py +17,Communication log.,通信日志。
@@ -1144,8 +1142,8 @@
 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 +472,cannot be greater than 100,不能大于100
-apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,品目{0}不是库存品目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +475,cannot be greater than 100,不能大于100
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is not a stock Item,品目{0}不是库存品目
 DocType: Maintenance Visit,Unscheduled,计划外
 DocType: Employee,Owned,资
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,依赖于无薪休假
@@ -1166,11 +1164,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 +447,Accounting Entry for {0}: {1} can only be made in currency: {2},会计分录为{0}:{1}只能在货币做:{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +460,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 +167,Tax Rule for transactions.,税收规则进行的交易。
+apps/erpnext/erpnext/config/accounts.py +175,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,账单
@@ -1183,8 +1181,8 @@
 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 +600,Packing Slip,装箱单
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,办公室租金
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +643,Packing Slip,装箱单
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,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!,导入失败!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,未添加地址。
@@ -1202,7 +1200,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,政府
 apps/erpnext/erpnext/config/stock.py +290,Item Variants,项目变体
 DocType: Company,Services,服务
-apps/erpnext/erpnext/accounts/report/financial_statements.py +191,Total ({0}),总计({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total ({0}),总计({0})
 DocType: Cost Center,Parent Cost Center,父成本中心
 DocType: Sales Invoice,Source,源
 DocType: Leave Type,Is Leave Without Pay,是无薪休假
@@ -1211,10 +1209,10 @@
 DocType: Employee External Work History,Total Experience,总经验
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +261,Packing Slip(s) cancelled,装箱单( S)取消
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,从投资现金流
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,货运及转运费
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Freight and Forwarding Charges,货运及转运费
 DocType: Item Group,Item Group Name,品目群组名称
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,已经过
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +86,Transfer Materials for Manufacture,转移制造材料
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +87,Transfer Materials for Manufacture,转移制造材料
 DocType: Pricing Rule,For Price List,对价格表
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,猎头
 apps/erpnext/erpnext/stock/stock_ledger.py +406,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.",购买率的项目:{0}没有找到,这是需要预订会计分录(费用)。请注明项目价格对买入价格表。
@@ -1223,7 +1221,7 @@
 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 +659,Maintenance Visit,维护访问
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +702,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,到岸成本帮助
@@ -1237,7 +1235,6 @@
 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 +196,Brand master.,主要品牌
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,供应商>供应商类型
 DocType: Sales Invoice Item,Brand Name,品牌名称
 DocType: Purchase Receipt,Transporter Details,转运详细
 apps/erpnext/erpnext/public/js/setup_wizard.js +272,Box,箱
@@ -1265,7 +1262,7 @@
 DocType: Quality Inspection Reading,Reading 4,阅读4
 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,库存负债
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +168,Stock Liabilities,库存负债
 DocType: Purchase Receipt,Supplier Warehouse,供应商仓库
 DocType: Opportunity,Contact Mobile No,联系人手机号码
 ,Material Requests for which Supplier Quotations are not created,无供应商报价的物料申请
@@ -1274,7 +1271,7 @@
 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/stock/doctype/item/item.py +349,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 +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,停止生日提醒
@@ -1284,26 +1281,26 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +520,{0} View,{0}查看
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,现金净变动
 DocType: Salary Structure Deduction,Salary Structure Deduction,薪酬结构扣款
-apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,计量单位{0}已经在换算系数表内
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Unit of Measure {0} has been entered more than once in Conversion Factor Table,计量单位{0}已经在换算系数表内
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,Payment Request already exists {0},付款申请已经存在{0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,已发料品目成本
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +184,Quantity must not be more than {0},数量不能超过{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},数量不能超过{0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),时间(天)
 DocType: Quotation Item,Quotation Item,报价品目
 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 +38,Supplier Type master.,主要的供应商类型。
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,主要的供应商类型。
 DocType: Purchase Order Item,Supplier Part Number,供应商零件编号
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,Conversion rate cannot be 0 or 1,汇率不能为0或1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Conversion rate cannot be 0 or 1,汇率不能为0或1
 DocType: Purchase Invoice,Reference Document,参考文献
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +172,{0} {1} is cancelled or stopped,{0} {1}被取消或停止
 DocType: Accounts Settings,Credit Controller,信用控制人
 DocType: Delivery Note,Vehicle Dispatch Date,车辆调度日期
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +203,Purchase Receipt {0} is not submitted,外购入库单{0}未提交
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +205,Purchase Receipt {0} is not submitted,外购入库单{0}未提交
 DocType: Company,Default Payable Account,默认应付账户
-apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.",网上购物车,如配送规则,价格表等的设置
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}%帐单
+apps/erpnext/erpnext/config/website.py +12,"Settings for online shopping cart such as shipping rules, price list etc.",网上购物车,如配送规则,价格表等的设置
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +80,{0}% Billed,{0}%帐单
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,保留数量
 DocType: Party Account,Party Account,党的帐户
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,人力资源
@@ -1325,7 +1322,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 +129,Update bank payment dates with journals.,用日记账更新银行付款时间
+apps/erpnext/erpnext/config/accounts.py +137,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.,没有一个项目无论在数量或价值的任何变化。
@@ -1344,7 +1341,7 @@
 DocType: Employee,Permanent Address,永久地址
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",推动打击{0} {1}不能大于付出\超过总计{2}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please select item code,请选择商品代码
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +139,Please select item code,请选择商品代码
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),减少停薪留职扣款(LWP)
 DocType: Territory,Territory Manager,区域经理
 DocType: Packed Item,To Warehouse (Optional),仓库(可选)
@@ -1354,15 +1351,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,网上拍卖
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,请注明无论是数量或估价率或两者
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory",公司,月度和财年是必须项
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,市场营销开支
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Marketing Expenses,市场营销开支
 ,Item Shortage Report,品目短缺报告
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量被提及,\n请注明“重量计量单位”
+apps/erpnext/erpnext/stock/doctype/item/item.js +181,"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 +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}必须是'提交'
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +216,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 +392,Warehouse required at Row No {0},在行无需仓库{0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,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,获取模板
@@ -1379,8 +1376,8 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},党的类型和党的需要应收/应付帐户{0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.",如果此项目已变种,那么它不能在销售订单等选择
 DocType: Lead,Next Contact By,下次联络人
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Quantity required for Item {0} in row {1},行{1}中的品目{0}必须指定数量
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},仓库{0}无法删除,因为物件{1}有库存量
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +225,Quantity required for Item {0} in row {1},行{1}中的品目{0}必须指定数量
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +93,Warehouse {0} can not be deleted as quantity exists for Item {1},仓库{0}无法删除,因为物件{1}有库存量
 DocType: Quotation,Order Type,订单类型
 DocType: Purchase Invoice,Notification Email Address,通知邮件地址
 DocType: Payment Tool,Find Invoices to Match,查找发票到匹配
@@ -1391,21 +1388,21 @@
 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 +232,No Production Orders created,暂无生产订单
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,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.,太多的列。导出报表,并使用电子表格应用程序进行打印。
 DocType: Sales Invoice Item,Batch No,批号
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,允许多个销售订单对客户的采购订单
-apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,主
+apps/erpnext/erpnext/setup/doctype/company/company.py +147,Main,主
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,变体
 DocType: Naming Series,Set prefix for numbering series on your transactions,为交易设置编号系列的前缀
 DocType: Employee Attendance Tool,Employees HTML,HTML员工
-apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,默认BOM({0})必须是活动的这个项目或者其模板
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,Default BOM ({0}) must be active for this item or its template,默认BOM({0})必须是活动的这个项目或者其模板
 DocType: Employee,Leave Encashed?,假期已使用?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,从机会是必选项
 DocType: Item,Variants,变种
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +759,Make Purchase Order,创建采购订单
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +802,Make Purchase Order,创建采购订单
 DocType: SMS Center,Send To,发送到
 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,分配量
@@ -1413,26 +1410,26 @@
 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/manufacturing/doctype/production_order/production_order.py +154,Work-in-Progress Warehouse is required before Submit,提交前需要指定在制品仓库
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,求职申请。
 DocType: Purchase Order Item,Warehouse and Reference,仓库及参考
 DocType: Supplier,Statutory info and other general information about your Supplier,供应商的注册信息和其他一般信息
-apps/erpnext/erpnext/shopping_cart/utils.py +37,Addresses,地址
+apps/erpnext/erpnext/hooks.py +91,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/manufacturing/doctype/production_order/production_order.py +339,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 +27,Time Logs for manufacturing.,时间日志制造。
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,BOM{0}未提交
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,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 +35,Time Log for tasks.,时间日志中的任务。
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +595,Payment,付款
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,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,称呼
@@ -1465,7 +1462,7 @@
 DocType: Sales Order Item,Delivery Warehouse,交货仓库
 DocType: Stock Settings,Allowance Percent,限额百分比
 DocType: SMS Settings,Message Parameter,消息参数
-apps/erpnext/erpnext/config/accounts.py +192,Tree of financial Cost Centers.,财务成本中心的树。
+apps/erpnext/erpnext/config/accounts.py +200,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,创建日期
@@ -1497,41 +1494,41 @@
 ,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 +230,{0} created,{0}已创建
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{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,品目表不能为空
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +125,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +129,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","行{0}:设置{1}的周期性,从和到日期\
 之间差必须大于或等于{2}"
 DocType: Pricing Rule,Selling,销售
 DocType: Employee,Salary Information,薪资信息
 DocType: Sales Person,Name and Employee ID,姓名和雇员ID
-apps/erpnext/erpnext/accounts/party.py +271,Due Date cannot be before Posting Date,到期日不能前于过账日期
+apps/erpnext/erpnext/accounts/party.py +277,Due Date cannot be before Posting Date,到期日不能前于过账日期
 DocType: Website Item Group,Website Item Group,网站物件组
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,关税与税项
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Duties and Taxes,关税与税项
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,参考日期请输入
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Payment Gateway Account is not configured,支付网关帐户未配置
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0}付款项不能由{1}过滤
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,将在网站显示的物件表
 DocType: Purchase Order Item Supplied,Supplied Qty,附送数量
-DocType: Production Order,Material Request Item,物料申请品目
+DocType: Request for Quotation Item,Material Request Item,物料申请品目
 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,红
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +215,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},请点击“生成表”来获取序列号增加了对项目{0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},请点击“生成表”来获取序列号增加了对项目{0}
 DocType: Account,Frozen,冻结的
 ,Open Production Orders,清生产订单
 DocType: Installation Note,Installation Time,安装时间
 DocType: Sales Invoice,Accounting Details,会计细节
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,删除所有交易本公司
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +188,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,行#{0}:操作{1}未完成的成品{2}在生产数量订单{3}。请通过时间日志更新运行状态
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,投资
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Investments,投资
 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 +160,Please enter Material Requests in the above table,请输入在上表请求材料
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,请输入在上表请求材料
 DocType: Item Attribute,Attribute Name,属性名称
 DocType: Item Group,Show In Website,在网站上显示
 apps/erpnext/erpnext/public/js/setup_wizard.js +267,Group,组
@@ -1559,7 +1556,7 @@
 ,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 +308,Debit To account must be a Receivable account,入借帐户必须是应收账科目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +309,Debit To account must be a Receivable account,入借帐户必须是应收账科目
 DocType: Shipping Rule Condition,Shipping Amount,发货数量
 ,Pending Amount,待审核金额
 DocType: Purchase Invoice Item,Conversion Factor,转换系数
@@ -1573,23 +1570,22 @@
 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 +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,额外的折扣金额
 DocType: Leave Block List Allow,Leave Block List Allow,例外用户
-apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,缩写不能为空或空格
+apps/erpnext/erpnext/setup/doctype/company/company.py +237,Abbr can not be blank or space,缩写不能为空或空格
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,集团以非组
 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 +124,Please specify Company,请注明公司
+apps/erpnext/erpnext/stock/get_item_details.py +123,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,您的会计年度结束于
 DocType: POS Profile,Price List,价格表
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,默认财政年度已经更新为{0}。请刷新您的浏览器以使更改生效。
-apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,报销
+apps/erpnext/erpnext/projects/doctype/project/project.js +58,Expense Claims,报销
 DocType: Issue,Support,支持
 ,BOM Search,BOM搜索
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),截止(开标+总计)
@@ -1598,29 +1594,29 @@
 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 +249,Account {0} is invalid. Account Currency must be {1},帐户{0}是无效的。帐户货币必须是{1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +262,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 +262,Item Price added for {0} in Price List {1},加入项目价格为{0}价格表{1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,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,客户按区域分类
 DocType: Project,% Tasks Completed,%任务已完成
 DocType: Project,Gross Margin,毛利
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,请先输入生产项目
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +138,Please enter Production Item first,请先输入生产项目
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Calculated Bank Statement balance,计算的银行对账单余额
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,已禁用用户
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,报价
 DocType: Salary Slip,Total Deduction,扣除总额
 DocType: Quotation,Maintenance User,维护用户
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +142,Cost Updated,成本更新
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +151,Cost Updated,成本更新
 DocType: Employee,Date of Birth,出生日期
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +85,Item {0} has already been returned,品目{0}已被退回
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**财年**表示财政年度。所有的会计分录和其他重大交易将根据**财年**跟踪。
 DocType: Opportunity,Customer / Lead Address,客户/潜在客户地址
-apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},警告:附件无效的SSL证书{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +156,Warning: Invalid SSL certificate on attachment {0},警告:附件无效的SSL证书{0}
 DocType: Production Order Operation,Actual Operation Time,实际操作时间
 DocType: Authorization Rule,Applicable To (User),适用于(用户)
 DocType: Purchase Taxes and Charges,Deduct,扣款
@@ -1632,8 +1628,8 @@
 ,SO Qty,销售订单数量
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",此库存记录已经出现在仓库{0}中,所以你不能重新指定或更改仓库
 DocType: Appraisal,Calculate Total Score,计算总分
-DocType: Supplier Quotation,Manufacturing Manager,生产经理
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +178,Serial No {0} is under warranty upto {1},序列号{0}截至至{1}之前在保修内。
+DocType: Request for Quotation,Manufacturing Manager,生产经理
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +182,Serial No {0} is under warranty upto {1},序列号{0}截至至{1}之前在保修内。
 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,要传送给客户
@@ -1641,12 +1637,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,序列号{0}不属于任何仓库
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,行#
 DocType: Purchase Invoice,In Words (Company Currency),大写金额(公司货币)
-DocType: Pricing Rule,Supplier,供应商
+DocType: Asset,Supplier,供应商
 DocType: C-Form,Quarter,季
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,杂项开支
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,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 +350,"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 +363,"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}已禁用
@@ -1655,7 +1651,7 @@
 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 +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}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +354,{0} is mandatory for Item {1},品目{1}必须有{0}
 DocType: Currency Exchange,From Currency,源货币
 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}的必须项
@@ -1668,8 +1664,7 @@
 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 > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",转到相应的组(通常是基金>流动负债>税和关税的来源,并创建一个新帐户(类型为“税”点击添加子),并做提税率。
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center,新建成本中心
 DocType: Bin,Ordered Quantity,订购数量
 apps/erpnext/erpnext/public/js/setup_wizard.js +22,"e.g. ""Build tools for builders""",例如“建筑工人的建筑工具!”
 DocType: Quality Inspection,In Process,进行中
@@ -1685,7 +1680,7 @@
 DocType: Quotation Item,Stock Balance,库存余额
 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/manufacturing/doctype/production_order/production_order.py +283,Time Logs created:,时间日志创建:
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +796,Please select correct account,请选择正确的帐户
 DocType: Item,Weight UOM,重量计量单位
 DocType: Employee,Blood Group,血型
@@ -1703,13 +1698,13 @@
 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 +302,Debit To is required,借记是必需的
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +303,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,质量经理
 DocType: Job Applicant,Job Opening,职务空缺
 DocType: Payment Reconciliation,Payment Reconciliation,付款对账
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Incharge Person's name,请选择Incharge人的名字
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +145,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 +18,Generate Material Requests (MRP) and Production Orders.,生成材料要求(MRP)和生产订单。
@@ -1717,22 +1712,22 @@
 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.",要添加子节点,探索树,然后单击要在其中添加更多节点的节点上。
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Credit To account must be a Payable account,入贷科目必须是一个“应付”科目
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +234,BOM recursion: {0} cannot be parent or child of {2},BOM {0}不能是{2}的上级或下级
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +104,Credit To account must be a Payable account,入贷科目必须是一个“应付”科目
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,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 +273,Price List {0} is disabled,价格表{0}被禁用
+apps/erpnext/erpnext/stock/get_item_details.py +272,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 +123,Create Payment Entries against Orders or Invoices.,创建订单或发票的支付分录。
+apps/erpnext/erpnext/config/accounts.py +131,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,所有品目已开具发票
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',请指定一个有效的“从案号”
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +300,Further cost centers can be made under Groups but entries can be made against non-Groups,进一步的成本中心可以根据组进行,但项可以对非组进行
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +303,Further cost centers can be made under Groups but entries can be made against non-Groups,进一步的成本中心可以根据组进行,但项可以对非组进行
 DocType: Project,External,外部
 DocType: Features Setup,Item Serial Nos,品目序列号
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,用户和权限
@@ -1741,10 +1736,10 @@
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,没有工资单找到了一个月:
 DocType: Bin,Actual Quantity,实际数量
 DocType: Shipping Rule,example: Next Day Shipping,例如:次日发货
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +175,Serial No {0} not found,序列号{0}未找到
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +179,Serial No {0} not found,序列号{0}未找到
 apps/erpnext/erpnext/public/js/setup_wizard.js +211,Your Customers,您的客户
 DocType: Leave Block List Date,Block Date,禁离日期
-apps/erpnext/erpnext/templates/generators/job_opening.html +17,Apply Now,现在申请
+apps/erpnext/erpnext/templates/generators/job_opening.html +18,Apply Now,现在申请
 DocType: Sales Order,Not Delivered,未交付
 ,Bank Clearance Summary,银行结算摘要
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.",创建和管理每日,每周和每月的电子邮件摘要。
@@ -1768,7 +1763,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 +114,No Item with Barcode {0},没有条码为{0}的品目
+apps/erpnext/erpnext/stock/get_item_details.py +113,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,在页面顶部显示幻灯片
@@ -1786,10 +1781,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 +608,Transfer Material,转印材料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +611,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 +839,Please set recurring after saving,请设置保存后复发
+apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Please set recurring after saving,请设置保存后复发
 DocType: Purchase Invoice,Price List Currency,价格表货币
 DocType: Naming Series,User must always select,用户必须始终选择
 DocType: Stock Settings,Allow Negative Stock,允许负库存
@@ -1803,7 +1798,7 @@
 DocType: Quality Inspection,Purchase Receipt No,购买收据号码
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,保证金
 DocType: Process Payroll,Create Salary Slip,建立工资单
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),资金来源(负债)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Source of Funds (Liabilities),资金来源(负债)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},行{0}中的数量({1})必须等于生产数量{2}
 DocType: Appraisal,Employee,雇员
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,导入电子邮件发件人
@@ -1817,9 +1812,9 @@
 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 +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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},请行选择BOM为项目{0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchse Order number required for Item {0},要求项目Purchse订单号{0}
+apps/erpnext/erpnext/controllers/buying_controller.py +237,Specified BOM {0} does not exist for Item {1},品目{1}指定的BOM{0}不存在
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +196,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消维护计划{0}
 DocType: Notification Control,Expense Claim Approved,报销批准
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,医药
@@ -1836,25 +1831,25 @@
 DocType: Upload Attendance,Attendance To Date,考勤结束日期
 DocType: Warranty Claim,Raised By,提出
 DocType: Payment Gateway Account,Payment Account,付款帐号
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +737,Please specify Company to proceed,请注明公司进行
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,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,已接受
 apps/erpnext/erpnext/setup/doctype/company/company.js +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,请确保你真的要删除这家公司的所有交易。主数据将保持原样。这个动作不能撤消。
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},无效的参考{0} {1}
 DocType: Payment Tool,Total Payment Amount,总付款金额
-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})
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +147,{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 +423,"Could not update stock, invoice contains drop shipping item.",无法更新库存,发票包含下降航运项目。
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Raw Materials cannot be blank.,原材料不能为空。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,"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, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,"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'",由于有存量交易为这个项目,\你不能改变的值'有序列号','有批号','是库存项目“和”评估方法“
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +449,Quick Journal Entry,快速日记帐分录
 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 +206,Please enter Planned Qty for Item {0} at row {1},请输入计划数量的项目{0}在行{1}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},请输入计划数量的项目{0}在行{1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1}未提交
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,请求的项目。
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,独立的生产订单将每个成品项目被创建。
@@ -1863,7 +1858,7 @@
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,9 。考虑税收或支出:在本部分中,您可以指定,如果税务/充电仅适用于估值(总共不一部分) ,或只为总(不增加价值的项目) ,或两者兼有。
 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/stock/doctype/material_request/material_request.py +388,The following Production Orders were created:,创建以下生产订单:
 apps/erpnext/erpnext/config/crm.py +116,Newsletter Mailing List,时事通讯录
 DocType: Delivery Note,Transporter Name,转运名称
 DocType: Authorization Rule,Authorized Value,授权值
@@ -1881,10 +1876,9 @@
 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/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",转到相应的组(通常是基金的流动资产应用>>银行账户,并创建一个新帐户(点击添加子)类型的“银行”
 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}的开始日期不能早于交付日期
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +189,Maintenance start date can not be before delivery date for Serial No {0},序列号为{0}的开始日期不能早于交付日期
 DocType: Production Order,Actual End Date,实际结束日期
 DocType: Authorization Rule,Applicable To (Role),适用于(角色)
 DocType: Stock Entry,Purpose,目的
@@ -1938,12 +1932,12 @@
 9. 税费应用于:你可以在这个部分指定此税费仅应用于评估(即不影响总计), 或者仅应用于总计(即不会应用到单个品目),或者两者。
 10. 添加或扣除: 添加还是扣除此税费。"
 DocType: Purchase Receipt Item,Recd Quantity,记录数量
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},不能生产超过销售订单数量{1}的品目{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},不能生产超过销售订单数量{1}的品目{0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +497,Stock Entry {0} is not submitted,库存记录{0}不提交
 DocType: Payment Reconciliation,Bank / Cash Account,银行/现金账户
 DocType: Tax Rule,Billing City,结算城市
 DocType: Global Defaults,Hide Currency Symbol,隐藏货币符号
-apps/erpnext/erpnext/config/accounts.py +262,"e.g. Bank, Cash, Credit Card",例如:银行,现金,信用卡
+apps/erpnext/erpnext/config/accounts.py +270,"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,质量
@@ -1967,9 +1961,9 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,我的地址
 DocType: Stock Ledger Entry,Outgoing Rate,传出率
 apps/erpnext/erpnext/config/hr.py +180,Organization branch master.,组织分支主。
-apps/erpnext/erpnext/controllers/accounts_controller.py +250, or ,或
+apps/erpnext/erpnext/controllers/accounts_controller.py +263, 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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Utility Expenses,基础设施费用
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90以上
 DocType: Buying Settings,Default Buying Price List,默认采购价格表
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,No employee for the above selected criteria OR salary slip already created,已创建的任何雇员对上述选择标准或工资单
@@ -1996,7 +1990,7 @@
 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',维护计划没有为所有品目生成,请点击“生产计划”
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,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}也必须包括
@@ -2007,7 +2001,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 +654,Delivery,交货
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,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,关键责任区
@@ -2029,16 +2023,16 @@
 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 +665,Please select a value for {0} quotation_to {1},请选择一个值{0} quotation_to {1}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +708,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/accounts/doctype/account/account.py +215,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",合并是唯一可能的,如果以下属性中均有记载相同。是集团,根型,公司
 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,新建成本中心名称
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,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/config/support.py +7,Issues,问题
+apps/erpnext/erpnext/hooks.py +90,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.,只对样品项目所需。
@@ -2057,10 +2051,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,债务人
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +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,请注明无需访问
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +143,Please mention no of visits required,请注明无需访问
 DocType: Stock Settings,Default Valuation Method,默认估值方法
 DocType: Production Order Operation,Planned Start Time,计划开始时间
-apps/erpnext/erpnext/config/accounts.py +214,Close Balance Sheet and book Profit or Loss.,关闭资产负债表,打开损益表。
+apps/erpnext/erpnext/config/accounts.py +222,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,未偿还总额
@@ -2116,7 +2110,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,Atleast one item should be entered with negative quantity in return document,ATLEAST一个项目应该负数量回报文档中输入
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",操作{0}比任何可用的工作时间更长工作站{1},分解成运行多个操作
 ,Requested,要求
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +67,No Remarks,暂无说明
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +68,No Remarks,暂无说明
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,过期的
 DocType: Account,Stock Received But Not Billed,已收货未开单的库存
 apps/erpnext/erpnext/accounts/doctype/account/account.py +83,Root Account must be a group,根帐户必须是一组
@@ -2143,7 +2137,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,获取相关条目
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,库存的会计分录
 DocType: Sales Invoice,Sales Team1,销售团队1
-apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,品目{0}不存在
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Item {0} does not exist,品目{0}不存在
 DocType: Sales Invoice,Customer Address,客户地址
 DocType: Payment Request,Recipient and Message,收件人和消息
 DocType: Purchase Invoice,Apply Additional Discount On,收取额外折扣
@@ -2157,7 +2151,7 @@
 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 +579,Warning: Material Requested Qty is less than Minimum Order Qty,警告:物料请求的数量低于最低起订量
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +582,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,静音电子邮件
@@ -2180,10 +2174,10 @@
 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 +405,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),总的超前({0})对二阶{1}不能大于总计({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,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 +294,Price List Currency not selected,价格表货币没有选择
+apps/erpnext/erpnext/stock/get_item_details.py +293,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 +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,项目开始日期
@@ -2192,7 +2186,7 @@
 DocType: Installation Note Item,Against Document No,对文档编号
 apps/erpnext/erpnext/config/selling.py +113,Manage Sales Partners.,管理销售合作伙伴。
 DocType: Quality Inspection,Inspection Type,检验类型
-apps/erpnext/erpnext/controllers/recurring_document.py +165,Please select {0},请选择{0}
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},请选择{0}
 DocType: C-Form,C-Form No,C-表编号
 DocType: BOM,Exploded_items,展开品目
 DocType: Employee Attendance Tool,Unmarked Attendance,无标记考勤
@@ -2220,7 +2214,7 @@
 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 +141,Amt,金额
+apps/erpnext/erpnext/controllers/trends.py +145,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,如果询价的来源是活动的话请输入活动名称。
@@ -2234,12 +2228,12 @@
 DocType: Purchase Receipt Item,Accepted Warehouse,已接收的仓库
 DocType: Bank Reconciliation Detail,Posting Date,发布日期
 DocType: Item,Valuation Method,估值方法
-apps/erpnext/erpnext/setup/utils.py +91,Unable to find exchange rate for {0} to {1},找不到汇率{0} {1}
+apps/erpnext/erpnext/setup/utils.py +93,Unable to find exchange rate for {0} to {1},找不到汇率{0} {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,马克半天
 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 +410,[Error],[错误]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +413,[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,创业投资
@@ -2271,13 +2265,13 @@
 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 +471,Material Requests {0} created,物料申请{0}已创建
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +474,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}
-apps/erpnext/erpnext/accounts/party.py +280,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),注意:到期日/计入日已超过客户信用日期{0}天。
+apps/erpnext/erpnext/accounts/party.py +286,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),注意:到期日/计入日已超过客户信用日期{0}天。
 DocType: Stock Settings,Freeze Stock Entries,冻结仓储记录
 DocType: Item,Reorder level based on Warehouse,根据仓库订货点水平
 DocType: Activity Cost,Billing Rate,结算利率
@@ -2291,12 +2285,11 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +248,{0} {1} is cancelled or closed,{0} {1}被取消或关闭
 DocType: Delivery Note,Track this Delivery Note against any Project,跟踪此送货单反对任何项目
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,从投资净现金
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Root account can not be deleted,root帐号不能被删除
 ,Is Primary Address,是主地址
 DocType: Production Order,Work-in-Progress Warehouse,在制品仓库
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},参考# {0}记载日期为{1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +16,Manage Addresses,管理地址
-DocType: Pricing Rule,Item Code,品目编号
+DocType: Asset,Item Code,品目编号
 DocType: Production Planning Tool,Create Production Orders,创建生产订单
 DocType: Serial No,Warranty / AMC Details,保修/ 年度保养合同详情
 DocType: Journal Entry,User Remark,用户备注
@@ -2342,24 +2335,24 @@
 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:,制作订单不能上调:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +390,Productions Orders cannot be raised for:,制作订单不能上调:
 apps/erpnext/erpnext/public/js/setup_wizard.js +273,Minute,分钟
 DocType: Purchase Invoice,Purchase Taxes and Charges,购置税和费
 ,Qty to Receive,接收数量
 DocType: Leave Block List,Leave Block List Allowed,禁离日例外用户
 DocType: Sales Partner,Retailer,零售商
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Credit To account must be a Balance Sheet account,信用帐户必须是资产负债表科目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,Credit To account must be a Balance Sheet account,信用帐户必须是资产负债表科目
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,所有供应商类型
 DocType: Global Defaults,Disable In Words,禁用词
 apps/erpnext/erpnext/stock/doctype/item/item.py +46,Item Code is mandatory because Item is not automatically numbered,品目编号是必须项,因为品目没有自动编号
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +94,Quotation {0} not of type {1},报价{0} 不属于{1}类型
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,维护计划品目
 DocType: Sales Order,%  Delivered,%已交付
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,银行透支账户
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +180,Bank Overdraft Account,银行透支账户
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,浏览BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,抵押贷款
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +178,Secured Loans,抵押贷款
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,优质产品
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,期初余额权益
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Opening Balance Equity,期初余额权益
 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,授权签字人
@@ -2368,7 +2361,7 @@
 DocType: Project,Total Purchase Cost (via Purchase Invoice),总购买成本(通过采购发票)
 DocType: Workstation Working Hour,Start Time,开始时间
 DocType: Item Price,Bulk Import Help,批量导入帮助
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +199,Select Quantity,选择数量
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,Select Quantity,选择数量
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,审批与被审批角色不能相同
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +66,Unsubscribe from this Email Digest,从该电子邮件摘要退订
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,消息已发送
@@ -2409,7 +2402,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,银行和支付
+apps/erpnext/erpnext/config/accounts.py +126,Banking and Payments,银行和支付
 ,Welcome to ERPNext,欢迎使用ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,凭证详情编号
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,导致报价
@@ -2417,17 +2410,17 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,电话
 DocType: Project,Total Costing Amount (via Time Logs),总成本核算金额(通过时间日志)
 DocType: Purchase Order Item Supplied,Stock UOM,库存计量单位
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchase Order {0} is not submitted,采购订单{0}未提交
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Purchase Order {0} is not submitted,采购订单{0}未提交
 apps/erpnext/erpnext/stock/doctype/item/item.js +32,Projected,预计
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},序列号{0}不属于仓库{1}
-apps/erpnext/erpnext/controllers/status_updater.py +137,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,注意:系统将不会为品目{0}检查超额发货或超额预订,因为其数量或金额为0
+apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,注意:系统将不会为品目{0}检查超额发货或超额预订,因为其数量或金额为0
 DocType: Notification Control,Quotation Message,报价信息
 DocType: Issue,Opening Date,开幕日期
 DocType: Journal Entry,Remark,备注
 DocType: Purchase Receipt Item,Rate and Amount,单价及小计
 apps/erpnext/erpnext/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/stock/doctype/warehouse/warehouse.py +115,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,已为账单批次化
@@ -2445,13 +2438,13 @@
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +53,"An item exists with same name ({0}), please change the item group name or rename the item",具有名称 {0} 的品目已存在,请更名
 DocType: Sales Order Item,Sales Order Date,销售订单日期
 DocType: Sales Invoice Item,Delivered Qty,已交付数量
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,仓库{0}必须指定公司
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +71,Warehouse {0}: Company is mandatory,仓库{0}必须指定公司
 ,Payment Period Based On Invoice Date,已经提交。
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},{0}没有货币汇率
 DocType: Journal Entry,Stock Entry,库存记录
 DocType: Account,Payable,支付
 apps/erpnext/erpnext/shopping_cart/cart.py +330,Debtors ({0}),债务人({0})
-DocType: Project,Margin,利润
+DocType: Pricing Rule,Margin,利润
 DocType: Salary Slip,Arrear Amount,欠款金额
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,新客户
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,毛利%
@@ -2472,7 +2465,7 @@
 DocType: Payment Request,Email To,通过电子邮件发送给
 DocType: Lead,Lead Owner,线索所有者
 DocType: Bin,Requested Quantity,要求的数量
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +253,Warehouse is required,仓库是必需的
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +256,Warehouse is required,仓库是必需的
 DocType: Employee,Marital Status,婚姻状况
 DocType: Stock Settings,Auto Material Request,汽车材料要求
 DocType: Time Log,Will be updated when billed.,出账被会更新。
@@ -2480,7 +2473,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,当前BOM和新BOM不能相同
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date Of Retirement must be greater than Date of Joining,退休日期必须大于入职日期
 DocType: Sales Invoice,Against Income Account,对收益账目
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}%交付
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +84,{0}% Delivered,{0}%交付
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,项目{0}:有序数量{1}不能低于最低订货量{2}(项中定义)。
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,月度分布比例
 DocType: Territory,Territory Targets,区域目标
@@ -2500,7 +2493,7 @@
 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,条款
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +247,Create New,创建新的
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +250,Create New,创建新的
 DocType: Buying Settings,Purchase Order Required,购货订单要求
 ,Item-wise Sales History,品目特定的销售历史
 DocType: Expense Claim,Total Sanctioned Amount,总被制裁金额
@@ -2513,7 +2506,7 @@
 ,Stock Ledger,库存总帐
 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/accounts/page/accounts_browser/accounts_browser.js +201,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",删除客户,供应商,销售伙伴和铅的参考,因为它是你的公司地址
@@ -2535,13 +2528,13 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}:来自{1}
 DocType: Task,depends_on,depends_on
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice",折扣字段在采购订单,采购收据,采购发票可用。
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,新帐户的名称。注:请不要创建帐户的客户和供应商
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,新帐户的名称。注:请不要创建帐户的客户和供应商
 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/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/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,下一个日期必须大于过帐日期更大
+apps/erpnext/erpnext/public/js/controllers/transaction.js +777,Show tax break-up,展会税分手
+apps/erpnext/erpnext/accounts/party.py +289,Due / Reference Date cannot be after {0},到期/参照日期不能迟于{0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,数据导入和导出
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',如果贵司涉及生产活动,将启动品目的“是否生产”属性
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,发票发布日期
@@ -2556,7 +2549,7 @@
 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 +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/accounts/doctype/sales_invoice/sales_invoice.py +372,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 +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.",注意:如果付款没有任何参考,请手动创建一个日记账分录。
@@ -2570,7 +2563,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 +213,{0} '{1}' is disabled,{0}“{1}”被禁用
+apps/erpnext/erpnext/controllers/accounts_controller.py +219,{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}.
@@ -2580,7 +2573,7 @@
 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 +469,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 +473,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,销售人员姓名
@@ -2591,7 +2584,7 @@
 DocType: Stock Reconciliation Item,Before reconciliation,在对账前
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),已添加的税费(公司货币)
-apps/erpnext/erpnext/stock/doctype/item/item.py +378,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,品目税项的行{0}中必须指定类型为税项/收益/支出/应课的账户。
+apps/erpnext/erpnext/stock/doctype/item/item.py +383,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,品目税项的行{0}中必须指定类型为税项/收益/支出/应课的账户。
 DocType: Sales Order,Partly Billed,天色帐单
 DocType: Item,Default BOM,默认的BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Please re-type company name to confirm,请确认重新输入公司名称
@@ -2604,7 +2597,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 +375,Cash or Bank Account is mandatory for making payment entry,“现金”或“银行账户”是付款分录的必须项
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +368,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,实习生
@@ -2612,7 +2605,7 @@
 DocType: Stock Entry,From BOM,从BOM
 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/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Please click on 'Generate Schedule',请点击“生成表”
 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,如果输入参考日期,参考编号是强制输入的
@@ -2620,14 +2613,13 @@
 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 +612,Issue Material,发料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +615,Issue Material,发料
 DocType: Material Request Item,For Warehouse,对仓库
 DocType: Employee,Offer Date,报价有效期
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,语录
 DocType: Hub Settings,Access Token,访问令牌
 DocType: Sales Invoice Item,Serial No,序列号
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +131,Please enter Maintaince Details first,请输入您的详细维护性第一
-DocType: Item,Is Fixed Asset Item,是否固定资产项目
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +135,Please enter Maintaince Details first,请输入您的详细维护性第一
 DocType: Purchase Invoice,Print Language,打印语言
 DocType: Stock Entry,Including items for sub assemblies,包括子组件项目
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page",如果你的打印格式很长,这个功能可以被用来分割打印多个页面,每个页面上的都会有页眉和页脚。
@@ -2644,7 +2636,7 @@
 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,证券及商品交易
-apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',测度变异的默认单位“{0}”必须是相同模板“{1}”
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',测度变异的默认单位“{0}”必须是相同模板“{1}”
 DocType: Shipping Rule,Calculate Based On,计算基于
 DocType: Delivery Note Item,From Warehouse,从仓库
 DocType: Purchase Taxes and Charges,Valuation and Total,估值与总计
@@ -2660,13 +2652,13 @@
 DocType: Quotation,Maintenance Manager,维护经理
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,总不能为零
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,“ 最后的订单到目前的天数”必须大于或等于零
-DocType: C-Form,Amended From,修订源
+DocType: Asset,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/accounts/doctype/account/account.py +195,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 +486,No default BOM exists for Item {0},品目{0}没有默认的BOM
+apps/erpnext/erpnext/stock/get_item_details.py +484,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,顺延
@@ -2680,20 +2672,20 @@
 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,匹配付款与发票
+apps/erpnext/erpnext/config/accounts.py +141,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 +235,Enable / disable currencies.,启用/禁用货币。
+apps/erpnext/erpnext/config/accounts.py +243,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Postal Expenses,邮政费用
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),共(AMT)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,娱乐休闲
 DocType: Quality Inspection,Item Serial No,品目序列号
-apps/erpnext/erpnext/controllers/status_updater.py +143,{0} must be reduced by {1} or you should increase overflow tolerance,{0}必须通过{1}会减少或应增加溢出宽容
+apps/erpnext/erpnext/controllers/status_updater.py +145,{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/config/accounts.py +97,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}不能被“库存盘点”更新
@@ -2712,13 +2704,13 @@
 DocType: C-Form,Invoices,发票
 DocType: Job Opening,Job Title,职位
 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/manufacturing/doctype/production_order/production_order.py +348,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 +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,客户群组
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +169,Expense account is mandatory for item {0},品目{0}必须指定开支账户
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Expense account is mandatory for item {0},品目{0}必须指定开支账户
 DocType: Item,Website Description,网站简介
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,在净资产收益变化
 DocType: Serial No,AMC Expiry Date,AMC到期时间
@@ -2728,12 +2720,12 @@
 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 +416,Please remove this Invoice {0} from C-Form {1},请删除此发票{0}从C-表格{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +409,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 +519,Get Items,获取品目
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Please enter Write Off Account,请输入核销帐户
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +522,Get Items,获取品目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Please enter Write Off Account,请输入核销帐户
 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-表
@@ -2745,18 +2737,17 @@
 DocType: Purchase Invoice,Mobile No,手机号码
 DocType: Payment Tool,Make Journal Entry,创建日记帐分录
 DocType: Leave Allocation,New Leaves Allocated,新调配的假期
-apps/erpnext/erpnext/controllers/trends.py +261,Project-wise data is not available for Quotation,项目明智的数据不适用于报价
+apps/erpnext/erpnext/controllers/trends.py +265,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/stock/doctype/purchase_receipt/purchase_receipt.js +663,Error: {0} > {1},错误:{0}> {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 +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 +251,Rules to calculate shipping amount for a sale,用来计算销售运输量的规则
+apps/erpnext/erpnext/config/accounts.py +259,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}
@@ -2767,10 +2758,10 @@
 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 +637,Transfer,转让
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +681,Fetch exploded BOM (including sub-assemblies),获取展开BOM(包括子品目)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +640,Transfer,转让
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +688,Fetch exploded BOM (including sub-assemblies),获取展开BOM(包括子品目)
 DocType: Authorization Rule,Applicable To (Employee),适用于(员工)
-apps/erpnext/erpnext/controllers/accounts_controller.py +92,Due Date is mandatory,截止日期是强制性的
+apps/erpnext/erpnext/controllers/accounts_controller.py +93,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,设置系列
@@ -2792,18 +2783,18 @@
 DocType: Journal Entry,Write Off Based On,核销基于
 DocType: Features Setup,POS View,POS机查看
 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/controllers/recurring_document.py +187,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,以上
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +40,Time Log has been Billed,时间日志已帐单
 DocType: Salary Slip,Earning & Deduction,盈余及扣除
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,科目{0}不能为组
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +215,Optional. This setting will be used to filter in various transactions.,可选。此设置将被应用于各种交易进行过滤。
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +218,Optional. This setting will be used to filter in various transactions.,可选。此设置将被应用于各种交易进行过滤。
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,负评估价格是不允许的
 DocType: Holiday List,Weekly Off,周末
 DocType: Fiscal Year,"For e.g. 2012, 2012-13",对例如2012,2012-13
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),临时溢利/(亏损)(信用)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Provisional Profit / Loss (Credit),临时溢利/(亏损)(信用)
 DocType: Sales Invoice,Return Against Sales Invoice,射向销售发票
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,项目5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},请设置在公司默认值{0} {1}
@@ -2813,12 +2804,11 @@
 ,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/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup > Numbering Series,请设置通过设置编号系列考勤>编号系列
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +501,Get Items from Product Bundle,获取从产品捆绑项目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +504,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,必须指定考勤起始日期和结束日期
-apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,请输入'转包' YES或NO
+apps/erpnext/erpnext/controllers/buying_controller.py +123,Please enter 'Is Subcontracted' as Yes or No,请输入'转包' YES或NO
 DocType: Sales Team,Contact No.,联络人电话
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +64,'Profit and Loss' type account {0} not allowed in Opening Entry,期初分录中不允许有“损益”类型的账户{0}
 DocType: Features Setup,Sales Discounts,销售折扣
@@ -2832,39 +2822,39 @@
 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,添加子项
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +120,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 +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,销售佣金
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Commission on Sales,销售佣金
 DocType: Offer Letter Term,Value / Description,值/说明
 DocType: Tax Rule,Billing Country,结算国家
 ,Customers Not Buying Since Long Time,长时间没有购买的客户
 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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,娱乐费用
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +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 +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,法律费用
+apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account with existing transaction can not be deleted,有交易的科目不能被删除
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,法律费用
 DocType: Sales Invoice,Posting Time,发布时间
 DocType: Sales Order,% Amount Billed,(%)金额帐单
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,电话费
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,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 +118,No Item with Serial No {0},没有序列号为{0}的品目
+apps/erpnext/erpnext/stock/get_item_details.py +117,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 +200,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Direct Expenses,直接开支
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{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,差旅费
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Travel Expenses,差旅费
 DocType: Maintenance Visit,Breakdown,细目
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,Account: {0} with currency: {1} can not be selected,帐号:{0}币种:{1}不能选择
+apps/erpnext/erpnext/controllers/accounts_controller.py +553,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!,成功删除与该公司相关的所有交易!
@@ -2881,7 +2871,7 @@
 DocType: Project,Total Billing Amount (via Time Logs),总结算金额(通过时间日志)
 apps/erpnext/erpnext/public/js/setup_wizard.js +275,We sell this Item,我们卖这些物件
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,供应商编号
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Quantity should be greater than 0,量应大于0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Quantity should be greater than 0,量应大于0
 DocType: Journal Entry,Cash Entry,现金分录
 DocType: Sales Partner,Contact Desc,联系人倒序
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.",叶似漫不经心,生病等类型
@@ -2896,7 +2886,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +19,Company Abbreviation,公司缩写
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,如果你使用质量检验的话。将启动采购收据内的“品目需要检验”和“QA编号”。
 DocType: GL Entry,Party Type,党的类型
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +71,Raw material cannot be same as main Item,原料不能和主项相同
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +80,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 +110,Salary template master.,薪资模板大师。
@@ -2912,7 +2902,7 @@
 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 +488,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}是必填项。可能是没有由{1}到{2}的货币转换记录。
+apps/erpnext/erpnext/controllers/accounts_controller.py +514,{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),价格列表费率(公司货币)
@@ -2927,13 +2917,13 @@
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,此时日志批次已被取消。
 ,Reqd By Date,REQD按日期
 DocType: Salary Slip Earning,Salary Slip Earning,工资单收入
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,债权人
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Creditors,债权人
 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 +721,Supplier Quotation,供应商报价
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +724,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}使用
+apps/erpnext/erpnext/stock/doctype/item/item.py +395,Barcode {0} already used in Item {1},条码{0}已被品目{1}使用
 DocType: Lead,Add to calendar on this date,将此日期添加至日历
 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,即将举行的活动
@@ -2953,15 +2943,14 @@
 DocType: Customer,From Lead,来自潜在客户
 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 +456,POS Profile required to make POS Entry,需要POS资料,使POS进入
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,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,必须选择至少一个仓库
 DocType: Serial No,Out of Warranty,超出保修期
 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: Project,Project Name,项目名称
+DocType: Request for Quotation Item,Project Name,项目名称
 DocType: Supplier,Mention if non-standard receivable account,提到如果不规范应收账款
 DocType: Journal Entry Account,If Income or Expense,收入或支出
 DocType: Features Setup,Item Batch Nos,品目批号
@@ -2998,7 +2987,7 @@
 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.,提交此生产订单以进行下一步处理。
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +30,Submit this Production Order for further processing.,提交此生产订单以进行下一步处理。
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",要在一个特定的交易不适用于定价规则,所有适用的定价规则应该被禁用。
 DocType: Company,Domain,领域
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,工作
@@ -3010,6 +2999,7 @@
 DocType: Time Log,Additional Cost,额外费用
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Financial Year End Date,财政年度结束日期
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher",按凭证分类后不能根据凭证编号过滤
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +599,Make Supplier Quotation,创建供应商报价
 DocType: Quality Inspection,Incoming,接收
 DocType: BOM,Materials Required (Exploded),所需物料(正展开)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),降低停薪留职的收入(LWP)
@@ -3044,7 +3034,7 @@
 DocType: Sales Partner,Partner's Website,合作伙伴的网站
 DocType: Opportunity,To Discuss,为了讨论
 DocType: SMS Settings,SMS Settings,短信设置
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,临时账户
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +63,Temporary Accounts,临时账户
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,黑
 DocType: BOM Explosion Item,BOM Explosion Item,BOM展开品目
 DocType: Account,Auditor,审计员
@@ -3052,22 +3042,22 @@
 DocType: Production Order Operation,Production Order Operation,生产订单操作
 DocType: Pricing Rule,Disable,禁用
 DocType: Project Task,Pending Review,待审核
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,点击这里要
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +132, Click here to pay,点击这里付款
 DocType: Task,Total Expense Claim (via Expense Claim),总费用报销(通过费用报销)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,客户ID
 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 +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}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +483,Sales Order {0} is not submitted,销售订单{0}未提交
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +722,Add items from,添加的项目
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,Warehouse {0}: Parent account {1} does not bolong to the company {2},仓库{0}的上级账户{1}不属于公司{2}
 DocType: BOM,Last Purchase Rate,最后采购价格
 DocType: Account,Asset,资产
 DocType: Project Task,Task ID,任务ID
 apps/erpnext/erpnext/public/js/setup_wizard.js +20,"e.g. ""MC""",例如“MC”
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,Stock cannot exist for Item {0} since has variants,品目{0}不能有库存,因为他存在变体
 ,Sales Person-wise Transaction Summary,销售人员特定的交易汇总
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,仓库{0}不存在
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +112,Warehouse {0} does not exist,仓库{0}不存在
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,立即注册ERPNext中心
 DocType: Monthly Distribution,Monthly Distribution Percentages,月度分布比例
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,所选项目不能有批次
@@ -3093,7 +3083,7 @@
 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 +245,Setup Gateway accounts.,设置网关帐户。
+apps/erpnext/erpnext/config/accounts.py +253,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,现金周转
@@ -3107,7 +3097,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 +132,Please find attached {0} #{1},随函附上{0}#{1}
+apps/erpnext/erpnext/controllers/recurring_document.py +133,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,客户/项目名称
@@ -3123,19 +3113,18 @@
 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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,客户>客户组>领地
 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 +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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,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,更新成品
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,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.,无法删除,因为此仓库有库存分类账分录。
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +103,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,无法删除,因为此仓库有库存分类账分录。
 DocType: Company,Distribution,分配
 apps/erpnext/erpnext/public/js/pos/pos.js +435,Amount Paid,已支付的款项
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,项目经理
@@ -3165,7 +3154,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},日期应该是在财政年度内。假设终止日期= {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc",在这里,你可以保持身高,体重,过敏,医疗问题等
 DocType: Leave Block List,Applies to Company,适用于公司
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Cannot cancel because submitted Stock Entry {0} exists,不能取消,因为提交的仓储记录{0}已经存在
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,Cannot cancel because submitted Stock Entry {0} exists,不能取消,因为提交的仓储记录{0}已经存在
 DocType: Purchase Invoice,In Words,大写金额
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Today is {0}'s birthday!,今天是{0}的生日!
 DocType: Production Planning Tool,Material Request For Warehouse,物料申请仓库
@@ -3179,7 +3168,7 @@
 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/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}存在具有相同属性
+apps/erpnext/erpnext/stock/doctype/item/item.py +569,Item variant {0} exists with same attributes,项目变种{0}存在具有相同属性
 DocType: Salary Slip,Salary Slip,工资单
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,“结束日期”必需设置
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",生成要发货品目的装箱单,包括包号,内容和重量。
@@ -3190,7 +3179,7 @@
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.",当所选的业务状态更改为“已提交”时,自动打开一个弹出窗口向有关的联系人编写邮件,业务将作为附件添加。用户可以选择发送或者不发送邮件。
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,全局设置
 DocType: Employee Education,Employee Education,雇员教育
-apps/erpnext/erpnext/public/js/controllers/transaction.js +782,It is needed to fetch Item Details.,这是需要获取项目详细信息。
+apps/erpnext/erpnext/public/js/controllers/transaction.js +793,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}已收到过
@@ -3198,14 +3187,13 @@
 DocType: Customer,Sales Team Details,销售团队详情
 DocType: Expense Claim,Total Claimed Amount,总索赔额
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,销售的潜在机会
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +177,Invalid {0},无效的{0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,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 > Settings > Naming Series,请设置命名为系列{0}通过设置>设置>命名系列
 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.,首先保存文档。
+apps/erpnext/erpnext/projects/doctype/project/project.js +73,Save the document first.,首先保存文档。
 DocType: Account,Chargeable,应课
 DocType: Company,Change Abbreviation,更改缩写
 DocType: Expense Claim Detail,Expense Date,报销日期
@@ -3223,10 +3211,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,业务发展经理
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,维护访问目的
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,期
-,General Ledger,总帐
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +12,General Ledger,总帐
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,查看信息
 DocType: Item Attribute Value,Attribute Value,属性值
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}",邮件地址{0}已存在
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +67,"Email id must be unique, already exists for {0}",邮件地址{0}已存在
 ,Itemwise Recommended Reorder Level,品目特定的推荐重订购级别
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +268,Please select {0} first,请选择{0}第一
 DocType: Features Setup,To get Item Group in details table,为了让项目组在详细信息表
@@ -3262,23 +3250,23 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`冻结老于此天数的库存`应该比%d天小。
 DocType: Tax Rule,Purchase Tax Template,购置税模板
 ,Project wise Stock Tracking,项目明智的库存跟踪
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +153,Maintenance Schedule {0} exists against {0},维护计划{0}已存在{0}中
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,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 +12,Employee records.,雇员记录。
 DocType: Payment Gateway,Payment Gateway,支付网关
 DocType: HR Settings,Payroll Settings,薪资设置
-apps/erpnext/erpnext/config/accounts.py +135,Match non-linked Invoices and Payments.,匹配无链接的发票和付款。
+apps/erpnext/erpnext/config/accounts.py +143,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...,选择品牌...
 DocType: Sales Invoice,C-Form Applicable,C-表格适用
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +351,Operation Time must be greater than 0 for Operation {0},运行时间必须大于0的操作{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +353,Operation Time must be greater than 0 for Operation {0},运行时间必须大于0的操作{0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +104,Warehouse is mandatory,仓库是强制性的
 DocType: Supplier,Address and Contacts,地址和联系方式
 DocType: UOM Conversion Detail,UOM Conversion Detail,计量单位换算详情
 apps/erpnext/erpnext/public/js/setup_wizard.js +144,Keep it web friendly 900px (w) by 100px (h),建议900px宽乘以100px高。
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Production Order cannot be raised against a Item Template,生产订单不能对一个项目提出的模板
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +342,Production Order cannot be raised against a Item Template,生产订单不能对一个项目提出的模板
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,费用会在每个品目的采购收据中更新
 DocType: Payment Tool,Get Outstanding Vouchers,获取未清凭证
 DocType: Warranty Claim,Resolved By,议决
@@ -3296,7 +3284,7 @@
 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 +633,Receive,接受
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +636,Receive,接受
 DocType: Maintenance Visit,Fully Completed,全部完成
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}%已完成
 DocType: Employee,Educational Qualification,学历
@@ -3304,14 +3292,14 @@
 DocType: Purchase Invoice,Submit on creation,提交关于创建
 DocType: Employee Leave Approver,Employee Leave Approver,雇员假期审批者
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0}已成功添加到我们的新闻列表。
-apps/erpnext/erpnext/stock/doctype/item/item.py +420,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}:一个重新排序条目已存在这个仓库{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}:一个重新排序条目已存在这个仓库{1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +65,"Cannot declare as lost, because Quotation has been made.",不能更改状态为丧失,因为已有报价。
 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/support/doctype/maintenance_schedule/maintenance_schedule.py +141,Please select Start Date and End Date for Item {0},请选择开始日期和结束日期的项目{0}
 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/stock/doctype/item/item.js +174,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 +313,My Orders,我的订单
@@ -3332,10 +3320,10 @@
 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 +250,Point-of-Sale Profile,简介销售点的
+apps/erpnext/erpnext/config/accounts.py +258,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,无担保贷款
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +179,Unsecured Loans,无担保贷款
 DocType: Cost Center,Cost Center Name,成本中心名称
 DocType: Maintenance Schedule Detail,Scheduled Date,计划日期
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +63,Total Paid Amt,数金额金额
@@ -3347,7 +3335,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,You cannot credit and debit same account at the same time,你不能同时将一个账户设为借方和贷方。
 DocType: Naming Series,Help HTML,HTML帮助
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},分配的总权重应为100 % 。这是{0}
-apps/erpnext/erpnext/controllers/status_updater.py +141,Allowance for over-{0} crossed for Item {1},品目{1}已经超过允许的超额{0}
+apps/erpnext/erpnext/controllers/status_updater.py +143,Allowance for over-{0} crossed for Item {1},品目{1}已经超过允许的超额{0}
 DocType: Address,Name of person or organization that this address belongs to.,此地址所属的人或组织的名称
 apps/erpnext/erpnext/public/js/setup_wizard.js +234,Your Suppliers,您的供应商
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,Cannot set as Lost as Sales Order is made.,不能更改状态为丧失,因为已有销售订单。
@@ -3360,12 +3348,12 @@
 DocType: Employee,Date of Issue,签发日期
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}:申请者{0} 金额{1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},行#{0}:设置供应商项目{1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,网站图像{0}附加到物品{1}无法找到
+apps/erpnext/erpnext/stock/doctype/item/item.py +119,Website Image {0} attached to Item {1} cannot be found,网站图像{0}附加到物品{1}无法找到
 DocType: Issue,Content Type,内容类型
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,电脑
 DocType: Item,List this Item in multiple groups on the website.,在网站上的多个组中显示此品目
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,请检查多币种选项,允许帐户与其他货币
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +65,Item: {0} does not exist in the system,品目{0}不存在
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +74,Item: {0} does not exist in the system,品目{0}不存在
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,You are not authorized to set Frozen value,您没有权限设定冻结值
 DocType: Payment Reconciliation,Get Unreconciled Entries,获取未调节分录
 DocType: Payment Reconciliation,From Invoice Date,从发票日期
@@ -3374,7 +3362,7 @@
 DocType: Delivery Note,To Warehouse,到仓库
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},财年{1}中已多次输入科目{0}
 ,Average Commission Rate,平均佣金率
-apps/erpnext/erpnext/stock/doctype/item/item.py +351,'Has Serial No' can not be 'Yes' for non-stock item,非库存项目不能勾选'是否有序列号'
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,'Has Serial No' can not be 'Yes' for non-stock item,非库存项目不能勾选'是否有序列号'
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,考勤不能标记为未来的日期
 DocType: Pricing Rule,Pricing Rule Help,定价规则说明
 DocType: Purchase Taxes and Charges,Account Head,账户头
@@ -3387,7 +3375,7 @@
 DocType: Item,Customer Code,客户代码
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +219,Birthday Reminder for {0},{0}的生日提醒
 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,借记帐户必须是资产负债表科目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +306,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,库存资产
@@ -3401,15 +3389,15 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,关闭帐户{0}的类型必须是负债/权益
 DocType: Authorization Rule,Based On,基于
 DocType: Sales Order Item,Ordered Qty,订购数量
-apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} is disabled,项目{0}无效
+apps/erpnext/erpnext/stock/doctype/item/item.py +585,Item {0} is disabled,项目{0}无效
 DocType: Stock Settings,Stock Frozen Upto,库存冻结止
-apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},期间从和周期要日期强制性的经常性{0}
+apps/erpnext/erpnext/controllers/recurring_document.py +169,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),核销金额(公司货币)
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,行#{0}:请设置再订购数量
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,Row #{0}: Please set reorder quantity,行#{0}:请设置再订购数量
 DocType: Landed Cost Voucher,Landed Cost Voucher,到岸成本凭证
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},请设置{0}
 DocType: Purchase Invoice,Repeat on Day of Month,重复上月的日
@@ -3430,7 +3418,7 @@
 DocType: Maintenance Visit,Maintenance Date,维护日期
 DocType: Purchase Receipt Item,Rejected Serial No,拒绝序列号
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,新的通讯
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Start date should be less than end date for Item {0},品目{0}的开始日期必须小于结束日期
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Start date should be less than end date for Item {0},品目{0}的开始日期必须小于结束日期
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","例如:ABCD ##### 
 如果设置了序列但是没有在交易中输入序列号,那么系统会根据序列自动生产序列号。如果要强制手动输入序列号,请不要勾选此项。"
@@ -3442,11 +3430,11 @@
 ,Sales Analytics,销售分析
 DocType: Manufacturing Settings,Manufacturing Settings,生产设置
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,设置电子邮件
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Please enter default currency in Company Master,请在公司主输入默认货币
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Please enter default currency in Company Master,请在公司主输入默认货币
 DocType: Stock Entry Detail,Stock Entry Detail,库存记录详情
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,每日提醒
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},税收规范冲突{0}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +206,New Account Name,新建账户名称
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +209,New Account Name,新建账户名称
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,供应的原料成本
 DocType: Selling Settings,Settings for Selling Module,销售模块的设置
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,顾客服务
@@ -3458,9 +3446,9 @@
 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 +225,Default settings for accounting transactions.,业务会计的默认设置。
+apps/erpnext/erpnext/config/accounts.py +233,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 +132,Item {0} must be a Sales Item,品目{0}必须是销售品目
+apps/erpnext/erpnext/stock/get_item_details.py +131,Item {0} must be a Sales Item,品目{0}必须是销售品目
 DocType: Naming Series,Update Series Number,更新序列号
 DocType: Account,Equity,权益
 DocType: Sales Order,Printing Details,印刷详情
@@ -3468,7 +3456,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 +385,Item Code required at Row No {0},行{0}中的品目编号是必须项
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +378,Item Code required at Row No {0},行{0}中的品目编号是必须项
 DocType: Sales Partner,Partner Type,合作伙伴类型
 DocType: Purchase Taxes and Charges,Actual,实际
 DocType: Authorization Rule,Customerwise Discount,客户折扣
@@ -3491,7 +3479,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,零售及批发
 DocType: Issue,First Responded On,首次回复时间
 DocType: Website Item Group,Cross Listing of Item in multiple groups,多个群组品目交叉显示
-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/fiscal_year/fiscal_year.py +81,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 +180,Where items are stored.,物件的存储位置。
@@ -3502,7 +3490,7 @@
 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 +71,Tax template for buying transactions.,采购业务的税项模板。
+apps/erpnext/erpnext/config/buying.py +76,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,期末券
@@ -3512,10 +3500,10 @@
 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 +204,'Notification Email Addresses' not specified for recurring %s,循环%s中未指定“通知电子邮件地址”
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'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,行政开支
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Administrative Expenses,行政开支
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,咨询
 DocType: Customer Group,Parent Customer Group,母公司集团客户
 apps/erpnext/erpnext/public/js/pos/pos.js +455,Change,变化
@@ -3534,13 +3522,13 @@
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,原材料被生产/重新打包后得到的品目数量
 DocType: Payment Reconciliation,Receivable / Payable Account,应收/应付账款
 DocType: Delivery Note Item,Against Sales Order Item,对销售订单项目
-apps/erpnext/erpnext/stock/doctype/item/item.py +559,Please specify Attribute Value for attribute {0},请指定属性值的属性{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,Please specify Attribute Value for attribute {0},请指定属性值的属性{0}
 DocType: Item,Default Warehouse,默认仓库
 DocType: Task,Actual End Date (via Time Logs),实际结束日期(通过时间日志)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},财政预算案不能对集团客户分配{0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,请输入父成本中心
 DocType: Delivery Note,Print Without Amount,打印量不
-apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,税项类型不能是“估值”或“估值和总计”,因为所有的物件都不是库存物件
+apps/erpnext/erpnext/controllers/buying_controller.py +61,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,税项类型不能是“估值”或“估值和总计”,因为所有的物件都不是库存物件
 DocType: Issue,Support Team,支持团队
 DocType: Appraisal,Total Score (Out of 5),总分(满分5分)
 DocType: Batch,Batch,批次
@@ -3554,7 +3542,7 @@
 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,预算和成本中心
+apps/erpnext/erpnext/config/accounts.py +192,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.,创建规则,根据属性值来限制交易。
@@ -3587,7 +3575,6 @@
 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 > Item Group > Brand,产品编号>项目组>品牌
 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,已接收数量
@@ -3595,7 +3582,7 @@
 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}新增用户
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +42,{0} subscribers added,{0}新增用户
 DocType: Maintenance Schedule,Schedule,计划任务
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""",定义预算这个成本中心。要设置预算的行动,请参阅“企业名录”
 DocType: Account,Parent Account,父帐户
@@ -3611,7 +3598,7 @@
 DocType: Employee,Education,教育
 DocType: Selling Settings,Campaign Naming By,活动命名:
 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.",可选。设置公司的默认货币,如果没有指定。
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +222,"Optional. Sets company's default currency, if not specified.",可选。设置公司的默认货币,如果没有指定。
 DocType: Address,Office,办公室
 apps/erpnext/erpnext/config/accounts.py +50,Accounting journal entries.,会计记账分录。
 DocType: Delivery Note Item,Available Qty at From Warehouse,可用数量从仓库
@@ -3646,7 +3633,7 @@
 DocType: Hub Settings,Hub Settings,Hub设置
 DocType: Project,Gross Margin %,毛利率%
 DocType: BOM,With Operations,带工艺
-apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,会计分录已取得货币{0}为公司{1}。请选择一个应收或应付账户币种{0}。
+apps/erpnext/erpnext/accounts/party.py +234,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,会计分录已取得货币{0}为公司{1}。请选择一个应收或应付账户币种{0}。
 ,Monthly Salary Register,月度工资记录
 DocType: Warranty Claim,If different than customer address,如果客户地址不同的话
 DocType: BOM Operation,BOM Operation,BOM操作
@@ -3654,22 +3641,22 @@
 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 +204,"Seasonality for setting budgets, targets etc.",设置季节性的预算,目标等。
+apps/erpnext/erpnext/config/accounts.py +212,"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 +135,"Item {0} is a template, please select one of its variants",项目{0}是一个模板,请选择它的一个变体
+apps/erpnext/erpnext/stock/get_item_details.py +134,"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 +636,Material to Supplier,材料到供应商
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +639,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +162,Current Liabilities,流动负债
 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,实际数量是必须项
@@ -3690,17 +3677,16 @@
 DocType: Item Attribute,Numeric Values,数字值
 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/stock/doctype/item/item.js +210,Make Variant,在Variant
 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 > Printing and Branding > Address Template.,无缺省地址模板中。请创建设置>打印和品牌>地址模板一个新的。
 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,允许在假日生产
 DocType: Sales Order,Customer's Purchase Order Date,客户的采购订单日期
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,股本
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Capital Stock,股本
 DocType: Packing Slip,Package Weight Details,包装重量详情
 DocType: Payment Gateway Account,Payment Gateway Account,支付网关账户
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,支付完成后重定向用户选择的页面。
@@ -3712,17 +3698,17 @@
 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,品目特定的采购记录
 DocType: Batch,Expiry Date,到期时间
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"To set reorder level, item must be a Purchase Item or Manufacturing Item",要设置订货点水平,项目必须购买项目或生产项目
+apps/erpnext/erpnext/stock/doctype/item/item.py +413,"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 +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 +409, (Half Day),(半天)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (Half Day),(半天)
 DocType: Supplier,Credit Days,信用期
 DocType: Leave Type,Is Carry Forward,是否顺延假期
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +599,Get Items from BOM,从物料清单获取品目
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +602,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,请在上表中输入销售订单
 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,参考日期
@@ -3730,6 +3716,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,已批准金额
 DocType: GL Entry,Is Opening,是否起始
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,Row {0}: Debit entry can not be linked with a {1},行{0}:借记条目不能与连接的{1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +212,Account {0} does not exist,科目{0}不存在
+apps/erpnext/erpnext/accounts/doctype/account/account.py +209,Account {0} does not exist,科目{0}不存在
 DocType: Account,Cash,现金
 DocType: Employee,Short biography for website and other publications.,在网站或其他出版物使用的个人简介。