[translation] translation updates (#9788)
diff --git a/erpnext/translations/zh.csv b/erpnext/translations/zh.csv
index 10f3b77..7a3edbf 100644
--- a/erpnext/translations/zh.csv
+++ b/erpnext/translations/zh.csv
@@ -17,7 +17,7 @@
DocType: Employee,Rented,租
DocType: Purchase Order,PO-,PO-
DocType: POS Profile,Applicable for User,适用于用户
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",停止生产订单无法取消，首先Unstop它取消
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",停止生产订单无法取消，首先Unstop它取消
DocType: Vehicle Service,Mileage,里程
apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,难道你真的想放弃这项资产？
apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,选择默认供应商
@@ -72,7 +72,7 @@
apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,医疗保健
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),延迟支付（天）
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,服务费用
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +845,Serial Number: {0} is already referenced in Sales Invoice: {1},序号：{0}已在销售发票中引用：{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +846,Serial Number: {0} is already referenced in Sales Invoice: {1},序号：{0}已在销售发票中引用：{1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,发票
DocType: Maintenance Schedule Item,Periodicity,周期性
apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,会计年度{0}是必需的
@@ -89,7 +89,7 @@
DocType: Production Order Operation,Work In Progress,在制品
apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,请选择日期
DocType: Employee,Holiday List,假期列表
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Accountant,会计
+apps/erpnext/erpnext/public/js/setup_wizard.js +214,Accountant,会计
DocType: Cost Center,Stock User,库存用户
DocType: Company,Phone No,电话号码
apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,课程表创建：
@@ -110,7 +110,7 @@
apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} 没有在任何活动的财政年度中。
DocType: Packed Item,Parent Detail docname,家长可采用DocName细节
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",参考：{0}，商品编号：{1}和顾客：{2}
-apps/erpnext/erpnext/public/js/setup_wizard.js +269,Kg,千克
+apps/erpnext/erpnext/public/js/setup_wizard.js +297,Kg,千克
DocType: Student Log,Log,日志
apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,开放的工作。
DocType: Item Attribute,Increment,增量
@@ -120,7 +120,7 @@
DocType: Employee,Married,已婚
apps/erpnext/erpnext/accounts/party.py +42,Not permitted for {0},不允许{0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,从获得项目
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +441,Stock cannot be updated against Delivery Note {0},送货单{0}不能更新库存
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,Stock cannot be updated against Delivery Note {0},送货单{0}不能更新库存
apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},产品{0}
apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,没有列出项目
DocType: Payment Reconciliation,Reconcile,对账
@@ -131,7 +131,7 @@
apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,接下来折旧日期不能购买日期之前
DocType: SMS Center,All Sales Person,所有的销售人员
DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,**月度分配**帮助你分配预算/目标跨越几个月，如果你在你的业务有季节性。
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1673,Not items found,未找到项目
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1767,Not items found,未找到项目
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,薪酬结构缺失
DocType: Lead,Person Name,人姓名
DocType: Sales Invoice Item,Sales Invoice Item,销售发票品目
@@ -142,9 +142,10 @@
DocType: Warehouse,Warehouse Detail,仓库详细信息
apps/erpnext/erpnext/selling/doctype/customer/customer.py +161,Credit limit has been crossed for customer {0} {1}/{2},客户{0} 的信用额度已经越过 {1} / {2}
apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,该期限结束日期不能晚于学年年终日期到这个词联系在一起（学年{}）。请更正日期，然后再试一次。
-apps/erpnext/erpnext/stock/doctype/item/item.py +473,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",是固定资产不能被反选，因为存在资产记录的项目
+apps/erpnext/erpnext/stock/doctype/item/item.py +466,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",是固定资产不能被反选，因为存在资产记录的项目
DocType: Vehicle Service,Brake Oil,刹车油
DocType: Tax Rule,Tax Type,税收类型
+apps/erpnext/erpnext/accounts/page/pos/pos.js +685,Taxable Amount,应税金额
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},你没有权限在{0}前添加或更改分录。
DocType: BOM,Item Image (if not slideshow),项目图片(如果没有指定幻灯片)
apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,同名客户已存在
@@ -160,7 +161,6 @@
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +28,From {0} to {1},从{0}至 {1}
DocType: Item,Copy From Item Group,从品目组复制
DocType: Journal Entry,Opening Entry,开放报名
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,客户>客户群>地区
apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,账户只需支付
DocType: Employee Loan,Repay Over Number of Periods,偿还期的超过数
DocType: Stock Entry,Additional Costs,额外费用
@@ -178,7 +178,7 @@
apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +89,Activity Log:,活动日志：
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,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 +7,Statement of Account,对账单
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,对账单
apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,制药
DocType: Purchase Invoice Item,Is Fixed Asset,是固定的资产
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +234,"Available qty is {0}, you need {1}",可用数量是{0}，则需要{1}
@@ -186,7 +186,7 @@
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,在CUTOMER组表中找到重复的客户群
apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,供应商类型/供应商
DocType: Naming Series,Prefix,字首
-apps/erpnext/erpnext/public/js/setup_wizard.js +266,Consumable,耗材
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Consumable,耗材
DocType: Employee,B-,B-
DocType: Upload Attendance,Import Log,导入日志
DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,拉根据上述标准型的制造材料要求
@@ -212,12 +212,12 @@
apps/erpnext/erpnext/controllers/buying_controller.py +321,Accepted + Rejected Qty must be equal to Received quantity for Item {0},已接受+已拒绝的数量必须等于条目{0}的已接收数量
DocType: Request for Quotation,RFQ-,RFQ-
DocType: Item,Supply Raw Materials for Purchase,供应原料采购
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +143,At least one mode of payment is required for POS invoice.,付款中的至少一个模式需要POS发票。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +144,At least one mode of payment is required for POS invoice.,付款中的至少一个模式需要POS发票。
DocType: Products Settings,Show Products as a List,产品展示作为一个列表
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 +482,Item {0} is not active or end of life has been reached,项目{0}处于非活动或寿命终止状态
-apps/erpnext/erpnext/public/js/setup_wizard.js +302,Example: Basic Mathematics,例如：基础数学
+apps/erpnext/erpnext/public/js/setup_wizard.js +331,Example: Basic Mathematics,例如：基础数学
apps/erpnext/erpnext/controllers/accounts_controller.py +669,"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 +214,Settings for HR Module,人力资源模块的设置
DocType: SMS Center,SMS Center,短信中心
@@ -235,6 +235,7 @@
apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,项目和定价
apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},总时间：{0}
apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},起始日期应该在财年之内。财年起始日是{0}
+apps/erpnext/erpnext/hooks.py +87,Quotes,行情
DocType: Customer,Individual,个人
DocType: Interest,Academics User,学术界用户
DocType: Cheque Print Template,Amount In Figure,量图
@@ -265,7 +266,7 @@
DocType: Selling Settings,Default Territory,默认地区
apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,电视
DocType: Production Order Operation,Updated via 'Time Log',通过“时间日志”更新
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},提前量不能大于{0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +420,Advance amount cannot be greater than {0} {1},提前量不能大于{0} {1}
DocType: Naming Series,Series List for this Transaction,此交易的系列列表
DocType: Company,Enable Perpetual Inventory,启用永久库存
DocType: Company,Default Payroll Payable Account,默认情况下，应付职工薪酬帐户
@@ -273,7 +274,7 @@
DocType: Sales Invoice,Is Opening Entry,是否期初分录
DocType: Customer Group,Mention if non-standard receivable account applicable,何况，如果不规范应收账款适用
DocType: Course Schedule,Instructor Name,导师姓名
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,For Warehouse is required before Submit,提交前必须选择仓库
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,提交前必须选择仓库
apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,收到的
DocType: Sales Partner,Reseller,经销商
DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.",如果选中，将包括材料要求非库存物品。
@@ -281,13 +282,13 @@
DocType: Delivery Note Item,Against Sales Invoice Item,对销售发票项目
,Production Orders in Progress,在建生产订单
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,从融资净现金
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2256,"LocalStorage is full , did not save",localStorage的满了，没救
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2350,"LocalStorage is full , did not save",localStorage的满了，没救
DocType: Lead,Address & Contact,地址及联系方式
DocType: Leave Allocation,Add unused leaves from previous allocations,添加未使用的叶子从以前的分配
apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},周期{0}下次创建时间为{1}
DocType: Sales Partner,Partner website,合作伙伴网站
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,新增项目
-apps/erpnext/erpnext/public/js/setup_wizard.js +228,Contact Name,联系人姓名
+apps/erpnext/erpnext/public/js/setup_wizard.js +254,Contact Name,联系人姓名
DocType: Course Assessment Criteria,Course Assessment Criteria,课程评价标准
DocType: Process Payroll,Creates salary slip for above mentioned criteria.,依上述条件创建工资单
DocType: POS Customer Group,POS Customer Group,POS客户群
@@ -301,13 +302,13 @@
apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,解除日期必须大于加入的日期
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +197,Leaves per Year,每年叶
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,行{0}：请检查'是推进'对帐户{1}，如果这是一个进步条目。
-apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},仓库{0}不属于公司{1}
+apps/erpnext/erpnext/stock/utils.py +212,Warehouse {0} does not belong to company {1},仓库{0}不属于公司{1}
DocType: Email Digest,Profit & Loss,利润损失
-apps/erpnext/erpnext/public/js/setup_wizard.js +270,Litre,升
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Litre,升
DocType: Task,Total Costing Amount (via Time Sheet),总成本计算量（通过时间表）
DocType: Item Website Specification,Item Website Specification,项目网站规格
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,已禁止请假
-apps/erpnext/erpnext/stock/doctype/item/item.py +679,Item {0} has reached its end of life on {1},项目{0}已经到达寿命终止日期{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +672,Item {0} has reached its end of life on {1},项目{0}已经到达寿命终止日期{1}
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,银行条目
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,全年
DocType: Stock Reconciliation Item,Stock Reconciliation Item,库存盘点品目
@@ -315,7 +316,7 @@
DocType: Material Request Item,Min Order Qty,最小订货量
DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,学生组创建工具课程
DocType: Lead,Do Not Contact,不要联系
-apps/erpnext/erpnext/public/js/setup_wizard.js +316,People who teach at your organisation,谁在您的组织教人
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,People who teach at your organisation,谁在您的组织教人
DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,跟踪所有周期性发票的唯一ID，提交时自动生成。
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Software Developer,软件开发人员
DocType: Item,Minimum Order Qty,最小起订量
@@ -326,7 +327,7 @@
DocType: Item,Publish in Hub,在发布中心
DocType: Student Admission,Student Admission,学生入学
,Terretory,区域
-apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item {0} is cancelled,项目{0}已取消
+apps/erpnext/erpnext/stock/doctype/item/item.py +692,Item {0} is cancelled,项目{0}已取消
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Material Request,物料申请
DocType: Bank Reconciliation,Update Clearance Date,更新清拆日期
DocType: Item,Purchase Details,购买详情
@@ -349,7 +350,7 @@
DocType: Student Group Student,Student Group Student,学生组学生
apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,最新
DocType: Vehicle Service,Inspection,检查
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard_row_head.html +1, List ,名单
+apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard_row_head.html +1, List ,清单
DocType: Email Digest,New Quotations,新报价
DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,电子邮件工资单员工根据员工选择首选的电子邮件
DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,假期审批人列表的第一个将被设为默认审批人
@@ -367,7 +368,7 @@
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},行＃{0}：{1}不能为负值对项{2}
apps/erpnext/erpnext/setup/doctype/company/company.js +70,Wrong Password,密码错误
DocType: Item,Variant Of,变体自
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',完成数量不能大于“生产数量”
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +363,Completed Qty can not be greater than 'Qty to Manufacture',完成数量不能大于“生产数量”
DocType: Period Closing Voucher,Closing Account Head,结算帐户头
DocType: Employee,External Work History,外部就职经历
apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,循环引用错误
@@ -384,7 +385,7 @@
apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,建立税
apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,出售资产的成本
apps/erpnext/erpnext/accounts/utils.py +351,Payment Entry has been modified after you pulled it. Please pull it again.,付款项被修改，你把它之后。请重新拉。
-apps/erpnext/erpnext/stock/doctype/item/item.py +442,{0} entered twice in Item Tax,{0}输入了两次税项
+apps/erpnext/erpnext/stock/doctype/item/item.py +435,{0} entered twice in Item Tax,{0}输入了两次税项
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,本周和待活动总结
DocType: Student Applicant,Admitted,录取
DocType: Workstation,Rent Cost,租金成本
@@ -418,7 +419,7 @@
DocType: Purchase Order,% Received,％已收货
apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,创建挺起胸
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,安装已经完成！
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Credit Note Amount,信用额度
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,信用额度
,Finished Goods,成品
DocType: Delivery Note,Instructions,说明
DocType: Quality Inspection,Inspected By,验货人
@@ -446,8 +447,9 @@
DocType: Request for Quotation,Request for Quotation,询价
DocType: Salary Slip Timesheet,Working Hours,工作时间
DocType: Naming Series,Change the starting / current sequence number of an existing series.,更改现有系列的起始/当前序列号。
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1456,Create a new Customer,创建一个新的客户
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,Create a new Customer,创建一个新的客户
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",如果几条价格规则同时使用，系统将提醒用户设置优先级。
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,请通过设置>编号系列设置出勤编号系列
apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,创建采购订单
,Purchase Register,购买注册
DocType: Course Scheduling Tool,Rechedule,Rechedule
@@ -472,7 +474,7 @@
DocType: Assessment Plan,Examiner Name,考官名称
DocType: Purchase Invoice Item,Quantity and Rate,数量和价格
DocType: Delivery Note,% Installed,％已安装
-apps/erpnext/erpnext/public/js/setup_wizard.js +330,Classrooms/ Laboratories etc where lectures can be scheduled.,教室/实验室等在那里的演讲可以预定。
+apps/erpnext/erpnext/public/js/setup_wizard.js +361,Classrooms/ Laboratories etc where lectures can be scheduled.,教室/实验室等在那里的演讲可以预定。
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,请先输入公司名称
DocType: Purchase Invoice,Supplier Name,供应商名称
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,阅读ERPNext手册
@@ -493,7 +495,7 @@
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 +641,Attribute {0} selected multiple times in Attributes Table,属性{0}多次选择在属性表
+apps/erpnext/erpnext/stock/doctype/item/item.py +634,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.,假期大师
@@ -529,7 +531,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,所选的材料清单并不同样项目
DocType: Pricing Rule,Valid Upto,有效期至
DocType: Training Event,Workshop,作坊
-apps/erpnext/erpnext/public/js/setup_wizard.js +219,List a few of your customers. They could be organizations or individuals.,列出一些你的客户，他们可以是组织或个人。
+apps/erpnext/erpnext/public/js/setup_wizard.js +244,List a few of your customers. They could be organizations or individuals.,列出一些你的客户，他们可以是组织或个人。
apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,足够的配件组装
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,直接收益
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account",按科目分类后不能根据科目过滤
@@ -544,7 +546,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,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 +537,"To merge, following properties must be same for both items",若要合并，以下属性必须为这两个项目是相同的
+apps/erpnext/erpnext/stock/doctype/item/item.py +530,"To merge, following properties must be same for both items",若要合并，以下属性必须为这两个项目是相同的
DocType: Shipping Rule,Net Weight,净重
DocType: Employee,Emergency Phone,紧急电话
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,购买
@@ -554,7 +556,7 @@
apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,请定义等级为阈值0％
DocType: Sales Order,To Deliver,为了提供
DocType: Purchase Invoice Item,Item,产品
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2428,Serial no item cannot be a fraction,序号项目不能是一个分数
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2522,Serial no item cannot be a fraction,序号项目不能是一个分数
DocType: Journal Entry,Difference (Dr - Cr),差异(贷方-借方)
DocType: Account,Profit and Loss,损益
apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,管理转包
@@ -573,7 +575,7 @@
DocType: Purchase Receipt,Add / Edit Taxes and Charges,添加/编辑税金及费用
DocType: Purchase Invoice,Supplier Invoice No,供应商发票编号
DocType: Territory,For reference,供参考
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions",无法删除序列号{0}，因为它采用的是现货交易
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions",无法删除序列号{0}，因为它采用的是现货交易
apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),结算(信用)
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,移动项目
DocType: Serial No,Warranty Period (Days),保修期限（天数）
@@ -594,7 +596,7 @@
apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,请选择公司和党的第一型
apps/erpnext/erpnext/config/accounts.py +295,Financial / accounting year.,财务/会计年度。
apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,累积值
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",抱歉，序列号无法合并
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged",抱歉，序列号无法合并
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +707,Make Sales Order,创建销售订单
DocType: Project Task,Project Task,项目任务
,Lead Id,线索ID
@@ -614,6 +616,7 @@
DocType: Leave Control Panel,Allocate,调配
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +780,Sales Return,销售退货
apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,注：总分配叶{0}应不低于已核定叶{1}期间
+,Total Stock Summary,总库存总结
DocType: Announcement,Posted By,发布者
DocType: Item,Delivered by Supplier (Drop Ship),由供应商交货（直接发运）
apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,潜在客户数据库。
@@ -622,7 +625,7 @@
DocType: Quotation,Quotation To,报价对象
DocType: Lead,Middle Income,中等收入
apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),开幕（CR ）
-apps/erpnext/erpnext/stock/doctype/item/item.py +805,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 +798,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 +355,Allocated amount can not be negative,调配数量不能为负
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,请设定公司
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,请设定公司
@@ -644,6 +647,7 @@
DocType: Assessment Plan,Maximum Assessment Score,最大考核评分
apps/erpnext/erpnext/config/accounts.py +140,Update Bank Transaction Dates,更新银行交易日期
apps/erpnext/erpnext/config/projects.py +30,Time Tracking,时间跟踪
+DocType: Sales Invoice,DUPLICATE FOR TRANSPORTER,输送机重复
DocType: Fiscal Year Company,Fiscal Year Company,公司财政年度
DocType: Packing Slip Item,DN Detail,送货单详情
DocType: Training Event,Conference,会议
@@ -683,8 +687,8 @@
DocType: Production Order Operation,In minutes,已分钟为单位
DocType: Issue,Resolution Date,决议日期
DocType: Student Batch Name,Batch Name,批名
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,创建时间表：
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +865,Please set default Cash or Bank account in Mode of Payment {0},请设置默认的现金或银行账户的付款方式{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +315,Timesheet created:,创建时间表：
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +866,Please set default Cash or Bank account in Mode of Payment {0},请设置默认的现金或银行账户的付款方式{0}
apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,注册
DocType: GST Settings,GST Settings,GST设置
DocType: Selling Settings,Customer Naming By,客户命名方式
@@ -713,7 +717,7 @@
DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,到岸成本税费
DocType: Production Order Operation,Actual Start Time,实际开始时间
DocType: BOM Operation,Operation Time,操作时间
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,完
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +284,Finish,完
apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,基础
DocType: Timesheet,Total Billed Hours,帐单总时间
DocType: Journal Entry,Write Off Amount,核销金额
@@ -748,7 +752,7 @@
,Absent Student Report,缺席学生报告
DocType: Email Digest,Next email will be sent on:,下次邮件发送时间：
DocType: Offer Letter Term,Offer Letter Term,报价函期限
-apps/erpnext/erpnext/stock/doctype/item/item.py +620,Item has variants.,项目有变体。
+apps/erpnext/erpnext/stock/doctype/item/item.py +613,Item has variants.,项目有变体。
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,项目{0}未找到
DocType: Bin,Stock Value,库存值
apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,公司{0}不存在
@@ -765,7 +769,7 @@
DocType: Journal Entry,Credit Card Entry,信用卡分录
apps/erpnext/erpnext/config/accounts.py +51,Company and Accounts,公司与账户
apps/erpnext/erpnext/config/stock.py +22,Goods received from Suppliers.,来自供应商的已收入成品。
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,在数值
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,金额
DocType: Lead,Campaign Name,活动名称
DocType: Selling Settings,Close Opportunity After Days,关闭机会后日
,Reserved,保留的
@@ -795,12 +799,12 @@
DocType: Warranty Claim,CI-,CI-
apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,行{0}：转换系数是强制性的
DocType: Employee,A+,A +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +332,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",海报价格规则，同样的标准存在，请分配优先级解决冲突。价格规则：{0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +325,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",海报价格规则，同样的标准存在，请分配优先级解决冲突。价格规则：{0}
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +467,Cannot deactivate or cancel BOM as it is linked with other BOMs,无法停用或取消BOM，因为它被其他BOM引用。
DocType: Opportunity,Maintenance,维护
DocType: Item Attribute Value,Item Attribute Value,项目属性值
apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,销售活动。
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +48,Make Timesheet,制作时间表
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +110,Make Timesheet,制作时间表
DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
#### Note
@@ -850,13 +854,13 @@
apps/erpnext/erpnext/stock/get_item_details.py +309,Price List not selected,价格列表没有选择
DocType: Employee,Family Background,家庭背景
DocType: Request for Quotation Supplier,Send Email,发送电子邮件
-apps/erpnext/erpnext/stock/doctype/item/item.py +207,Warning: Invalid Attachment {0},警告：无效的附件{0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,无此权限
+apps/erpnext/erpnext/stock/doctype/item/item.py +203,Warning: Invalid Attachment {0},警告：无效的附件{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +755,No Permission,无此权限
DocType: Company,Default Bank Account,默认银行账户
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",要根据党的筛选，选择党第一类型
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},“库存更新'校验不通过，因为{0}中的退货条目未交付
DocType: Vehicle,Acquisition Date,采集日期
-apps/erpnext/erpnext/public/js/setup_wizard.js +269,Nos,Nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +297,Nos,Nos
DocType: Item,Items with higher weightage will be shown higher,具有较高权重的项目将显示更高的可
DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,银行对帐详细
apps/erpnext/erpnext/controllers/accounts_controller.py +561,Row #{0}: Asset {1} must be submitted,行＃{0}：资产{1}必须提交
@@ -876,7 +880,7 @@
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}：成本中心{2}不属于公司{3}
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}帐户{2}不能是一个组
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,项目行{idx}: {文档类型}上不存在'{文档类型}'表
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +274,Timesheet {0} is already completed or cancelled,时间表{0}已完成或取消
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +275,Timesheet {0} is already completed or cancelled,时间表{0}已完成或取消
apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,没有任务
DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",每月自动生成发票的日期，例如5号，28号等
DocType: Asset,Opening Accumulated Depreciation,打开累计折旧
@@ -964,14 +968,14 @@
apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,提交工资单
apps/erpnext/erpnext/config/accounts.py +305,Currency exchange rate master.,货币汇率大师
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +192,Reference Doctype must be one of {0},参考文档类型必须是一个{0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},找不到时隙在未来{0}天操作{1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +298,Unable to find Time Slot in the next {0} days for Operation {1},找不到时隙在未来{0}天操作{1}
DocType: Production Order,Plan material for sub-assemblies,计划材料为子组件
apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,销售合作伙伴和地区
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +543,BOM {0} must be active,BOM{0}处于非活动状态
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +546,BOM {0} must be active,BOM{0}处于非活动状态
DocType: Journal Entry,Depreciation Entry,折旧分录
apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,请选择文档类型第一
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,取消此上门保养之前请先取消物料访问{0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},序列号{0}不属于品目{1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},序列号{0}不属于品目{1}
DocType: Purchase Receipt Item Supplied,Required Qty,所需数量
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouses with existing transaction can not be converted to ledger.,与现有的交易仓库不能转换到总帐。
DocType: Bank Reconciliation,Total Amount,总金额
@@ -988,7 +992,7 @@
DocType: Fee Structure,Components,组件
apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},请输入项目资产类别{0}
DocType: Quality Inspection Reading,Reading 6,阅读6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +885,Cannot {0} {1} {2} without any negative outstanding invoice,无法{0} {1} {2}没有任何负面的优秀发票
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +887,Cannot {0} {1} {2} without any negative outstanding invoice,无法{0} {1} {2}没有任何负面的优秀发票
DocType: Purchase Invoice Advance,Purchase Invoice Advance,购买发票提前
DocType: Hub Settings,Sync Now,立即同步
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},行{0}：信用记录无法被链接的{1}
@@ -1002,12 +1006,12 @@
DocType: Item,Is Purchase Item,是否采购项目
DocType: Asset,Purchase Invoice,购买发票
DocType: Stock Ledger Entry,Voucher Detail No,凭证详情编号
-apps/erpnext/erpnext/accounts/page/pos/pos.js +731,New Sales Invoice,新的销售发票
+apps/erpnext/erpnext/accounts/page/pos/pos.js +825,New Sales Invoice,新的销售发票
DocType: Stock Entry,Total Outgoing Value,即将离任的总价值
apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,开幕日期和截止日期应在同一会计年度
DocType: Lead,Request for Information,索取资料
,LeaderBoard,排行榜
-apps/erpnext/erpnext/accounts/page/pos/pos.js +744,Sync Offline Invoices,同步离线发票
+apps/erpnext/erpnext/accounts/page/pos/pos.js +838,Sync Offline Invoices,同步离线发票
DocType: Payment Request,Paid,付费
DocType: Program Fee,Program Fee,课程费用
DocType: Salary Slip,Total in words,总字
@@ -1040,10 +1044,10 @@
apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,化学品
DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,默认银行/现金帐户时，会选择此模式可以自动在工资日记条目更新。
DocType: BOM,Raw Material Cost(Company Currency),原料成本（公司货币）
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +733,All items have already been transferred for this Production Order.,所有品目都已经转移到这个生产订单。
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +731,All items have already been transferred for this Production Order.,所有品目都已经转移到这个生产订单。
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},行＃{0}：速率不能大于{1} {2}中使用的速率
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},行＃{0}：速率不能大于{1} {2}中使用的速率
-apps/erpnext/erpnext/public/js/setup_wizard.js +270,Meter,仪表
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Meter,仪表
DocType: Workstation,Electricity Cost,电力成本
DocType: HR Settings,Don't send Employee Birthday Reminders,不要发送员工生日提醒
DocType: Item,Inspection Criteria,检验标准
@@ -1065,7 +1069,7 @@
apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},订单类型必须是一个{0}
DocType: Lead,Next Contact Date,下次联络日期
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,开放数量
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Please enter Account for Change Amount,对于涨跌额请输入帐号
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please enter Account for Change Amount,对于涨跌额请输入帐号
DocType: Student Batch Name,Student Batch Name,学生批名
DocType: Holiday List,Holiday List Name,假期列表名称
DocType: Repayment Schedule,Balance Loan Amount,平衡贷款额
@@ -1073,7 +1077,7 @@
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Stock Options,库存选项
DocType: Journal Entry Account,Expense Claim,报销
apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,难道你真的想恢复这个报废的资产？
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +259,Qty for {0},{0}数量
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +348,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,禁离日列表日期
@@ -1085,9 +1089,9 @@
apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},请指定{0}
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,删除的项目在数量或价值没有变化。
DocType: Delivery Note,Delivery To,交货对象
-apps/erpnext/erpnext/stock/doctype/item/item.py +638,Attribute table is mandatory,属性表是强制性的
+apps/erpnext/erpnext/stock/doctype/item/item.py +631,Attribute table is mandatory,属性表是强制性的
DocType: Production Planning Tool,Get Sales Orders,获取销售订单
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +68,{0} can not be negative,{0}不能为负
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0}不能为负
apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,折扣
DocType: Asset,Total Number of Depreciations,折旧总数
DocType: Sales Invoice Item,Rate With Margin,利率保证金
@@ -1124,7 +1128,7 @@
DocType: GL Entry,Against,针对
DocType: Item,Default Selling Cost Center,默认销售成本中心
DocType: Sales Partner,Implementation Partner,实施合作伙伴
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1546,ZIP Code,邮编
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1640,ZIP Code,邮编
apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},销售订单{0} {1}
DocType: Opportunity,Contact Info,联系方式
apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,制作Stock条目
@@ -1143,7 +1147,7 @@
DocType: School Settings,Attendance Freeze Date,出勤冻结日期
DocType: School Settings,Attendance Freeze Date,出勤冻结日期
DocType: Opportunity,Your sales person who will contact the customer in future,联系客户的销售人员
-apps/erpnext/erpnext/public/js/setup_wizard.js +238,List a few of your suppliers. They could be organizations or individuals.,列出一些你的供应商，他们可以是组织或个人。
+apps/erpnext/erpnext/public/js/setup_wizard.js +264,List a few of your suppliers. They could be organizations or individuals.,列出一些你的供应商，他们可以是组织或个人。
apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,查看所有产品
apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),最低铅年龄（天）
apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),最低铅年龄（天）
@@ -1168,7 +1172,7 @@
DocType: Sales Partner,Distributor,经销商
DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,购物车配送规则
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,生产订单{0}必须取消这个销售订单之前被取消
-apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',请设置“收取额外折扣”
+apps/erpnext/erpnext/public/js/controllers/transaction.js +67,Please set 'Apply Additional Discount On',请设置“收取额外折扣”
,Ordered Items To Be Billed,订购物品被标榜
apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,从范围必须小于要范围
DocType: Global Defaults,Global Defaults,全局默认值
@@ -1176,10 +1180,10 @@
DocType: Salary Slip,Deductions,扣款列表
DocType: Leave Allocation,LAL/,LAL /
apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,开始年份
-apps/erpnext/erpnext/regional/india/utils.py +22,First 2 digits of GSTIN should match with State number {0},GSTIN的前2位数字应与状态号{0}匹配
+apps/erpnext/erpnext/regional/india/utils.py +23,First 2 digits of GSTIN should match with State number {0},GSTIN的前2位数字应与状态号{0}匹配
DocType: Purchase Invoice,Start date of current invoice's period,当前发票周期的起始日期
DocType: Salary Slip,Leave Without Pay,无薪假期
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,容量规划错误
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +342,Capacity Planning Error,容量规划错误
,Trial Balance for Party,试算表的派对
DocType: Lead,Consultant,顾问
DocType: Salary Slip,Earnings,盈余
@@ -1198,7 +1202,7 @@
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,返回/借记注
DocType: Price List Country,Price List Country,价目表国家
DocType: Item,UOMs,计量单位
-apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},品目{1}有{0}个有效序列号
+apps/erpnext/erpnext/stock/utils.py +205,{0} valid serial nos for Item {1},品目{1}有{0}个有效序列号
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,项目编号不能因序列号改变
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +24,POS Profile {0} already created for user: {1} and company {2},POS简介{0}已经为用户创建：{1}和公司{2}
DocType: Sales Invoice Item,UOM Conversion Factor,计量单位换算系数
@@ -1208,7 +1212,7 @@
apps/erpnext/erpnext/config/buying.py +38,Supplier database.,供应商数据库。
DocType: Account,Balance Sheet,资产负债表
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +675,Cost Center For Item with Item Code ',成本中心：品目代码‘
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2389,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",付款方式未配置。请检查是否帐户已就付款方式或POS机配置文件中设置。
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2483,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",付款方式未配置。请检查是否帐户已就付款方式或POS机配置文件中设置。
DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,您的销售人员将在此日期收到联系客户的提醒
apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,同一项目不能输入多次。
apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups",进一步帐户可以根据组进行，但条目可针对非组进行
@@ -1251,7 +1255,7 @@
apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,查看总帐
DocType: Grading Scale,Intervals,间隔
apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,最早
-apps/erpnext/erpnext/stock/doctype/item/item.py +511,"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 +504,"An Item Group exists with same name, please change the item name or rename the item group",同名品目群组已存在，请修改品目名或群组名
apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,学生手机号码
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +489,Rest Of The World,世界其他地区
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,物件{0}不能有批次
@@ -1280,7 +1284,7 @@
,Employee Leave Balance,雇员假期余量
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},账户{0}的余额必须总是{1}
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +178,Valuation Rate required for Item in row {0},行对项目所需的估值速率{0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +288,Example: Masters in Computer Science,举例：硕士计算机科学
+apps/erpnext/erpnext/public/js/setup_wizard.js +316,Example: Masters in Computer Science,举例：硕士计算机科学
DocType: Purchase Invoice,Rejected Warehouse,拒绝仓库
DocType: GL Entry,Against Voucher,对凭证
DocType: Item,Default Buying Cost Center,默认采购成本中心
@@ -1291,7 +1295,7 @@
apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},从{0}工资支付{1}
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},无权修改冻结帐户{0}
DocType: Journal Entry,Get Outstanding Invoices,获取未清发票
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,销售订单{0}无效
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +66,Sales Order {0} is not valid,销售订单{0}无效
apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,采购订单帮助您规划和跟进您的购买
apps/erpnext/erpnext/setup/doctype/company/company.py +225,"Sorry, companies cannot be merged",抱歉，公司不能合并
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +167,"The total Issue / Transfer quantity {0} in Material Request {1} \
@@ -1309,14 +1313,14 @@
DocType: Employee,Place of Issue,签发地点
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Contract,合同
DocType: Email Digest,Add Quote,添加报价
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +861,UOM coversion factor required for UOM: {0} in Item: {1},物件{1}的计量单位{0}需要单位换算系数
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +868,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 +92,Indirect Expenses,间接支出
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,行{0}：数量是强制性的
apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,农业
-apps/erpnext/erpnext/accounts/page/pos/pos.js +736,Sync Master Data,同步主数据
-apps/erpnext/erpnext/public/js/setup_wizard.js +256,Your Products or Services,您的产品或服务
+apps/erpnext/erpnext/accounts/page/pos/pos.js +830,Sync Master Data,同步主数据
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,您的产品或服务
DocType: Mode of Payment,Mode of Payment,付款方式
-apps/erpnext/erpnext/stock/doctype/item/item.py +181,Website Image should be a public file or website URL,网站形象应该是一个公共文件或网站网址
+apps/erpnext/erpnext/stock/doctype/item/item.py +177,Website Image should be a public file or website URL,网站形象应该是一个公共文件或网站网址
DocType: Student Applicant,AP,美联社
DocType: Purchase Invoice Item,BOM,BOM
apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,这是一个root群组，无法被编辑。
@@ -1334,14 +1338,13 @@
DocType: Student Group Student,Group Roll Number,组卷编号
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",对于{0}，贷方分录只能选择贷方账户
apps/erpnext/erpnext/projects/doctype/project/project.py +73,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,所有任务的权重合计应为1。请相应调整的所有项目任务重
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +562,Delivery Note {0} is not submitted,送货单{0}未提交
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +563,Delivery Note {0} is not submitted,送货单{0}未提交
apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,项目{0}必须是外包项目
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,资本设备
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",定价规则是第一选择是基于“应用在”字段，可以是项目，项目组或品牌。
DocType: Hub Settings,Seller Website,卖家网站
DocType: Item,ITEM-,项目-
apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,对于销售团队总分配比例应为100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},生产订单状态为{0}
DocType: Appraisal Goal,Goal,目标
DocType: Sales Invoice Item,Edit Description,编辑说明
,Team Updates,团队更新
@@ -1357,14 +1360,14 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,儿童仓库存在这个仓库。您不能删除这个仓库。
DocType: Item,Website Item Groups,网站物件组
DocType: Purchase Invoice,Total (Company Currency),总（公司货币）
-apps/erpnext/erpnext/stock/utils.py +177,Serial number {0} entered more than once,序列号{0}已多次输入
+apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,序列号{0}已多次输入
DocType: Depreciation Schedule,Journal Entry,日记帐分录
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0}操作中的单品
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,{0} items in progress,{0}操作中的单品
DocType: Workstation,Workstation Name,工作站名称
DocType: Grading Scale Interval,Grade Code,等级代码
DocType: POS Item Group,POS Item Group,POS项目组
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,邮件摘要：
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +549,BOM {0} does not belong to Item {1},BOM{0}不属于品目{1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +552,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,这就是以这个前缀的最后一个创建的事务数
@@ -1423,7 +1426,6 @@
DocType: POS Profile,Campaign,活动
DocType: Supplier,Name and Type,名称和类型
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',审批状态必须被“已批准”或“已拒绝”
-apps/erpnext/erpnext/public/js/setup_wizard.js +345,Bootstrap,引导
DocType: Purchase Invoice,Contact Person,联络人
apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',“预计开始日期”不能大于“预计结束日期'
DocType: Course Scheduling Tool,Course End Date,课程结束日期
@@ -1436,7 +1438,7 @@
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,在固定资产净变动
DocType: Leave Control Panel,Leave blank if considered for all designations,如果针对所有 职位请留空
apps/erpnext/erpnext/controllers/accounts_controller.py +675,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}中的收取类型“实际”不能有“品目税率”
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +260,Max: {0},最大值：{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +349,Max: {0},最大值：{0}
apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,起始时间日期
DocType: Email Digest,For Company,对公司
apps/erpnext/erpnext/config/support.py +17,Communication log.,通信日志。
@@ -1446,7 +1448,7 @@
apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,科目表
DocType: Material Request,Terms and Conditions Content,条款和条件内容
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,不能大于100
-apps/erpnext/erpnext/stock/doctype/item/item.py +690,Item {0} is not a stock Item,项目{0}不是库存项目
+apps/erpnext/erpnext/stock/doctype/item/item.py +683,Item {0} is not a stock Item,项目{0}不是库存项目
DocType: Maintenance Visit,Unscheduled,计划外
DocType: Employee,Owned,资
DocType: Salary Detail,Depends on Leave Without Pay,依赖于无薪休假
@@ -1477,7 +1479,7 @@
DocType: Journal Entry Account,Account Balance,账户余额
apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,税收规则进行的交易。
DocType: Rename Tool,Type of document to rename.,的文件类型进行重命名。
-apps/erpnext/erpnext/public/js/setup_wizard.js +273,We buy this Item,我们购买这些物件
+apps/erpnext/erpnext/public/js/setup_wizard.js +301,We buy this Item,我们购买这些物件
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +53,{0} {1}: Customer is required against Receivable account {2},{0} {1}：需要客户支付的应收账款{2}
DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),总税费和费用（公司货币）
apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,显示未关闭的会计年度的盈亏平衡
@@ -1488,7 +1490,7 @@
DocType: Stock Entry,Total Additional Costs,总额外费用
DocType: Course Schedule,SH,SH
DocType: BOM,Scrap Material Cost(Company Currency),废料成本（公司货币）
-apps/erpnext/erpnext/public/js/setup_wizard.js +266,Sub Assemblies,半成品
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Sub Assemblies,半成品
DocType: Asset,Asset Name,资产名称
DocType: Project,Task Weight,任务重
DocType: Shipping Rule Condition,To Value,To值
@@ -1521,12 +1523,12 @@
DocType: Sales Invoice,Source,源
apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,显示关闭
DocType: Leave Type,Is Leave Without Pay,是无薪休假
-apps/erpnext/erpnext/stock/doctype/item/item.py +239,Asset Category is mandatory for Fixed Asset item,资产类别是强制性的固定资产项目
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Asset Category is mandatory for Fixed Asset item,资产类别是强制性的固定资产项目
apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,没有在支付表中找到记录
apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},此{0}冲突{1}在{2} {3}
DocType: Student Attendance Tool,Students HTML,学生HTML
DocType: POS Profile,Apply Discount,应用折扣
-DocType: Purchase Invoice Item,GST HSN Code,GST HSN代码
+DocType: GST HSN Code,GST HSN Code,GST HSN代码
DocType: Employee External Work History,Total Experience,总经验
apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,打开项目
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +283,Packing Slip(s) cancelled,装箱单（ S）取消
@@ -1569,8 +1571,8 @@
DocType: Program Enrollment Tool,Program Enrollments,计划扩招
DocType: Sales Invoice Item,Brand Name,品牌名称
DocType: Purchase Receipt,Transporter Details,转运详细
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2573,Default warehouse is required for selected item,默认仓库需要选中的项目
-apps/erpnext/erpnext/public/js/setup_wizard.js +269,Box,箱
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2667,Default warehouse is required for selected item,默认仓库需要选中的项目
+apps/erpnext/erpnext/public/js/setup_wizard.js +297,Box,箱
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,可能的供应商
DocType: Budget,Monthly Distribution,月度分布
apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,接收人列表为空。请创建接收人列表
@@ -1600,7 +1602,6 @@
DocType: Employee Loan,Repayment Method,还款方式
DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website",如果选中，主页将是网站的默认项目组
DocType: Quality Inspection Reading,Reading 4,阅读4
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},默认BOM {0}未找到项目{1}
apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,公司开支报销
apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students",学生在系统的心脏，添加所有的学生
apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},行＃{0}：清除日期{1}无法支票日期前{2}
@@ -1617,29 +1618,29 @@
apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,请报价
apps/erpnext/erpnext/config/selling.py +216,Other Reports,其他报告
DocType: Dependent Task,Dependent Task,相关任务
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,Conversion factor for default Unit of Measure must be 1 in row {0},行{0}中默认计量单位的转换系数必须是1
+apps/erpnext/erpnext/stock/doctype/item/item.py +401,Conversion factor for default Unit of Measure must be 1 in row {0},行{0}中默认计量单位的转换系数必须是1
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},类型为{0}的假期不能长于{1}天
DocType: Manufacturing Settings,Try planning operations for X days in advance.,尝试规划X天行动提前。
DocType: HR Settings,Stop Birthday Reminders,停止生日提醒
apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},请公司设定默认应付职工薪酬帐户{0}
DocType: SMS Center,Receiver List,接收人列表
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1060,Search Item,搜索项目
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1154,Search Item,搜索项目
apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,消耗量
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,现金净变动
DocType: Assessment Plan,Grading Scale,分级量表
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Unit of Measure {0} has been entered more than once in Conversion Factor Table,计量单位{0}已经在换算系数表内
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,已经完成
+apps/erpnext/erpnext/stock/doctype/item/item.py +396,Unit of Measure {0} has been entered more than once in Conversion Factor Table,计量单位{0}已经在换算系数表内
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +599,Already completed,已经完成
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,库存在手
apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},付款申请已经存在{0}
apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,已发料品目成本
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},数量不能超过{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +352,Quantity must not be more than {0},数量不能超过{0}
apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,上一财政年度未关闭
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),时间（天）
DocType: Quotation Item,Quotation Item,报价品目
DocType: Customer,Customer POS Id,客户POS ID
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/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,序列号{0}的数量{1}不能是分数
apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,主要的供应商类型。
DocType: Purchase Order Item,Supplier Part Number,供应商零件编号
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,Conversion rate cannot be 0 or 1,汇率不能为0或1
@@ -1647,6 +1648,7 @@
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +213,{0} {1} is cancelled or stopped,{0} {1}被取消或停止
DocType: Accounts Settings,Credit Controller,信用控制人
DocType: Delivery Note,Vehicle Dispatch Date,车辆调度日期
+DocType: Purchase Order Item,HSN/SAC,HSN / SAC
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +230,Purchase Receipt {0} is not submitted,外购入库单{0}未提交
DocType: Company,Default Payable Account,默认应付账户
apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.",网上购物车，如配送规则，价格表等的设置
@@ -1702,7 +1704,7 @@
DocType: Sales Invoice,Packed Items,盒装项目
apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,针对序列号提出的保修申请
DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM",在它使用的所有其他材料明细表替换特定的BOM。它将取代旧的BOM链接，更新成本和再生“BOM爆炸物品”表按照新的BOM
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +67,'Total','总'
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +61,'Total','总'
DocType: Shopping Cart Settings,Enable Shopping Cart,启用购物车
DocType: Employee,Permanent Address,永久地址
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
@@ -1738,6 +1740,7 @@
DocType: Vehicle,Doors,门
apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +205,ERPNext Setup Complete!,ERPNext设置完成！
DocType: Course Assessment Criteria,Weightage,权重
+DocType: Sales Invoice,Tax Breakup,税收分解
DocType: Packing Slip,PS-,PS-
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}：需要的损益“账户成本中心{2}。请设置为公司默认的成本中心。
apps/erpnext/erpnext/selling/doctype/customer/customer.py +115,A Customer Group exists with same name please change the Customer name or rename the Customer Group,同名的客户组已经存在，请更改客户姓名或重命名该客户组
@@ -1757,7 +1760,7 @@
,Item-wise Sales Register,逐项销售登记
DocType: Asset,Gross Purchase Amount,总购买金额
DocType: Asset,Depreciation Method,折旧方法
-apps/erpnext/erpnext/accounts/page/pos/pos.js +699,Offline,离线
+apps/erpnext/erpnext/accounts/page/pos/pos.js +793,Offline,离线
DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,此税项是否包含在基本价格中？
apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,总目标
DocType: Job Applicant,Applicant for a Job,求职申请
@@ -1773,7 +1776,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +60,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 +422,Default BOM ({0}) must be active for this item or its template,默认BOM（{0}）必须是活动的这个项目或者其模板
+apps/erpnext/erpnext/stock/doctype/item/item.py +415,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: Email Digest,Annual Expenses,年度支出
@@ -1786,7 +1789,7 @@
DocType: Sales Invoice Item,Customer's Item Code,客户的品目编号
DocType: Stock Reconciliation,Stock Reconciliation,库存盘点
DocType: Territory,Territory Name,区域名称
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,提交前需要指定在制品仓库
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,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,供应商的注册信息和其他一般信息
@@ -1796,7 +1799,7 @@
apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,学生群体力量
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +237,Against Journal Entry {0} does not have any unmatched {1} entry,日记帐分录{0}没有不符合的{1}分录
apps/erpnext/erpnext/config/hr.py +137,Appraisals,估价
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},品目{0}的序列号重复
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},品目{0}的序列号重复
DocType: Shipping Rule Condition,A condition for a Shipping Rule,发货规则的一个条件
apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,请输入
apps/erpnext/erpnext/controllers/accounts_controller.py +435,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings",行不能overbill为项目{0} {1}超过{2}。要允许对帐单，请在购买设置中设置
@@ -1805,7 +1808,7 @@
DocType: Sales Order,To Deliver and Bill,为了提供与比尔
DocType: Student Group,Instructors,教师
DocType: GL Entry,Credit Amount in Account Currency,在账户币金额
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +546,BOM {0} must be submitted,BOM{0}未提交
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +549,BOM {0} must be submitted,BOM{0}未提交
DocType: Authorization Control,Authorization Control,授权控制
apps/erpnext/erpnext/controllers/buying_controller.py +304,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},行＃{0}：拒绝仓库是强制性的反对否决项{1}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,付款
@@ -1824,12 +1827,12 @@
DocType: Quotation Item,Actual Qty,实际数量
DocType: Sales Invoice Item,References,参考
DocType: Quality Inspection Reading,Reading 10,阅读10
-apps/erpnext/erpnext/public/js/setup_wizard.js +257,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",列出您采购或销售的产品或服务。请确认品目群组，计量单位或其他属性。
+apps/erpnext/erpnext/public/js/setup_wizard.js +284,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",列出您采购或销售的产品或服务。请确认品目群组，计量单位或其他属性。
DocType: Hub Settings,Hub Node,Hub节点
apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,您输入了重复的条目。请纠正然后重试。
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,Associate,协理
DocType: Asset Movement,Asset Movement,资产运动
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2107,New Cart,新的车
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2201,New Cart,新的车
apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,项目{0}不是一个序列项目
DocType: SMS Center,Create Receiver List,创建接收人列表
DocType: Vehicle,Wheels,车轮
@@ -1855,7 +1858,7 @@
DocType: Landed Cost Voucher,Get Items From Purchase Receipts,从购买收据获取品目
DocType: Serial No,Creation Date,创建日期
apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},产品{0}多次出现价格表{1}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Selling must be checked, if Applicable For is selected as {0}",如果“适用于”的值为{0}，则必须选择“销售”
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +40,"Selling must be checked, if Applicable For is selected as {0}",如果“适用于”的值为{0}，则必须选择“销售”
DocType: Production Plan Material Request,Material Request Date,材料申请日期
DocType: Purchase Order Item,Supplier Quotation Item,供应商报价品目
DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,禁止对创作生产订单的时间日志。操作不得对生产订单追踪
@@ -1872,12 +1875,12 @@
DocType: Budget,Fiscal Year,财政年度
DocType: Vehicle Log,Fuel Price,燃油价格
DocType: Budget,Budget,预算
-apps/erpnext/erpnext/stock/doctype/item/item.py +236,Fixed Asset Item must be a non-stock item.,固定资产项目必须是一个非库存项目。
+apps/erpnext/erpnext/stock/doctype/item/item.py +232,Fixed Asset Item must be a non-stock item.,固定资产项目必须是一个非库存项目。
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",财政预算案不能对{0}指定的，因为它不是一个收入或支出帐户
apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,已实现
DocType: Student Admission,Application Form Route,申请表路线
apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,区域/客户
-apps/erpnext/erpnext/public/js/setup_wizard.js +209,e.g. 5,例如5
+apps/erpnext/erpnext/public/js/setup_wizard.js +234,e.g. 5,例如5
apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,休假类型{0}，因为它是停薪留职无法分配
apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},行{0}：已分配量{1}必须小于或等于发票余额{2}
DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,大写金额将在销售发票保存后显示。
@@ -1886,7 +1889,7 @@
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,项目{0}没有设置序列号，请进入主项目中修改
DocType: Maintenance Visit,Maintenance Time,维护时间
,Amount to Deliver,量交付
-apps/erpnext/erpnext/public/js/setup_wizard.js +263,A Product or Service,产品或服务
+apps/erpnext/erpnext/public/js/setup_wizard.js +291,A Product or Service,产品或服务
apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,这个词开始日期不能超过哪个术语链接学年的开学日期较早（学年{}）。请更正日期，然后再试一次。
DocType: Guardian,Guardian Interests,守护兴趣
DocType: Naming Series,Current Value,当前值
@@ -1962,7 +1965,7 @@
DocType: Task,Total Billing Amount (via Time Sheet),总开票金额（通过时间表）
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,重复客户收入
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} {1}必须有“费用审批人”的角色
-apps/erpnext/erpnext/public/js/setup_wizard.js +269,Pair,对
+apps/erpnext/erpnext/public/js/setup_wizard.js +297,Pair,对
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +862,Select BOM and Qty for Production,选择BOM和数量生产
DocType: Asset,Depreciation Schedule,折旧计划
apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,销售合作伙伴地址和联系人
@@ -1981,10 +1984,10 @@
DocType: Task,Actual End Date (via Time Sheet),实际结束日期（通过时间表）
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +361,Amount {0} {1} against {2} {3},数量 {0}{1} 对应 {2}{3}
,Quotation Trends,报价趋势
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +160,Item Group not mentioned in item master for item {0},项目{0}的项目群组没有设置
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +342,Debit To account must be a Receivable account,入借帐户必须是应收账科目
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},项目{0}的项目群组没有设置
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +343,Debit To account must be a Receivable account,入借帐户必须是应收账科目
DocType: Shipping Rule Condition,Shipping Amount,发货数量
-apps/erpnext/erpnext/public/js/setup_wizard.js +218,Add Customers,添加客户
+apps/erpnext/erpnext/public/js/setup_wizard.js +243,Add Customers,添加客户
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,待审核金额
DocType: Purchase Invoice Item,Conversion Factor,转换系数
DocType: Purchase Order,Delivered,已交付
@@ -2001,6 +2004,7 @@
,Supplier-Wise Sales Analytics,供应商特定的销售分析
apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,输入支付的金额
DocType: Salary Structure,Select employees for current Salary Structure,当前薪酬结构中选择员工
+DocType: Sales Invoice,Company Address Name,公司地址名称
DocType: Production Order,Use Multi-Level BOM,采用多级物料清单
DocType: Bank Reconciliation,Include Reconciled Entries,包括核销分录
DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)",家长课程（如果不是家长课程的一部分，请留空）
@@ -2021,7 +2025,7 @@
DocType: Loan Type,Loan Name,贷款名称
apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,实际总
DocType: Student Siblings,Student Siblings,学生兄弟姐妹
-apps/erpnext/erpnext/public/js/setup_wizard.js +269,Unit,单位
+apps/erpnext/erpnext/public/js/setup_wizard.js +297,Unit,单位
apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,请注明公司
,Customer Acquisition and Loyalty,客户获得和忠诚度
DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,维护拒收物件的仓库
@@ -2043,7 +2047,7 @@
apps/erpnext/erpnext/controllers/accounts_controller.py +291,Account {0} is invalid. Account Currency must be {1},帐户{0}是无效的。帐户货币必须是{1}
apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},行{0}计量单位换算系数是必须项
DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1004,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",行＃{0}：参考文件类型必须是销售订单之一，销售发票或日记帐分录
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1006,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",行＃{0}：参考文件类型必须是销售订单之一，销售发票或日记帐分录
DocType: Salary Component,Deduction,扣款
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,行{0}：从时间和时间是强制性的。
DocType: Stock Reconciliation Item,Amount Difference,金额差异
@@ -2052,7 +2056,7 @@
DocType: Territory,Classification of Customers by region,客户按区域分类
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,差量必须是零
DocType: Project,Gross Margin,毛利
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,请先输入生产项目
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +53,Please enter Production Item first,请先输入生产项目
apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,计算的银行对账单余额
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,已禁用用户
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,报价
@@ -2064,7 +2068,7 @@
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,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 +211,Warning: Invalid SSL certificate on attachment {0},警告：附件{0}中存在无效的SSL证书
+apps/erpnext/erpnext/stock/doctype/item/item.py +207,Warning: Invalid SSL certificate on attachment {0},警告：附件{0}中存在无效的SSL证书
DocType: Student Admission,Eligibility,合格
apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads",信息帮助你的业务，你所有的联系人和更添加为您的线索
DocType: Production Order Operation,Actual Operation Time,实际操作时间
@@ -2083,11 +2087,11 @@
DocType: Request for Quotation,Manufacturing Manager,生产经理
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},序列号{0}截至至{1}之前在保修内。
apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,分裂送货单成包。
-apps/erpnext/erpnext/hooks.py +87,Shipments,发货
+apps/erpnext/erpnext/hooks.py +94,Shipments,发货
DocType: Payment Entry,Total Allocated Amount (Company Currency),总拨款额（公司币种）
DocType: Purchase Order Item,To be delivered to customer,要传送给客户
DocType: BOM,Scrap Material Cost,废料成本
-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/serial_no/serial_no.py +227,Serial No {0} does not belong to any Warehouse,序列号{0}不属于任何仓库
DocType: Purchase Invoice,In Words (Company Currency),大写金额（公司货币）
DocType: Asset,Supplier,供应商
DocType: C-Form,Quarter,季
@@ -2102,11 +2106,10 @@
DocType: Email Digest,Note: Email will not be sent to disabled users,注意：邮件不会发送给已禁用用户
apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,交互次数
apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,交互次数
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,商品编号>商品组>品牌
apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,选择公司...
DocType: Leave Control Panel,Leave blank if considered for all departments,如果针对所有部门请留空
apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).",就业（永久，合同，实习生等）的类型。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,{0} is mandatory for Item {1},{0}是{1}的必填项
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +409,{0} is mandatory for Item {1},{0}是{1}的必填项
DocType: Process Payroll,Fortnightly,半月刊
DocType: Currency Exchange,From Currency,源货币
apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",请ATLEAST一行选择分配金额，发票类型和发票号码
@@ -2150,7 +2153,8 @@
apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,销售订单到付款
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,CEO,CEO
DocType: Expense Claim Detail,Expense Claim Detail,报销详情
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,请选择正确的帐户
+DocType: Sales Invoice,TRIPLICATE FOR SUPPLIER,供应商提供服务
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +859,Please select correct account,请选择正确的帐户
DocType: Item,Weight UOM,重量计量单位
DocType: Salary Structure Employee,Salary Structure Employee,薪资结构员工
DocType: Employee,Blood Group,血型
@@ -2172,7 +2176,7 @@
DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,价格将不会显示如果没有设置价格
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,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 +336,Debit To is required,借记是必需的
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +337,Debit To is required,借记是必需的
apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team",时间表帮助追踪的时间，费用和结算由你的团队做activites
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,采购价格表
DocType: Offer Letter Term,Offer Term,要约期限
@@ -2185,7 +2189,7 @@
DocType: BOM Website Operation,BOM Website Operation,BOM网站运营
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,报价函
apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,生成材料要求(MRP)和生产订单。
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +73,Total Invoiced Amt,总开票金额
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +67,Total Invoiced Amt,总开票金额
DocType: BOM,Conversion Rate,兑换率
apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,产品搜索
DocType: Timesheet Detail,To Time,要时间
@@ -2200,7 +2204,7 @@
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",序列化项目{0}无法使用库存调节更新，请使用库存条目
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",序列化项目{0}无法使用库存调节更新，请使用库存条目
DocType: Training Event Employee,Training Event Employee,培训活动的员工
-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}。
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{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,客户项目代码
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +122,Exchange Gain/Loss,兑换收益/损失
@@ -2248,7 +2252,7 @@
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,软件
apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,接下来跟日期不能过去
DocType: Company,For Reference Only.,仅供参考。
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,Select Batch No,选择批号
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2548,Select Batch No,选择批号
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},无效的{0}：{1}
DocType: Purchase Invoice,PINV-RET-,PINV-RET-
DocType: Sales Invoice Advance,Advance Amount,预付款总额
@@ -2272,19 +2276,19 @@
DocType: Purchase Order,Customer Mobile No,客户手机号码
DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,跟踪独立收入和支出进行产品垂直或部门。
DocType: Rename Tool,Rename Tool,重命名工具
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,更新成本
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +37,Update Cost,更新成本
DocType: Item Reorder,Item Reorder,项目重新排序
apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,显示工资单
apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,Transfer Material,转印材料
DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",设定流程，操作成本及向流程指定唯一的流程编号
apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,这份文件是超过限制，通过{0} {1}项{4}。你在做另一个{3}对同一{2}？
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1064,Please set recurring after saving,请设置保存后复发
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +741,Select change amount account,选择变化量账户
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,Please set recurring after saving,请设置保存后复发
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +742,Select change amount account,选择变化量账户
DocType: Purchase Invoice,Price List Currency,价格表货币
DocType: Naming Series,User must always select,用户必须始终选择
DocType: Stock Settings,Allow Negative Stock,允许负库存
DocType: Installation Note,Installation Note,安装注意事项
-apps/erpnext/erpnext/public/js/setup_wizard.js +200,Add Taxes,添加税款
+apps/erpnext/erpnext/public/js/setup_wizard.js +224,Add Taxes,添加税款
DocType: Topic,Topic,话题
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,从融资现金流
DocType: Budget Account,Budget Account,预算科目
@@ -2295,6 +2299,7 @@
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/stock/doctype/item/item_dashboard.py +34,Traceability,可追溯性
+DocType: Purchase Invoice Item,HSN/SAC Code,HSN / SAC代码
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),资金来源（负债）
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +381,Quantity in row {0} ({1}) must be same as manufactured quantity {2},行{0}中的数量({1})必须等于生产数量{2}
DocType: Appraisal,Employee,雇员
@@ -2324,7 +2329,7 @@
DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,维护计划细节
DocType: Quality Inspection Reading,Reading 9,阅读9
DocType: Supplier,Is Frozen,被冻结
-apps/erpnext/erpnext/stock/utils.py +194,Group node warehouse is not allowed to select for transactions,组节点仓库不允许选择用于交易
+apps/erpnext/erpnext/stock/utils.py +217,Group node warehouse is not allowed to select for transactions,组节点仓库不允许选择用于交易
DocType: Buying Settings,Buying Settings,采购设置
DocType: Stock Entry Detail,BOM No. for a Finished Good Item,成品品目的BOM编号
DocType: Upload Attendance,Attendance To Date,考勤结束日期
@@ -2339,13 +2344,13 @@
apps/erpnext/erpnext/setup/doctype/company/company.js +52,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,请确保你真的要删除这家公司的所有交易。主数据将保持原样。这个动作不能撤消。
DocType: Room,Room Number,房间号
apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},无效的参考{0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{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 +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} {1}不能大于生产订单{3}的计划数量({2})
DocType: Shipping Rule,Shipping Rule Label,配送规则标签
apps/erpnext/erpnext/public/js/conf.js +28,User Forum,用户论坛
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +275,Raw Materials cannot be blank.,原材料不能为空。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,"Could not update stock, invoice contains drop shipping item.",无法更新库存，发票包含下降航运项目。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +473,"Could not update stock, invoice contains drop shipping item.",无法更新库存，发票包含下降航运项目。
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,快速日记帐分录
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +153,You can not change rate if BOM mentioned agianst any item,如果任何条目中引用了BOM，你不能更改其税率
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +165,You can not change rate if BOM mentioned agianst any item,如果任何条目中引用了BOM，你不能更改其税率
DocType: Employee,Previous Work Experience,以前的工作经验
DocType: Stock Entry,For Quantity,对于数量
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},请输入计划数量的项目{0}在行{1}
@@ -2367,7 +2372,7 @@
DocType: BOM,Show Operations,显示操作
,Minutes to First Response for Opportunity,分钟的机会第一个反应
apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,共缺席
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +786,Item or Warehouse for row {0} does not match Material Request,行{0}中的项目或仓库与物料申请不符合
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +793,Item or Warehouse for row {0} does not match Material Request,行{0}中的项目或仓库与物料申请不符合
apps/erpnext/erpnext/config/stock.py +189,Unit of Measure,计量单位
DocType: Fiscal Year,Year End Date,年度结束日期
DocType: Task Depends On,Task Depends On,任务取决于
@@ -2451,7 +2456,7 @@
DocType: Purchase Receipt Item,Recd Quantity,记录数量
apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},费纪录创造 - {0}
DocType: Asset Category Account,Asset Category Account,资产类别的帐户
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},不能生产超过销售订单数量{1}的品目{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Cannot produce more Item {0} than Sales Order quantity {1},不能生产超过销售订单数量{1}的品目{0}
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,库存记录{0}不提交
DocType: Payment Reconciliation,Bank / Cash Account,银行/现金账户
apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,接着联系到不能相同铅邮箱地址
@@ -2549,9 +2554,9 @@
apps/erpnext/erpnext/setup/doctype/company/company.py +150,Set default inventory account for perpetual inventory,设置永久库存的默认库存帐户
DocType: Item Reorder,Material Request Type,物料申请类型
apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural日记条目从{0}薪金{1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +789,"LocalStorage is full, did not save",localStorage的是满的，没救
+apps/erpnext/erpnext/accounts/page/pos/pos.js +883,"LocalStorage is full, did not save",localStorage的是满的，没救
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,行{0}：计量单位转换系数是必需的
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,参考
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,参考
DocType: Budget,Cost Center,成本中心
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,凭证 #
DocType: Notification Control,Purchase Order Message,采购订单的消息
@@ -2567,7 +2572,7 @@
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.",如果选择的定价规则是由为'价格'，它将覆盖价目表。定价规则价格是最终价格，所以没有进一步的折扣应适用。因此，在像销售订单，采购订单等交易，这将是“速度”字段进账，而不是“价格单率”字段。
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,轨道信息通过行业类型。
DocType: Item Supplier,Item Supplier,项目供应商
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1165,Please enter Item Code to get batch no,请输入产品编号，以获得批号
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1086,Please enter Item Code to get batch no,请输入产品编号，以获得批号
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +773,Please select a value for {0} quotation_to {1},请选择一个值{0} quotation_to {1}
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,所有地址。
DocType: Company,Stock Settings,库存设置
@@ -2586,7 +2591,7 @@
apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,断货
DocType: Appraisal,HR User,HR用户
DocType: Purchase Invoice,Taxes and Charges Deducted,已扣除税费
-apps/erpnext/erpnext/hooks.py +116,Issues,问题
+apps/erpnext/erpnext/hooks.py +124,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.,只对样品项目所需。
@@ -2615,6 +2620,7 @@
DocType: C-Form Invoice Detail,Territory,区域
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,请注明无需访问
DocType: Stock Settings,Default Valuation Method,默认估值方法
+apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,费用
DocType: Vehicle Log,Fuel Qty,燃油数量
DocType: Production Order Operation,Planned Start Time,计划开始时间
DocType: Course,Assessment,评定
@@ -2624,12 +2630,12 @@
DocType: Fees,Fees,费用
DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,指定货币兑换的汇率
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Quotation {0} is cancelled,报价{0}已被取消
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Total Outstanding Amount,未偿还总额
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Outstanding Amount,未偿还总额
DocType: Sales Partner,Targets,目标
DocType: Price List,Price List Master,价格表大师
DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,所有的销售交易都可以标记多个**销售人员**，方便你设置和监控目标。
,S.O. No.,销售订单号
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},请牵头建立客户{0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +176,Please create Customer from Lead {0},请牵头建立客户{0}
DocType: Price List,Applicable for Countries,适用于国家
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,只留下地位的申请“已批准”和“拒绝”，就可以提交
apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},学生组名称是强制性的行{0}
@@ -2667,6 +2673,7 @@
,Salary Register,薪酬注册
DocType: Warehouse,Parent Warehouse,家长仓库
DocType: C-Form Invoice Detail,Net Total,总净
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +493,Default BOM not found for Item {0} and Project {1},项目{0}和项目{1}找不到默认BOM
apps/erpnext/erpnext/config/hr.py +163,Define various loan types,定义不同的贷款类型
DocType: Bin,FCFS Rate,FCFS率
DocType: Payment Reconciliation Invoice,Outstanding Amount,未偿还的金额
@@ -2709,8 +2716,8 @@
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,折扣百分比可以应用于一个或所有的价目表。
DocType: Purchase Invoice,Half-yearly,半年一次
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +397,Accounting Entry for Stock,库存的会计分录
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,您已经评估了评估标准{}。
DocType: Vehicle Service,Engine Oil,机油
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource > HR Settings,请在人力资源>人力资源设置中设置员工命名系统
DocType: Sales Invoice,Sales Team1,销售团队1
apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,产品{0}不存在
DocType: Sales Invoice,Customer Address,客户地址
@@ -2738,7 +2745,7 @@
DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,属于本机构的，带独立科目表的法人/附属机构。
DocType: Payment Request,Mute Email,静音电子邮件
apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco",食品，饮料与烟草
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +638,Can only make payment against unbilled {0},只能使支付对未付款的{0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +642,Can only make payment against unbilled {0},只能使支付对未付款的{0}
apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,佣金率不能大于100
DocType: Stock Entry,Subcontract,外包
apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,请输入{0}第一
@@ -2766,7 +2773,7 @@
,Student Monthly Attendance Sheet,学生每月考勤表
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},雇员{0}申请了{1}，时间是{2}至{3}
apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,项目开始日期
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +11,Until,直到
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +5,Until,直到
DocType: Rename Tool,Rename Log,重命名日志
apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,学生组或课程表是强制性的
apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,学生组或课程表是强制性的
@@ -2791,7 +2798,7 @@
DocType: Employee,Exit,退出
apps/erpnext/erpnext/accounts/doctype/account/account.py +159,Root Type is mandatory,根类型是强制性的
DocType: BOM,Total Cost(Company Currency),总成本（公司货币）
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,序列号{0}已创建
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +299,Serial No {0} created,序列号{0}已创建
DocType: Homepage,Company Description for website homepage,公司介绍了网站的首页
DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",为方便客户，这些代码可以在打印格式(如发票和送货单)中使用
apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Suplier名称
@@ -2812,7 +2819,7 @@
apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,课程表删除：
apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,日志维护短信发送状态
DocType: Accounts Settings,Make Payment via Journal Entry,通过日记帐分录进行付款
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +83,Printed On,印上
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Printed On,印上
DocType: Item,Inspection Required before Delivery,分娩前检查所需
DocType: Item,Inspection Required before Purchase,购买前检查所需
apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,待活动
@@ -2844,9 +2851,10 @@
apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,限制交叉
apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,创业投资
apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,这个“学年”一个学期{0}和“术语名称”{1}已经存在。请修改这些条目，然后再试一次。
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"As there are existing transactions against item {0}, you can not change the value of {1}",由于有对项目{0}现有的交易，你不能改变的值{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +461,"As there are existing transactions against item {0}, you can not change the value of {1}",由于有对项目{0}现有的交易，你不能改变的值{1}
DocType: UOM,Must be Whole Number,必须是整数
DocType: Leave Control Panel,New Leaves Allocated (In Days),新调配的假期(天数)
+DocType: Sales Invoice,Invoice Copy,发票副本
apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,序列号{0}不存在
DocType: Sales Invoice Item,Customer Warehouse (Optional),客户仓库（可选）
DocType: Pricing Rule,Discount Percentage,折扣百分比
@@ -2892,8 +2900,10 @@
apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",假，不是之前分配{0}，因为休假余额已经结转转发在未来的假期分配记录{1}
apps/erpnext/erpnext/accounts/party.py +305,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),注意：到期日/计入日已超过客户信用日期{0}天。
apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,学生申请
+DocType: Sales Invoice,ORIGINAL FOR RECIPIENT,收件人原件
DocType: Asset Category Account,Accumulated Depreciation Account,累计折旧科目
DocType: Stock Settings,Freeze Stock Entries,冻结仓储记录
+DocType: Program Enrollment,Boarding Student,寄宿学生
DocType: Asset,Expected Value After Useful Life,期望值使用寿命结束后
DocType: Item,Reorder level based on Warehouse,根据仓库订货点水平
DocType: Activity Cost,Billing Rate,结算利率
@@ -2920,11 +2930,11 @@
apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,为基于活动的组手动选择学生
DocType: Journal Entry,User Remark,用户备注
DocType: Lead,Market Segment,市场分类
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +890,Paid Amount cannot be greater than total negative outstanding amount {0},支付的金额不能超过总负余额大于{0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +892,Paid Amount cannot be greater than total negative outstanding amount {0},支付的金额不能超过总负余额大于{0}
DocType: Employee Internal Work History,Employee Internal Work History,雇员内部就职经历
apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),结算(借记)
DocType: Cheque Print Template,Cheque Size,支票大小
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,序列号{0}无库存
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +232,Serial No {0} not in stock,序列号{0}无库存
apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,销售业务的税务模板。
DocType: Sales Invoice,Write Off Outstanding Amount,核销未付金额
apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},帐户{0}与公司{1}不符
@@ -2948,7 +2958,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,获取更新
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}帐户{2}不属于公司{3}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +134,Material Request {0} is cancelled or stopped,物料申请{0}已取消或已停止
-apps/erpnext/erpnext/public/js/setup_wizard.js +348,Add a few sample records,添加了一些样本记录
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,Add a few sample records,添加了一些样本记录
apps/erpnext/erpnext/config/hr.py +301,Leave Management,离开管理
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,基于账户分组
DocType: Sales Order,Fully Delivered,完全交付
@@ -2962,17 +2972,17 @@
apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},无法改变地位的学生{0}与学生申请链接{1}
DocType: Asset,Fully Depreciated,已提足折旧
,Stock Projected Qty,预计库存量
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +418,Customer {0} does not belong to project {1},客户{0}不属于项目{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +419,Customer {0} does not belong to project {1},客户{0}不属于项目{1}
DocType: Employee Attendance Tool,Marked Attendance HTML,显着的考勤HTML
apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers",语录是建议，你已经发送到你的客户提高出价
DocType: Sales Order,Customer's Purchase Order,客户采购订单
apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,序列号和批次
DocType: Warranty Claim,From Company,源公司
-apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,评估标准的得分之和必须是{0}。
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,评估标准的得分之和必须是{0}。
apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,请设置折旧数预订
apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,价值或数量
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +430,Productions Orders cannot be raised for:,制作订单不能上调：
-apps/erpnext/erpnext/public/js/setup_wizard.js +270,Minute,分钟
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Minute,分钟
DocType: Purchase Invoice,Purchase Taxes and Charges,购置税和费
,Qty to Receive,接收数量
DocType: Leave Block List,Leave Block List Allowed,禁离日例外用户
@@ -2993,7 +3003,7 @@
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,银行透支账户
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,创建工资单
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,行＃{0}：分配金额不能大于未结算金额。
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,浏览BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +40,Browse BOM,浏览BOM
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,抵押贷款
DocType: Purchase Invoice,Edit Posting Date and Time,编辑投稿时间
apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +98,Please set Depreciation related Accounts in Asset Category {0} or Company {1},请设置在资产类别{0}或公司折旧相关帐户{1}
@@ -3009,7 +3019,7 @@
DocType: Hub Settings,Seller Email,卖家电子邮件
DocType: Project,Total Purchase Cost (via Purchase Invoice),总购买成本（通过采购发票）
DocType: Training Event,Start Time,开始时间
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +278,Select Quantity,选择数量
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +367,Select Quantity,选择数量
DocType: Customs Tariff Number,Customs Tariff Number,海关税则号
apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,审批与被审批角色不能相同
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,从该电子邮件摘要退订
@@ -3032,6 +3042,7 @@
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},不允许对早于{0}的库存交易进行更新
DocType: Purchase Invoice Item,PR Detail,PR详细
DocType: Sales Order,Fully Billed,完全开票
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,供应商>供应商类型
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,现款
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +127,Delivery warehouse required for stock item {0},需要的库存项目交割仓库{0}
DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),包的总重量，通常是净重+包装材料的重量。 （用于打印）
@@ -3070,8 +3081,9 @@
DocType: Purchase Order Item Supplied,Stock UOM,库存计量单位
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +226,Purchase Order {0} is not submitted,采购订单{0}未提交
DocType: Customs Tariff Number,Tariff Number,税则号
+DocType: Production Order Item,Available Qty at WIP Warehouse,在WIP仓库可用的数量
apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,预计
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},序列号{0}不属于仓库{1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +222,Serial No {0} does not belong to Warehouse {1},序列号{0}不属于仓库{1}
apps/erpnext/erpnext/controllers/status_updater.py +174,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,注意：系统将不会为品目{0}检查超额发货或超额预订，因为其数量或金额为0
DocType: Notification Control,Quotation Message,报价信息
DocType: Employee Loan,Employee Loan Application,职工贷款申请
@@ -3090,13 +3102,13 @@
DocType: Purchase Invoice Item,Landed Cost Voucher Amount,到岸成本凭证金额
apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,供应商开出的账单
DocType: POS Profile,Write Off Account,核销帐户
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,Debit Note Amt,借方票据
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Debit Note Amt,借方票据
apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,折扣金额
DocType: Purchase Invoice,Return Against Purchase Invoice,回到对采购发票
DocType: Item,Warranty Period (in days),保修期限（天数）
apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,与关系Guardian1
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,从运营的净现金
-apps/erpnext/erpnext/public/js/setup_wizard.js +207,e.g. VAT,例如增值税
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. VAT,例如增值税
apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,项目4
DocType: Student Admission,Admission End Date,录取结束日期
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +29,Sub-contracting,分包
@@ -3104,7 +3116,7 @@
apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,学生组
DocType: Shopping Cart Settings,Quotation Series,报价系列
apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item",具有名称 {0} 的品目已存在，请更名
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1945,Please select customer,请选择客户
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2039,Please select customer,请选择客户
DocType: C-Form,I,I
DocType: Company,Asset Depreciation Cost Center,资产折旧成本中心
DocType: Sales Order Item,Sales Order Date,销售订单日期
@@ -3133,7 +3145,7 @@
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,党是强制性
DocType: Journal Entry,JV-,将N-
DocType: Topic,Topic Name,主题名称
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,Atleast one of the Selling or Buying must be selected,必须至少选择'销售'或'采购'其中的一项
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,必须至少选择'销售'或'采购'其中的一项
apps/erpnext/erpnext/public/js/setup_wizard.js +28,Select the nature of your business.,选择您的业务的性质。
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},行＃{0}：引用{1} {2}中的重复条目
apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,生产流程进行的地方。
@@ -3142,7 +3154,7 @@
apps/erpnext/erpnext/controllers/accounts_controller.py +553,Row #{0}: Asset {1} does not belong to company {2},行＃{0}：资产{1}不属于公司{2}
DocType: Employee,Confirmation Date,确认日期
DocType: C-Form,Total Invoiced Amount,发票总金额
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +50,Min Qty can not be greater than Max Qty,最小数量不能大于最大数量
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +49,Min Qty can not be greater than Max Qty,最小数量不能大于最大数量
DocType: Account,Accumulated Depreciation,累计折旧
DocType: Stock Entry,Customer or Supplier Details,客户或供应商详细信息
DocType: Employee Loan Application,Required by Date,按日期必填
@@ -3171,10 +3183,10 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +127,Company Name cannot be Company,公司名称不能为公司
apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,打印模板的信头。
apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,标题打印模板例如形式发票。
+DocType: Program Enrollment,Walking,步行
DocType: Student Guardian,Student Guardian,学生家长
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Valuation type charges can not marked as Inclusive,估值类型罪名不能标记为包容性
DocType: POS Profile,Update Stock,更新库存
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier > Supplier Type,供应商>供应商类型
apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,不同计量单位的项目会导致不正确的（总）净重值。请确保每个品目的净重使用同一个计量单位。
apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM税率
DocType: Asset,Journal Entry for Scrap,日记帐分录报废
@@ -3228,7 +3240,6 @@
DocType: Sales Order Item,Supplier delivers to Customer,供应商提供给客户
apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}](#Form/Item/{0}) 超出了库存
apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,下一个日期必须大于过帐日期更大
-apps/erpnext/erpnext/public/js/controllers/transaction.js +995,Show tax break-up,展会税分手
apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},到期/参照日期不能迟于{0}
apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,数据导入和导出
apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +71,No students Found,没有发现学生
@@ -3248,14 +3259,14 @@
DocType: Company,Default Cash Account,默认现金账户
apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,公司(非客户或供应商)大师。
apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,这是基于这名学生出席
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +176,No Students in,没有学生
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,没有学生
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,添加更多项目或全开放形式
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',请输入“预产期”
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,取消这个销售订单之前必须取消送货单{0}
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +78,Paid amount + Write Off Amount can not be greater than Grand Total,支付的金额+写的抵销金额不能大于总计
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0}不是物料{1}的有效批次号
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Note: There is not enough leave balance for Leave Type {0},注意：假期类型{0}的余量不足
-apps/erpnext/erpnext/regional/india/utils.py +13,Invalid GSTIN or Enter NA for Unregistered,无效的GSTIN或输入NA未注册
+apps/erpnext/erpnext/regional/india/utils.py +14,Invalid GSTIN or Enter NA for Unregistered,无效的GSTIN或输入NA未注册
DocType: Training Event,Seminar,研讨会
DocType: Program Enrollment Fee,Program Enrollment Fee,计划注册费
DocType: Item,Supplier Items,供应商品目
@@ -3285,21 +3296,23 @@
apps/erpnext/erpnext/controllers/accounts_controller.py +83,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注意：付款分录不会创建，因为“现金或银行账户”没有指定
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Responsibilities,职责
DocType: Expense Claim Account,Expense Claim Account,报销账户
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup > Settings > Naming Series,请通过设置>设置>命名系列设置{0}的命名系列
DocType: Sales Person,Sales Person Name,销售人员姓名
apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,请在表中输入ATLEAST 1发票
+apps/erpnext/erpnext/public/js/setup_wizard.js +196,Add Users,添加用户
DocType: POS Item Group,Item Group,项目群组
DocType: Item,Safety Stock,安全库存
apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,为任务进度百分比不能超过100个。
DocType: Stock Reconciliation Item,Before reconciliation,在对账前
apps/erpnext/erpnext/maintenance/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 +439,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 +432,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,项目税项的行{0}中必须指定类型为税项/收益/支出/应课的账户。
DocType: Sales Order,Partly Billed,天色帐单
apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,项目{0}必须是固定资产项目
DocType: Item,Default BOM,默认的BOM
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +30,Debit Note Amount,借方票据金额
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Debit Note Amount,借方票据金额
apps/erpnext/erpnext/setup/doctype/company/company.js +50,Please re-type company name to confirm,请确认重新输入公司名称
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +76,Total Outstanding Amt,总街货量金额
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,总街货量金额
DocType: Journal Entry,Printing Settings,打印设置
DocType: Sales Invoice,Include Payment (POS),包括支付（POS）
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,Total Debit must be equal to Total Credit. The difference is {0},总借记必须等于总积分。
@@ -3307,20 +3320,19 @@
DocType: Vehicle,Insurance Company,保险公司
DocType: Asset Category Account,Fixed Asset Account,固定资产帐户
apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,变量
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,来自送货单
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,来自送货单
DocType: Student,Student Email Address,学生的电子邮件地址
DocType: Timesheet Detail,From Time,起始时间
apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,有现货
DocType: Notification Control,Custom Message,自定义消息
apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,投资银行业务
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +74,Cash or Bank Account is mandatory for making payment entry,“现金”或“银行账户”是付款分录的必须项
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup > Numbering Series,请通过设置>编号系列设置出勤编号系列
apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,学生地址
apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,学生地址
DocType: Purchase Invoice,Price List Exchange Rate,价目表汇率
DocType: Purchase Invoice Item,Rate,单价
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Intern,实习生
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1517,Address Name,地址名称
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1611,Address Name,地址名称
DocType: Stock Entry,From BOM,从BOM
DocType: Assessment Code,Assessment Code,评估准则
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +42,Basic,基本
@@ -3337,7 +3349,7 @@
DocType: Material Request Item,For Warehouse,对仓库
DocType: Employee,Offer Date,报价有效期
apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,语录
-apps/erpnext/erpnext/accounts/page/pos/pos.js +678,You are in offline mode. You will not be able to reload until you have network.,您在离线模式。您将无法重新加载，直到你有网络。
+apps/erpnext/erpnext/accounts/page/pos/pos.js +772,You are in offline mode. You will not be able to reload until you have network.,您在离线模式。您将无法重新加载，直到你有网络。
apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,没有学生团体创建的。
DocType: Purchase Invoice Item,Serial No,序列号
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,每月还款额不能超过贷款金额较大
@@ -3345,7 +3357,7 @@
DocType: Purchase Invoice,Print Language,打印语言
DocType: Salary Slip,Total Working Hours,总的工作时间
DocType: Stock Entry,Including items for sub assemblies,包括子组件项目
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1874,Enter value must be positive,输入值必须为正
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1968,Enter value must be positive,输入值必须为正
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,All Territories,所有的区域
DocType: Purchase Invoice,Items,项目
apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,学生已经注册。
@@ -3354,7 +3366,7 @@
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +234,There are more holidays than working days this month.,这个月的假期比工作日多。
DocType: Product Bundle Item,Product Bundle Item,产品包项目
DocType: Sales Partner,Sales Partner Name,销售合作伙伴名称
-apps/erpnext/erpnext/hooks.py +111,Request for Quotations,索取报价
+apps/erpnext/erpnext/hooks.py +118,Request for Quotations,索取报价
DocType: Payment Reconciliation,Maximum Invoice Amount,最大发票额
DocType: Student Language,Student Language,学生语言
apps/erpnext/erpnext/config/selling.py +23,Customers,客户
@@ -3365,7 +3377,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 +631,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',测度变异的默认单位“{0}”必须是相同模板“{1}”
+apps/erpnext/erpnext/stock/doctype/item/item.py +624,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',测度变异的默认单位“{0}”必须是相同模板“{1}”
DocType: Shipping Rule,Calculate Based On,计算基于
DocType: Delivery Note Item,From Warehouse,从仓库
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +847,No Items with Bill of Materials to Manufacture,不与物料清单的项目，以制造
@@ -3384,7 +3396,7 @@
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,“ 最后的订单到目前的天数”必须大于或等于零
DocType: Process Payroll,Payroll Frequency,工资频率
DocType: Asset,Amended From,修订源
-apps/erpnext/erpnext/public/js/setup_wizard.js +266,Raw Material,原料
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Raw Material,原料
DocType: Leave Application,Follow via Email,通过电子邮件关注
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,植物和机械设备
DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,税额折后金额
@@ -3396,7 +3408,6 @@
apps/erpnext/erpnext/stock/get_item_details.py +526,No default BOM exists for Item {0},品目{0}没有默认的BOM
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,请选择发布日期第一
apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,开业日期应该是截止日期之前，
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup > Settings > Naming Series,请通过设置>设置>命名系列设置{0}的命名系列
DocType: Leave Control Panel,Carry Forward,顺延
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,有交易的成本中心不能转化为总账
DocType: Department,Days for which Holidays are blocked for this department.,此部门的禁离日
@@ -3409,8 +3420,8 @@
apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,最后沟通
apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,最后沟通
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',分类是“估值”或“估值和总计”的时候不能扣税。
-apps/erpnext/erpnext/public/js/setup_wizard.js +201,"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/public/js/setup_wizard.js +225,"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 +234,Serial Nos Required for Serialized Item {0},序列化的品目{0}必须指定序列号
apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,匹配付款与发票
DocType: Journal Entry,Bank Entry,银行记录
DocType: Authorization Rule,Applicable To (Designation),适用于(指定)
@@ -3427,7 +3438,7 @@
apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,建立员工档案
apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,总现
apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,会计报表
-apps/erpnext/erpnext/public/js/setup_wizard.js +270,Hour,小时
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Hour,小时
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,新序列号不能有仓库，仓库只能通过库存记录和采购收据设置。
DocType: Lead,Lead Type,线索类型
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,您无权批准叶子座日期
@@ -3437,7 +3448,7 @@
apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,未知
DocType: Shipping Rule,Shipping Rule Conditions,配送规则条件
DocType: BOM Replace Tool,The new BOM after replacement,更换后的物料清单
-apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,销售点
+apps/erpnext/erpnext/accounts/page/pos/pos.js +739,Point of Sale,销售点
DocType: Payment Entry,Received Amount,收金额
DocType: GST Settings,GSTIN Email Sent On,发送GSTIN电子邮件
DocType: Program Enrollment,Pick/Drop by Guardian,由守护者选择
@@ -3454,8 +3465,8 @@
DocType: Batch,Source Document Name,源文档名称
DocType: Job Opening,Job Title,职位
apps/erpnext/erpnext/utilities/activation.py +97,Create Users,创建用户
-apps/erpnext/erpnext/public/js/setup_wizard.js +270,Gram,公克
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,量生产必须大于0。
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Gram,公克
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +389,Quantity to Manufacture must be greater than 0.,量生产必须大于0。
apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,保养电话的现场报告。
DocType: Stock Entry,Update Rate and Availability,更新率和可用性
DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,百分比你被允许接收或传递更多针对订购的数量。例如：如果您订购100个单位。和你的津贴是10％，那么你被允许接收110个单位。
@@ -3481,14 +3492,14 @@
apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,现金流量表
apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},贷款额不能超过最高贷款额度{0}
apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,执照
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Please remove this Invoice {0} from C-Form {1},请删除此发票{0}从C-表格{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +466,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.py +219,Please enter Write Off Account,请输入核销帐户
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,最后订购日期
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},帐户{0}不属于公司{1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +834,Serial Numbers in row {0} does not match with Delivery Note,行{0}中的序列号与交货单不匹配
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +835,Serial Numbers in row {0} does not match with Delivery Note,行{0}中的序列号与交货单不匹配
DocType: Student,Guardian Details,卫详细
DocType: C-Form,C-Form,C-表
apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,马克出席了多个员工
@@ -3520,7 +3531,7 @@
DocType: Tax Rule,Sales,销售
DocType: Stock Entry Detail,Basic Amount,基本金额
DocType: Training Event,Exam,考试
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +436,Warehouse required for stock Item {0},物件{0}需要指定仓库
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Warehouse required for stock Item {0},物件{0}需要指定仓库
DocType: Leave Allocation,Unused leaves,未使用的叶子
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,信用
DocType: Tax Rule,Billing State,计费状态
@@ -3568,7 +3579,7 @@
apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,对网站的主页设置
DocType: Offer Letter,Awaiting Response,正在等待回应
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,以上
-apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},无效的属性{0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +216,Invalid attribute {0} {1},无效的属性{0} {1}
DocType: Supplier,Mention if non-standard payable account,如果非标准应付账款提到
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +291,Same item has been entered multiple times. {list},相同的物品已被多次输入。 {}名单
apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +13,Please select the assessment group other than 'All Assessment Groups',请选择“所有评估组”以外的评估组
@@ -3669,16 +3680,18 @@
DocType: Program Enrollment Tool,New Academic Year,新学年
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +736,Return / Credit Note,返回/信用票据
DocType: Stock Settings,Auto insert Price List rate if missing,自动插入价目表率，如果丢失
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +29,Total Paid Amount,总支付金额
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +23,Total Paid Amount,总支付金额
DocType: Production Order Item,Transferred Qty,转让数量
apps/erpnext/erpnext/config/learn.py +11,Navigating,导航
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +157,Planning,规划
DocType: Material Request,Issued,发行
+apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +14,Student Activity,学生活动
DocType: Project,Total Billing Amount (via Time Logs),总结算金额（通过时间日志）
-apps/erpnext/erpnext/public/js/setup_wizard.js +272,We sell this Item,我们卖这些物件
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,We sell this Item,我们卖这些物件
apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,供应商编号
DocType: Payment Request,Payment Gateway Details,支付网关细节
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +241,Quantity should be greater than 0,量应大于0
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Sample Data,样品数据
DocType: Journal Entry,Cash Entry,现金分录
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,子节点可以在'集团'类型的节点上创建
DocType: Leave Application,Half Day Date,半天日期
@@ -3708,7 +3721,7 @@
,Sales Funnel,销售管道
apps/erpnext/erpnext/setup/doctype/company/company.py +48,Abbreviation is mandatory,缩写是强制性的
DocType: Project,Task Progress,任务进度
-apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,车
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,购物车
,Qty to Transfer,转移数量
apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,向潜在客户或客户发出的报价。
DocType: Stock Settings,Role Allowed to edit frozen stock,角色可以编辑冻结库存
@@ -3726,7 +3739,7 @@
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Secretary,秘书
DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction",如果禁用“，在词”字段不会在任何交易可见
DocType: Serial No,Distinct unit of an Item,品目的属性
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1186,Please set Company,请设公司
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1205,Please set Company,请设公司
DocType: Pricing Rule,Buying,采购
DocType: HR Settings,Employee Records to be created by,雇员记录创建于
DocType: POS Profile,Apply Discount On,申请折扣
@@ -3743,13 +3756,14 @@
apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},数量（{0}）不能是行{1}中的分数
apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,收费
DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +451,Barcode {0} already used in Item {1},条码{0}已被品目{1}使用
+apps/erpnext/erpnext/stock/doctype/item/item.py +444,Barcode {0} already used in Item {1},条码{0}已被品目{1}使用
DocType: Lead,Add to calendar on this date,将此日期添加至日历
apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,规则增加运输成本。
DocType: Item,Opening Stock,期初库存
apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,客户是必须项
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0}是退货单的必填项
DocType: Purchase Order,To Receive,接受
+apps/erpnext/erpnext/public/js/setup_wizard.js +205,user@example.com,user@example.com
DocType: Employee,Personal Email,个人电子邮件
apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,总方差
DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",如果启用，系统将自动为库存创建会计分录。
@@ -3760,7 +3774,7 @@
DocType: Customer,From Lead,来自潜在客户
apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,发布生产订单。
apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,选择财政年度...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +541,POS Profile required to make POS Entry,需要POS资料，使POS进入
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +542,POS Profile required to make POS Entry,需要POS资料，使POS进入
DocType: Program Enrollment Tool,Enroll Students,招生
DocType: Hub Settings,Name Token,名称令牌
apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,标准销售
@@ -3768,7 +3782,6 @@
DocType: Serial No,Out of Warranty,超出保修期
DocType: BOM Replace Tool,Replace,更换
apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,找不到产品。
-DocType: Production Order,Unstopped,通畅了
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0}不允许销售发票{1}
DocType: Sales Invoice,SINV-,SINV-
DocType: Request for Quotation Item,Project Name,项目名称
@@ -3779,6 +3792,7 @@
apps/erpnext/erpnext/config/learn.py +234,Human Resource,人力资源
DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,付款方式付款对账
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,所得税资产
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +613,Production Order has been {0},生产订单已经{0}
DocType: BOM Item,BOM No,BOM编号
DocType: Instructor,INS/,INS /
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,日记帐分录{0}没有科目{1}或已经匹配其他凭证
@@ -3816,9 +3830,9 @@
DocType: Item Attribute,From Range,从范围
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Syntax error in formula or condition: {0},式或条件语法错误：{0}
DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,每日工作总结公司的设置
-apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,产品{0}不属于库存产品，因此被忽略
+apps/erpnext/erpnext/stock/utils.py +123,Item {0} ignored since it is not a stock item,产品{0}不属于库存产品，因此被忽略
DocType: Appraisal,APRSL,APRSL
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,Submit this Production Order for further processing.,提交此生产订单以进行下一步处理。
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +102,Submit this Production Order for further processing.,提交此生产订单以进行下一步处理。
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",要在一个特定的交易不适用于定价规则，所有适用的定价规则应该被禁用。
DocType: Assessment Group,Parent Assessment Group,家长评估小组
apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,工作
@@ -3826,12 +3840,14 @@
DocType: Employee,Held On,举行日期
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,生产项目
,Employee Information,雇员资料
-apps/erpnext/erpnext/public/js/setup_wizard.js +209,Rate (%),率（ ％ ）
+apps/erpnext/erpnext/public/js/setup_wizard.js +234,Rate (%),率（ ％ ）
DocType: Stock Entry Detail,Additional Cost,额外费用
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher",按凭证分类后不能根据凭证编号过滤
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,创建供应商报价
DocType: Quality Inspection,Incoming,接收
DocType: BOM,Materials Required (Exploded),所需物料（正展开）
+apps/erpnext/erpnext/public/js/setup_wizard.js +197,"Add users to your organization, other than yourself",将用户添加到您的组织，除了自己
+apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',如果Group By是“Company”，请设置公司过滤器空白
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,发布日期不能是未来的日期
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},行＃{0}：序列号{1}不相匹配{2} {3}
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Casual Leave,事假
@@ -3860,7 +3876,7 @@
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,同一项目已进入多次
DocType: Department,Leave Block List,禁离日列表
DocType: Sales Invoice,Tax ID,税号
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,项目{0}没有设置序列号，序列号必须留空
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,项目{0}没有设置序列号，序列号必须留空
DocType: Accounts Settings,Accounts Settings,账户设置
apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,批准
DocType: Customer,Sales Partner and Commission,销售合作伙伴及佣金
@@ -3875,7 +3891,7 @@
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Black,黑
DocType: BOM Explosion Item,BOM Explosion Item,BOM展开品目
DocType: Account,Auditor,审计员
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +62,{0} items produced,{0}项目已产生
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +125,{0} items produced,{0}项目已产生
DocType: Cheque Print Template,Distance from top edge,从顶边的距离
apps/erpnext/erpnext/stock/get_item_details.py +307,Price List {0} is disabled or does not exist,价格表{0}禁用或不存在
DocType: Purchase Invoice,Return,回报
@@ -3889,7 +3905,7 @@
apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,马克缺席
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +138,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},行{0}：BOM＃的货币{1}应等于所选货币{2}
DocType: Journal Entry Account,Exchange Rate,汇率
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +559,Sales Order {0} is not submitted,销售订单{0}未提交
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +560,Sales Order {0} is not submitted,销售订单{0}未提交
DocType: Homepage,Tag Line,标语
DocType: Fee Component,Fee Component,收费组件
apps/erpnext/erpnext/config/hr.py +195,Fleet Management,车队的管理
@@ -3914,18 +3930,18 @@
DocType: SMS Settings,Enter url parameter for receiver nos,请输入收件人编号的URL参数
DocType: Payment Entry,Paid Amount,支付的金额
DocType: Assessment Plan,Supervisor,监
-apps/erpnext/erpnext/accounts/page/pos/pos.js +705,Online,线上
+apps/erpnext/erpnext/accounts/page/pos/pos.js +799,Online,线上
,Available Stock for Packing Items,库存可用打包品目
DocType: Item Variant,Item Variant,项目变体
DocType: Assessment Result Tool,Assessment Result Tool,评价结果工具
DocType: BOM Scrap Item,BOM Scrap Item,BOM项目废料
-apps/erpnext/erpnext/accounts/page/pos/pos.js +866,Submitted orders can not be deleted,提交的订单不能被删除
+apps/erpnext/erpnext/accounts/page/pos/pos.js +960,Submitted orders can not be deleted,提交的订单不能被删除
apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",账户余额已设置为'借方'，不能设置为'贷方'
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Quality Management,质量管理
apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,项目{0}已被禁用
DocType: Employee Loan,Repay Fixed Amount per Period,偿还每期固定金额
apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},请输入量的项目{0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +75,Credit Note Amt,信用证
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Credit Note Amt,信用证
DocType: Employee External Work History,Employee External Work History,雇员外部就职经历
DocType: Tax Rule,Purchase,采购
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,余额数量
@@ -3951,7 +3967,7 @@
apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,学生的电子邮件ID
DocType: Employee,Notice (days),通告（天）
DocType: Tax Rule,Sales Tax Template,销售税模板
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2383,Select items to save the invoice,选取要保存发票
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2477,Select items to save the invoice,选取要保存发票
DocType: Employee,Encashment Date,兑现日期
DocType: Training Event,Internet,互联网
DocType: Account,Stock Adjustment,库存调整
@@ -3981,6 +3997,7 @@
DocType: Grading Scale Interval,Threshold,阈
DocType: BOM Replace Tool,Current BOM,当前BOM
apps/erpnext/erpnext/public/js/utils.js +45,Add Serial No,添加序列号
+DocType: Production Order Item,Available Qty at Source Warehouse,源仓库可用数量
apps/erpnext/erpnext/config/support.py +22,Warranty,质量保证
DocType: Purchase Invoice,Debit Note Issued,借记发行说明
DocType: Production Order,Warehouses,仓库
@@ -3996,13 +4013,13 @@
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,Project Manager,项目经理
,Quoted Item Comparison,项目报价比较
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Dispatch,调度
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +74,Max discount allowed for item: {0} is {1}%,品目{0}的最大折扣为 {1}%
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +73,Max discount allowed for item: {0} is {1}%,品目{0}的最大折扣为 {1}%
apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,净资产值作为
DocType: Account,Receivable,应收账款
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +279,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,行＃{0}：不能更改供应商的采购订单已经存在
DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,作用是允许提交超过设定信用额度交易的。
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +879,Select Items to Manufacture,选择项目，以制造
-apps/erpnext/erpnext/accounts/page/pos/pos.js +930,"Master data syncing, it might take some time",主数据同步，这可能需要一些时间
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1024,"Master data syncing, it might take some time",主数据同步，这可能需要一些时间
DocType: Item,Material Issue,发料
DocType: Hub Settings,Seller Description,卖家描述
DocType: Employee Education,Qualification,学历
@@ -4026,7 +4043,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 +200,Cannot cancel because submitted Stock Entry {0} exists,不能取消，因为提交的仓储记录{0}已经存在
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,不能取消，因为提交的仓储记录{0}已经存在
DocType: Employee Loan,Disbursement Date,支付日期
DocType: Vehicle,Vehicle,车辆
DocType: Purchase Invoice,In Words,大写金额
@@ -4047,7 +4064,7 @@
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",要设置这个财政年度为默认值，点击“设为默认”
apps/erpnext/erpnext/projects/doctype/project/project.py +200,Join,加入
apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,短缺数量
-apps/erpnext/erpnext/stock/doctype/item/item.py +655,Item variant {0} exists with same attributes,项目变体{0}存在具有相同属性
+apps/erpnext/erpnext/stock/doctype/item/item.py +648,Item variant {0} exists with same attributes,项目变体{0}存在具有相同属性
DocType: Employee Loan,Repay from Salary,从工资偿还
DocType: Leave Application,LAP/,LAP /
apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},请求对付款{0} {1}量{2}
@@ -4065,18 +4082,18 @@
DocType: Assessment Result Detail,Assessment Result Detail,评价结果详细
DocType: Employee Education,Employee Education,雇员教育
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,在项目组表中找到重复的项目组
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1011,It is needed to fetch Item Details.,这是需要获取项目详细信息。
+apps/erpnext/erpnext/public/js/controllers/transaction.js +944,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}已收到过
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,序列号{0}已收到过
,Requested Items To Be Transferred,要求要传输的项目
DocType: Expense Claim,Vehicle Log,车辆登录
DocType: Purchase Invoice,Recurring Id,经常性ID
DocType: Customer,Sales Team Details,销售团队详情
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1312,Delete permanently?,永久删除？
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1406,Delete permanently?,永久删除？
DocType: Expense Claim,Total Claimed Amount,总索赔额
apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,销售的潜在机会
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +235,Invalid {0},无效的{0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},无效的{0}
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Sick Leave,病假
DocType: Email Digest,Email Digest,邮件摘要
DocType: Delivery Note,Billing Address Name,帐单地址名称
@@ -4089,6 +4106,7 @@
DocType: Account,Chargeable,应课
DocType: Company,Change Abbreviation,更改缩写
DocType: Expense Claim Detail,Expense Date,报销日期
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code > Item Group > Brand,商品编号>商品组>品牌
DocType: Item,Max Discount (%),最大折扣(%)
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,最后订单金额
DocType: Task,Is Milestone,是里程碑
@@ -4112,8 +4130,8 @@
DocType: Item Attribute Value,Attribute Value,属性值
,Itemwise Recommended Reorder Level,项目特定的推荐重订购级别
DocType: Salary Detail,Salary Detail,薪酬详细
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +987,Please select {0} first,请选择{0}第一
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +796,Batch {0} of Item {1} has expired.,一批项目的{0} {1}已过期。
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +989,Please select {0} first,请选择{0}第一
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +803,Batch {0} of Item {1} has expired.,一批项目的{0} {1}已过期。
DocType: Sales Invoice,Commission,佣金
apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,时间表制造。
apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,小计
@@ -4138,12 +4156,12 @@
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,培训活动/结果
apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,作为累计折旧
DocType: Sales Invoice,C-Form Applicable,C-表格适用
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},运行时间必须大于0的操作{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Operation Time must be greater than 0 for Operation {0},运行时间必须大于0的操作{0}
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,仓库是强制性的
DocType: Supplier,Address and Contacts,地址和联系方式
DocType: UOM Conversion Detail,UOM Conversion Detail,计量单位换算详情
DocType: Program,Program Abbreviation,计划缩写
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,生产订单不能对一个项目提出的模板
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +382,Production Order cannot be raised against a Item Template,生产订单不能对一个项目提出的模板
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,费用会在每个品目的采购收据中更新
DocType: Warranty Claim,Resolved By,议决
DocType: Bank Guarantee,Start Date,开始日期
@@ -4173,7 +4191,7 @@
DocType: Asset,Disposal Date,处置日期
DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",电子邮件将在指定的时间发送给公司的所有在职职工，如果他们没有假期。回复摘要将在午夜被发送。
DocType: Employee Leave Approver,Employee Leave Approver,雇员假期审批者
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：一个重新排序条目已存在这个仓库{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：一个重新排序条目已存在这个仓库{1}
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.",不能更改状态为丧失，因为已有报价。
apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,培训反馈
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,生产订单{0}必须提交
@@ -4207,6 +4225,7 @@
apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,组织单位（部门）的主人。
apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +26,Please enter valid mobile nos,请输入有效的手机号
apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,在发送前，请填写留言
+DocType: Sales Invoice,DUPLICATE FOR SUPPLIER,供应商重复
DocType: Email Digest,Pending Quotations,待语录
apps/erpnext/erpnext/config/accounts.py +315,Point-of-Sale Profile,简介销售点的
apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +75,Please Update SMS Settings,请更新短信设置
@@ -4215,7 +4234,7 @@
DocType: Employee,B+,B +
DocType: HR Settings,Max working hours against Timesheet,最大工作时间针对时间表
DocType: Maintenance Schedule Detail,Scheduled Date,计划日期
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Total Paid Amt,数金额金额
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Paid Amt,数金额金额
DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,大于160个字符的消息将被分割为多条消息
DocType: Purchase Receipt Item,Received and Accepted,收到并接受
,GST Itemised Sales Register,消费税商品销售登记册
@@ -4225,7 +4244,7 @@
DocType: Student Group Creation Tool,Student Group Creation Tool,学生组创建工具
DocType: Item,Variant Based On,基于变异对
apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},分配的总权重应为100 ％ 。这是{0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Suppliers,您的供应商
+apps/erpnext/erpnext/public/js/setup_wizard.js +263,Your Suppliers,您的供应商
apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,不能更改状态为丧失，因为已有销售订单。
DocType: Request for Quotation Item,Supplier Part No,供应商部件号
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',当类是“估值”或“Vaulation和总'不能扣除
@@ -4237,7 +4256,7 @@
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}",根据购买设置，如果需要购买记录==“是”，则为了创建采购发票，用户需要首先为项目{0}创建采购凭证
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},行＃{0}：设置供应商项目{1}
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,行{0}：小时值必须大于零。
-apps/erpnext/erpnext/stock/doctype/item/item.py +174,Website Image {0} attached to Item {1} cannot be found,网站图像{0}附加到物品{1}无法找到
+apps/erpnext/erpnext/stock/doctype/item/item.py +170,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.,在网站上的多个组中显示此品目
@@ -4252,7 +4271,7 @@
apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,到仓库
apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,所有学生入学
,Average Commission Rate,平均佣金率
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,'Has Serial No' can not be 'Yes' for non-stock item,非库存项目不能勾选'是否有序列号'
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,'Has Serial No' can not be 'Yes' for non-stock item,非库存项目不能勾选'是否有序列号'
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,考勤不能标记为未来的日期
DocType: Pricing Rule,Pricing Rule Help,定价规则说明
DocType: School House,House Name,房名
@@ -4268,7 +4287,7 @@
DocType: Item,Customer Code,客户代码
apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,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 +339,Debit To account must be a Balance Sheet account,借记帐户必须是资产负债表科目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +340,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/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,保险开始日期应小于保险终止日期
@@ -4283,20 +4302,20 @@
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},员工的工资单{0}已为时间表创建{1}
DocType: Vehicle Log,Odometer,里程表
DocType: Sales Order Item,Ordered Qty,订购数量
-apps/erpnext/erpnext/stock/doctype/item/item.py +683,Item {0} is disabled,项目{0}无效
+apps/erpnext/erpnext/stock/doctype/item/item.py +676,Item {0} is disabled,项目{0}无效
DocType: Stock Settings,Stock Frozen Upto,库存冻结止
apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +874,BOM does not contain any stock item,BOM不包含任何库存项目
apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},期间从和周期要日期强制性的经常性{0}
apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,项目活动/任务。
DocType: Vehicle Log,Refuelling Details,加油详情
apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,生成工资条
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +45,"Buying must be checked, if Applicable For is selected as {0}",“适用于”为{0}时必须勾选“采购”
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"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
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,最后购买率未找到
DocType: Purchase Invoice,Write Off Amount (Company Currency),核销金额（公司货币）
DocType: Sales Invoice Timesheet,Billing Hours,结算时间
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,默认BOM {0}未找到
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Row #{0}: Please set reorder quantity,行＃{0}：请设置再订购数量
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +495,Default BOM for {0} not found,默认BOM {0}未找到
+apps/erpnext/erpnext/stock/doctype/item/item.py +485,Row #{0}: Please set reorder quantity,行＃{0}：请设置再订购数量
apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,点击项目将其添加到此处
DocType: Fees,Program Enrollment,招生计划
DocType: Landed Cost Voucher,Landed Cost Voucher,到岸成本凭证
@@ -4360,7 +4379,6 @@
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,预计日期不能早于物料申请时间
DocType: Purchase Invoice Item,Stock Qty,库存数量
DocType: Purchase Invoice Item,Stock Qty,库存数量
-DocType: Production Order,Source Warehouse (for reserving Items),源数据仓库（用于保留项目）
DocType: Employee Loan,Repayment Period in Months,在月还款期
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,错误：没有有效的身份证？
DocType: Naming Series,Update Series Number,更新序列号
@@ -4409,7 +4427,7 @@
apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,物件的存储位置。
DocType: Request for Quotation,Supplier Detail,供应商详细
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},公式或条件错误:{0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,已开票金额
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,已开票金额
DocType: Attendance,Attendance,考勤
apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,库存产品
DocType: BOM,Materials,物料
@@ -4450,10 +4468,10 @@
DocType: Landed Cost Item,Landed Cost Item,到岸成本品目
apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,显示零值
DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,原材料被生产/重新打包后得到的品目数量
-apps/erpnext/erpnext/public/js/setup_wizard.js +350,Setup a simple website for my organization,设置一个简单的网站为我的组织
+apps/erpnext/erpnext/public/js/setup_wizard.js +382,Setup a simple website for my organization,设置一个简单的网站为我的组织
DocType: Payment Reconciliation,Receivable / Payable Account,应收/应付账款
DocType: Delivery Note Item,Against Sales Order Item,对销售订单项目
-apps/erpnext/erpnext/stock/doctype/item/item.py +650,Please specify Attribute Value for attribute {0},请指定属性值的属性{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +643,Please specify Attribute Value for attribute {0},请指定属性值的属性{0}
DocType: Item,Default Warehouse,默认仓库
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},财政预算案不能对集团客户分配{0}
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,请输入父成本中心
@@ -4515,7 +4533,7 @@
,Items To Be Requested,要申请的项目
DocType: Purchase Order,Get Last Purchase Rate,获取最新的采购税率
DocType: Company,Company Info,公司简介
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1344,Select or add new customer,选择或添加新客户
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1438,Select or add new customer,选择或添加新客户
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,成本中心需要预订费用报销
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),资金(资产)申请
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,这是基于该员工的考勤
@@ -4523,6 +4541,7 @@
DocType: Fiscal Year,Year Start Date,年度起始日期
DocType: Attendance,Employee Name,雇员姓名
DocType: Sales Invoice,Rounded Total (Company Currency),圆润的总计（公司货币）
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource > HR Settings,请在人力资源>人力资源设置中设置员工命名系统
apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,不能转换到组，因为你选择的是帐户类型。
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +231,{0} {1} has been modified. Please refresh.,{0} {1}已被修改过，请刷新。
DocType: Leave Block List,Stop users from making Leave Applications on following days.,禁止用户在以下日期提交假期申请。
@@ -4545,7 +4564,7 @@
DocType: Quality Inspection Reading,Reading 3,阅读3
,Hub,Hub
DocType: GL Entry,Voucher Type,凭证类型
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1637,Price List not found or disabled,价格表未找到或禁用
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1731,Price List not found or disabled,价格表未找到或禁用
DocType: Employee Loan Application,Approved,已批准
DocType: Pricing Rule,Price,价格
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',{0}的假期批准后，雇员的状态必须设置为“离开”
@@ -4565,7 +4584,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},行{0}：甲方/客户不与匹配{1} / {2} {3} {4}
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,请输入您的费用帐户
DocType: Account,Stock,库存
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1012,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",行＃{0}：参考文件类型必须是采购订单之一，购买发票或日记帐分录
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1014,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",行＃{0}：参考文件类型必须是采购订单之一，购买发票或日记帐分录
DocType: Employee,Current Address,当前地址
DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",如果品目为另一品目的变体，那么它的描述，图片，价格，税率等将从模板自动设置。你也可以手动设置。
DocType: Serial No,Purchase / Manufacture Details,采购/制造详细信息
@@ -4604,11 +4623,12 @@
apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,转让资产
DocType: POS Profile,POS Profile,POS简介
DocType: Training Event,Event Name,事件名称
-apps/erpnext/erpnext/config/schools.py +39,Admission,入场
+apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +10,Admission,入场
apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},招生{0}
apps/erpnext/erpnext/config/accounts.py +259,"Seasonality for setting budgets, targets etc.",设置季节性的预算，目标等。
apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants",项目{0}是一个模板，请选择它的一个变体
DocType: Asset,Asset Category,资产类别
+apps/erpnext/erpnext/public/js/setup_wizard.js +211,Purchaser,购买者
apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +30,Net pay cannot be negative,净支付金额不能为负数
DocType: SMS Settings,Static Parameters,静态参数
DocType: Assessment Plan,Room,房间
@@ -4617,6 +4637,7 @@
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,材料到供应商
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +380,Excise Invoice,消费税发票
apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}出现％不止一次
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,客户>客户群>地区
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 +138,Current Liabilities,流动负债
@@ -4688,6 +4709,7 @@
apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +785,Get Items from BOM,从物料清单获取品目
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,交货天数
apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},行＃{0}：过帐日期必须是相同的购买日期{1}资产的{2}
+DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,如果学生住在学院的旅馆，请检查。
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,请在上表中输入销售订单
apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +186,Not Submitted Salary Slips,未提交工资单
,Stock Summary,库存摘要