[translations]
diff --git a/erpnext/translations/zh-cn.csv b/erpnext/translations/zh-cn.csv
index 547237b..716c076 100644
--- a/erpnext/translations/zh-cn.csv
+++ b/erpnext/translations/zh-cn.csv
@@ -34,7 +34,7 @@
DocType: Purchase Receipt Item,Required By,必选
DocType: Delivery Note,Return Against Delivery Note,射向送货单
DocType: Department,Department,部门
-DocType: Purchase Order,% Billed,％已开账单
+DocType: Purchase Order,% Billed,％已记账
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),汇率必须一致{0} {1}（{2}）
DocType: Sales Invoice,Customer Name,客户名称
DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.",所有和出口相关的字段，例如货币，汇率，出口总额，出口总计等，都可以在送货单，POS，报价单，销售发票，销售订单等系统里面找到。
@@ -135,7 +135,7 @@
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},从{0}至 {1}
DocType: Item,Copy From Item Group,从品目组复制
DocType: Journal Entry,Opening Entry,开放报名
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0}是必须项
+apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0}是必填项
DocType: Stock Entry,Additional Costs,额外费用
apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,有交易的科目不能被转换为组。
DocType: Lead,Product Enquiry,产品查询
@@ -169,7 +169,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,显示的时间记录
DocType: Journal Entry Account,Credit in Company Currency,信用在公司货币
DocType: Delivery Note,Installation Status,安装状态
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},已接受+已拒绝的数量必须等于品目{0}的接收数量
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},已接受+已拒绝的数量必须等于条目{0}的已接收数量
DocType: Item,Supply Raw Materials for Purchase,供应原料采购
apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,品目{0}必须是采购品目
DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -250,7 +250,7 @@
DocType: Dropbox Backup,Dropbox Access Key,Dropbox的Key
DocType: Payment Tool,Reference No,参考编号
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,已禁止请假
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},品目{0}已经到达寿命终止日期{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +535,Item {0} has reached its end of life on {1},品目{0}已经到达寿命终止日期{1}
apps/erpnext/erpnext/accounts/utils.py +339,Annual,全年
DocType: Stock Reconciliation Item,Stock Reconciliation Item,库存盘点品目
DocType: Stock Entry,Sales Invoice No,销售发票编号
@@ -262,7 +262,7 @@
DocType: Pricing Rule,Supplier Type,供应商类型
DocType: Item,Publish in Hub,在发布中心
,Terretory,区域
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,品目{0}已取消
+apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,品目{0}已取消
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,物料申请
DocType: Bank Reconciliation,Update Clearance Date,更新清拆日期
DocType: Item,Purchase Details,购买详情
@@ -321,7 +321,7 @@
DocType: Dropbox Backup,Allow Dropbox Access,允许访问Dropbox
apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,建立税
apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,付款项被修改，你把它之后。请重新拉。
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0}输入两次项税
+apps/erpnext/erpnext/stock/doctype/item/item.py +343,{0} entered twice in Item Tax,{0}输入两次税项
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,本周和待活动总结
DocType: Workstation,Rent Cost,租金成本
apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,请选择年份和月份
@@ -415,7 +415,7 @@
apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,所有生产流程的全局设置。
DocType: Accounts Settings,Accounts Frozen Upto,账户被冻结到...为止
DocType: SMS Log,Sent On,发送日期
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,属性{0}多次选择在属性表
+apps/erpnext/erpnext/stock/doctype/item/item.py +512,Attribute {0} selected multiple times in Attributes Table,属性{0}多次选择在属性表
DocType: Sales Order,Not Applicable,不适用
apps/erpnext/erpnext/config/hr.py +140,Holiday master.,假期大师
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,外壳成型
@@ -458,7 +458,7 @@
DocType: Production Order,Additional Operating Cost,额外的运营成本
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,化妆品
DocType: DocField,Type,类型
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items",若要合并，以下属性必须为这两个项目是相同的
+apps/erpnext/erpnext/stock/doctype/item/item.py +417,"To merge, following properties must be same for both items",若要合并，以下属性必须为这两个项目是相同的
DocType: Communication,Subject,主题
DocType: Shipping Rule,Net Weight,净重
DocType: Employee,Emergency Phone,紧急电话
@@ -482,7 +482,7 @@
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,品目{0}不是采购品目
apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
Email Address'",“通知电子邮件地址”的{0}不是有效的电子邮件地址
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,总计费今年：
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,总计费今年：
DocType: Purchase Receipt,Add / Edit Taxes and Charges,添加/编辑税金及费用
DocType: Purchase Invoice,Supplier Invoice No,供应商发票编号
DocType: Territory,For reference,供参考
@@ -531,7 +531,7 @@
apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,调配数量不能为负
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,翻筋斗
DocType: Purchase Order Item,Billed Amt,已开票金额
-DocType: Warehouse,A logical Warehouse against which stock entries are made.,库存记录针对的逻辑仓库。
+DocType: Warehouse,A logical Warehouse against which stock entries are made.,创建库存记录所依赖的逻辑仓库。
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},参考号与参考日期须为{0}
DocType: Event,Wednesday,星期三
DocType: Sales Invoice,Customer's Vendor,客户的供应商
@@ -600,7 +600,7 @@
DocType: Journal Entry,Bill No,账单编号
DocType: Purchase Invoice,Quarterly,季度
DocType: Selling Settings,Delivery Note Required,送货单是必须项
-DocType: Sales Order Item,Basic Rate (Company Currency),基础税率（公司货币）
+DocType: Sales Order Item,Basic Rate (Company Currency),基础利率（公司货币）
DocType: Manufacturing Settings,Backflush Raw Materials Based On,反吹为原材料的开
apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,请输入项目细节
DocType: Purchase Receipt,Other Details,其他详细信息
@@ -615,7 +615,7 @@
DocType: Hub Settings,Seller City,卖家城市
DocType: Email Digest,Next email will be sent on:,下次邮件发送时间：
DocType: Offer Letter Term,Offer Letter Term,报价函期限
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,项目已变种。
+apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,项目已变种。
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,品目{0}未找到
DocType: Bin,Stock Value,库存值
apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,树类型
@@ -649,7 +649,7 @@
DocType: Delivery Note,Customer's Purchase Order No,客户的采购订单号
DocType: Employee,Cell Number,手机号码
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,丧失
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,“对日记账分录”不能选择此凭证。
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,您不能在“对日记账分录”列中选择此凭证。
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,能源
DocType: Opportunity,Opportunity From,从机会
apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,月度工资结算
@@ -713,10 +713,11 @@
apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,价格列表没有选择
DocType: Employee,Family Background,家庭背景
DocType: Process Payroll,Send Email,发送电子邮件
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},警告：无效的附件{0}
apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,无此权限
DocType: Company,Default Bank Account,默认银行账户
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",要根据党的筛选，选择党第一类型
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},“更新股票'不能检验，因为项目没有通过传递{0}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},“库存更新'校验不通过，因为{0}中的退货条目未交付
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
DocType: Item,Items with higher weightage will be shown higher,具有较高权重的项目将显示更高的可
DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,银行对帐详细
@@ -757,8 +758,8 @@
DocType: Sales Order Item,Projected Qty,预计数量
DocType: Sales Invoice,Payment Due Date,付款到期日
DocType: Newsletter,Newsletter Manager,通讯经理
-apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,项目变种{0}已经具有相同属性的存在
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',“开放”
+apps/erpnext/erpnext/stock/doctype/item/item.js +229,Item Variant {0} already exists with same attributes,项目变种{0}已经具有相同属性的存在
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',“打开”
DocType: Notification Control,Delivery Note Message,送货单留言
DocType: Expense Claim,Expenses,开支
DocType: Item Variant Attribute,Item Variant Attribute,产品规格属性
@@ -822,7 +823,7 @@
DocType: Supplier,Default Payable Accounts,默认应付账户(多个)
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,雇员{0}非活动或不存在
DocType: Features Setup,Item Barcode,品目条码
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,品目变种{0}已更新
+apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,品目变种{0}已更新
DocType: Quality Inspection Reading,Reading 6,6阅读
DocType: Purchase Invoice Advance,Purchase Invoice Advance,购买发票提前
DocType: Address,Shop,商店
@@ -900,7 +901,7 @@
DocType: POS Profile,Cash/Bank Account,现金/银行账户
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,删除的项目在数量或价值没有变化。
DocType: Delivery Note,Delivery To,交货对象
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,属性表是强制性的
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute table is mandatory,属性表是强制性的
DocType: Production Planning Tool,Get Sales Orders,获取销售订单
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0}不能为负
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,备案
@@ -917,7 +918,7 @@
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,在销售订单/成品仓库保留仓库
apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,销售金额
apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,时间日志
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,你是本条目的开支审批人，请更新并保存其状态。
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,你是本记录的费用审批人，请更新‘状态’字段并保存。
DocType: Serial No,Creation Document No,创建文档编号
DocType: Issue,Issue,问题
apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.",品目变体的属性。如大小，颜色等。
@@ -948,7 +949,7 @@
apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},{0} | {1} {2}
DocType: Time Log Batch,updated via Time Logs,通过时间更新日志
apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,平均年龄
-DocType: Opportunity,Your sales person who will contact the customer in future,联系未来客户的销售人员
+DocType: Opportunity,Your sales person who will contact the customer in future,联系客户的销售人员
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,列出一些你的供应商，他们可以是组织或个人。
DocType: Company,Default Currency,默认货币
DocType: Contact,Enter designation of this Contact,输入联系人的职务
@@ -1048,7 +1049,7 @@
apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,查看总帐
DocType: File,Lft,Lft
apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,最早
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"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 +394,"An Item Group exists with same name, please change the item name or rename the item group",同名品目群组已存在，请修改品目名或群组名
DocType: Communication,Delivery Status,交货状态
DocType: Production Order,Manufacture against Sales Order,按销售订单生产
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,世界其他地区
@@ -1166,7 +1167,7 @@
apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,总订单价值
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,食品
apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,账龄范围3
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,您只能对已提交的生产订单进行时间记录操作
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,您只能对已提交的生产订单进行时间日志记录
DocType: Maintenance Schedule Item,No of Visits,访问数量
DocType: File,old_parent,old_parent
apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",发给联系人和潜在客户的通讯
@@ -1212,7 +1213,7 @@
apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,科目表
DocType: Material Request,Terms and Conditions Content,条款和条件内容
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,不能大于100
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,品目{0}不是库存品目
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,品目{0}不是库存品目
DocType: Maintenance Visit,Unscheduled,计划外
DocType: Employee,Owned,资
DocType: Salary Slip Deduction,Depends on Leave Without Pay,依赖于无薪休假
@@ -1356,7 +1357,7 @@
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,标记为交付
apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,请报价
DocType: Dependent Task,Dependent Task,相关任务
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},行{0}中默认计量单位的转换系数必须是1
+apps/erpnext/erpnext/stock/doctype/item/item.py +306,Conversion factor for default Unit of Measure must be 1 in row {0},行{0}中默认计量单位的转换系数必须是1
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},类型为{0}的假期不能长于{1}天
DocType: Manufacturing Settings,Try planning operations for X days in advance.,尝试规划X天行动提前。
DocType: HR Settings,Stop Birthday Reminders,停止生日提醒
@@ -1366,7 +1367,7 @@
apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0}查看
DocType: Salary Structure Deduction,Salary Structure Deduction,薪酬结构扣款
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,选择性激光烧结
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,计量单位{0}已经在换算系数表内
+apps/erpnext/erpnext/stock/doctype/item/item.py +301,Unit of Measure {0} has been entered more than once in Conversion Factor Table,计量单位{0}已经在换算系数表内
apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,导入成功！
apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,已发料品目成本
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},数量不能超过{0}
@@ -1375,7 +1376,7 @@
DocType: Account,Account Name,帐户名称
apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,起始日期不能大于结束日期
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,序列号{0}的数量{1}不能是分数
-apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,供应商类型大师。
+apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,主要的供应商类型。
DocType: Purchase Order Item,Supplier Part Number,供应商零件编号
apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,添加
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,汇率不能为0或1
@@ -1444,7 +1445,7 @@
apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory",公司，月度和财年是必须项
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,市场营销开支
,Item Shortage Report,品目短缺报告
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量被提及，\n请注明“重量计量单位”
+apps/erpnext/erpnext/stock/doctype/item/item.js +183,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量被提及，\n请注明“重量计量单位”
DocType: Stock Entry Detail,Material Request used to make this Stock Entry,创建此库存记录的物料申请
apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,此品目的一件。
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',时间日志批量{0}必须是'提交'
@@ -1457,7 +1458,7 @@
DocType: Item,Weightage,权重
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,矿业
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,树脂浇注
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,同名的客户群组已经存在，请更改客户姓名或重命名客户集团
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,同名的客户组已经存在，请更改客户姓名或重命名该客户组
apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,请选择{0}第一。
apps/erpnext/erpnext/templates/pages/order.html +57,text {0},文字{0}
DocType: Territory,Parent Territory,家长领地
@@ -1490,9 +1491,9 @@
apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},新建{0}
DocType: Naming Series,Set prefix for numbering series on your transactions,为交易设置编号系列的前缀
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,已停止的订单无法取消，请先点击“重新开始”
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,默认BOM（{0}）必须是活动的这个项目或者其模板
+apps/erpnext/erpnext/stock/doctype/item/item.py +323,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,机会从字段是强制性的
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,从机会是必选项
DocType: Item,Variants,变种
apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,创建采购订单
DocType: SMS Center,Send To,发送到
@@ -1510,7 +1511,7 @@
DocType: Communication,Received,收到
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,日记帐分录{0}没有不符合的{1}分录
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},品目{0}的序列号重复
-DocType: Shipping Rule Condition,A condition for a Shipping Rule,航运规则的一个条件
+DocType: Shipping Rule Condition,A condition for a Shipping Rule,发货规则的一个条件
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,项目是不允许有生产订单。
DocType: DocField,Attach Image,附加图片
DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),此打包的净重。（根据内容物件的净重自动计算）
@@ -1535,7 +1536,7 @@
DocType: Quality Inspection Reading,Reading 10,阅读10
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"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/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,您输入了重复的条目。请纠正然后重试。
apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,值{0}的属性{1}不在有效的项目列表存在属性值
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,协理
apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,品目{0}不是一个序列品目
@@ -1605,7 +1606,7 @@
DocType: Website Item Group,Website Item Group,网站物件组
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,关税与税项
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,参考日期请输入
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0}付款项不能由过滤{1}
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0}付款项不能由{1}过滤
DocType: Item Website Specification,Table for Item that will be shown in Web Site,将在网站显示的物件表
DocType: Purchase Order Item Supplied,Supplied Qty,附送数量
DocType: Material Request Item,Material Request Item,物料申请品目
@@ -1657,7 +1658,7 @@
,Quotation Trends,报价趋势
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},品目{0}的品目群组没有设置
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,入借帐户必须是应收账科目
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.",此品目必须是库存品目，因为它可以生成生产订单
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.",此品目必须是库存品目，因为它可以生成生产订单
DocType: Shipping Rule Condition,Shipping Amount,发货数量
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,加盟
DocType: Authorization Rule,Above Value,上述值
@@ -1677,7 +1678,7 @@
apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,树finanial帐户。
DocType: Leave Control Panel,Leave blank if considered for all employee types,如果针对所有雇员类型请留空
DocType: Landed Cost Voucher,Distribute Charges Based On,费用分配基于
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,因为账项{1}是一个资产项目，所以科目{0}的类型必须为“固定资产”
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,因为账项{1}是一个资产条目，所以科目{0}的类型必须为“固定资产”
DocType: HR Settings,HR Settings,人力资源设置
apps/frappe/frappe/config/setup.py +130,Printing,印花
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,报销正在等待批准。只有开支审批人才能更改其状态。
@@ -1685,7 +1686,7 @@
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,你要申请的假期位于假日内，无需请假。
apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,和
DocType: Leave Block List Allow,Leave Block List Allow,例外用户
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,缩写不能为空或空间
+apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,缩写不能为空或空格
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,体育
apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,实际总
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,单位
@@ -1693,7 +1694,7 @@
apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,请注明公司
,Customer Acquisition and Loyalty,客户获得和忠诚度
DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,维护拒收物件的仓库
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,您的财政年度结束于
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,您的会计年度结束于
DocType: POS Profile,Price List,价格表
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,默认财政年度已经更新为{0}。请刷新您的浏览器以使更改生效。
apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,报销
@@ -1773,7 +1774,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,他人
apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,无法找到匹配的项目。请选择其他值{0}。
DocType: POS Profile,Taxes and Charges,税项和收费
-DocType: Item,"A Product or a Service that is bought, sold or kept in stock.",一个已购买、被出售或者保留在库存的产品或服务。
+DocType: Item,"A Product or a Service that is bought, sold or kept in stock.",库存中已被购买，销售或保留的一个产品或服务。
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,第一行的“收取类型”不能是“基于上一行的金额”或者“前一行的总计”
apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,已完成
DocType: Web Form,Select DocType,选择文档类型
@@ -1786,7 +1787,7 @@
DocType: Quality Inspection,In Process,进行中
DocType: Authorization Rule,Itemwise Discount,品目特定的折扣
DocType: Purchase Order Item,Reference Document Type,参考文档类型
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0}对销售订单{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0}不允许销售订单{1}
DocType: Account,Fixed Asset,固定资产
apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,序列化库存
DocType: Activity Type,Default Billing Rate,默认计费率
@@ -1832,7 +1833,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry",对于{0}，借方分录只能选择借方账户
apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,价格表{0}被禁用
DocType: Manufacturing Settings,Allow Overtime,允许加班
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0}需要的产品序列号{1}。您所提供{2}。
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,品目{1}需要{0}的序列号。您已提供{2}。
DocType: Stock Reconciliation Item,Current Valuation Rate,目前的估值价格
DocType: Item,Customer Item Codes,客户项目代码
DocType: Opportunity,Lost Reason,丧失原因
@@ -1854,7 +1855,7 @@
apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,序列号{0}未找到
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,您的客户
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,压缩成型
-DocType: Leave Block List Date,Block Date,禁离日
+DocType: Leave Block List Date,Block Date,禁离日期
DocType: Sales Order,Not Delivered,未交付
,Bank Clearance Summary,银行结算摘要
apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.",创建和管理每日，每周和每月的电子邮件摘要。
@@ -1967,10 +1968,10 @@
DocType: Shipping Rule,Shipping Rule Label,配送规则标签
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,原材料不能为空。
DocType: Newsletter,Test,测试
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'",由于有存量交易为这个项目，\你不能改变的值'有序列号'，'有批号'，'是股票项目“和”评估方法“
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,快速日记帐分录
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,BOM被引用后你不能更改其税率
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,如果任何条目中引用了BOM，你不能更改其税率
DocType: Employee,Previous Work Experience,以前的工作经验
DocType: Stock Entry,For Quantity,对于数量
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},请输入计划数量的项目{0}在行{1}
@@ -1989,7 +1990,7 @@
apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,共缺席
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,行{0}中的品目或仓库与物料申请不符合
apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,计量单位
-DocType: Fiscal Year,Year End Date,年度开始日期
+DocType: Fiscal Year,Year End Date,年度结束日期
DocType: Task Depends On,Task Depends On,任务取决于
DocType: Lead,Opportunity,机会
DocType: Salary Structure Earning,Salary Structure Earning,薪酬结构收入
@@ -2006,16 +2007,16 @@
DocType: Item,Will also apply for variants unless overrridden,除非手动指定，否则会同时应用于变体
DocType: Purchase Invoice,Advances,进展
apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,审批与被审批用户不能相同
-DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),基本速率（按库存计量单位）
+DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),基础利率（按库存计量单位）
DocType: SMS Log,No of Requested SMS,请求短信数量
DocType: Campaign,Campaign-.####,活动-.####
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,冲孔
apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,合同结束日期必须大于加入的日期
-DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,销售公司产品的第三方分销商/经销商/代理商/分支机构/分销商
+DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,授权销售公司产品的第三方分销商/经销商/授权代理商/分支机构/转销商
DocType: Customer Group,Has Child Node,有子节点
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0}对采购订单{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0}不允许采购订单{1}
DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","请输入静态的URL参数(例如 sender=ERPNext, username=ERPNext, password=1234 etc.)"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1}在没有任何活动的会计年度。详情查看{2}。
+apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1}不存在于任何活动的会计年度中。详情查看{2}。
apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,这是一个示例网站从ERPNext自动生成
apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,账龄范围1
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,光化学加工
@@ -2085,7 +2086,7 @@
apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,我的地址
DocType: Stock Ledger Entry,Outgoing Rate,传出率
apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,组织分支主。
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,要么
+apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,或
DocType: Sales Order,Billing Status,账单状态
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,基础设施费用
apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90以上
@@ -2188,7 +2189,7 @@
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,抛光
DocType: Production Order Operation,Planned Start Time,计划开始时间
apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,关闭资产负债表，打开损益表。
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
you have already made some transaction(s) with another UOM. To change default UOM, \
use 'UOM Replace Utility' tool under Stock module.",测度项目的默认单位{0}不能直接改变，因为\你已经做了一些交易（S）与其他计量单位。要更改默认的计量单位，\使用“计量单位更换工具”下的股票模块工具。
DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,指定货币兑换的汇率
@@ -2210,7 +2211,7 @@
apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,已取消
apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,从薪酬结构日期不能高于员工加入日期较小。
DocType: Employee Education,Graduate,研究生
-DocType: Leave Block List,Block Days,禁离日
+DocType: Leave Block List,Block Days,禁离天数
DocType: Journal Entry,Excise Entry,Excise分录
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},警告：销售订单{0}已经存在针对客户的采购订单{1}
DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
@@ -2260,7 +2261,7 @@
DocType: Supplier Quotation Item,Material Request No,物料申请编号
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},品目{0}要求质量检验
DocType: Quotation,Rate at which customer's currency is converted to company's base currency,速率客户的货币转换为公司的基础货币
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0}已经从这个名单退订成功！
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0}已经从这个清单退订成功！
DocType: Purchase Invoice Item,Net Rate (Company Currency),净利率（公司货币）
apps/frappe/frappe/templates/base.html +134,Added,添加
apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,管理区域
@@ -2278,7 +2279,7 @@
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,库存的会计分录
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,铸币
DocType: Sales Invoice,Sales Team1,销售团队1
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,品目{0}不存在
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,品目{0}不存在
DocType: Sales Invoice,Customer Address,客户地址
apps/frappe/frappe/desk/query_report.py +136,Total,总
DocType: Purchase Invoice,Apply Additional Discount On,收取额外折扣
@@ -2369,7 +2370,7 @@
DocType: Salary Structure,Salary breakup based on Earning and Deduction.,基于收入和扣款的工资明细。
apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,科目与子节点不能转换为分类账
DocType: Address,Preferred Shipping Address,首选送货地址
-DocType: Purchase Receipt Item,Accepted Warehouse,接收仓库
+DocType: Purchase Receipt Item,Accepted Warehouse,已接收的仓库
DocType: Bank Reconciliation Detail,Posting Date,发布日期
DocType: Item,Valuation Method,估值方法
DocType: Sales Invoice,Sales Team,销售团队
@@ -2394,7 +2395,7 @@
DocType: Pricing Rule,Purchase Manager,采购经理
DocType: Payment Tool,Payment Tool,支付工具
DocType: Target Detail,Target Detail,目标详细信息
-DocType: Sales Order,% of materials billed against this Sales Order,此销售订单％的材料已开账单。
+DocType: Sales Order,% of materials billed against this Sales Order,此销售订单％的材料已记账。
apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,期末进入
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,有交易的成本中心不能转化为组
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,折旧
@@ -2479,7 +2480,7 @@
,Qty to Receive,接收数量
DocType: Leave Block List,Leave Block List Allowed,禁离日例外用户
apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,转换系数不能是分数
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,用作登录名
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,你将使用它来进行登录
DocType: Sales Partner,Retailer,零售商
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,信用帐户必须是资产负债表科目
apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,所有供应商类型
@@ -2699,11 +2700,11 @@
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',请输入“预产期”
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,取消这个销售订单之前必须取消送货单{0}
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,支付的金额+写的抵销金额不能大于总计
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0}不是品目{1}的有效批号
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0}不是品目{1}的有效批次号
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},注意：假期类型{0}的余量不足
apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.",注意：如果付款没有任何参考，请手动创建一个日记账分录。
DocType: Item,Supplier Items,供应商品目
-DocType: Opportunity,Opportunity Type,机会型
+DocType: Opportunity,Opportunity Type,机会类型
apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +42,New Company,新建公司
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,Cost Center is required for 'Profit and Loss' account {0},成本中心是“损益”科目{0}的必须项
apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,交易只能由公司的创建者被删除
@@ -2733,7 +2734,7 @@
DocType: Stock Reconciliation Item,Before reconciliation,前和解
apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),已添加的税费（公司货币）
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,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 +340,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,品目税项的行{0}中必须指定类型为税项/收益/支出/应课的账户。
DocType: Sales Order,Partly Billed,天色帐单
DocType: Item,Default BOM,默认的BOM
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
@@ -2810,7 +2811,7 @@
DocType: Quotation,Maintenance Manager,维护经理
DocType: Workflow State,Search,搜索
apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,总不能为零
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,“自从最后订购日”必须大于或等于零
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,“ 最后的订单到目前的天数”必须大于或等于零
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,铜焊
DocType: C-Form,Amended From,修订源
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,原料
@@ -2983,7 +2984,7 @@
apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,必须指定考勤起始日期和结束日期
apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,请输入'转包' YES或NO
DocType: Sales Team,Contact No.,联络人电话
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,期初分录不允许有“损益”类型{0}的账户
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,期初分录中不允许有“损益”类型的账户{0}
DocType: Workflow State,Time,时间
DocType: Features Setup,Sales Discounts,销售折扣
DocType: Hub Settings,Seller Country,卖家国家
@@ -3034,7 +3035,7 @@
apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,随着对日
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,珩磨
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,缓刑
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,库存品目必须指定默认仓库。
+apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,库存品目必须指定默认仓库。
DocType: Feed,Full Name,全名
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,铆
apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},支付工资的月{0}和年{1}
@@ -3081,7 +3082,7 @@
DocType: Stock Settings,Role Allowed to edit frozen stock,角色可以编辑冻结股票
,Territory Target Variance Item Group-Wise,按物件组的区域目标波动
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,所有客户群组
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}是必须项。可能是没有由{1}到{2}的货币转换记录。
+apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}是必填项。可能是没有由{1}到{2}的货币转换记录。
apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,税务模板是强制性的。
apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,科目{0}的上级科目{1}不存在
DocType: Purchase Invoice Item,Price List Rate (Company Currency),价格列表费率（公司货币）
@@ -3103,14 +3104,14 @@
DocType: Quotation,In Words will be visible once you save the Quotation.,大写金额将在报价单保存后显示。
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,熨衣服
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1}已停止
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},条码{0}已被品目{1}使用
+apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},条码{0}已被品目{1}使用
DocType: Lead,Add to calendar on this date,将此日期添加至日历
apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,规则增加运输成本。
apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,即将举行的活动
apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,客户是必须项
DocType: Letter Head,Letter Head,信头
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,快速入门
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0}是强制性的回报
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0}是退货单的必填项
DocType: Purchase Order,To Receive,接受
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,冷缩配合
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
@@ -3132,7 +3133,7 @@
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,必须选择至少一个仓库
DocType: Serial No,Out of Warranty,超出保修期
DocType: BOM Replace Tool,Replace,更换
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0}对销售发票{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0}不允许销售发票{1}
apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,请输入缺省的计量单位
DocType: Purchase Invoice Item,Project Name,项目名称
DocType: Supplier,Mention if non-standard receivable account,提到如果不规范应收账款
@@ -3229,7 +3230,7 @@
DocType: Purchase Order,End date of current order's period,当前订单周期的结束日期
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,使录取通知书
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,回报
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,测度变异的默认单位必须与模板
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,测度变异的默认单位必须与模板
DocType: DocField,Fold,折叠
DocType: Production Order Operation,Production Order Operation,生产订单操作
DocType: Pricing Rule,Disable,禁用
@@ -3366,7 +3367,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/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),设置接收支持的电子邮件地址。 （例如support@example.com ）
apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,短缺数量
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,项目变种{0}存在具有相同属性
+apps/erpnext/erpnext/stock/doctype/item/item.py +528,Item variant {0} exists with same attributes,项目变种{0}存在具有相同属性
DocType: Salary Slip,Salary Slip,工资单
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,打磨
apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,“结束日期”必需设置
@@ -3387,7 +3388,7 @@
DocType: Purchase Invoice,Recurring Id,经常性标识
DocType: Customer,Sales Team Details,销售团队详情
DocType: Expense Claim,Total Claimed Amount,总索赔额
-apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,潜在的机会卖。
+apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,销售的潜在机会
apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,病假
DocType: Email Digest,Email Digest,邮件摘要
DocType: Delivery Note,Billing Address Name,帐单地址名称
@@ -3502,7 +3503,7 @@
DocType: Workstation,Operating Costs,运营成本
DocType: Employee Leave Approver,Employee Leave Approver,雇员假期审批者
apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0}已成功添加到我们的新闻列表。
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：一个重新排序条目已存在这个仓库{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +383,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：一个重新排序条目已存在这个仓库{1}
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.",不能更改状态为丧失，因为已有报价。
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,电子束加工
DocType: Purchase Taxes and Charges Template,Purchase Master Manager,采购经理大师
@@ -3512,7 +3513,7 @@
apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,存库分类帐分录的余额已更新
apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,无效的主名称
DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc的DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,添加/编辑价格
+apps/erpnext/erpnext/stock/doctype/item/item.js +176,Add / Edit Prices,添加/编辑价格
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,成本中心表
,Requested Items To Be Ordered,要求项目要订购
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,我的订单
@@ -3550,7 +3551,7 @@
,Serial No Service Contract Expiry,序列号/年度保养合同过期
DocType: Item,Unit of Measure Conversion,转换度量单位
apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,雇员不能更改
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,你不能向一个账户同时输入贷方和借方记录。
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,你不能同时将一个账户设为借方和贷方。
DocType: Naming Series,Help HTML,HTML帮助
apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},分配的总权重应为100 ％ 。这是{0}
apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},品目{1}已经超过允许的超额{0}
@@ -3577,9 +3578,9 @@
DocType: Employee,Emergency Contact Details,紧急联系方式
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,贵公司的标语
DocType: Delivery Note,To Warehouse,到仓库
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},科目{0}已多次输入财年{1}
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},财年{1}中已多次输入科目{0}
,Average Commission Rate,平均佣金率
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,非库存项目不能勾选'是否有序列号'
+apps/erpnext/erpnext/stock/doctype/item/item.py +313,'Has Serial No' can not be 'Yes' for non-stock item,非库存项目不能勾选'是否有序列号'
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,考勤不能标记为未来的日期
DocType: Pricing Rule,Pricing Rule Help,定价规则说明
DocType: Purchase Taxes and Charges,Account Head,账户头
@@ -3608,7 +3609,7 @@
DocType: Notification Control,Sales Invoice Message,销售发票信息
DocType: Authorization Rule,Based On,基于
DocType: Sales Order Item,Ordered Qty,订购数量
-apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,项目{0}无效
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,项目{0}无效
DocType: Stock Settings,Stock Frozen Upto,库存冻结止
apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},期间从和周期要日期强制性的经常性{0}
apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,项目活动/任务。
@@ -3672,7 +3673,7 @@
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,品目{0}必须是库存品目
DocType: Manufacturing Settings,Default Work In Progress Warehouse,默认工作正在进行仓库
apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,业务会计的默认设置。
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0}是必须项
+apps/frappe/frappe/model/naming.py +40,{0} is required,{0}是必填项
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,真空成型
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,预计日期不能早于物料申请时间
DocType: Contact Us Settings,City,城市
@@ -3727,14 +3728,14 @@
,Item Prices,品目价格
DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,大写金额将在采购订单保存后显示。
DocType: Period Closing Voucher,Period Closing Voucher,期末券
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,价格表师傅。
+apps/erpnext/erpnext/config/stock.py +125,Price List master.,主价格表。
DocType: Task,Review Date,评论日期
DocType: Purchase Invoice,Advance Payments,预付款
DocType: DocPerm,Level,级别
DocType: Purchase Taxes and Charges,On Net Total,基于净总计
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,行{0}的目标仓库必须与生产订单的仓库相同
apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,没有使用付款工具的权限
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,周期性的%s没有设置“通知电子邮件地址”
+apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,循环%s中未指定“通知电子邮件地址”
apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,磨
apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,货币不能使用其他货币进行输入后更改
DocType: Company,Round Off Account,四舍五入账户
@@ -3759,7 +3760,7 @@
DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,原材料被生产/重新打包后得到的品目数量
DocType: Payment Reconciliation,Receivable / Payable Account,应收/应付账款
DocType: Delivery Note Item,Against Sales Order Item,对销售订单项目
-apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},请指定属性值的属性{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +521,Please specify Attribute Value for attribute {0},请指定属性值的属性{0}
DocType: Item,Default Warehouse,默认仓库
DocType: Task,Actual End Date (via Time Logs),实际结束日期（通过时间日志）
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},财政预算案不能对集团客户分配{0}
@@ -3821,7 +3822,7 @@
DocType: Sales Invoice,Is POS,是否POS机
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},盒装数量必须等于量项目{0}行{1}
DocType: Production Order,Manufactured Qty,已生产数量
-DocType: Purchase Receipt Item,Accepted Quantity,接收数量
+DocType: Purchase Receipt Item,Accepted Quantity,已接收数量
apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}：{1}不存在
apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,对客户开出的账单。
DocType: DocField,Default,默认
@@ -3895,7 +3896,7 @@
DocType: POS Profile,POS Profile,POS简介
apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.",设置季节性的预算，目标等。
apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,行{0}：付款金额不能大于杰出金额
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,总未付
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,总未付
apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,时间日志是不计费
apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants",项目{0}是一个模板，请选择它的一个变体
apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,购买者
@@ -3948,7 +3949,7 @@
DocType: Item,Automatically create Material Request if quantity falls below this level,自动创建材料，如果申请数量低于这个水平
,Item-wise Purchase Register,品目特定的采购记录
DocType: Batch,Expiry Date,到期时间
-apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item",要设置订货点水平，项目必须购买项目或生产项目
+apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item",要设置订货点水平，项目必须购买项目或生产项目
,Supplier Addresses and Contacts,供应商的地址和联系方式
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,属性是相同的两个记录。
apps/erpnext/erpnext/config/projects.py +18,Project master.,项目主。