[Translation] Updated Translations (#16227)
diff --git a/erpnext/translations/zh.csv b/erpnext/translations/zh.csv
index b56552f..69a5c02 100644
--- a/erpnext/translations/zh.csv
+++ b/erpnext/translations/zh.csv
@@ -44,7 +44,7 @@
apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,本统计基于该供应商的过往交易。详情请参阅表单下方的时间线记录
DocType: Manufacturing Settings,Overproduction Percentage For Work Order,工作订单的超订单生产量的百分比
DocType: Landed Cost Voucher,MAT-LCV-.YYYY.-,MAT-LCV-.YYYY.-
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +362,Legal,法律
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +393,Legal,法律
DocType: Delivery Note,Transport Receipt Date,运输收货日期
DocType: Shopify Settings,Sales Order Series,销售订单系列
DocType: Vital Signs,Tongue,舌
@@ -65,13 +65,13 @@
DocType: Employee Tax Exemption Declaration,HRA as per Salary Structure,HRA根据薪资结构
DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,标题（或者组），以此会计分录建立和余额保存的
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Outstanding for {0} cannot be less than zero ({1}),未付{0}不能小于零（ {1} ）
-apps/erpnext/erpnext/public/js/controllers/transaction.js +876,Service Stop Date cannot be before Service Start Date,服务停止日期不能早于服务开始日期
+apps/erpnext/erpnext/public/js/controllers/transaction.js +882,Service Stop Date cannot be before Service Start Date,服务停止日期不能早于服务开始日期
DocType: Manufacturing Settings,Default 10 mins,默认为10分钟
DocType: Leave Type,Leave Type Name,休假类型名称
apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,公开显示
apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,系列已成功更新
apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,退出
-apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{1}行中的{0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +788,{0} in row {1},{1}行中的{0}
DocType: Asset Finance Book,Depreciation Start Date,折旧开始日期
DocType: Pricing Rule,Apply On,应用于
DocType: Item Price,Multiple Item prices.,多个物料的价格。
@@ -82,7 +82,7 @@
DocType: Amazon MWS Settings,Amazon MWS Settings,亚马逊MWS设置
apps/erpnext/erpnext/utilities/transaction_base.py +126,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,行＃{0}：速率必须与{1}：{2}（{3} / {4}）
,Batch Item Expiry Status,物料批号到期状态
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +160,Bank Draft,银行汇票
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Bank Draft,银行汇票
DocType: Journal Entry,ACC-JV-.YYYY.-,ACC-JV-.YYYY.-
DocType: Mode of Payment Account,Mode of Payment Account,付款方式默认科目
apps/erpnext/erpnext/config/healthcare.py +8,Consultation,会诊
@@ -92,8 +92,7 @@
DocType: Academic Term,Academic Term,学期
DocType: Employee Tax Exemption Sub Category,Employee Tax Exemption Sub Category,员工免税子类别
apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,材料
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +71,Making website,创建网站
-apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +58,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of benefit application pro-rata component\
+apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +61,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of benefit application pro-rata component\
amount and previous claimed amount",员工{0}的福利已超过{1}，按有效天数折算的可用福利扣减已申报金额的总和{2}
DocType: Opening Invoice Creation Tool Item,Quantity,数量
,Customers Without Any Sales Transactions,没有任何销售交易的客户
@@ -141,7 +140,7 @@
DocType: Finance Book,Finance Book,账簿
DocType: Patient Encounter,HLC-ENC-.YYYY.-,HLC-ENC-.YYYY.-
DocType: Daily Work Summary Group,Holiday List,假期列表
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,会计
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +90,Accountant,会计
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,销售价格清单
DocType: Patient,Tobacco Current Use,烟草当前使用
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,销售价
@@ -157,7 +156,7 @@
apps/erpnext/erpnext/setup/doctype/company/company.py +50,Abbreviation cannot have more than 5 characters,缩写不能超过5个字符
DocType: Amazon MWS Settings,AU,AU
apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js +7,Payment Request,付款申请
-apps/erpnext/erpnext/config/accounts.py +56,To view logs of Loyalty Points assigned to a Customer.,查看分配给客户的忠诚度积分的日志。
+apps/erpnext/erpnext/config/accounts.py +556,To view logs of Loyalty Points assigned to a Customer.,查看分配给客户的忠诚度积分的日志。
DocType: Asset,Value After Depreciation,折旧后值
DocType: Student,O+,O +
apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,有关
@@ -165,7 +164,7 @@
DocType: Grading Scale,Grading Scale Name,分级标准名称
apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,将用户添加到市场
apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,这是一个顶层（根）科目，不能被编辑。
-DocType: Sales Invoice,Company Address,公司地址
+DocType: POS Profile,Company Address,公司地址
DocType: BOM,Operations,操作
apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},不能为{0}设置折扣授权
DocType: Subscription,Subscription Start Date,订阅开始日期
@@ -220,19 +219,19 @@
apps/erpnext/erpnext/config/stock.py +28,Stock Reports,库存报表
DocType: Warehouse,Warehouse Detail,仓库详细信息
apps/erpnext/erpnext/education/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 +294,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",是固定资产不能被反选，因为存在资产记录的项目
+apps/erpnext/erpnext/stock/doctype/item/item.py +298,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",是固定资产不能被反选，因为存在资产记录的项目
DocType: Delivery Trip,Departure Time,出发时间
DocType: Vehicle Service,Brake Oil,刹车油
DocType: Tax Rule,Tax Type,税收类型
,Completed Work Orders,完成的工单
DocType: Support Settings,Forum Posts,论坛帖子
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +602,Taxable Amount,应税金额
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +603,Taxable Amount,应税金额
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +161,You are not authorized to add or update entries before {0},你没有权限在{0}前添加或更改分录。
DocType: Leave Policy,Leave Policy Details,休假政策信息
DocType: BOM,Item Image (if not slideshow),物料图片(如果没有演示文稿)
DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,（小时率/ 60）*实际操作时间
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1136,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,行＃{0}：参考文档类型必须是费用报销或手工凭证之一
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1052,Select BOM,选择BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1053,Select BOM,选择BOM
DocType: SMS Log,SMS Log,短信日志
apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,出货物料成本
apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +39,The holiday on {0} is not between From Date and To Date,在{0}这个节日之间没有从日期和结束日期
@@ -243,7 +242,7 @@
apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Opening,开帐
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +36,From {0} to {1},从{0}至 {1}
apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +234,Program: ,程序：
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,无法设置税收
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +51,Failed to setup taxes,无法设置税收
DocType: Item,Copy From Item Group,从物料组复制
DocType: Journal Entry,Opening Entry,开帐凭证
apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,账户仅用于支付
@@ -281,14 +280,14 @@
DocType: Naming Series,Prefix,字首
apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html +7,Event Location,活动地点
DocType: Asset Settings,Asset Settings,资产设置
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +71,Consumable,耗材
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +46,Consumable,耗材
DocType: Student,B-,B-
DocType: Assessment Result,Grade,职级
DocType: Restaurant Table,No of Seats,座位数
DocType: Sales Invoice Item,Delivered By Supplier,交付供应商
DocType: Asset Maintenance Task,Asset Maintenance Task,资产维护任务
DocType: SMS Center,All Contact,所有联系人
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +213,Annual Salary,年薪
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Annual Salary,年薪
DocType: Daily Work Summary,Daily Work Summary,每日工作总结
DocType: Period Closing Voucher,Closing Fiscal Year,结算财年
apps/erpnext/erpnext/accounts/party.py +425,{0} {1} is frozen,{0} {1}已冻结
@@ -304,10 +303,10 @@
DocType: BOM,Quality Inspection Template,质量检验模板
apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +136,"Do you want to update attendance?<br>Present: {0}\
<br>Absent: {1}",你想更新考勤？ <br>出勤：{0} \ <br>缺勤：{1}
-apps/erpnext/erpnext/controllers/buying_controller.py +421,Accepted + Rejected Qty must be equal to Received quantity for Item {0},已接收+已拒收数量须等于物料{0}的已接收数量
+apps/erpnext/erpnext/controllers/buying_controller.py +433,Accepted + Rejected Qty must be equal to Received quantity for Item {0},已接收+已拒收数量须等于物料{0}的已接收数量
DocType: Item,Supply Raw Materials for Purchase,采购时提供原材料给供应商
DocType: Agriculture Analysis Criteria,Fertilizer,肥料
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +435,"Cannot ensure delivery by Serial No as \
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +441,"Cannot ensure delivery by Serial No as \
Item {0} is added with and without Ensure Delivery by \
Serial No.",无法通过序列号确保交货，因为\项目{0}是否添加了确保交货\序列号
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +203,At least one mode of payment is required for POS invoice.,需要为POS发票定义至少一种付款模式
@@ -321,18 +320,18 @@
apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,差异数量
DocType: Production Plan,Material Request Detail,材料申请信息
DocType: Selling Settings,Default Quotation Validity Days,默认报价有效天数
-apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",要包括税款，行{0}项率，税收行{1}也必须包括在内
+apps/erpnext/erpnext/controllers/accounts_controller.py +886,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",要包括税款，行{0}项率，税收行{1}也必须包括在内
DocType: SMS Center,SMS Center,短信中心
DocType: Payroll Entry,Validate Attendance,验证考勤
DocType: Sales Invoice,Change Amount,找零
DocType: Party Tax Withholding Config,Certificate Received,已收到证书
DocType: GST Settings,Set Invoice Value for B2C. B2CL and B2CS calculated based on this invoice value.,设置B2C的发票值。 B2CL和B2CS根据此发票值计算。
DocType: BOM Update Tool,New BOM,新建物料清单
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +243,Prescribed Procedures,规定程序
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +307,Prescribed Procedures,规定程序
apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +36,Show only POS,只显示POS
DocType: Supplier Group,Supplier Group Name,供应商群组名称
DocType: Driver,Driving License Categories,驾驶执照类别
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +125,Please enter Delivery Date,请输入交货日期
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +124,Please enter Delivery Date,请输入交货日期
DocType: Depreciation Schedule,Make Depreciation Entry,创建计算折旧凭证
DocType: Closed Document,Closed Document,已关闭文件
DocType: HR Settings,Leave Settings,保留设置
@@ -343,9 +342,9 @@
DocType: Payroll Period,Payroll Periods,工资期间
apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +18,Make Employee,创建员工
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,广播
-apps/erpnext/erpnext/config/accounts.py +351,Setup mode of POS (Online / Offline),POS（在线/离线）的设置模式
+apps/erpnext/erpnext/config/accounts.py +538,Setup mode of POS (Online / Offline),POS（在线/离线）的设置模式
DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,禁止根据工单创建时间日志。不得根据工作指令跟踪操作
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +167,Execution,执行
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,Execution,执行
apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,生产操作信息。
DocType: Asset Maintenance Log,Maintenance Status,维护状态
apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,会员资格
@@ -355,7 +354,7 @@
apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},起始日期应该在财年之内。财年起始日是{0}
DocType: Patient Medical Record,HLC-PMR-.YYYY.-,HLC-PMR-.YYYY.-
DocType: Drug Prescription,Interval,间隔
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Preference,偏爱
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +211,Preference,偏爱
DocType: Supplier,Individual,个人
DocType: Academic Term,Academics User,学术界用户
DocType: Cheque Print Template,Amount In Figure,量图
@@ -397,13 +396,13 @@
DocType: Travel Itinerary,Check-out Date,离开日期
DocType: Leave Type,Allow Negative Balance,允许负余额
apps/erpnext/erpnext/projects/doctype/project_type/project_type.py +13,You cannot delete Project Type 'External',您不能删除“外部”类型的项目
-apps/erpnext/erpnext/public/js/utils.js +254,Select Alternate Item,选择替代物料
+apps/erpnext/erpnext/public/js/utils.js +274,Select Alternate Item,选择替代物料
DocType: Employee,Create User,创建用户
DocType: Selling Settings,Default Territory,默认地区
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,电视
DocType: Work Order Operation,Updated via 'Time Log',通过“时间日志”更新
apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,选择客户或供应商。
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +448,Advance amount cannot be greater than {0} {1},预付金额不能大于{0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +449,Advance amount cannot be greater than {0} {1},预付金额不能大于{0} {1}
apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +55,"Time slot skiped, the slot {0} to {1} overlap exisiting slot {2} to {3}",时隙滑动，时隙{0}到{1}与现有时隙{2}重叠到{3}
DocType: Naming Series,Series List for this Transaction,此交易的系列列表
DocType: Company,Enable Perpetual Inventory,启用永续库存功能（每次库存移动实时生成会计凭证）
@@ -433,7 +432,7 @@
DocType: Lab Test,Custom Result,自定义结果
DocType: Delivery Stop,Contact Name,联系人姓名
DocType: Course Assessment Criteria,Course Assessment Criteria,课程评价标准
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,纳税登记号：
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +21,Tax Id: ,纳税登记号：
apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,学生卡：
DocType: POS Customer Group,POS Customer Group,销售终端客户群
DocType: Healthcare Practitioner,Practitioner Schedules,从业者时间表
@@ -452,7 +451,7 @@
DocType: Inpatient Record,Discharge Scheduled,预定的卸货
apps/erpnext/erpnext/hr/doctype/employee/employee.py +138,Relieving Date must be greater than Date of Joining,离职日期必须晚于入职日期
DocType: POS Closing Voucher,Cashier,出纳员
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +221,Leaves per Year,每年休假（天）
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +198,Leaves per Year,每年休假（天）
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +162,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,行{0}：如果预付凭证，请为科目{1}勾选'预付？'。
apps/erpnext/erpnext/stock/utils.py +243,Warehouse {0} does not belong to company {1},仓库{0}不属于公司{1}
DocType: Email Digest,Profit & Loss,利润损失
@@ -462,7 +461,7 @@
apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +31,Complete Job,完成工作
DocType: Item Website Specification,Item Website Specification,网站上显示的物料详细规格
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +543,Leave Blocked,已禁止请假
-apps/erpnext/erpnext/stock/doctype/item/item.py +814,Item {0} has reached its end of life on {1},物料{0}已经到达寿命终止日期{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +818,Item {0} has reached its end of life on {1},物料{0}已经到达寿命终止日期{1}
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,银行条目
DocType: Customer,Is Internal Customer,是内部客户
DocType: Crop,Annual,全年
@@ -474,7 +473,7 @@
DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,学生组创建工具课程
DocType: Lead,Do Not Contact,请勿打扰
apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,谁在您的组织教人
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,Software Developer,软件开发人员
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +98,Software Developer,软件开发人员
DocType: Item,Minimum Order Qty,最小起订量
DocType: Supplier,Supplier Type,供应商类型
DocType: Course Scheduling Tool,Course Start Date,课程开始日期
@@ -483,10 +482,10 @@
DocType: Item,Publish in Hub,在集散中心发布
DocType: Student Admission,Student Admission,学生入学
,Terretory,区域
-apps/erpnext/erpnext/stock/doctype/item/item.py +836,Item {0} is cancelled,物料{0}已取消
+apps/erpnext/erpnext/stock/doctype/item/item.py +840,Item {0} is cancelled,物料{0}已取消
apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,折旧行{0}：折旧开始日期作为过去的日期输入
DocType: Contract Template,Fulfilment Terms and Conditions,履行条款和条件
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1137,Material Request,材料申请
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1138,Material Request,材料申请
DocType: Bank Reconciliation,Update Clearance Date,更新清算日期
,GSTR-2,GSTR-2
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +494,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},物料{0}未定义在采购订单{1}发给供应商的原材料清单中
@@ -511,7 +510,7 @@
DocType: Payment Term,Payment Term Name,付款条款名称
DocType: Healthcare Settings,Create documents for sample collection,创建样本收集文件
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Payment against {0} {1} cannot be greater than Outstanding Amount {2},对{0} {1}的付款不能大于总未付金额{2}
-apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py +9,All Healthcare Service Units,所有医疗服务单位
+apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py +16,All Healthcare Service Units,所有医疗服务单位
DocType: Bank Account,Address HTML,地址HTML
DocType: Lead,Mobile No.,手机号码
apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html +35,Mode of Payments,付款方式
@@ -552,7 +551,7 @@
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,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 +111,Circular Reference Error,循环引用错误
+apps/erpnext/erpnext/projects/doctype/task/task.py +114,Circular Reference Error,循环引用错误
apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +206,Student Report Card,学生报表卡
apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +207,From Pin Code,来自Pin码
DocType: Appointment Type,Is Inpatient,住院病人
@@ -577,7 +576,7 @@
DocType: Volunteer,Morning,早上
apps/erpnext/erpnext/accounts/utils.py +374,Payment Entry has been modified after you pulled it. Please pull it again.,获取付款凭证后有修改，请重新获取。
DocType: Program Enrollment Tool,New Student Batch,新学生批次
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,{0} entered twice in Item Tax,{0}输入了两次税项
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,{0} entered twice in Item Tax,{0}输入了两次税项
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +121,Summary for this week and pending activities,本周和待活动总结
DocType: Student Applicant,Admitted,准入
DocType: Workstation,Rent Cost,租金成本
@@ -591,7 +590,7 @@
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,订单价值
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,订单价值
DocType: Certified Consultant,Certified Consultant,认证顾问
-apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,针对往来单位或内部转帐的银行/现金交易
+apps/erpnext/erpnext/config/accounts.py +29,Bank/Cash transactions against party or for internal transfer,针对往来单位或内部转帐的银行/现金交易
DocType: Shipping Rule,Valid for Countries,有效的国家
apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,此项目为模板，不可用于交易。项目的属性会被复制到变量，除非设置“不允许复制”
DocType: Grant Application,Grant Application,授予申请
@@ -600,7 +599,7 @@
DocType: Asset Value Adjustment,New Asset Value,新资产价值
DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,客户货币转换为客户的本币后的单价
DocType: Course Scheduling Tool,Course Scheduling Tool,排课工具
-apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},行＃{0}：采购发票不能对现有资产进行{1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +698,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},行＃{0}：采购发票不能对现有资产进行{1}
DocType: Crop Cycle,LInked Analysis,链接的分析
DocType: POS Closing Voucher,POS Closing Voucher,销售终端关闭凭证
DocType: Contract,Lapsed,间隔
@@ -624,7 +623,7 @@
DocType: Purchase Order,% Received,％已收货
apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,创建学生组
DocType: Volunteer,Weekends,周末
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,换货凭单金额
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +138,Credit Note Amount,换货凭单金额
DocType: Setup Progress Action,Action Document,行动文件
DocType: Chapter Member,Website URL,网站网址
,Finished Goods,成品
@@ -675,7 +674,7 @@
DocType: Purchase Receipt,Vehicle Date,车日期
DocType: Student Log,Medical,医药
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +186,Reason for losing,原因丢失
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1753,Please select Drug,请选择药物
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1757,Please select Drug,请选择药物
apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,线索负责人不能是线索本身
apps/erpnext/erpnext/accounts/utils.py +380,Allocated amount can not greater than unadjusted amount,已核销金额不能超过未调整金额
DocType: Announcement,Receiver,接收器
@@ -728,7 +727,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 +774,Attribute {0} selected multiple times in Attributes Table,属性{0}多次选择在属性表
+apps/erpnext/erpnext/stock/doctype/item/item.py +778,Attribute {0} selected multiple times in Attributes Table,属性{0}多次选择在属性表
DocType: HR Settings,Employee record is created using selected field. ,使用所选字段创建员工记录。
DocType: Sales Order,Not Applicable,不适用
DocType: Amazon MWS Settings,UK,英国
@@ -764,7 +763,7 @@
DocType: Loan,Total Payment,总付款
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +117,Cannot cancel transaction for Completed Work Order.,无法取消已完成工单的交易。
DocType: Manufacturing Settings,Time Between Operations (in mins),各操作之间的时间（以分钟）
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +831,PO already created for all sales order items,已为所有销售订单项创建采购订单
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +837,PO already created for all sales order items,已为所有销售订单项创建采购订单
DocType: Healthcare Service Unit,Occupied,占据
DocType: Clinical Procedure,Consumables,耗材
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +130,{0} {1} is cancelled so the action cannot be completed,{0} {1}被取消，因此无法完成操作
@@ -788,9 +787,9 @@
DocType: Subscription Invoice,Subscription Invoice,订阅发票
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,直接收益
DocType: Patient Appointment,Date TIme,约会时间
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +55,"Can not filter based on Account, if grouped by Account",按科目分类后不能根据科目过滤
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Administrative Officer,行政主任
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,建立公司和税收
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +53,"Can not filter based on Account, if grouped by Account",按科目分类后不能根据科目过滤
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +93,Administrative Officer,行政主任
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Setting up company and taxes,建立公司和税收
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,请选择课程
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,请选择课程
DocType: Codification Table,Codification Table,编纂表
@@ -798,13 +797,13 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +410,Please select Company,请选择公司
DocType: Stock Entry Detail,Difference Account,差异科目
DocType: Purchase Invoice,Supplier GSTIN,供应商GSTIN
-apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,不能关闭任务因为其依赖的任务{0}没有关闭。
+apps/erpnext/erpnext/projects/doctype/task/task.py +50,Cannot close task as its dependant task {0} is not closed.,不能关闭任务因为其依赖的任务{0}没有关闭。
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +435,Please enter Warehouse for which Material Request will be raised,请重新拉。
DocType: Work Order,Additional Operating Cost,额外的运营成本
DocType: Lab Test Template,Lab Routine,实验室常规
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,化妆品
apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +18,Please select Completion Date for Completed Asset Maintenance Log,请选择已完成资产维护日志的完成日期
-apps/erpnext/erpnext/stock/doctype/item/item.py +579,"To merge, following properties must be same for both items",若要合并，两个物料的以下属性必须相同
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,"To merge, following properties must be same for both items",若要合并，两个物料的以下属性必须相同
DocType: Supplier,Block Supplier,块供应商
DocType: Shipping Rule,Net Weight,净重
DocType: Job Opening,Planned number of Positions,计划的职位数量
@@ -867,7 +866,7 @@
DocType: Healthcare Settings,Appointment Confirmation,约定确认
DocType: Inpatient Record,HLC-INP-.YYYY.-,HLC-INP-.YYYY.-
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Cannot delete Serial No {0}, as it is used in stock transactions",无法删除序列号{0}，因为它采用的是库存交易
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +271,Closing (Cr),结算(信用)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +278,Closing (Cr),结算(信用)
apps/erpnext/erpnext/hr/notification/training_feedback/training_feedback.html +1,Hello,你好
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,移动物料
DocType: Employee Incentive,Incentive Amount,激励金额
@@ -878,11 +877,11 @@
DocType: Budget,Ignore,忽略
apps/erpnext/erpnext/accounts/party.py +429,{0} {1} is not active,{0} {1} 未激活
DocType: Woocommerce Settings,Freight and Forwarding Account,货运和转运科目
-apps/erpnext/erpnext/config/accounts.py +310,Setup cheque dimensions for printing,设置检查尺寸打印
+apps/erpnext/erpnext/config/accounts.py +240,Setup cheque dimensions for printing,设置检查尺寸打印
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +33,Create Salary Slips,创建工资单
DocType: Vital Signs,Bloated,胀
DocType: Salary Slip,Salary Slip Timesheet,工资单工时单
-apps/erpnext/erpnext/controllers/buying_controller.py +188,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,外包采购收货单必须指定供应商仓库
+apps/erpnext/erpnext/controllers/buying_controller.py +200,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,外包采购收货单必须指定供应商仓库
DocType: Item Price,Valid From,有效期自
DocType: Sales Invoice,Total Commission,总佣金
DocType: Tax Withholding Account,Tax Withholding Account,代扣税款科目
@@ -891,11 +890,11 @@
DocType: Buying Settings,Purchase Receipt Required,需要采购收据
DocType: Delivery Note,Rail,轨
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +267,Target warehouse in row {0} must be same as Work Order,行{0}中的目标仓库必须与工单相同
-apps/erpnext/erpnext/stock/doctype/item/item.py +179,Valuation Rate is mandatory if Opening Stock entered,库存开帐凭证中评估价字段必填
+apps/erpnext/erpnext/stock/doctype/item/item.py +183,Valuation Rate is mandatory if Opening Stock entered,库存开帐凭证中评估价字段必填
apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +143,No records found in the Invoice table,没有在发票表中找到记录
apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +36,Please select Company and Party Type first,请先选择公司和往来单位类型
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default",已经在用户{1}的pos配置文件{0}中设置了默认值，请禁用默认值
-apps/erpnext/erpnext/config/accounts.py +331,Financial / accounting year.,财务/会计年度。
+apps/erpnext/erpnext/config/accounts.py +261,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 +166,"Sorry, Serial Nos cannot be merged",抱歉，序列号无法合并
DocType: Shopify Settings,Customer Group will set to selected group while syncing customers from Shopify,客户组将在同步Shopify客户的同时设置为选定的组
@@ -944,9 +943,9 @@
DocType: Authorization Rule,Customer or Item,客户或物料
apps/erpnext/erpnext/config/selling.py +28,Customer database.,客户数据库。
DocType: Quotation,Quotation To,报价对象
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +305,Middle Income,中等收入
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +243,Opening (Cr),期初（贷方 ）
-apps/erpnext/erpnext/stock/doctype/item/item.py +946,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}了。如果需要请创建一个新物料，以使用不同的默认计量单位。
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +215,Middle Income,中等收入
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +250,Opening (Cr),期初（贷方 ）
+apps/erpnext/erpnext/stock/doctype/item/item.py +950,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}了。如果需要请创建一个新物料，以使用不同的默认计量单位。
apps/erpnext/erpnext/accounts/utils.py +378,Allocated amount can not be negative,分配数量不能为负
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,请设定公司
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,请设定公司
@@ -966,9 +965,9 @@
apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll",建立员工档案管理叶，报销和工资
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +712,An error occurred during the update process,更新过程中发生错误
DocType: Restaurant Reservation,Restaurant Reservation,餐厅预订
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +166,Proposal Writing,提案写作
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,Proposal Writing,提案写作
DocType: Payment Entry Deduction,Payment Entry Deduction,输入付款扣除
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,包起来
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Wrapping up,包起来
apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +45,Notify Customers via Email,通过电子邮件通知客户
DocType: Item,Batch Number Series,批号系列
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +54,Another Sales Person {0} exists with the same Employee id,另外销售人员{0}存在具有相同员工ID
@@ -980,7 +979,7 @@
apps/erpnext/erpnext/config/education.py +180,Masters,主数据
DocType: Employee Onboarding,Employee Onboarding Template,员工入职模板
DocType: Assessment Plan,Maximum Assessment Score,最大考核评分
-apps/erpnext/erpnext/config/accounts.py +161,Update Bank Transaction Dates,更新银行交易日期
+apps/erpnext/erpnext/config/accounts.py +134,Update Bank Transaction Dates,更新银行交易日期
apps/erpnext/erpnext/config/projects.py +41,Time Tracking,时间跟踪
DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,运输方副本
apps/erpnext/erpnext/hr/doctype/employee_advance/employee_advance.py +57,Row {0}# Paid Amount cannot be greater than requested advance amount,第{0}行的付款金额不能大于预付申请金额
@@ -1017,7 +1016,8 @@
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +83,Net Change in Inventory,库存净变动
DocType: Employee,Passport Number,护照号码
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,与监护人2的关系
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +112,Manager,经理
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +87,Manager,经理
+apps/erpnext/erpnext/public/js/controllers/transaction.js +282, Qty increased by 1,数量增加1
DocType: Payment Entry,Payment From / To,支付自/至
apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +8,From Fiscal Year,从财政年度开始
apps/erpnext/erpnext/selling/doctype/customer/customer.py +185,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},新的信用额度小于该客户未付总额。信用额度至少应该是 {0}
@@ -1061,15 +1061,15 @@
apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,{0}: {1} not found in Invoice Details table,{0}：{1}在发票信息表中无法找到
DocType: Asset,Asset Owner Company,资产所有者公司
DocType: Company,Round Off Cost Center,四舍五入成本中心
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +254,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消维护访问{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +257,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消维护访问{0}
apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +14,Material Transfer,材料转移
DocType: Cost Center,Cost Center Number,成本中心编号
apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,找不到路径
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +236,Opening (Dr),期初（借方）
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +243,Opening (Dr),期初（借方）
DocType: Compensatory Leave Request,Work End Date,工作结束日期
DocType: Loan,Applicant,申请人
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +37,Posting timestamp must be after {0},记帐时间必须晚于{0}
-apps/erpnext/erpnext/config/accounts.py +44,To make recurring documents,复制文件
+apps/erpnext/erpnext/config/accounts.py +293,To make recurring documents,复制文件
,GST Itemised Purchase Register,GST物料采购台帐
DocType: Course Scheduling Tool,Reschedule,改期
DocType: Loan,Total Interest Payable,合计应付利息
@@ -1099,7 +1099,7 @@
DocType: Sales Invoice Timesheet,Time Sheet,时间表
DocType: Manufacturing Settings,Backflush Raw Materials Based On,基于..进行原物料倒扣账
DocType: Sales Invoice,Port Code,港口代码
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1030,Reserve Warehouse,储备仓库
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1031,Reserve Warehouse,储备仓库
DocType: Lead,Lead is an Organization,商机是一个组织
apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,售前
DocType: Instructor Log,Other Details,其他详细信息
@@ -1110,12 +1110,12 @@
DocType: Account,Accounts,会计
DocType: Vehicle,Odometer Value (Last),里程表值（最后）
apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,供应商计分卡标准模板。
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +351,Marketing,市场营销
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +382,Marketing,市场营销
DocType: Sales Invoice,Redeem Loyalty Points,兑换忠诚度积分
apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,付款凭证已创建
DocType: Request for Quotation,Get Suppliers,获取供应商
DocType: Purchase Receipt Item Supplied,Current Stock,当前库存
-apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},行＃{0}：资产{1}不挂项目{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +681,Row #{0}: Asset {1} does not linked to Item {2},行＃{0}：资产{1}不挂项目{2}
apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,预览工资单
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,科目{0}已多次输入
DocType: Account,Expenses Included In Valuation,计入库存评估价的费用科目
@@ -1130,7 +1130,7 @@
apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +189,From Address 1,来自地址1
DocType: Email Digest,Next email will be sent on:,下次邮件发送时间：
DocType: Supplier Scorecard,Per Week,每个星期
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item has variants.,物料有变体。
+apps/erpnext/erpnext/stock/doctype/item/item.py +725,Item has variants.,物料有变体。
apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,学生总数
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,物料{0}未找到
DocType: Bin,Stock Value,库存值
@@ -1149,7 +1149,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +7,Aerospace,航天
,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
DocType: Journal Entry,Credit Card Entry,信用卡分录
-apps/erpnext/erpnext/config/accounts.py +74,Company and Accounts,公司与科目
+apps/erpnext/erpnext/config/accounts.py +35,Company and Accounts,公司与科目
apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +85,In Value,金额
DocType: Asset Settings,Depreciation Options,折旧选项
apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Either location or employee must be required,必须要求地点或员工
@@ -1170,7 +1170,7 @@
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,{0} is not a stock Item,{0}不是一个库存物料
apps/erpnext/erpnext/hr/notification/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',请点击“培训反馈”，再点击“新建”来分享你的培训反馈
DocType: Mode of Payment Account,Default Account,默认科目
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,Please select Sample Retention Warehouse in Stock Settings first,请先在库存设置中选择留存样品仓库
+apps/erpnext/erpnext/stock/doctype/item/item.py +302,Please select Sample Retention Warehouse in Stock Settings first,请先在库存设置中选择留存样品仓库
apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +62,Please select the Multiple Tier Program type for more than one collection rules.,请为多个收集规则选择多层程序类型。
DocType: Payment Entry,Received Amount (Company Currency),收到的款项（公司币种）
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,如果商机的来源是“线索”的话，必须指定线索
@@ -1199,7 +1199,7 @@
DocType: BOM,Website Specifications,网站规格
DocType: Special Test Items,Particulars,细节
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}：申请者{0} 休假类型{1}
-apps/erpnext/erpnext/controllers/buying_controller.py +387,Row {0}: Conversion Factor is mandatory,行{0}：转换系数必填
+apps/erpnext/erpnext/controllers/buying_controller.py +399,Row {0}: Conversion Factor is mandatory,行{0}：转换系数必填
DocType: Student,A+,A +
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +353,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",海报价格规则，同样的标准存在，请分配优先级解决冲突。价格规则：{0}
DocType: Exchange Rate Revaluation,Exchange Rate Revaluation Account,汇率重估科目
@@ -1209,7 +1209,7 @@
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Get from Patient Encounter,从患者遭遇中获取
DocType: Subscriber,Subscriber,订户
DocType: Item Attribute Value,Item Attribute Value,物料属性值
-apps/erpnext/erpnext/projects/doctype/project/project.py +472,Please Update your Project Status,请更新您的工程状态
+apps/erpnext/erpnext/projects/doctype/project/project.py +455,Please Update your Project Status,请更新您的工程状态
apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +26,Currency Exchange must be applicable for Buying or for Selling.,外币汇率必须适用于买入或卖出。
DocType: Item,Maximum sample quantity that can be retained,可以保留的最大样品数量
DocType: Project Update,How is the Project Progressing Right Now?,工程现在进展如何？
@@ -1273,7 +1273,7 @@
DocType: Shopify Settings,Update Price from Shopify To ERPNext Price List,将Shopify更新到ERPNext价格清单
apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,设置电子邮件科目
apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,请先输入物料
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +316,Needs Analysis,需求分析
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +221,Needs Analysis,需求分析
DocType: Asset Repair,Downtime,停工期
DocType: Account,Liability,负债
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +228,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,核准金额不能大于行{0}的申报额。
@@ -1284,20 +1284,20 @@
apps/erpnext/erpnext/stock/get_item_details.py +523,Price List not selected,价格列表没有选择
DocType: Employee,Family Background,家庭背景
DocType: Request for Quotation Supplier,Send Email,发送电子邮件
-apps/erpnext/erpnext/stock/doctype/item/item.py +253,Warning: Invalid Attachment {0},警告：无效的附件{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +257,Warning: Invalid Attachment {0},警告：无效的附件{0}
DocType: Item,Max Sample Quantity,最大样品量
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +810,No Permission,无此权限
DocType: Contract Fulfilment Checklist,Contract Fulfilment Checklist,合同履行清单
DocType: Vital Signs,Heart Rate / Pulse,心率/脉搏
DocType: Company,Default Bank Account,默认银行科目
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +78,"To filter based on Party, select Party Type first",如果基于往来单位过滤，请先选择往来单位类型
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +76,"To filter based on Party, select Party Type first",如果基于往来单位过滤，请先选择往来单位类型
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +46,'Update Stock' can not be checked because items are not delivered via {0},因为物料还未通过{0）交付，“库存更新'不能被勾选
DocType: Vehicle,Acquisition Date,采集日期
apps/erpnext/erpnext/utilities/user_progress.py +146,Nos,Nos
DocType: Item,Items with higher weightage will be shown higher,具有较高权重的物料会优先显示在清单的上面
apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,实验室测试和重要标志
DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,银行对帐信息
-apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,行＃{0}：资产{1}必须提交
+apps/erpnext/erpnext/controllers/accounts_controller.py +685,Row #{0}: Asset {1} must be submitted,行＃{0}：资产{1}必须提交
apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,未找到任何员工
DocType: Item,If subcontracted to a vendor,针对外包给供应商的情况
apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,学生组已经更新。
@@ -1324,7 +1324,7 @@
DocType: Asset,Opening Accumulated Depreciation,期初累计折旧
apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +50,Score must be less than or equal to 5,得分必须小于或等于5
DocType: Program Enrollment Tool,Program Enrollment Tool,计划注册工具
-apps/erpnext/erpnext/config/accounts.py +373,C-Form records,C-表记录
+apps/erpnext/erpnext/config/accounts.py +298,C-Form records,C-表记录
apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +74,The shares already exist,股份已经存在
apps/erpnext/erpnext/config/selling.py +322,Customer and Supplier,客户和供应商
DocType: Email Digest,Email Digest Settings,邮件摘要设置
@@ -1382,7 +1382,7 @@
DocType: Payroll Entry,Bimonthly,半月刊
DocType: Vehicle Service,Brake Pad,刹车片
DocType: Fertilizer,Fertilizer Contents,肥料含量
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +361,Research & Development,研究与发展
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +392,Research & Development,研究与发展
apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,待开票金额
DocType: Company,Registration Details,注册详细信息
DocType: Timesheet,Total Billed Amount,总可开单金额
@@ -1434,7 +1434,7 @@
DocType: Examination Result,Examination Result,考试成绩
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +928,Purchase Receipt,采购收货单
,Received Items To Be Billed,待开票已收货物料
-apps/erpnext/erpnext/config/accounts.py +341,Currency exchange rate master.,货币汇率主数据
+apps/erpnext/erpnext/config/accounts.py +271,Currency exchange rate master.,货币汇率主数据
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +210,Reference Doctype must be one of {0},参考文档类型必须是一个{0}
apps/erpnext/erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js +46,Filter Total Zero Qty,过滤器总计零数量
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +322,Unable to find Time Slot in the next {0} days for Operation {1},在未来{0}天操作{1}无可用时间（档期）
@@ -1445,7 +1445,7 @@
DocType: Employee Boarding Activity,Activity Name,活动名称
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +867,Change Release Date,更改审批日期
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +218,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,成品数量<b>{0}</b>和数量<b>{1}</b>不能不同
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +258,Closing (Opening + Total),期末（期初+总计）
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +256,Closing (Opening + Total),期末（期初+总计）
DocType: Delivery Settings,Dispatch Notification Attachment,发货通知附件
DocType: Payroll Entry,Number Of Employees,在职员工人数
DocType: Journal Entry,Depreciation Entry,折旧分录
@@ -1457,7 +1457,7 @@
DocType: Purchase Receipt Item Supplied,Required Qty,需求数量
DocType: Marketplace Settings,Custom Data,自定义数据
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,有现有的交易的仓库不能转换到总帐。
-apps/erpnext/erpnext/controllers/buying_controller.py +570,Serial no is mandatory for the item {0},物料{0}的序列号必填
+apps/erpnext/erpnext/controllers/buying_controller.py +582,Serial no is mandatory for the item {0},物料{0}的序列号必填
DocType: Bank Reconciliation,Total Amount,总金额
apps/erpnext/erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py +24,From Date and To Date lie in different Fiscal Year,从日期和到期日位于不同的财政年度
apps/erpnext/erpnext/healthcare/utils.py +160,The Patient {0} do not have customer refrence to invoice,患者{0}没有客户参考发票
@@ -1484,19 +1484,19 @@
DocType: Support Search Source,Search Term Param Name,搜索字词Param Name
DocType: Item Barcode,Item Barcode,物料条码
DocType: Woocommerce Settings,Endpoints,端点
-apps/erpnext/erpnext/stock/doctype/item/item.py +716,Item Variants {0} updated,物料变体{0}已更新
+apps/erpnext/erpnext/stock/doctype/item/item.py +720,Item Variants {0} updated,物料变体{0}已更新
DocType: Quality Inspection Reading,Reading 6,检验结果6
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +994,Cannot {0} {1} {2} without any negative outstanding invoice,没有负的未完成发票，无法{0} {1} {2}
DocType: Share Transfer,From Folio No,来自对开本No.
DocType: Purchase Invoice Advance,Purchase Invoice Advance,采购发票预付
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +231,Row {0}: Credit entry can not be linked with a {1},行{0}：信用记录无法被链接的{1}
-apps/erpnext/erpnext/config/accounts.py +284,Define budget for a financial year.,定义预算财务年度。
+apps/erpnext/erpnext/config/accounts.py +214,Define budget for a financial year.,定义预算财务年度。
DocType: Shopify Tax Account,ERPNext Account,ERPNext科目
-apps/erpnext/erpnext/controllers/accounts_controller.py +57,{0} is blocked so this transaction cannot proceed,{0}被阻止，所以此事务无法继续
+apps/erpnext/erpnext/controllers/accounts_controller.py +58,{0} is blocked so this transaction cannot proceed,{0}被阻止，所以此事务无法继续
DocType: Budget,Action if Accumulated Monthly Budget Exceeded on MR,如果累计每月预算超过MR，则采取行动
DocType: Employee,Permanent Address Is,永久地址
DocType: Work Order Operation,Operation completed for how many finished goods?,已为多少成品操作完成？
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +128,Healthcare Practitioner {0} not available on {1},{1}上没有医疗从业者{0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +130,Healthcare Practitioner {0} not available on {1},{1}上没有医疗从业者{0}
DocType: Payment Terms Template,Payment Terms Template,付款条款模板
apps/erpnext/erpnext/public/js/setup_wizard.js +51,The Brand,你的品牌
DocType: Employee Tax Exemption Proof Submission,Rented To Date,迄今已售出
@@ -1578,13 +1578,13 @@
DocType: Expense Claim,Total Advance Amount,总预付金额
DocType: Delivery Stop,Estimated Arrival,预计抵达时间
apps/erpnext/erpnext/templates/pages/help.html +29,See All Articles,查看所有文章
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Walk In,主动上门
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +165,Walk In,主动上门
DocType: Item,Inspection Criteria,检验标准
apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,转移
DocType: BOM Website Item,BOM Website Item,物料清单网站项目
apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,上传你的信头和logo。(您可以在以后对其进行编辑）。
DocType: Timesheet Detail,Bill,账单
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +183,White,白
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +160,White,白
DocType: SMS Center,All Lead (Open),所有潜在客户（开放）
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +352,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),行{0}：数量不适用于{4}在仓库{1}在发布条目的时间（{2} {3}）
apps/erpnext/erpnext/accounts/doctype/cash_flow_mapping/cash_flow_mapping.py +18,You can only select a maximum of one option from the list of check boxes.,您只能从复选框列表中选择最多一个选项。
@@ -1596,7 +1596,7 @@
apps/erpnext/erpnext/hr/doctype/employee/employee_tree.js +29,New Employee,新员工
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,发生了错误，一个可能的原因可能是您没有保存表单。如果问题仍然存在请联系support@erpnext.com。
apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,我的购物车
-apps/erpnext/erpnext/controllers/selling_controller.py +139,Order Type must be one of {0},订单类型必须是一个{0}
+apps/erpnext/erpnext/controllers/selling_controller.py +142,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,期初数量
DocType: Healthcare Settings,Appointment Reminder,预约提醒
@@ -1607,7 +1607,7 @@
apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +132,Added to details,添加到细节
apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,课程工时单
DocType: Budget,Applicable on Material Request,适用于物料申请
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +217,Stock Options,库存选项
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +194,Stock Options,库存选项
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +628,No Items added to cart,没有项目已添加到购物车
DocType: Journal Entry Account,Expense Claim,费用报销
apps/erpnext/erpnext/assets/doctype/asset/asset.js +352,Do you really want to restore this scrapped asset?,难道你真的想恢复这个报废的资产？
@@ -1637,7 +1637,7 @@
apps/erpnext/erpnext/stock/doctype/item/item.js +471,Variant creation has been queued.,变量创建已经排队。
apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},{0}的工作摘要
DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,列表中的第一个将被设置为默认的休假审批人。
-apps/erpnext/erpnext/stock/doctype/item/item.py +770,Attribute table is mandatory,属性表中的信息必填
+apps/erpnext/erpnext/stock/doctype/item/item.py +774,Attribute table is mandatory,属性表中的信息必填
DocType: Production Plan,Get Sales Orders,获取销售订单
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +69,{0} can not be negative,{0}不能为负
apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +37,Connect to Quickbooks,连接到Quickbooks
@@ -1657,7 +1657,7 @@
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +187,Please specify a valid Row ID for row {0} in table {1},请指定行{0}在表中的有效行ID {1}
apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,无法找到变量：
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +893,Please select a field to edit from numpad,请选择要从数字键盘编辑的字段
-apps/erpnext/erpnext/stock/doctype/item/item.py +289,Cannot be a fixed asset item as Stock Ledger is created.,不能成为股票分类账创建的固定资产项目。
+apps/erpnext/erpnext/stock/doctype/item/item.py +293,Cannot be a fixed asset item as Stock Ledger is created.,不能成为股票分类账创建的固定资产项目。
DocType: Subscription Plan,Fixed rate,固定利率
apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record.js +7,Admit,准入
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,转到桌面和开始使用ERPNext
@@ -1707,7 +1707,7 @@
DocType: Buying Settings,Material Transferred for Subcontract,为转包合同材料转移
DocType: Email Digest,Purchase Orders Items Overdue,采购订单项目逾期
apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,邮编
-apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},销售订单{0} {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},销售订单{0} {1}
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},选择贷款{0}中的利息收入科目
DocType: Opportunity,Contact Info,联系方式
apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,创建手工入库
@@ -1723,7 +1723,7 @@
apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +380,Email sent to {0},邮件已发送到{0}
apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,从供应商收到的报价。
apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,更换BOM并更新所有BOM中的最新价格
-apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},{0} | {1} {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +29,To {0} | {1} {2},{0} | {1} {2}
apps/erpnext/erpnext/setup/doctype/supplier_group/supplier_group.js +13,This is a root supplier group and cannot be edited.,这是一个根源供应商组，无法编辑。
DocType: Delivery Note,Driver Name,司机姓名
apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Average Age,平均库龄
@@ -1738,11 +1738,11 @@
DocType: Company,Parent Company,母公司
apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +35,Hotel Rooms of type {0} are unavailable on {1},{0}类型的酒店客房不适用于{1}
DocType: Healthcare Practitioner,Default Currency,默认货币
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Maximum discount for Item {0} is {1}%,第{0}项的最大折扣为{1}％
+apps/erpnext/erpnext/controllers/selling_controller.py +150,Maximum discount for Item {0} is {1}%,第{0}项的最大折扣为{1}％
DocType: Asset Movement,From Employee,来自员工
DocType: Driver,Cellphone Number,手机号码
DocType: Project,Monitor Progress,监控进度
-apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告： 因为{1}中的物料{0}为零，系统将不会检查超额
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告： 因为{1}中的物料{0}为零，系统将不会检查超额
DocType: Journal Entry,Make Difference Entry,创建差异分录
DocType: Supplier Quotation,Auto Repeat Section,自动重复部分
DocType: Upload Attendance,Attendance From Date,考勤起始日期
@@ -1752,13 +1752,13 @@
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,{0} {1} must be submitted,{0} {1}必须提交
DocType: Buying Settings,Default Supplier Group,默认供应商组
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +159,Quantity must be less than or equal to {0},量必须小于或等于{0}
-apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +42,Maximum amount eligible for the component {0} exceeds {1},符合组件{0}的最高金额超过{1}
+apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +44,Maximum amount eligible for the component {0} exceeds {1},符合组件{0}的最高金额超过{1}
DocType: Department Approver,Department Approver,部门批准人
DocType: QuickBooks Migrator,Application Settings,应用程序设置
DocType: SMS Center,Total Characters,总字符
DocType: Employee Advance,Claimed,已申报
DocType: Crop,Row Spacing,行间距
-apps/erpnext/erpnext/controllers/buying_controller.py +192,Please select BOM in BOM field for Item {0},请为物料{0}在主数据中设置BOM（字段）
+apps/erpnext/erpnext/controllers/buying_controller.py +204,Please select BOM in BOM field for Item {0},请为物料{0}在主数据中设置BOM（字段）
apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +22,There isn't any item variant for the selected item,所选物料无相关变体物料
DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-形式发票详细信息
DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,付款发票对账
@@ -1768,7 +1768,7 @@
,HSN-wise-summary of outward supplies,HSN明智的向外供应摘要
DocType: Company,Company registration numbers for your reference. Tax numbers etc.,公司注册号码，供大家参考。税务号码等
apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +261,To State,国家
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +145,Distributor,经销商
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +122,Distributor,经销商
DocType: Asset Finance Book,Asset Finance Book,资产资金账簿
DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,购物车配送规则
apps/erpnext/erpnext/public/js/controllers/transaction.js +72,Please set 'Apply Additional Discount On',请设置“额外折扣基于”
@@ -1781,7 +1781,7 @@
DocType: Setup Progress Action,Action Name,行动名称
apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js +17,Start Year,开始年份
apps/erpnext/erpnext/regional/india/utils.py +28,First 2 digits of GSTIN should match with State number {0},GSTIN的前2位数字应与状态号{0}匹配
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,部分支付
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +84,PDC/LC,部分支付
DocType: Purchase Invoice,Start date of current invoice's period,当前发票周期的起始日期
DocType: Salary Slip,Leave Without Pay,无薪休假
DocType: Payment Request,Outward,向外
@@ -1803,8 +1803,8 @@
DocType: Amazon MWS Settings,CN,CN
DocType: Item Variant Settings,Fields will be copied over only at time of creation.,字段将仅在创建时复制。
DocType: Setup Progress Action,Domains,域
-apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',“实际开始日期”不能大于“实际结束日期'
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +359,Management,管理人员
+apps/erpnext/erpnext/projects/doctype/task/task.py +44,'Actual Start Date' can not be greater than 'Actual End Date',“实际开始日期”不能大于“实际结束日期'
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +390,Management,管理人员
DocType: Cheque Print Template,Payer Settings,付款人设置
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +651,No pending Material Requests found to link for the given items.,找不到针对给定项目链接的待处理物料请求。
apps/erpnext/erpnext/public/js/utils/party.js +193,Select company first,首先选择公司
@@ -1815,6 +1815,7 @@
apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',开始日期大于任务“{0}”的结束日期
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +893,Return / Debit Note,退货/借记单
DocType: Price List Country,Price List Country,价格清单国家
+DocType: Sales Invoice,Set Source Warehouse,设置源仓库（出货仓）
DocType: Item,UOMs,计量单位
apps/erpnext/erpnext/stock/utils.py +236,{0} valid serial nos for Item {1},物料{1}有{0}个有效序列号
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Item Code cannot be changed for Serial No.,物料代码不能因序列号改变
@@ -1842,12 +1843,12 @@
apps/erpnext/erpnext/stock/doctype/batch/batch.js +105,Stock Entry {0} created,手工库存移动{0}已创建
apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.py +110,You don't have enought Loyalty Points to redeem,您没有获得忠诚度积分兑换
apps/erpnext/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py +23,Please set associated account in Tax Withholding Category {0} against Company {1},请在针对公司{1}的预扣税分类{0}中设置关联帐户
-apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,行＃{0}：拒收数量不能包含在采购退货数量中
+apps/erpnext/erpnext/controllers/buying_controller.py +405,Row #{0}: Rejected Qty can not be entered in Purchase Return,行＃{0}：拒收数量不能包含在采购退货数量中
apps/erpnext/erpnext/stock/doctype/item/item.js +203,Changing Customer Group for the selected Customer is not allowed.,不允许更改所选客户的客户组。
,Purchase Order Items To Be Billed,待开票采购订单项
apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,Updating estimated arrival times.,更新预计到达时间。
DocType: Program Enrollment Tool,Enrollment Details,注册信息
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Cannot set multiple Item Defaults for a company.,无法为公司设置多个项目默认值。
+apps/erpnext/erpnext/stock/doctype/item/item.py +684,Cannot set multiple Item Defaults for a company.,无法为公司设置多个项目默认值。
DocType: Purchase Invoice Item,Net Rate,净单价
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +194,Please select a customer,请选择一个客户
DocType: Leave Policy,Leave Allocations,离开分配
@@ -1890,7 +1891,7 @@
DocType: Subscription Settings,Subscription Settings,订阅设置
DocType: Purchase Invoice,Update Auto Repeat Reference,更新自动重复参考
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +273,Optional Holiday List not set for leave period {0},可选假期列表未设置为假期{0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +165,Research,研究
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +142,Research,研究
apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +243,To Address 2,致地址2
DocType: Maintenance Visit Purpose,Work Done,已完成工作
apps/erpnext/erpnext/controllers/item_variant.py +35,Please specify at least one attribute in the Attributes table,请指定属性表中的至少一个属性
@@ -1901,16 +1902,16 @@
DocType: Bank Statement Transaction Entry,Reconciled Transactions,协调后的交易
apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +42,Earliest,最早
DocType: Crop Cycle,Linked Location,链接位置
-apps/erpnext/erpnext/stock/doctype/item/item.py +553,"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 +557,"An Item Group exists with same name, please change the item name or rename the item group",同名物料群组已存在，请修改物料名或群组名
DocType: Crop Cycle,Less than a year,不到一年
apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,学生手机号码
-apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +106,Rest Of The World,世界其他地区
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Rest Of The World,世界其他地区
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,物料{0}不能有批次
DocType: Crop,Yield UOM,产量UOM
,Budget Variance Report,预算差异报表
DocType: Salary Slip,Gross Pay,工资总额
DocType: Item,Is Item from Hub,是来自集线器的组件
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1638,Get Items from Healthcare Services,从医疗保健服务获取项目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1642,Get Items from Healthcare Services,从医疗保健服务获取项目
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Activity Type is mandatory.,行{0}：活动类型是强制性的。
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Dividends Paid,股利支付
apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +39,Accounting Ledger,会计分类帐
@@ -1947,7 +1948,7 @@
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.",为了用好ERPNext，我们建议您花一些时间来观看这些帮助视频。
apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +1046,For Default Supplier (optional),对于默认供应商（可选）
DocType: Supplier Quotation Item,Lead Time in days,交期（天）
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +82,Accounts Payable Summary,应付帐款摘要
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +83,Accounts Payable Summary,应付帐款摘要
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,Not authorized to edit frozen Account {0},无权修改冻结科目{0}
DocType: Journal Entry,Get Outstanding Invoices,获取未付发票
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,销售订单{0}无效
@@ -1956,7 +1957,7 @@
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +146,Lab Test Prescriptions,实验室测试处方
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +164,"The total Issue / Transfer quantity {0} in Material Request {1} \
cannot be greater than requested quantity {2} for Item {3}",对于物料{3}在材料申请{1} 中的总发行/传送量{0} \不能超过申请的数量{2}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +172,Small,小
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +149,Small,小
DocType: Shopify Settings,"If Shopify not contains a customer in Order, then while syncing Orders, the system will consider default customer for order",如果Shopify不包含订单中的客户，则在同步订单时，系统会考虑默认客户订单
DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,发票创建工具项
DocType: Cashier Closing Payments,Cashier Closing Payments,收银员结算付款
@@ -1986,13 +1987,13 @@
apps/erpnext/erpnext/accounts/page/pos/pos.js +801,Sync Master Data,同步主数据
DocType: Asset Repair,Repair Cost,修理费用
apps/erpnext/erpnext/utilities/user_progress.py +138,Your Products or Services,您的产品或服务
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,登录失败
-apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,资产{0}已创建
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +16,Failed to login,登录失败
+apps/erpnext/erpnext/controllers/buying_controller.py +629,Asset {0} created,资产{0}已创建
DocType: Special Test Items,Special Test Items,特殊测试项目
apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,您需要是具有System Manager和Item Manager角色的用户才能在Marketplace上注册。
DocType: Bank Statement Transaction Payment Item,Mode of Payment,付款方式
apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,根据您指定的薪资结构，您无法申请福利
-apps/erpnext/erpnext/stock/doctype/item/item.py +227,Website Image should be a public file or website URL,网站形象应该是一个公共文件或网站网址
+apps/erpnext/erpnext/stock/doctype/item/item.py +231,Website Image should be a public file or website URL,网站形象应该是一个公共文件或网站网址
DocType: Purchase Invoice Item,BOM,BOM
apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +71,This is a root item group and cannot be edited.,这是一个根物料群组，无法被编辑。
apps/erpnext/erpnext/accounts/doctype/account/account.js +133,Merge,合并
@@ -2001,7 +2002,7 @@
DocType: Warehouse,Warehouse Contact Info,仓库联系方式
DocType: Payment Entry,Write Off Difference Amount,销帐差异金额
DocType: Volunteer,Volunteer Name,志愿者姓名
-apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},发现其他行中具有重复截止日期的行：{0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +793,Rows with duplicate due dates in other rows were found: {0},发现其他行中具有重复截止日期的行：{0}
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent",{0}：未发现员工的电子邮件，因此，电子邮件未发
apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},给定日期{1}的员工{0}没有分配薪金结构
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},运费规则不适用于国家/地区{0}
@@ -2020,7 +2021,7 @@
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.",定价规则是基于“应用在”字段，可以是项目，项目组或品牌首先被选择的。
apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +372,Please set the Item Code first,请先设定商品代码
apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +157,Doc Type,文档类型
-apps/erpnext/erpnext/controllers/selling_controller.py +132,Total allocated percentage for sales team should be 100,对于销售团队总分配比例应为100
+apps/erpnext/erpnext/controllers/selling_controller.py +135,Total allocated percentage for sales team should be 100,对于销售团队总分配比例应为100
DocType: Subscription Plan,Billing Interval Count,计费间隔计数
apps/erpnext/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner_dashboard.py +10,Appointments and Patient Encounters,预约和患者遭遇
apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +135,Value missing,栏位值缺失
@@ -2077,11 +2078,11 @@
DocType: BOM Operation,Workstation,工作站
DocType: Request for Quotation Supplier,Request for Quotation Supplier,询价供应商
DocType: Healthcare Settings,Registration Message,注册信息
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,Hardware,硬件
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Hardware,硬件
DocType: Prescription Dosage,Prescription Dosage,处方用量
DocType: Contract,HR Manager,人力资源经理
apps/erpnext/erpnext/accounts/party.py +196,Please select a Company,请选择一个公司
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +95,Privilege Leave,特权休假
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +70,Privilege Leave,特权休假
DocType: Purchase Invoice,Supplier Invoice Date,供应商发票日期
DocType: Asset Settings,This value is used for pro-rata temporis calculation,该值用于按比例计算
apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +91,You need to enable Shopping Cart,您需要启用购物车
@@ -2101,7 +2102,7 @@
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,针对的手工凭证{0}已经被其他凭证调整
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,总订单价值
apps/erpnext/erpnext/demo/setup/setup_data.py +341,Food,食品
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +69,Ageing Range 3,账龄范围3
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +42,Ageing Range 3,账龄范围3
DocType: POS Closing Voucher Details,POS Closing Voucher Details,销售终端关闭凭证详细信息
DocType: Shopify Log,Shopify Log,Shopify日志
DocType: Inpatient Occupancy,Check In,报到
@@ -2130,7 +2131,7 @@
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,Application period cannot be outside leave allocation period,申请期间须在休假分配周期内
DocType: Activity Cost,Projects,工程
DocType: Payment Request,Transaction Currency,交易货币
-apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},来自{0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +34,From {0} | {1} {2},来自{0} | {1} {2}
apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,有些电子邮件无效
DocType: Work Order Operation,Operation Description,操作说明
apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,财年保存后便不能更改财年开始日期和结束日期
@@ -2142,7 +2143,7 @@
DocType: Healthcare Practitioner,Contacts and Address,联系人和地址
DocType: Salary Structure,Max Benefits (Amount),最大收益（金额）
DocType: Purchase Invoice,Contact Person,联络人
-apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',“预计开始日期”不能大于“预计结束日期'
+apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Expected Start Date' can not be greater than 'Expected End Date',“预计开始日期”不能大于“预计结束日期'
apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +107,No data for this period,此期间没有数据
DocType: Course Scheduling Tool,Course End Date,课程结束日期
DocType: Holiday List,Holidays,假期
@@ -2155,7 +2156,7 @@
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,固定资产净变动
apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,需要数量
DocType: Leave Control Panel,Leave blank if considered for all designations,如果针对所有 职位请留空
-apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}中的收取类型“实际”不能包含在“物料税率”
+apps/erpnext/erpnext/controllers/accounts_controller.py +892,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}中的收取类型“实际”不能包含在“物料税率”
apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},最大值：{0}
apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,起始时间日期
DocType: Shopify Settings,For Company,对公司
@@ -2170,7 +2171,7 @@
DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,列表中的第一个费用审批人将被设置为默认的费用审批人。
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,不能大于100
apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,您需要是Administrator以外的System Manager和Item Manager角色的用户才能在Marketplace上注册。
-apps/erpnext/erpnext/stock/doctype/item/item.py +826,Item {0} is not a stock Item,物料{0}不是库存物料
+apps/erpnext/erpnext/stock/doctype/item/item.py +830,Item {0} is not a stock Item,物料{0}不是库存物料
DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC-.YYYY.-
DocType: Maintenance Visit,Unscheduled,计划外
DocType: Employee,Owned,已有所有者
@@ -2198,10 +2199,10 @@
DocType: HR Settings,Employee Settings,员工设置
apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,加载支付系统
,Batch-Wise Balance History,物料批号结余数量历史记录
-apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,行＃{0}：如果金额大于项目{1}的开帐单金额，则无法设置费率。
+apps/erpnext/erpnext/controllers/accounts_controller.py +1122,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,行＃{0}：如果金额大于项目{1}的开帐单金额，则无法设置费率。
apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,打印设置在相应的打印格式更新
DocType: Package Code,Package Code,包装代码
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,学徒
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +83,Apprentice,学徒
DocType: Purchase Invoice,Company GSTIN,公司GSTIN
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,不允许负数量
DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
@@ -2214,7 +2215,7 @@
DocType: HR Settings,Leave Approver Mandatory In Leave Application,在离职申请中休假审批人字段必填
DocType: Job Opening,"Job profile, qualifications required etc.",工作概况，要求的学历等。
DocType: Journal Entry Account,Account Balance,科目余额
-apps/erpnext/erpnext/config/accounts.py +206,Tax Rule for transactions.,税收规则进行的交易。
+apps/erpnext/erpnext/config/accounts.py +179,Tax Rule for transactions.,税收规则进行的交易。
DocType: Rename Tool,Type of document to rename.,需重命名的文件类型。
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),总税/费（公司货币）
@@ -2234,7 +2235,7 @@
DocType: Stock Entry,Total Additional Costs,总额外费用
apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +47,No of Interactions,交互数
DocType: BOM,Scrap Material Cost(Company Currency),废料成本（公司货币）
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +69,Sub Assemblies,半成品
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +44,Sub Assemblies,半成品
DocType: Asset,Asset Name,资产名称
DocType: Project,Task Weight,任务权重
DocType: Shipping Rule Condition,To Value,To值
@@ -2252,7 +2253,7 @@
apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,未添加地址。
DocType: Workstation Working Hour,Workstation Working Hour,工作站工作时间
DocType: Vital Signs,Blood Pressure,血压
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +113,Analyst,分析员
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Analyst,分析员
apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +20,{0} is not in a valid Payroll Period,{0}不在有效的工资核算期间
DocType: Employee Benefit Application,Max Benefits (Yearly),最大收益（每年）
DocType: Item,Inventory,库存
@@ -2264,7 +2265,7 @@
DocType: Education Settings,Validate Enrolled Course for Students in Student Group,验证学生组学生入学课程
DocType: Notification Control,Expense Claim Rejected,报销被拒
DocType: Item,Item Attribute,物料属性
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Government,政府
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +112,Government,政府
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,报销{0}已经存在车辆日志
DocType: Asset Movement,Source Location,来源地点
apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,机构名称
@@ -2281,7 +2282,7 @@
DocType: Shopify Settings,Import Delivery Notes from Shopify on Shipment,在发货时从Shopify导入交货单
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 +286,Asset Category is mandatory for Fixed Asset item,固定资产类的物料其资产类别字段是必填的
+apps/erpnext/erpnext/stock/doctype/item/item.py +290,Asset Category is mandatory for Fixed Asset item,固定资产类的物料其资产类别字段是必填的
DocType: Fee Validity,Fee Validity,费用有效期
apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +146,No records found in the Payment table,没有在支付表中找到记录
apps/erpnext/erpnext/education/utils.py +19,This {0} conflicts with {1} for {2} {3},此{0}与在{2} {3}的{1}冲突
@@ -2302,7 +2303,7 @@
DocType: Pricing Rule,For Price List,价格清单
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +27,Executive Search,猎头
DocType: Employee Advance,HR-EAD-.YYYY.-,HR-EAD-.YYYY.-
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +55,Setting defaults,设置默认值
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +56,Setting defaults,设置默认值
DocType: Loyalty Program,Auto Opt In (For all customers),自动选择（适用于所有客户）
apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,建立潜在客户
DocType: Maintenance Schedule,Schedules,计划任务
@@ -2331,7 +2332,7 @@
apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,会员细节
DocType: Leave Block List,Block Holidays on important days.,禁止将重要日期设为假期。
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +194,Please input all required Result Value(s),请输入所有必需的结果值（s）
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +119,Accounts Receivable Summary,应收账款汇总
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +137,Accounts Receivable Summary,应收账款汇总
DocType: POS Closing Voucher,Linked Invoices,链接的发票
DocType: Loan,Monthly Repayment Amount,每月还款额
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,待创建发票
@@ -2365,7 +2366,7 @@
apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +72,Receiver List is empty. Please create Receiver List,接收人列表为空。请创建接收人列表
apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),医疗保健（beta）
DocType: Production Plan Sales Order,Production Plan Sales Order,生产计划销售订单
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +427,"No active BOM found for item {0}. Delivery by \
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +433,"No active BOM found for item {0}. Delivery by \
Serial No cannot be ensured",未找到项{0}的有效BOM。无法确保交货\串口号
DocType: Sales Partner,Sales Partner Target,销售合作伙伴目标
DocType: Loan Type,Maximum Loan Amount,最高贷款额度
@@ -2382,7 +2383,7 @@
,Lead Name,线索姓名
,POS,销售终端
DocType: C-Form,III,III
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +314,Prospecting,勘探
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +219,Prospecting,勘探
apps/erpnext/erpnext/config/stock.py +317,Opening Stock Balance,期初存货余额
DocType: Asset Category Account,Capital Work In Progress Account,在途资本科目
apps/erpnext/erpnext/assets/doctype/asset/asset.js +92,Asset Value Adjustment,资产价值调整
@@ -2413,7 +2414,7 @@
DocType: Staffing Plan Detail,Estimated Cost Per Position,预估单人成本
DocType: Employee,HR-EMP-,HR-EMP-
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,用户{0}没有任何默认的POS配置文件。检查此用户的行{1}处的默认值。
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Employee Referral,员工推荐
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +166,Employee Referral,员工推荐
DocType: Student Group,Set 0 for no limit,为不限制设为0
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +191,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,您申请的休假日期是节假日，无需申请休假。
DocType: Customer,Primary Address and Contact Detail,主要地址和联系人信息
@@ -2425,7 +2426,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,请选择至少一个域名。
DocType: Dependent Task,Dependent Task,相关任务
DocType: Shopify Settings,Shopify Tax Account,Shopify税收科目
-apps/erpnext/erpnext/stock/doctype/item/item.py +471,Conversion factor for default Unit of Measure must be 1 in row {0},行{0}中默认计量单位的转换系数必须是1
+apps/erpnext/erpnext/stock/doctype/item/item.py +475,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 +257,Leave of type {0} cannot be longer than {1},类型为{0}的假期不能长于{1}天
DocType: Delivery Trip,Optimize Route,优化路线
DocType: Manufacturing Settings,Try planning operations for X days in advance.,尝试计划将操作提前X天。
@@ -2442,7 +2443,7 @@
apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Consumed Amount,消耗量
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +69,Net Change in Cash,现金净变动
DocType: Assessment Plan,Grading Scale,分级量表
-apps/erpnext/erpnext/stock/doctype/item/item.py +465,Unit of Measure {0} has been entered more than once in Conversion Factor Table,计量单位{0}已经在换算系数表内
+apps/erpnext/erpnext/stock/doctype/item/item.py +469,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 +617,Already completed,已经完成
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +34,Stock In Hand,在手库存
apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +68,"Please add the remaining benefits {0} to the application as \
@@ -2483,7 +2484,7 @@
DocType: Party Account,Party Account,往来单位科目
apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +142,Please select Company and Designation,请选择公司和任命
apps/erpnext/erpnext/config/setup.py +116,Human Resources,人力资源
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +306,Upper Income,高收入
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +216,Upper Income,高收入
apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,拒绝
DocType: Journal Entry Account,Debit in Company Currency,借记卡在公司货币
DocType: BOM Item,BOM Item,物料清单项目
@@ -2518,7 +2519,7 @@
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +82,Net Change in Accounts Payable,应付账款净额变化
apps/erpnext/erpnext/selling/doctype/customer/customer.py +257,Credit limit has been crossed for customer {0} ({1}/{2}),客户{0}（{1} / {2}）的信用额度已超过
apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',”客户折扣“需要指定客户
-apps/erpnext/erpnext/config/accounts.py +163,Update bank payment dates with journals.,用日记账更新银行付款时间
+apps/erpnext/erpnext/config/accounts.py +136,Update bank payment dates with journals.,用日记账更新银行付款时间
apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +26,Pricing,价钱
DocType: Quotation,Term Details,条款信息
DocType: Employee Incentive,Employee Incentive,员工激励
@@ -2541,7 +2542,7 @@
DocType: Purchase Invoice,End date of current invoice's period,当前发票周期的结束日期
DocType: Pricing Rule,Applicable For,适用于
DocType: Lab Test,Technician Name,技术员姓名
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +419,"Cannot ensure delivery by Serial No as \
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +425,"Cannot ensure delivery by Serial No as \
Item {0} is added with and without Ensure Delivery by \
Serial No.",无法通过序列号确保交货，因为\项目{0}是否添加了确保交货\序列号
DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,取消发票时去掉关联的付款
@@ -2560,7 +2561,7 @@
DocType: Tax Withholding Category,Tax Withholding Rates,预扣税率
DocType: Contract,Contract Period,合同期
apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,针对序列号提出的保修申请
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total','总'
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +237,'Total','总'
DocType: Employee,Permanent Address,永久地址
DocType: Loyalty Program,Collection Tier,收集层
apps/erpnext/erpnext/hr/utils.py +156,From date can not be less than employee's joining date,起始日期不得少于员工的加入日期
@@ -2610,7 +2611,7 @@
DocType: Vehicle,Doors,门
apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +118,ERPNext Setup Complete!,ERPNext设置完成！
DocType: Healthcare Settings,Collect Fee for Patient Registration,收取病人登记费
-apps/erpnext/erpnext/stock/doctype/item/item.py +733,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,股票交易后不能更改属性。创建一个新项目并将库存转移到新项目
+apps/erpnext/erpnext/stock/doctype/item/item.py +737,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,股票交易后不能更改属性。创建一个新项目并将库存转移到新项目
DocType: Course Assessment Criteria,Weightage,权重
DocType: Purchase Invoice,Tax Breakup,税收分解
DocType: Employee,Joining Details,入职信息
@@ -2646,7 +2647,7 @@
DocType: Asset,Depreciation Method,折旧方法
DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,此税项是否包含在基本价格中？
apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Target,总目标
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +319,Perception Analysis,感知分析
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +224,Perception Analysis,感知分析
DocType: Soil Texture,Sand Composition (%),沙成分（％）
DocType: Job Applicant,Applicant for a Job,求职申请人
DocType: Production Plan Material Request,Production Plan Material Request,生产计划申请材料
@@ -2661,17 +2662,17 @@
DocType: Grant Application,Assessment Mark (Out of 10),评估标记（满分10分）
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Guardian2手机号码
apps/erpnext/erpnext/setup/doctype/company/company.py +263,Main,主
-apps/erpnext/erpnext/controllers/buying_controller.py +762,Following item {0} is not marked as {1} item. You can enable them as {1} item from its Item master,下列项目{0}未标记为{1}项目。您可以从项目主文件中将它们作为{1}项启用
+apps/erpnext/erpnext/controllers/buying_controller.py +774,Following item {0} is not marked as {1} item. You can enable them as {1} item from its Item master,下列项目{0}未标记为{1}项目。您可以从项目主文件中将它们作为{1}项启用
apps/erpnext/erpnext/stock/doctype/item/item.js +74,Variant,变体
apps/erpnext/erpnext/controllers/status_updater.py +163,"For an item {0}, quantity must be negative number",对于商品{0}，数量必须是负数
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 +485,Default BOM ({0}) must be active for this item or its template,该物料或其模板物料的默认物料清单状态必须是激活的
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Default BOM ({0}) must be active for this item or its template,该物料或其模板物料的默认物料清单状态必须是激活的
DocType: Employee,Leave Encashed?,假期已折现？
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,机会来源是必填字段
DocType: Email Digest,Annual Expenses,年度支出
DocType: Item,Variants,变种
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1308,Make Purchase Order,创建采购订单
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1309,Make Purchase Order,创建采购订单
DocType: SMS Center,Send To,发送到
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +201,There is not enough leave balance for Leave Type {0},假期类型{0}的剩余天数不足了
DocType: Payment Reconciliation Payment,Allocated amount,已核销金额
@@ -2710,9 +2711,9 @@
DocType: Student Group,Instructors,教师
DocType: GL Entry,Credit Amount in Account Currency,科目币别贷方金额
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +631,BOM {0} must be submitted,BOM{0}未提交
-apps/erpnext/erpnext/config/accounts.py +504,Share Management,股份管理
+apps/erpnext/erpnext/config/accounts.py +429,Share Management,股份管理
DocType: Authorization Control,Authorization Control,授权控制
-apps/erpnext/erpnext/controllers/buying_controller.py +404,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},第{0}行物料{1}被拒收，其拒收仓库字段必填
+apps/erpnext/erpnext/controllers/buying_controller.py +416,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},第{0}行物料{1}被拒收，其拒收仓库字段必填
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +887,Payment,付款
apps/erpnext/erpnext/controllers/stock_controller.py +96,"Warehouse {0} is not linked to any account, please mention the account in the warehouse record or set default inventory account in company {1}.",仓库{0}未与任何科目关联，请在仓库记录提及科目或在公司{1}设置默认库存科目。
apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,管理您的订单
@@ -2737,7 +2738,7 @@
DocType: Item,Barcodes,条形码
DocType: Hub Tracked Item,Hub Node,集线器节点
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/operations/install_fixtures.py +117,Associate,协理
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +92,Associate,协理
DocType: Asset Movement,Asset Movement,资产移动
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +605,Work Order {0} must be submitted,必须提交工单{0}
apps/erpnext/erpnext/accounts/page/pos/pos.js +2227,New Cart,新的车
@@ -2762,7 +2763,7 @@
apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,帐单货币必须等于默认公司的货币或科目币种
DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),表示该打包是这个交付的一部分（仅草稿）
DocType: Soil Texture,Loam,壤土
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,行{0}：到期日不能在记帐日之前
+apps/erpnext/erpnext/controllers/accounts_controller.py +786,Row {0}: Due Date cannot be before posting date,行{0}：到期日不能在记帐日之前
apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,创建付款分录
apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},物料{0}的数量必须小于{1}
,Sales Invoice Trends,销售发票趋势
@@ -2770,7 +2771,7 @@
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +180,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',收取类型类型必须是“基于上一行的金额”或者“前一行的总计”才能引用组
DocType: Sales Order Item,Delivery Warehouse,交货仓库
DocType: Leave Type,Earned Leave Frequency,年假频率
-apps/erpnext/erpnext/config/accounts.py +279,Tree of financial Cost Centers.,财务成本中心的树。
+apps/erpnext/erpnext/config/accounts.py +209,Tree of financial Cost Centers.,财务成本中心的树。
apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +151,Sub Type,子类型
DocType: Serial No,Delivery Document No,交货文档编号
DocType: Sales Order Item,Ensure Delivery Based on Produced Serial No,确保基于生产的序列号的交货
@@ -2782,14 +2783,14 @@
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"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,供应商报价物料
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +205,Material Consumption is not set in Manufacturing Settings.,材料消耗未在生产设置中设置。
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +208,Material Consumption is not set in Manufacturing Settings.,材料消耗未在生产设置中设置。
DocType: Quality Inspection,MAT-QA-.YYYY.-,MAT-QA-.YYYY.-
apps/erpnext/erpnext/templates/pages/help.html +46,Visit the forums,访问论坛
DocType: Student,Student Mobile Number,学生手机号码
DocType: Item,Has Variants,有变体
DocType: Employee Benefit Claim,Claim Benefit For,福利类型（薪资构成）
apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,更新响应
-apps/erpnext/erpnext/public/js/utils.js +512,You have already selected items from {0} {1},您已经选择从项目{0} {1}
+apps/erpnext/erpnext/public/js/utils.js +538,You have already selected items from {0} {1},您已经选择从项目{0} {1}
DocType: Monthly Distribution,Name of the Monthly Distribution,月度分布名称
apps/erpnext/erpnext/stock/doctype/batch/batch.py +100,Batch ID is mandatory,批号是必需的
apps/erpnext/erpnext/stock/doctype/batch/batch.py +100,Batch ID is mandatory,批号是必需的
@@ -2809,13 +2810,12 @@
DocType: Vehicle Log,Fuel Price,燃油价格
DocType: Bank Guarantee,Margin Money,保证金
DocType: Budget,Budget,预算
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +79,Set Open,设置打开
-apps/erpnext/erpnext/stock/doctype/item/item.py +283,Fixed Asset Item must be a non-stock item.,固定资产物料必须是一个非库存物料。
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +83,Set Open,设置打开
+apps/erpnext/erpnext/stock/doctype/item/item.py +287,Fixed Asset Item must be a non-stock item.,固定资产物料必须是一个非库存物料。
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +60,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",财务预算案不能对{0}指定的，因为它不是一个收入或支出科目
apps/erpnext/erpnext/hr/utils.py +228,Max exemption amount for {0} is {1},{0}的最大免除金额为{1}
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,区域/客户
DocType: Healthcare Settings,Patient Encounters in valid days,患者在有效日期遇到
apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +58,Leave Type {0} cannot be allocated since it is leave without pay,休假类型{0}，因为它是停薪留职无法分配
apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +167,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},行{0}：已分配金额{1}必须小于或等于发票余额{2}
@@ -2835,7 +2835,7 @@
DocType: Guardian,Guardian Interests,监护人利益
apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,更新帐户名称/号码
DocType: Naming Series,Current Value,当前值
-apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,多个会计年度的日期{0}存在。请设置公司财年
+apps/erpnext/erpnext/controllers/accounts_controller.py +331,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,多个会计年度的日期{0}存在。请设置公司财年
DocType: Education Settings,Instructor Records to be created by,导师记录由
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0}已创建
DocType: GST Account,GST Account,GST科目
@@ -2851,7 +2851,6 @@
DocType: Pricing Rule,Selling,销售
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +394,Amount {0} {1} deducted against {2},金额{0} {1}抵扣{2}
DocType: Sales Person,Name and Employee ID,姓名和员工ID
-apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,到期日不能前于过账日期
DocType: Website Item Group,Website Item Group,网站物料组
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,按以上选择的条件没有发现需提交的工资单或工资单已提交
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,关税与税项
@@ -2872,7 +2871,7 @@
DocType: Account,Frozen,已冻结
apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +382,Vehicle Type,车辆类型
DocType: Sales Invoice Payment,Base Amount (Company Currency),基本金额（公司币种）
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1001,Raw Materials,原材料
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1002,Raw Materials,原材料
DocType: Payment Reconciliation Payment,Reference Row,引用行
DocType: Installation Note,Installation Time,安装时间
DocType: Sales Invoice,Accounting Details,会计细节
@@ -2904,7 +2903,7 @@
DocType: Appraisal,For Employee Name,员工姓名
DocType: Holiday List,Clear Table,清除表格
DocType: Woocommerce Settings,Tax Account,税收科目
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +135,Available slots,可用插槽
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +138,Available slots,可用插槽
DocType: C-Form Invoice Detail,Invoice No,发票号码
apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +408,Make Payment,付款
DocType: Room,Room Name,房间名称
@@ -2924,7 +2923,6 @@
DocType: Bank Statement Settings Item,Mapped Header,已映射的标题
DocType: Employee,Resignation Letter Date,辞职信日期
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,定价规则进一步过滤基于数量。
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +115,Not Set,未设置
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +417,Please set the Date Of Joining for employee {0},请为员工{0}设置加入日期
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +417,Please set the Date Of Joining for employee {0},请为员工{0}设置加入日期
DocType: Inpatient Record,Discharge,卸货
@@ -2936,7 +2934,7 @@
DocType: Chapter,Chapter,章节
apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,对
DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,选择此模式后，默认科目将在POS发票中自动更新。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1047,Select BOM and Qty for Production,选择BOM和数量生产
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1048,Select BOM and Qty for Production,选择BOM和数量生产
DocType: Asset,Depreciation Schedule,折旧计划
apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,销售合作伙伴地址和联系人
DocType: Bank Reconciliation Detail,Against Account,针对的科目
@@ -2944,9 +2942,8 @@
DocType: Maintenance Schedule Detail,Actual Date,实际日期
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +135,Please set the Default Cost Center in {0} company.,请在{0}公司中设置默认成本中心。
DocType: Item,Has Batch No,有批号
-apps/erpnext/erpnext/public/js/utils.js +107,Annual Billing: {0},本年总发票金额：{0}
DocType: Shopify Webhook Detail,Shopify Webhook Detail,Shopify Webhook详细信息
-apps/erpnext/erpnext/config/accounts.py +228,Goods and Services Tax (GST India),商品和服务税（印度消费税）
+apps/erpnext/erpnext/config/accounts.py +479,Goods and Services Tax (GST India),商品和服务税（印度消费税）
DocType: Delivery Note,Excise Page Number,Excise页码
DocType: Asset,Purchase Date,采购日期
apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +33,Could not generate Secret,无法生成秘密
@@ -2990,7 +2987,7 @@
DocType: Travel Itinerary,Meal Preference,餐食偏好
,Supplier-Wise Sales Analytics,供应商直出客户的贸易业务销售分析
DocType: Purchase Invoice,Availed ITC Central Tax,有效的ITC中央税收
-DocType: Sales Invoice,Company Address Name,公司地址名称
+DocType: POS Profile,Company Address Name,公司地址名称
DocType: Work 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)",家长课程（如果不是家长课程的一部分，请留空）
@@ -3009,12 +3006,12 @@
DocType: Shareholder,Shareholder,股东
DocType: Purchase Invoice,Additional Discount Amount,额外的折扣金额
DocType: Cash Flow Mapper,Position,位置
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1799,Get Items from Prescriptions,从处方获取物品
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1803,Get Items from Prescriptions,从处方获取物品
DocType: Patient,Patient Details,患者细节
DocType: Inpatient Record,B Positive,B积极
apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
amount",员工{0}的最大权益超过{1}，前面声明的金额\金额为{2}
-apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",第{0}行是固定资产类物料，其采购数量必须是1，如须采购多个，请拆分成多行。
+apps/erpnext/erpnext/controllers/accounts_controller.py +671,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",第{0}行是固定资产类物料，其采购数量必须是1，如须采购多个，请拆分成多行。
DocType: Leave Block List Allow,Leave Block List Allow,例外用户
apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,缩写不能为空或空格
DocType: Patient Medical Record,Patient Medical Record,病人医疗记录
@@ -3049,7 +3046,7 @@
DocType: Workstation,Wages per hour,时薪
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},批次{0}中，仓库{3}中物料{2}的库存余额将变为{1}
apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,以下物料需求数量已自动根据重订货水平相应增加了
-apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},科目{0}状态为非激活。科目货币必须是{1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +376,Account {0} is invalid. Account Currency must be {1},科目{0}状态为非激活。科目货币必须是{1}
apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},起始日期{0}不能在员工离职日期之后{1}
DocType: Supplier,Is Internal Supplier,是内部供应商
DocType: Employee,Create User Permission,创建用户权限
@@ -3078,7 +3075,7 @@
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +970,Quotation,报价
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1041,Cannot set a received RFQ to No Quote,无法将收到的询价单设置为无报价
DocType: Salary Slip,Total Deduction,扣除总额
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +24,Select an account to print in account currency,选择一个科目以科目币别进行打印
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +22,Select an account to print in account currency,选择一个科目以科目币别进行打印
,Production Analytics,生产Analytics（分析）
apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,这是基于对这个病人的交易。有关信息，请参阅下面的工时单
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +218,Cost Updated,成本更新
@@ -3089,14 +3086,14 @@
DocType: Supplier Scorecard Period,Supplier Scorecard Setup,供应商记分卡设置
apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,评估计划名称
DocType: Work Order Operation,Work Order Operation,工单操作
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Warning: Invalid SSL certificate on attachment {0},警告：附件{0}中存在无效的SSL证书
+apps/erpnext/erpnext/stock/doctype/item/item.py +262,Warning: Invalid SSL certificate on attachment {0},警告：附件{0}中存在无效的SSL证书
apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads",信息帮助你的业务，你所有的联系人和更添加为您的线索
DocType: Work Order Operation,Actual Operation Time,实际操作时间
DocType: Authorization Rule,Applicable To (User),适用于(用户)
DocType: Purchase Taxes and Charges,Deduct,扣除
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +219,Job Description,职位描述
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Job Description,职位描述
DocType: Student Applicant,Applied,应用的
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Re-open,重新打开
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +942,Re-open,重新打开
DocType: Sales Invoice Item,Qty as per Stock UOM,按库存计量单位数量
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2名称
DocType: Attendance,Attendance Request,考勤申请
@@ -3122,7 +3119,7 @@
DocType: Grant Application,Email Notification Sent,电子邮件通知已发送
DocType: Purchase Invoice,In Words (Company Currency),大写金额（公司货币）
apps/erpnext/erpnext/accounts/doctype/bank_account/bank_account.py +24,Company is manadatory for company account,公司是公司账户的强制项
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1091,"Item Code, warehouse, quantity are required on row",在该行上需要物料代码，仓库，数量
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1092,"Item Code, warehouse, quantity are required on row",在该行上需要物料代码，仓库，数量
DocType: Bank Guarantee,Supplier,供应商
apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js +9,Get From,得到
apps/erpnext/erpnext/hr/doctype/department/department.js +9,This is a root department and cannot be edited.,这是根部门，无法编辑。
@@ -3135,7 +3132,7 @@
apps/erpnext/erpnext/controllers/stock_controller.py +231,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,必须为物料{0}指定费用/差异科目，因为会影响整个库存的价值。
DocType: Bank,Bank Name,银行名称
apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +78,-Above,-天以上
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1300,Leave the field empty to make purchase orders for all suppliers,将该字段留空以为所有供应商下达采购订单
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1301,Leave the field empty to make purchase orders for all suppliers,将该字段留空以为所有供应商下达采购订单
DocType: Healthcare Practitioner,Inpatient Visit Charge Item,住院访问费用项目
DocType: Vital Signs,Fluid,流体
DocType: Leave Application,Total Leave Days,总休假天数
@@ -3143,7 +3140,7 @@
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/stock/doctype/item/item.js +107,Item Variant Settings,物料变式设置
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +37,Select Company...,选择公司...
+apps/erpnext/erpnext/public/js/account_tree_grid.js +57,Select Company...,选择公司...
DocType: Leave Control Panel,Leave blank if considered for all departments,如果针对所有部门请留空
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +506,{0} is mandatory for Item {1},{0}是{1}的必填项
apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +149,"Item {0}: {1} qty produced, ",项目{0}：{1}产生的数量，
@@ -3188,7 +3185,7 @@
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}在{2}会计分录只能用货币单位：{3}
DocType: Fee Schedule,In Process,进行中
DocType: Authorization Rule,Itemwise Discount,物料级的折扣
-apps/erpnext/erpnext/config/accounts.py +92,Tree of financial accounts.,财务账目的树。
+apps/erpnext/erpnext/config/accounts.py +53,Tree of financial accounts.,财务账目的树。
DocType: Bank Guarantee,Reference Document Type,参考文档类型
DocType: Cash Flow Mapping,Cash Flow Mapping,现金流量映射
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +400,{0} against Sales Order {1},{0}不允许销售订单{1}
@@ -3208,10 +3205,10 @@
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,费用结构和学生组{0}中的课程是不同的。
DocType: Bank Statement Transaction Entry,Receivable Account,应收账款
apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,有效起始日期必须小于有效起始日期。
-apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},行＃{0}：资产{1}已经是{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Asset {1} is already {2},行＃{0}：资产{1}已经是{2}
DocType: Quotation Item,Stock Balance,库存余额
apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,销售订单到付款
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,CEO
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,CEO,CEO
DocType: Purchase Invoice,With Payment of Tax,缴纳税款
DocType: Expense Claim Detail,Expense Claim Detail,报销信息
DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,供应商提供服务
@@ -3221,7 +3218,7 @@
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +915,Please select correct account,请选择正确的科目
DocType: Salary Structure Assignment,Salary Structure Assignment,薪资结构分配
DocType: Purchase Invoice Item,Weight UOM,重量计量单位
-apps/erpnext/erpnext/config/accounts.py +510,List of available Shareholders with folio numbers,包含folio号码的可用股东名单
+apps/erpnext/erpnext/config/accounts.py +435,List of available Shareholders with folio numbers,包含folio号码的可用股东名单
DocType: Salary Structure Employee,Salary Structure Employee,薪资结构员工
apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +62,Show Variant Attributes,显示变体属性
DocType: Student,Blood Group,血型
@@ -3234,10 +3231,10 @@
DocType: Fiscal Year,Companies,企业
DocType: Supplier Scorecard,Scoring Setup,得分设置
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +24,Electronics,电子
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +366,Debit ({0}),借记卡（{0}）
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +364,Debit ({0}),借记卡（{0}）
DocType: BOM,Allow Same Item Multiple Times,多次允许相同的项目
DocType: Stock Settings,Raise Material Request when stock reaches re-order level,当库存达到重订货点时提出物料申请
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +101,Full-time,全职
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +76,Full-time,全职
DocType: Payroll Entry,Employees,员工
DocType: Employee,Contact Details,联系人信息
DocType: C-Form,Received Date,收到日期
@@ -3259,7 +3256,6 @@
DocType: Payment Reconciliation,Payment Reconciliation,付款对账
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,请选择Incharge人的名字
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +51,Technology,技术
-apps/erpnext/erpnext/public/js/utils.js +109,Total Unpaid: {0},总未付：{0}
DocType: BOM Website Operation,BOM Website Operation,物料清单网站运营
DocType: Bank Statement Transaction Payment Item,outstanding_amount,未付金额
DocType: Supplier Scorecard,Supplier Score,供应商分数
@@ -3293,7 +3289,7 @@
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,汇兑损益
DocType: Opportunity,Lost Reason,遗失的原因
DocType: Amazon MWS Settings,Enable Amazon,启用亚马逊
-apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},行＃{0}：科目{1}不属于公司{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +322,Row #{0}: Account {1} does not belong to company {2},行＃{0}：科目{1}不属于公司{2}
apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},无法找到DocType {0}
apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,新地址
DocType: Quality Inspection,Sample Size,样本大小
@@ -3361,7 +3357,7 @@
apps/erpnext/erpnext/crm/doctype/lead/lead.py +53,Next Contact Date cannot be in the past,接下来跟日期不能过去
DocType: Company,For Reference Only.,仅供参考。
apps/erpnext/erpnext/accounts/page/pos/pos.js +2595,Select Batch No,选择批号
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +82,Invalid {0}: {1},无效的{0}：{1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +80,Invalid {0}: {1},无效的{0}：{1}
,GSTR-1,GSTR-1
DocType: Fee Validity,Reference Inv,参考发票
DocType: Sales Invoice Advance,Advance Amount,预付款总额
@@ -3379,10 +3375,10 @@
DocType: Item,Show a slideshow at the top of the page,在页面顶部显示幻灯片
DocType: Tax Withholding Rate,Tax Withholding Rate,税收预扣税率
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +552,Boms,物料清单
-apps/erpnext/erpnext/stock/doctype/item/item.py +187,Stores,仓库
+apps/erpnext/erpnext/stock/doctype/item/item.py +191,Stores,仓库
DocType: Project Type,Projects Manager,工程经理
DocType: Serial No,Delivery Time,交货时间
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +45,Ageing Based On,账龄基于
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +15,Ageing Based On,账龄基于
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +103,Appointment cancelled,约定被取消
DocType: Item,End of Life,寿命结束
apps/erpnext/erpnext/demo/setup/setup_data.py +344,Travel,出差
@@ -3404,7 +3400,7 @@
DocType: Travel Request,Any other details,任何其他细节
DocType: Water Analysis,Origin,起源
apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,这份文件超过对于项{4}的{0} {1}的限制。你在做针对同一的{2}另一个{3}？
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1282,Please set recurring after saving,请设置保存后复发
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1288,Please set recurring after saving,请设置保存后复发
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,选择零钱科目
DocType: Purchase Invoice,Price List Currency,价格清单货币
DocType: Naming Series,User must always select,用户必须始终选择
@@ -3444,8 +3440,8 @@
DocType: Soil Analysis,Soil Analysis Criterias,土壤分析标准
apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,销售或采购的标准合同条款。
DocType: BOM Item,Item operation,物品操作
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +58,Group by Voucher,基于凭证分组
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,你确定要取消这个预约吗？
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +56,Group by Voucher,基于凭证分组
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +391,Are you sure you want to cancel this appointment?,你确定要取消这个预约吗？
DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,酒店房间价格套餐
apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,销售渠道
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},请在薪资组件设置默认科目{0}
@@ -3454,17 +3450,17 @@
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},请为第{0}行的物料指定物料清单
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,获取订阅更新
apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},科目{0}与科目模式{2}中的公司{1}不符
-apps/erpnext/erpnext/controllers/buying_controller.py +707,Specified BOM {0} does not exist for Item {1},物料{1}不存在于指定的BOM{0}
+apps/erpnext/erpnext/controllers/buying_controller.py +719,Specified BOM {0} does not exist for Item {1},物料{1}不存在于指定的BOM{0}
apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,课程：
DocType: Soil Texture,Sandy Loam,桑迪Loam
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +244,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消维护计划{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +246,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消维护计划{0}
DocType: POS Profile,Applicable for Users,适用于用户
DocType: Supplier Quotation,PUR-SQTN-.YYYY.-,PUR-SQTN-.YYYY.-
DocType: Notification Control,Expense Claim Approved,费用报销已批准
DocType: Purchase Invoice,Set Advances and Allocate (FIFO),设置进度和分配（FIFO）
apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,没有创建工单
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +403,Salary Slip of employee {0} already created for this period,这一时期员工的工资单{0}已创建
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,Pharmaceutical,医药
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Pharmaceutical,医药
apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +24,You can only submit Leave Encashment for a valid encashment amount,假期折现的折现金额不正确
apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,采购物料成本
DocType: Employee Separation,Employee Separation Template,员工离职模板
@@ -3486,11 +3482,11 @@
DocType: Support Search Source,Post Title Key,帖子标题密钥
apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +232,For Job Card,对于工作卡
DocType: Warranty Claim,Raised By,提出
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1552,Prescriptions,处方
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1556,Prescriptions,处方
DocType: Payment Gateway Account,Payment Account,付款帐号
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +1112,Please specify Company to proceed,请注明公司进行
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +81,Net Change in Accounts Receivable,应收账款净额变化
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +91,Compensatory Off,补假
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +66,Compensatory Off,补假
DocType: Job Offer,Accepted,已接受
DocType: POS Closing Voucher,Sales Invoices Summary,销售发票摘要
apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +225,To Party Name,到党名
@@ -3532,7 +3528,6 @@
DocType: Sales Invoice Item,Deferred Revenue,递延收入
DocType: Shopify Settings,Cash Account will used for Sales Invoice creation,现金科目将用于创建销售发票
DocType: Employee Tax Exemption Declaration Category,Exemption Sub Category,豁免子类别
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Group / Supplier,供应商群组/供应商
DocType: Member,Membership Expiry Date,会员到期日
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +134,{0} must be negative in return document,{0}在退货凭证中必须为负
DocType: Employee Tax Exemption Proof Submission,Submission Date,提交日期
@@ -3605,7 +3600,7 @@
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +121,Remaining Balance,余额
DocType: Selling Settings,Auto close Opportunity after 15 days,15天之后自动关闭商机
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +83,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,由于{1}的记分卡状态，{0}不允许采购订单。
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Barcode {0} is not a valid {1} code,条形码{0}不是有效的{1}代码
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,Barcode {0} is not a valid {1} code,条形码{0}不是有效的{1}代码
apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js +25,End Year,结束年份
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,报价/铅％
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,报价/线索％
@@ -3618,7 +3613,7 @@
DocType: Patient,Patient Demographics,患者人口统计学
DocType: Task,Actual Start Date (via Time Sheet),实际开始日期（通过工时单）
apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,这是一个从ERPNext自动生成的示例网站
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +55,Ageing Range 1,账龄范围1
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +28,Ageing Range 1,账龄范围1
DocType: Shopify Settings,Enable Shopify,启用Shopify
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +220,Total advance amount cannot be greater than total claimed amount,总预付金额不能超过申报总额
DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -3675,7 +3670,7 @@
DocType: Global Defaults,Hide Currency Symbol,隐藏货币符号
apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +281,Sales Opportunities by Source,来源的销售机会
apps/erpnext/erpnext/config/non_profit.py +58,Donor information.,捐助者信息。
-apps/erpnext/erpnext/config/accounts.py +368,"e.g. Bank, Cash, Credit Card",例如：银行，现金，信用卡
+apps/erpnext/erpnext/config/accounts.py +287,"e.g. Bank, Cash, Credit Card",例如：银行，现金，信用卡
DocType: Job Applicant,Source Name,源名称
DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""",成年人的正常静息血压约为收缩期120mmHg，舒张压80mmHg，缩写为“120 / 80mmHg”
apps/erpnext/erpnext/stock/doctype/batch/batch.py +124,"Set items shelf life in days, to set expiry based on manufacturing_date plus self life",以天为单位设置货架保质期，根据manufacturing_date加上自我生命设置到期日
@@ -3717,7 +3712,7 @@
DocType: Purchase Receipt,Time at which materials were received,收到物料的时间
DocType: Products Settings,Products per Page,每页产品
DocType: Stock Ledger Entry,Outgoing Rate,出库库存评估价
-apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,或
+apps/erpnext/erpnext/controllers/accounts_controller.py +377, or ,或
DocType: Sales Order,Billing Status,账单状态
apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,报表问题
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,基础设施费用
@@ -3728,7 +3723,7 @@
DocType: Buying Settings,Default Buying Price List,默认采购价格清单
DocType: Payroll Entry,Salary Slip Based on Timesheet,基于工时单的工资单
apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +55,Buying Rate,采购价
-apps/erpnext/erpnext/controllers/buying_controller.py +590,Row {0}: Enter location for the asset item {1},行{0}：请为第{0}行的资产，即物料号{1}输入位置信息
+apps/erpnext/erpnext/controllers/buying_controller.py +602,Row {0}: Enter location for the asset item {1},行{0}：请为第{0}行的资产，即物料号{1}输入位置信息
DocType: Request for Quotation,PUR-RFQ-.YYYY.-,PUR-RFQ-.YYYY.-
DocType: Company,About the Company,关于公司
DocType: Notification Control,Sales Order Message,销售订单留言
@@ -3763,7 +3758,7 @@
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Receipt document must be submitted,收到文件必须提交
DocType: Purchase Invoice Item,Received Qty,收到数量
DocType: Stock Entry Detail,Serial No / Batch,序列号/批次
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +353,Not Paid and Not Delivered,没有支付，未送达
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +359,Not Paid and Not Delivered,没有支付，未送达
DocType: Product Bundle,Parent Item,上层物料
DocType: Account,Account Type,科目类型
DocType: Shopify Settings,Webhooks Details,Webhooks详细信息
@@ -3786,7 +3781,7 @@
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +883,Please select an item in the cart,请在购物车中选择一个项目
DocType: Landed Cost Voucher,Purchase Receipt Items,采购收据项
apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,自定义表单
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +77,Arrear,欠款
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +52,Arrear,欠款
apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Depreciation Amount during the period,期间折旧额
DocType: Sales Invoice,Is Return (Credit Note),是退货？（退款单）
apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,开始工作
@@ -3836,14 +3831,14 @@
DocType: Employee Education,Class / Percentage,类/百分比
DocType: Shopify Settings,Shopify Settings,Shopify设置
DocType: Amazon MWS Settings,Market Place ID,市场ID
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +122,Head of Marketing and Sales,营销和销售主管
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +75,Income Tax,所得税
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +97,Head of Marketing and Sales,营销和销售主管
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +50,Income Tax,所得税
apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,轨道信息通过行业类型。
apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,转到信头
DocType: Subscription,Cancel At End Of Period,在期末取消
apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +114,Property already added,已添加属性
DocType: Item Supplier,Item Supplier,物料供应商
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1383,Please enter Item Code to get batch no,请输入物料代码，以获得批号
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1389,Please enter Item Code to get batch no,请输入物料代码，以获得批号
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},请选择一个值{0} quotation_to {1}
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,请选择物料
apps/erpnext/erpnext/config/selling.py +46,All Addresses.,所有地址。
@@ -3879,7 +3874,7 @@
apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +35,Student Admissions,学生入学
apps/erpnext/erpnext/accounts/party.py +421,{0} {1} is disabled,{0} {1}已禁用
DocType: Supplier,Billing Currency,结算货币
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +175,Extra Large,特大号
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +152,Extra Large,特大号
DocType: Loan,Loan Application,申请贷款
DocType: Crop,Scientific Name,科学名称
DocType: Healthcare Service Unit,Service Unit Type,服务单位类型
@@ -3896,13 +3891,13 @@
apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,当地
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),贷款及垫款（资产）
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,债务人
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +174,Large,大
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +151,Large,大
DocType: Bank Statement Settings,Bank Statement Settings,银行对账单设置
DocType: Shopify Settings,Customer Settings,客户设置
DocType: Homepage Featured Product,Homepage Featured Product,首页推荐产品
apps/erpnext/erpnext/manufacturing/doctype/blanket_order/blanket_order.js +12,View Orders,查看订单
DocType: Marketplace Settings,Marketplace URL (to hide and update label),市场URL（隐藏和更新标签）
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +229,All Assessment Groups,所有评估组
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +206,All Assessment Groups,所有评估组
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,新仓库名称
DocType: Shopify Settings,App Type,应用类型
apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py +401,Total {0} ({1}),总{0}（{1}）
@@ -3918,22 +3913,22 @@
DocType: Work Order Operation,Planned Start Time,计划开始时间
DocType: Course,Assessment,评估
DocType: Payment Entry Reference,Allocated,已分配
-apps/erpnext/erpnext/config/accounts.py +305,Close Balance Sheet and book Profit or Loss.,关闭资产负债表，记帐到损益表。
+apps/erpnext/erpnext/config/accounts.py +235,Close Balance Sheet and book Profit or Loss.,关闭资产负债表，记帐到损益表。
DocType: Student Applicant,Application Status,应用现状
DocType: Additional Salary,Salary Component Type,薪资组件类型
DocType: Sensitivity Test Items,Sensitivity Test Items,灵敏度测试项目
DocType: Project Update,Project Update,工程更新
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 +166,Quotation {0} is cancelled,报价{0}已被取消
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,总待处理金额
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,Quotation {0} is cancelled,报价{0}已被取消
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +139,Total Outstanding Amount,总待处理金额
DocType: Sales Partner,Targets,目标
apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +40,Please register the SIREN number in the company information file,请在公司信息文件中注册SIREN号码
DocType: Email Digest,Sales Orders to Bill,应开账单的的销售订单
DocType: Price List,Price List Master,价格清单主数据
DocType: GST Account,CESS Account,CESS科目
DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,所有的销售交易都可以标记多个**销售人员**，方便你设置和监控目标。
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1184,Link to Material Request,链接到材料请求
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1185,Link to Material Request,链接到材料请求
apps/erpnext/erpnext/templates/pages/help.html +35,Forum Activity,论坛活动
,S.O. No.,销售订单号
DocType: Bank Statement Transaction Settings Item,Bank Statement Transaction Settings Item,银行对账单交易设置项目
@@ -3955,7 +3950,7 @@
DocType: Leave Block List,Block Days,禁离天数
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +83,"Shipping Address does not have country, which is required for this Shipping Rule",销售出货地址没有国家，这是运输规则所必需的
DocType: Journal Entry,Excise Entry,Excise分录
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +70,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},警告：已经有销售订单{0}关联了客户采购订单号{1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +69,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},警告：已经有销售订单{0}关联了客户采购订单号{1}
DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
Examples:
@@ -4031,7 +4026,7 @@
DocType: Item,Total Projected Qty,预计总数量
DocType: Monthly Distribution,Distribution Name,分配名称
apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +56,Include UOM,包括基本计量单位
-apps/erpnext/erpnext/stock/stock_ledger.py +478,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",对于{1} {2}进行会计分录所需的项目{0}，找不到估值。如果该项目在{1}中作为零评估价项目进行交易，请在{1}项目表中提及。否则，请在项目记录中创建货物的进货库存交易或提交估值费率，然后尝试提交/取消此条目
+apps/erpnext/erpnext/stock/stock_ledger.py +482,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",对于{1} {2}进行会计分录所需的项目{0}，找不到估值。如果该项目在{1}中作为零评估价项目进行交易，请在{1}项目表中提及。否则，请在项目记录中创建货物的进货库存交易或提交估值费率，然后尝试提交/取消此条目
DocType: Course,Course Code,课程代码
apps/erpnext/erpnext/controllers/stock_controller.py +341,Quality Inspection required for Item {0},物料{0}要求质量检验
DocType: Location,Parent Location,父位置
@@ -4056,12 +4051,12 @@
DocType: Lab Test,LabTest Approver,实验室检测审批者
apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,您已经评估了评估标准{}。
DocType: Vehicle Service,Engine Oil,机油
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1083,Work Orders Created: {0},创建的工单：{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1084,Work Orders Created: {0},创建的工单：{0}
DocType: Sales Invoice,Sales Team1,销售团队1
-apps/erpnext/erpnext/stock/doctype/item/item.py +574,Item {0} does not exist,物料{0}不存在
+apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item {0} does not exist,物料{0}不存在
DocType: Sales Invoice,Customer Address,客户地址
DocType: Loan,Loan Details,贷款信息
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +61,Failed to setup post company fixtures,未能设置公司固定装置
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +62,Failed to setup post company fixtures,未能设置公司固定装置
DocType: Company,Default Inventory Account,默认存货科目
apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +193,The folio numbers are not matching,作品集编号不匹配
apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +304,Payment Request for {0},付款申请{0}
@@ -4085,7 +4080,7 @@
DocType: Purchase Invoice,Select Supplier Address,选择供应商地址
apps/erpnext/erpnext/public/js/event.js +27,Add Employees,添加员工
DocType: Purchase Invoice Item,Quality Inspection,质量检验
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +171,Extra Small,超小
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +148,Extra Small,超小
DocType: Company,Standard Template,标准模板
DocType: Training Event,Theory,理论学习
apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +1103,Warning: Material Requested Qty is less than Minimum Order Qty,警告：物料需求数量低于最小起订量
@@ -4095,7 +4090,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +29,"Food, Beverage & Tobacco",食品，饮料与烟草
DocType: Account,Account Number,帐号
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +794,Can only make payment against unbilled {0},只能为未开票{0}付款
-apps/erpnext/erpnext/controllers/selling_controller.py +111,Commission rate cannot be greater than 100,佣金率不能大于100
+apps/erpnext/erpnext/controllers/selling_controller.py +114,Commission rate cannot be greater than 100,佣金率不能大于100
DocType: Sales Invoice,Allocate Advances Automatically (FIFO),自动分配进度（FIFO）
DocType: Volunteer,Volunteer,志愿者
DocType: Buying Settings,Subcontract,外包
@@ -4117,7 +4112,7 @@
DocType: Healthcare Practitioner,Inpatient Visit Charge,住院访问费用
DocType: Account,Expense Account,费用科目
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,软件
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +178,Colour,颜色
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Colour,颜色
DocType: Assessment Plan Criteria,Assessment Plan Criteria,评估计划标准
apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card_dashboard.py +8,Transactions,交易
apps/erpnext/erpnext/stock/doctype/batch/batch.py +123,Expiry date is mandatory for selected item,所选物料的有效期限必填
@@ -4131,7 +4126,7 @@
DocType: Patient,Personal and Social History,个人和社会史
apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,用户{0}已创建
DocType: Fee Schedule,Fee Breakup for each student,每名学生的费用细分
-apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),对订单{1}的合计的预付款（{0}）不能大于总计（{2}）
+apps/erpnext/erpnext/controllers/accounts_controller.py +617,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),对订单{1}的合计的预付款（{0}）不能大于总计（{2}）
DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,如果要不规则的按月分配，请选择“月度分布”。
apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,更改代码
DocType: Purchase Invoice Item,Valuation Rate,库存评估价
@@ -4142,7 +4137,7 @@
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,运费规则仅适用于销售
apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,折旧行{0}：下一个折旧日期不能在采购日期之前
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 +36,Until,直到
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Until,直到
DocType: Rename Tool,Rename Log,重命名日志
apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,学生组或课程表是强制性的
apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,学生组或课程表是强制性的
@@ -4167,7 +4162,7 @@
DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD-.YYYY.-
DocType: Employee Attendance Tool,Unmarked Attendance,无标记考勤
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +256,Creating Payment Entries......,创建支付条目......
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Researcher,研究员
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Researcher,研究员
DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,计划注册学生工具
apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},开始日期应该小于任务{0}的结束日期
,Consolidated Financial Statement,合并财务报表
@@ -4178,7 +4173,7 @@
DocType: Purchase Order Item,Returned Qty,退货数量
DocType: Student,Exit,离职
apps/erpnext/erpnext/accounts/doctype/account/account.py +163,Root Type is mandatory,根类型是强制性的
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +29,Failed to install presets,无法安装预设
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +30,Failed to install presets,无法安装预设
DocType: Healthcare Service Unit Type,UOM Conversion in Hours,UOM按小时转换
DocType: Contract,Signee Details,签名信息
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.",{0}目前拥有{1}供应商记分卡，并且谨慎地向该供应商发出询价。
@@ -4195,7 +4190,7 @@
DocType: Employee,You can enter any date manually,您可以手动输入日期
DocType: Healthcare Settings,Result Printed,结果打印
DocType: Asset Category Account,Depreciation Expense Account,折旧费用科目
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +214,Probationary Period,试用期
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Probationary Period,试用期
DocType: Purchase Taxes and Charges Template,Is Inter State,跨省？
apps/erpnext/erpnext/config/hr.py +269,Shift Management,班别管理
DocType: Customer Group,Only leaf nodes are allowed in transaction,只有叶节点中允许交易
@@ -4212,7 +4207,7 @@
apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,以日期时间
apps/erpnext/erpnext/config/selling.py +308,Logs for maintaining sms delivery status,日志维护短信发送状态
DocType: Accounts Settings,Make Payment via Journal Entry,通过手工凭证进行付款
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,印上
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +263,Printed On,印上
DocType: Clinical Procedure Template,Clinical Procedure Template,临床步骤模板
DocType: Item,Inspection Required before Delivery,需进行出货检验
DocType: Item,Inspection Required before Purchase,需进行来料检验
@@ -4233,7 +4228,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +38,Newspaper Publishers,报纸出版商
apps/erpnext/erpnext/hr/utils.py +154,Future dates not allowed,未来的日期不允许
apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,选择财务年度
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +120,Expected Delivery Date should be after Sales Order Date,预计交货日期应在销售订单日期之后
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Expected Delivery Date should be after Sales Order Date,预计交货日期应在销售订单日期之后
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,重订货水平
DocType: Company,Chart Of Accounts Template,科目表模板
DocType: Attendance,Attendance Date,考勤日期
@@ -4285,7 +4280,7 @@
DocType: Shopify Settings,Last Sync Datetime,上次同步日期时间
DocType: Landed Cost Item,Receipt Document Type,收据凭证类型
DocType: Daily Work Summary Settings,Select Companies,选择公司
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +320,Proposal/Price Quote,提案/报价
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +225,Proposal/Price Quote,提案/报价
DocType: Antibiotic,Healthcare,卫生保健
DocType: Target Detail,Target Detail,目标详细信息
apps/erpnext/erpnext/stock/doctype/item/item.js +67,Single Variant,单一变种
@@ -4351,7 +4346,7 @@
DocType: Quality Inspection,Outgoing,出货检验
DocType: Material Request,Requested For,需求目的
DocType: Quotation Item,Against Doctype,针对的文档类型
-apps/erpnext/erpnext/controllers/buying_controller.py +491,{0} {1} is cancelled or closed,{0} {1}被取消或关闭
+apps/erpnext/erpnext/controllers/buying_controller.py +503,{0} {1} is cancelled or closed,{0} {1}被取消或关闭
DocType: Asset,Calculate Depreciation,计算折旧
DocType: Delivery Note,Track this Delivery Note against any Project,对任何工程跟踪此销售出货单
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Cash from Investing,从投资产生的净现金
@@ -4378,7 +4373,7 @@
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +999,Paid Amount cannot be greater than total negative outstanding amount {0},支付金额不能大于总未付金额{0}
DocType: Supplier Scorecard Period,Variables,变量
DocType: Employee Internal Work History,Employee Internal Work History,员工内部就职经历
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +264,Closing (Dr),结算(借记)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +271,Closing (Dr),结算(借记)
DocType: Cheque Print Template,Cheque Size,支票大小
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +284,Serial No {0} not in stock,序列号{0}无库存
apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,销售业务的税务模板。
@@ -4394,13 +4389,13 @@
apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,已开票金额
DocType: Share Transfer,(including),（包含）
DocType: Asset,Double Declining Balance,双倍余额递减
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Closed order cannot be cancelled. Unclose to cancel.,关闭的定单不能被取消。 打开关闭再取消。
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +188,Closed order cannot be cancelled. Unclose to cancel.,关闭的定单不能被取消。 打开关闭再取消。
apps/erpnext/erpnext/config/hr.py +120,Payroll Setup,工资单设置
DocType: Amazon MWS Settings,Synch Products,同步产品
DocType: Loyalty Point Entry,Loyalty Program,忠诚计划
DocType: Student Guardian,Father,父亲
apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,支持门票
-apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,固定资产销售不能选择“更新库存”
+apps/erpnext/erpnext/controllers/accounts_controller.py +703,'Update Stock' cannot be checked for fixed asset sale,固定资产销售不能选择“更新库存”
DocType: Bank Reconciliation,Bank Reconciliation,银行对帐
DocType: Attendance,On Leave,休假
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,获取更新
@@ -4410,11 +4405,11 @@
apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +219,Dispatch State,派遣国
apps/erpnext/erpnext/config/hr.py +399,Leave Management,休假管理
apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +17,Groups,组
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +53,Group by Account,基于账户分组
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +51,Group by Account,基于账户分组
DocType: Purchase Invoice,Hold Invoice,暂缓处理发票
apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +37,Please select Employee,请选择员工
DocType: Sales Order,Fully Delivered,完全交付
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +304,Lower Income,较低收益
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +214,Lower Income,较低收益
DocType: Restaurant Order Entry,Current Order,当前订单
apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +25,Number of serial nos and quantity must be the same,序列号和数量必须相同
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +275,Source and target warehouse cannot be same for row {0},行{0}中的源和目标仓库不能相同
@@ -4448,7 +4443,7 @@
apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,评估标准的得分之和必须是{0}。
apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,请设置折旧数预订
DocType: Supplier Scorecard Period,Calculations,计算
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,价值或数量
+apps/erpnext/erpnext/public/js/stock_analytics.js +48,Value or Qty,价值或数量
DocType: Payment Terms Template,Payment Terms,付款条件
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +485,Productions Orders cannot be raised for:,不能为...提升生产订单：
apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,分钟
@@ -4472,8 +4467,8 @@
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,信用科目必须是资产负债表科目
DocType: Donor,Donor,捐赠者
DocType: Global Defaults,Disable In Words,禁用词
-apps/erpnext/erpnext/stock/doctype/item/item.py +70,Item Code is mandatory because Item is not automatically numbered,项目代码是必须项，因为项目没有自动编号
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +103,Quotation {0} not of type {1},报价{0} 不属于{1}类型
+apps/erpnext/erpnext/stock/doctype/item/item.py +74,Item Code is mandatory because Item is not automatically numbered,项目代码是必须项，因为项目没有自动编号
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +102,Quotation {0} not of type {1},报价{0} 不属于{1}类型
DocType: Maintenance Schedule Item,Maintenance Schedule Item,维护计划物料
DocType: Sales Order,% Delivered,％已交付
apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,请设置学生的电子邮件ID以发送付款申请
@@ -4533,10 +4528,10 @@
DocType: Stock Settings,Item Naming By,物料命名字段
apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},在{1}之后另一个期间结束分录{0}已经被录入
DocType: Work Order,Material Transferred for Manufacturing,材料移送用于制造
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +51,Account {0} does not exists,科目{0}不存在
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1604,Select Loyalty Program,选择忠诚度计划
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Account {0} does not exists,科目{0}不存在
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1608,Select Loyalty Program,选择忠诚度计划
DocType: Project,Project Type,工程类型
-apps/erpnext/erpnext/projects/doctype/task/task.py +154,Child Task exists for this Task. You can not delete this Task.,子任务存在这个任务。你不能删除这个任务。
+apps/erpnext/erpnext/projects/doctype/task/task.py +157,Child Task exists for this Task. You can not delete this Task.,子任务存在这个任务。你不能删除这个任务。
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +17,Either target qty or target amount is mandatory.,需要指定目标数量和金额。
apps/erpnext/erpnext/config/projects.py +56,Cost of various activities,各种活动的费用
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}",设置活动为{0}，因为附连到下面的销售者的员工不具有用户ID {1}
@@ -4553,7 +4548,7 @@
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +101,Shipping rule only applicable for Buying,运费规则只适用于采购
DocType: Vital Signs,BMI,BMI
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 +144,Delivery warehouse required for stock item {0},物料{0}为库存管理物料，且在主数据中未定义默认仓库，请在销售订单行填写出货仓库信息
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +143,Delivery warehouse required for stock item {0},物料{0}为库存管理物料，且在主数据中未定义默认仓库，请在销售订单行填写出货仓库信息
DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),包装的毛重。通常是净重+包装材料的重量。 （用于打印）
DocType: Assessment Plan,Program,程序
DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,拥有此角色的用户可以设置冻结科目，创建/修改冻结科目的会计凭证
@@ -4571,22 +4566,21 @@
DocType: Setup Progress,Setup Progress,设置进度
DocType: Expense Claim,Approval Status,审批状态
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},行{0}的起始值必须小于去值
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +158,Wire Transfer,电汇
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Wire Transfer,电汇
apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +93,Check all,全选
,Issued Items Against Work Order,发料到工单
,BOM Stock Calculated,物料清单库存计算
DocType: Vehicle Log,Invoice Ref,发票编号
DocType: Company,Default Income Account,默认收入科目
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,客户群组/客户
apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Unclosed Fiscal Years Profit / Loss (Credit),未关闭的财年利润/损失
DocType: Sales Invoice,Time Sheets,时间表
DocType: Healthcare Service Unit Type,Change In Item,项目的更改
DocType: Payment Gateway Account,Default Payment Request Message,默认的付款申请消息
DocType: Retention Bonus,Bonus Amount,奖金金额
DocType: Item Group,Check this if you want to show in website,要在网站上展示，请勾选此项。
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +378,Balance ({0}),余额（{0}）
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +376,Balance ({0}),余额（{0}）
DocType: Loyalty Point Entry,Redeem Against,兑换
-apps/erpnext/erpnext/config/accounts.py +157,Banking and Payments,银行和支付
+apps/erpnext/erpnext/config/accounts.py +130,Banking and Payments,银行和支付
apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +99,Please enter API Consumer Key,请输入API使用者密钥
,Welcome to ERPNext,欢迎使用ERPNext
apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,从线索到报价
@@ -4630,16 +4624,15 @@
apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,暂无联系人。
DocType: Purchase Invoice Item,Landed Cost Voucher Amount,到岸成本凭证金额
,Item Balance (Simple),物料余额（简单）
-apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,供应商开出的账单
+apps/erpnext/erpnext/config/accounts.py +19,Bills raised by Suppliers.,供应商开出的账单
DocType: POS Profile,Write Off Account,销帐科目
DocType: Patient Appointment,Get prescribed procedures,获取规定的程序
DocType: Sales Invoice,Redemption Account,赎回账户
DocType: Purchase Invoice Item,Discount Amount,折扣金额
DocType: Purchase Invoice,Return Against Purchase Invoice,基于采购发票退货
DocType: Item,Warranty Period (in days),保修期限（天数）
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Failed to set defaults,无法设置默认值
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,与监护人1的关系
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +873,Please select BOM against item {0},请选择物料{0}的物料清单
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +879,Please select BOM against item {0},请选择物料{0}的物料清单
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js +18,Make Invoices,创建发票
DocType: Shopping Cart Settings,Show Stock Quantity,显示库存数量
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +77,Net Cash from Operations,从运营产生的净现金
@@ -4688,7 +4681,7 @@
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +555,Change POS Profile,更改POS配置文件
DocType: Bank Reconciliation Detail,Clearance Date,清帐日期
DocType: Delivery Settings,Dispatch Notification Template,派遣通知模板
-apps/erpnext/erpnext/stock/doctype/item/item.py +738,"Asset is already exists against the item {0}, you cannot change the has serial no value",资产已针对商品{0}存在，您无法更改已连续编号的值
+apps/erpnext/erpnext/stock/doctype/item/item.py +742,"Asset is already exists against the item {0}, you cannot change the has serial no value",资产已针对商品{0}存在，您无法更改已连续编号的值
apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +10,Assessment Report,评估报表
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +26,Get Employees,获得员工
apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Gross Purchase Amount is mandatory,总消费金额字段必填
@@ -4718,7 +4711,7 @@
DocType: BOM Explosion Item,Source Warehouse,源仓库
DocType: Installation Note,Installation Date,安装日期
apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Share Ledger
-apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},行＃{0}：资产{1}不属于公司{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Asset {1} does not belong to company {2},行＃{0}：资产{1}不属于公司{2}
apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,已创建销售发票{0}
DocType: Employee,Confirmation Date,确认日期
DocType: Inpatient Occupancy,Check Out,退出
@@ -4789,7 +4782,7 @@
DocType: Purchase Invoice,Terms,条款
apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,选择天数
DocType: Academic Term,Term Name,术语名称
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +372,Credit ({0}),信用（{0}）
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +370,Credit ({0}),信用（{0}）
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,创建工资单......
apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,您不能编辑根节点。
DocType: Buying Settings,Purchase Order Required,需要采购订单
@@ -4882,7 +4875,7 @@
DocType: Employee Transfer,Employee Transfer Details,员工转移信息
apps/erpnext/erpnext/selling/doctype/customer/customer.py +263,Please contact to the user who have Sales Master Manager {0} role,请联系，谁拥有硕士学位的销售经理{0}角色的用户
DocType: Company,Default Cash Account,默认现金科目
-apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,公司(非客户或供应商)主数据。
+apps/erpnext/erpnext/config/accounts.py +40,Company (not Customer or Supplier) master.,公司(非客户或供应商)主数据。
apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,基于该学生的考勤
apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +179,No Students in,没有学生
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +180,Add more items or open full form,添加更多项目或全开放形式
@@ -4906,7 +4899,6 @@
DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,比对物料采购价或库存评估价以验证物料的销售价格
DocType: Fee Schedule,Fee Schedule,收费表
DocType: Company,Create Chart Of Accounts Based On,基于...创建科目表
-apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,无法将其转换为非组。子任务存在。
apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Date of Birth cannot be greater than today.,出生日期不能大于今天。
,Stock Ageing,库存账龄
DocType: Travel Request,"Partially Sponsored, Require Partial Funding",部分赞助，需要部分资金
@@ -4916,7 +4908,7 @@
apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,批次：
DocType: Volunteer,Afternoon,下午
DocType: Loyalty Program,Loyalty Program Help,忠诚度计划帮助
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0}“{1}”被禁用
+apps/erpnext/erpnext/controllers/accounts_controller.py +315,{0} '{1}' is disabled,{0}“{1}”被禁用
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,设置为打开
DocType: Cheque Print Template,Scanned Cheque,支票扫描
DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,交易提交时自动向联系人发送电子邮件。
@@ -4929,13 +4921,13 @@
DocType: Warranty Claim,Item and Warranty Details,物料和保修
DocType: Chapter,Chapter Members,章节成员
DocType: Sales Team,Contribution (%),贡献（％）
-apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注意：“现金或银行科目”未指定，付款凭证不会创建
+apps/erpnext/erpnext/controllers/accounts_controller.py +143,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注意：“现金或银行科目”未指定，付款凭证不会创建
apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,工程{0}已经存在
DocType: Clinical Procedure,Nursing User,护理用户
DocType: Employee Benefit Application,Payroll Period,工资期间
DocType: Plant Analysis,Plant Analysis Criterias,植物分析标准
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},序列号{0}不属于批次{1}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,职责
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Responsibilities,职责
apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,此报价的有效期已经结束。
DocType: Expense Claim Account,Expense Claim Account,费用报销科目
DocType: Account,Capital Work in Progress,在途资本
@@ -4950,18 +4942,18 @@
DocType: Item,Safety Stock,安全库存
DocType: Healthcare Settings,Healthcare Settings,医疗设置
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html +8,Total Allocated Leaves,合计已分配休假天数
-apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,为任务进度百分比不能超过100个。
+apps/erpnext/erpnext/projects/doctype/task/task.py +57,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 +503,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 +507,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/assets/doctype/asset/asset.py +54,Item {0} must be a Fixed Asset Item,物料{0}必须被定义为是固定资产
apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +286,HSN,HSN
apps/erpnext/erpnext/stock/doctype/item/item.js +427,Make Variants,创建变量
DocType: Item,Default BOM,默认的BOM
DocType: Project,Total Billed Amount (via Sales Invoices),总可开票金额（通过销售发票）
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,借项金额
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +138,Debit Note Amount,借项金额
DocType: Project Update,Not Updated,未更新
apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +107,"There are inconsistencies between the rate, no of shares and the amount calculated",费率，股份数量和计算的金额之间不一致
apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +39,You are not present all day(s) between compensatory leave request days,您在补休请求日之间不是全天
@@ -4992,7 +4984,7 @@
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,学生地址
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,学生地址
DocType: Purchase Invoice,Price List Exchange Rate,价格清单汇率
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +116,All Supplier Groups,所有供应商组织
+apps/erpnext/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py +27,All Supplier Groups,所有供应商组织
DocType: Employee Boarding Activity,Required for Employee Creation,用于创建员工时
apps/erpnext/erpnext/accounts/doctype/account/account.py +214,Account Number {0} already used in account {1},已在帐户{1}中使用的帐号{0}
DocType: GoCardless Mandate,Mandate,要求
@@ -5000,11 +4992,11 @@
DocType: Hotel Room Reservation,Booked,已预订
DocType: Detected Disease,Tasks Created,创建的任务
DocType: Purchase Invoice Item,Rate,单价
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +107,Intern,实习生
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +82,Intern,实习生
DocType: Delivery Stop,Address Name,地址名称
DocType: Stock Entry,From BOM,来自物料清单
DocType: Assessment Code,Assessment Code,评估准则
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +76,Basic,基本
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +51,Basic,基本
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,早于{0}的库存事务已冻结
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',请点击“生成表”
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +154,Reference No is mandatory if you entered Reference Date,如果输入参考日期，参考编号是强制输入的
@@ -5017,7 +5009,7 @@
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,航空公司
apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +886,Issue Material,发料
apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,将Shopify与ERPNext连接
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1160,For Warehouse,仓库
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1161,For Warehouse,仓库
apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +92,Delivery Notes {0} updated,已更新交货单{0}
DocType: Employee,Offer Date,录用日期
apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,报价
@@ -5027,7 +5019,7 @@
DocType: Purchase Invoice Item,Serial No,序列号
apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,每月还款额不能超过贷款金额较大
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,请先输入客户拜访（维护）信息
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,行＃{0}：预计交货日期不能在采购订单日期之前
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +60,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,行＃{0}：预计交货日期不能在采购订单日期之前
DocType: Purchase Invoice,Print Language,打印语言
DocType: Salary Slip,Total Working Hours,总的工作时间
DocType: Sales Invoice,Customer PO Details,客户PO详细信息
@@ -5038,14 +5030,14 @@
DocType: Employee Tax Exemption Declaration Category,Employee Tax Exemption Declaration Category,员工免税申报类别
apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +451,All Territories,所有的区域
apps/erpnext/erpnext/hr/utils.py +216,Please set leave policy for employee {0} in Employee / Grade record,请在员工/成绩记录中为员工{0}设置休假政策
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1466,Invalid Blanket Order for the selected Customer and Item,无效框架订单对所选客户和物料无效
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1472,Invalid Blanket Order for the selected Customer and Item,无效框架订单对所选客户和物料无效
apps/erpnext/erpnext/projects/doctype/task/task_tree.js +49,Add Multiple Tasks,添加多个任务
DocType: Purchase Invoice,Items,物料
apps/erpnext/erpnext/crm/doctype/contract/contract.py +38,End Date cannot be before Start Date.,结束日期不能在开始日期之前。
apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +33,Student is already enrolled.,学生已经注册。
DocType: Fiscal Year,Year Name,年度名称
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +323,There are more holidays than working days this month.,本月假期比工作日多。
-apps/erpnext/erpnext/controllers/buying_controller.py +760,Following items {0} are not marked as {1} item. You can enable them as {1} item from its Item master,以下项{0}未标记为{1}项。您可以从项目主文件中将它们作为{1}项启用
+apps/erpnext/erpnext/controllers/buying_controller.py +772,Following items {0} are not marked as {1} item. You can enable them as {1} item from its Item master,以下项{0}未标记为{1}项。您可以从项目主文件中将它们作为{1}项启用
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +108,PDC/LC Ref,部分支付参考号码
DocType: Production Plan Item,Product Bundle Item,产品包物料
DocType: Sales Partner,Sales Partner Name,销售合作伙伴名称
@@ -5065,12 +5057,12 @@
DocType: Issue,Opening Time,开放时间
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +97,From and To dates required,必须指定起始和结束日期
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,证券及商品交易
-apps/erpnext/erpnext/stock/doctype/item/item.py +756,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',物料变体的默认单位“{0}”必须与模板默认单位一致“{1}”
+apps/erpnext/erpnext/stock/doctype/item/item.py +760,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',物料变体的默认单位“{0}”必须与模板默认单位一致“{1}”
DocType: Shipping Rule,Calculate Based On,基于...的计算
DocType: Contract,Unfulfilled,未完成的
DocType: Delivery Note Item,From Warehouse,源仓库
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,没有员工提到的标准
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1032,No Items with Bill of Materials to Manufacture,待生产物料没有物料清单
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1033,No Items with Bill of Materials to Manufacture,待生产物料没有物料清单
DocType: Shopify Settings,Default Customer,默认客户
DocType: Sales Stage,Stage Name,艺名
DocType: Warranty Claim,SER-WRN-.YYYY.-,SER-WRN-.YYYY.-
@@ -5082,7 +5074,7 @@
apps/erpnext/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner.py +59,User {0} is already assigned to Healthcare Practitioner {1},用户{0}已分配给Healthcare Practitioner {1}
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +187,Make Sample Retention Stock Entry,创建留存样品手工库存移动记录
DocType: Purchase Taxes and Charges,Valuation and Total,库存评估价与总计
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +321,Negotiation/Review,谈判/评论
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +226,Negotiation/Review,谈判/评论
DocType: Leave Encashment,Encashment Amount,折现金额
apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +11,Scorecards,记分卡
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +159,Expired Batches,过期批次
@@ -5106,14 +5098,14 @@
DocType: Payroll Entry,Payroll Frequency,工资发放频率
DocType: Lab Test Template,Sensitivity,灵敏度
apps/erpnext/erpnext/erpnext_integrations/doctype/amazon_mws_settings/amazon_methods.py +132,Sync has been temporarily disabled because maximum retries have been exceeded,暂时禁用了同步，因为已超出最大重试次数
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1014,Raw Material,原材料
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1015,Raw Material,原材料
DocType: Leave Application,Follow via Email,通过电子邮件关注
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,植物和机械设备
DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,税额折后金额
DocType: Patient,Inpatient Status,住院状况
DocType: Daily Work Summary Settings,Daily Work Summary Settings,每日工作总结设置
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,选定价格清单应该有买入和卖出的字段。
-apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,请输入按日期请求
+apps/erpnext/erpnext/controllers/buying_controller.py +693,Please enter Reqd by Date,请输入按日期请求
DocType: Payment Entry,Internal Transfer,内部转账
DocType: Asset Maintenance,Maintenance Tasks,维护任务
apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,需要指定目标数量和金额
@@ -5138,7 +5130,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +73,Queued for replacing the BOM. It may take a few minutes.,排队等待更换BOM。可能需要几分钟时间。
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +385,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',分类是“估值”或“估值和总计”的时候不能扣税。
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +286,Serial Nos Required for Serialized Item {0},序列化的物料{0}必须指定序列号
-apps/erpnext/erpnext/config/accounts.py +167,Match Payments with Invoices,匹配付款与发票
+apps/erpnext/erpnext/config/accounts.py +140,Match Payments with Invoices,匹配付款与发票
DocType: Journal Entry,Bank Entry,银行凭证
DocType: Authorization Rule,Applicable To (Designation),适用于(职位)
,Profitability Analysis,盈利能力分析
@@ -5148,7 +5140,7 @@
apps/erpnext/erpnext/templates/generators/item.html +96,Add to Cart,加入购物车
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,分组基于
DocType: Guardian,Interests,兴趣
-apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,启用/禁用货币。
+apps/erpnext/erpnext/config/accounts.py +266,Enable / disable currencies.,启用/禁用货币。
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,无法提交一些薪资单
DocType: Exchange Rate Revaluation,Get Entries,获取条目
DocType: Production Plan,Get Material Request,获取物料需求
@@ -5162,10 +5154,10 @@
apps/erpnext/erpnext/utilities/activation.py +135,Create Employee Records,建立员工档案
apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +97,Total Present,总现
DocType: Work Order,MFG-WO-.YYYY.-,MFG-WO-.YYYY.-
-apps/erpnext/erpnext/config/accounts.py +122,Accounting Statements,会计报表
+apps/erpnext/erpnext/config/accounts.py +83,Accounting Statements,会计报表
DocType: Drug Prescription,Hour,小时
DocType: Restaurant Order Entry,Last Sales Invoice,上次销售发票
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +875,Please select Qty against item {0},请选择为物料{0}指定数量
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +881,Please select Qty against item {0},请选择为物料{0}指定数量
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +33,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 +183,You are not authorized to approve leaves on Block Dates,您无权批准锁定日期内的休假
@@ -5178,7 +5170,7 @@
DocType: Item,Default Material Request Type,默认物料申请类型
DocType: Supplier Scorecard,Evaluation Period,评估期
apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,未知
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1031,Work Order not created,工单未创建
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1032,Work Order not created,工单未创建
apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +36,"An amount of {0} already claimed for the component {1},\
set the amount equal or greater than {2}",已为组件{1}申请的金额{0}，设置等于或大于{2}的金额
DocType: Shipping Rule,Shipping Rule Conditions,配送规则条件
@@ -5311,7 +5303,7 @@
DocType: Subscription Settings,Grace Period,宽限期
DocType: Item Alternative,Alternative Item Name,替代物料名称
apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,父项{0}不能是库存产品
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +187,Website Listing,网站列表
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +164,Website Listing,网站列表
apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,所有的产品或服务。
DocType: Email Digest,Open Quotations,打开报价单
DocType: Expense Claim,More Details,更多信息
@@ -5339,10 +5331,10 @@
DocType: Project Update,Problematic/Stuck,问题/卡住
DocType: Tax Rule,Billing State,计费状态
DocType: Share Transfer,Transfer,转移
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +264,Work Order {0} must be cancelled before cancelling this Sales Order,在取消此销售订单之前，必须先取消工单{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Work Order {0} must be cancelled before cancelling this Sales Order,在取消此销售订单之前，必须先取消工单{0}
apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +1008,Fetch exploded BOM (including sub-assemblies),获取展开BOM（包括子物料）
DocType: Authorization Rule,Applicable To (Employee),适用于(员工)
-apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,截止日期字段必填
+apps/erpnext/erpnext/controllers/accounts_controller.py +180,Due Date is mandatory,截止日期字段必填
apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,增量属性{0}不能为0
DocType: Employee Benefit Claim,Benefit Type and Amount,福利类型和金额
apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,客房预订
@@ -5356,7 +5348,7 @@
DocType: Disease,Treatment Period,治疗期
DocType: Travel Itinerary,Travel Itinerary,出差行程
apps/erpnext/erpnext/education/api.py +336,Result already Submitted,结果已提交
-apps/erpnext/erpnext/controllers/buying_controller.py +197,Reserved Warehouse is mandatory for Item {0} in Raw Materials supplied,发给供应供应商的原物料{0}其保留仓库字段必填
+apps/erpnext/erpnext/controllers/buying_controller.py +209,Reserved Warehouse is mandatory for Item {0} in Raw Materials supplied,发给供应供应商的原物料{0}其保留仓库字段必填
,Inactive Customers,非活跃客户
DocType: Student Admission Program,Maximum Age,最大年龄
apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +28,Please wait 3 days before resending the reminder.,请重新发送提醒之前请等待3天。
@@ -5395,7 +5387,7 @@
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +197,Invoice {0} no longer exists,发票{0}不再存在
DocType: Guardian Interest,Guardian Interest,监护人利益
DocType: Volunteer,Availability,可用性
-apps/erpnext/erpnext/config/accounts.py +357,Setup default values for POS Invoices,设置POS发票的默认值
+apps/erpnext/erpnext/config/accounts.py +544,Setup default values for POS Invoices,设置POS发票的默认值
apps/erpnext/erpnext/config/hr.py +248,Training,培训
DocType: Project,Time to send,发送时间
DocType: Timesheet,Employee Detail,员工详细信息
@@ -5447,7 +5439,7 @@
DocType: GL Entry,Is Advance,是否预付款
apps/erpnext/erpnext/config/hr.py +202,Employee Lifecycle,员工生命周期
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 +184,Please enter 'Is Subcontracted' as Yes or No,请输入'转包' YES或NO
+apps/erpnext/erpnext/controllers/buying_controller.py +196,Please enter 'Is Subcontracted' as Yes or No,请输入'转包' YES或NO
DocType: Item,Default Purchase Unit of Measure,默认采购单位
apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,最后通讯日期
DocType: Clinical Procedure Item,Clinical Procedure Item,临床流程项目
@@ -5490,7 +5482,7 @@
DocType: Purchase Invoice Item,Total Weight,总重量
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,销售佣金
DocType: Job Offer Term,Value / Description,值/说明
-apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",行＃{0}：资产{1}无法提交，这已经是{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +706,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",行＃{0}：资产{1}无法提交，这已经是{2}
DocType: Tax Rule,Billing Country,结算国家
DocType: Purchase Order Item,Expected Delivery Date,预计交货日期
DocType: Restaurant Order Entry,Restaurant Order Entry,餐厅订单录入
@@ -5502,7 +5494,7 @@
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +98,Make Material Request,创建材料需求
apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},打开物料{0}
DocType: Asset Finance Book,Written Down Value,账面净值
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +234,Sales Invoice {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消销售发票{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +235,Sales Invoice {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消销售发票{0}
DocType: Clinical Procedure,Age,账龄
DocType: Sales Invoice Timesheet,Billing Amount,开票金额
DocType: Cash Flow Mapping,Select Maximum Of 1,选择最多1个
@@ -5514,7 +5506,7 @@
DocType: Vehicle,Last Carbon Check,最后炭检查
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Legal Expenses,法律费用
apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +147,Please select quantity on row ,请选择行数量
-apps/erpnext/erpnext/config/accounts.py +315,Make Opening Sales and Purchase Invoices,创建开放的销售和采购发票
+apps/erpnext/erpnext/config/accounts.py +245,Make Opening Sales and Purchase Invoices,创建开放的销售和采购发票
DocType: Purchase Invoice,Posting Time,记帐时间
DocType: Timesheet,% Amount Billed,（％）金额帐单
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +125,Telephone Expenses,电话费
@@ -5529,7 +5521,7 @@
DocType: Maintenance Visit,Breakdown,细目
DocType: Travel Itinerary,Vegetarian,素食者
DocType: Patient Encounter,Encounter Date,遇到日期
-apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,帐号：{0}币种：{1}不能选择
+apps/erpnext/erpnext/controllers/accounts_controller.py +907,Account: {0} with currency: {1} can not be selected,帐号：{0}币种：{1}不能选择
DocType: Bank Statement Transaction Settings Item,Bank Data,银行数据
DocType: Purchase Receipt Item,Sample Quantity,样品数量
DocType: Bank Guarantee,Name of Beneficiary,受益人姓名
@@ -5538,19 +5530,20 @@
DocType: Bank Reconciliation Detail,Cheque Date,支票日期
apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},科目{0}的上级科目{1}不属于公司{2}
apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,成功删除与该公司相关的所有交易！
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +39,As on Date,截至日期
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +22,As on Date,截至日期
DocType: Additional Salary,HR,HR
DocType: Program Enrollment,Enrollment Date,报名日期
DocType: Healthcare Settings,Out Patient SMS Alerts,不住院病人短信
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Probation,试用
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +78,Probation,试用
DocType: Program Enrollment Tool,New Academic Year,新学年
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +866,Return / Credit Note,退货/退款单
DocType: Stock Settings,Auto insert Price List rate if missing,如果价格清单中不存在该单价则自动插入
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,已支付总金额
+apps/erpnext/erpnext/public/js/controllers/transaction.js +322, does not exist!,不存在！
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +137,Total Paid Amount,已支付总金额
DocType: GST Settings,B2C Limit,B2C限制
DocType: Job Card,Transferred Qty,已发料数量
apps/erpnext/erpnext/config/learn.py +11,Navigating,导航
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +164,Planning,规划
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +141,Planning,规划
DocType: Contract,Signee,签署人
DocType: Share Balance,Issued,发行
DocType: Loan,Repayment Start Date,还款开始日期
@@ -5606,10 +5599,10 @@
apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,向潜在客户或客户发出的报价。
DocType: Stock Settings,Role Allowed to edit frozen stock,可以编辑冻结库存的角色
,Territory Target Variance Item Group-Wise,按物料组的区域目标差异
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,所有客户群组
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,All Customer Groups,所有客户群组
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,每月累计
DocType: Attendance Request,On Duty,值班
-apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}是必填项。{1}和{2}的货币转换记录可能还未生成。
+apps/erpnext/erpnext/controllers/accounts_controller.py +864,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}是必填项。{1}和{2}的货币转换记录可能还未生成。
apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},委派{1}的人员配置计划{0}已存在
apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,税务模板字段必填。
apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,科目{0}的上级科目{1}不存在
@@ -5617,22 +5610,22 @@
DocType: Purchase Invoice Item,Price List Rate (Company Currency),价格清单单价（公司货币）
DocType: Products Settings,Products Settings,产品设置
,Item Price Stock,物料价格与库存
-apps/erpnext/erpnext/config/accounts.py +50,To make Customer based incentive schemes.,制定基于客户的激励计划。
+apps/erpnext/erpnext/config/accounts.py +550,To make Customer based incentive schemes.,制定基于客户的激励计划。
DocType: Lab Prescription,Test Created,测试已创建
DocType: Healthcare Settings,Custom Signature in Print,自定义签名打印
DocType: Account,Temporary,临时
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,客户采购订单号
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +127,Customer LPO No.,客户采购订单号
DocType: Amazon MWS Settings,Market Place Account Group,市场账户组
apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js +14,Make Payment Entries,创建付款条目
DocType: Program,Courses,课程
DocType: Monthly Distribution Percentage,Percentage Allocation,核销百分比
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Secretary,秘书
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +91,Secretary,秘书
apps/erpnext/erpnext/regional/india/utils.py +177,House rented dates required for exemption calculation,用于豁免计算的房子租用天数
DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction",如果禁用“，在词”字段不会在任何交易可见
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,此操作将停止未来的结算。您确定要取消此订阅吗？
DocType: Serial No,Distinct unit of an Item,物料的不同的计量单位
DocType: Supplier Scorecard Criteria,Criteria Name,标准名称
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1387,Please set Company,请设公司
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.js +406,Please set Company,请设公司
DocType: Procedure Prescription,Procedure Created,程序已创建
DocType: Pricing Rule,Buying,采购
apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,疾病与肥料
@@ -5643,19 +5636,19 @@
,Reqd By Date,需求日期
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +147,Creditors,债权人
DocType: Assessment Plan,Assessment Name,评估名称
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +101,Show PDC in Print,在打印中显示部分支付
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +107,Show PDC in Print,在打印中显示部分支付
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,行＃{0}：序列号是必需的
DocType: Purchase Taxes and Charges,Item Wise Tax Detail,物料税/费信息
DocType: Employee Onboarding,Job Offer,工作机会
apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,机构缩写
,Item-wise Price List Rate,物料价格清单单价
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1156,Supplier Quotation,供应商报价
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1157,Supplier Quotation,供应商报价
DocType: Quotation,In Words will be visible once you save the Quotation.,大写金额将在报价单保存后显示。
apps/erpnext/erpnext/utilities/transaction_base.py +169,Quantity ({0}) cannot be a fraction in row {1},数量（{0}）不能是行{1}中的分数
apps/erpnext/erpnext/utilities/transaction_base.py +169,Quantity ({0}) cannot be a fraction in row {1},数量（{0}）不能是行{1}中的分数
DocType: Contract,Unsigned,无符号
DocType: Selling Settings,Each Transaction,每笔交易
-apps/erpnext/erpnext/stock/doctype/item/item.py +519,Barcode {0} already used in Item {1},条码{0}已被物料{1}使用
+apps/erpnext/erpnext/stock/doctype/item/item.py +523,Barcode {0} already used in Item {1},条码{0}已被物料{1}使用
apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,规则增加运输成本。
DocType: Hotel Room,Extra Bed Capacity,加床容量
apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +72,Varaiance ,变量
@@ -5723,7 +5716,7 @@
DocType: Account,Debit,借方
apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +63,Leaves must be allocated in multiples of 0.5,假期天数必须为0.5的倍数
DocType: Work Order,Operation Cost,运营成本
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +318,Identifying Decision Makers,确定决策者
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +223,Identifying Decision Makers,确定决策者
apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +47,Outstanding Amt,未付金额
DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,为该销售人员设置目标物料组别
DocType: Stock Settings,Freeze Stocks Older Than [Days],冻结库存超出此天数的
@@ -5736,12 +5729,12 @@
DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,允许以下用户批准在禁离日请假的申请。
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +30,Lifecycle,生命周期
apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +142,Make BOM,制作BOM
-apps/erpnext/erpnext/controllers/selling_controller.py +158,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},项目{0}的销售价格低于其{1}。售价应至少为{2}
-apps/erpnext/erpnext/controllers/selling_controller.py +158,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},项目{0}的销售价格低于其{1}。售价应至少为{2}
+apps/erpnext/erpnext/controllers/selling_controller.py +161,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},项目{0}的销售价格低于其{1}。售价应至少为{2}
+apps/erpnext/erpnext/controllers/selling_controller.py +161,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},项目{0}的销售价格低于其{1}。售价应至少为{2}
DocType: Subscription,Taxes,税
DocType: Purchase Invoice,capital goods,资本货物
DocType: Purchase Invoice Item,Weight Per Unit,每单位重量
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +357,Paid and Not Delivered,已支付但未送达
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +363,Paid and Not Delivered,已支付但未送达
DocType: QuickBooks Migrator,Default Cost Center,默认成本中心
apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,库存交易
DocType: Budget,Budget Accounts,预算科目
@@ -5754,7 +5747,7 @@
DocType: Employee Advance,Due Advance Amount,到期金额
DocType: Maintenance Visit,Customer Feedback,客户反馈
DocType: Account,Expense,费用
-apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.js +42,Score cannot be greater than Maximum Score,分数不能超过最高得分更大
+apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.js +48,Score cannot be greater than Maximum Score,分数不能超过最高得分更大
DocType: Support Search Source,Source Type,来源类型
apps/erpnext/erpnext/utilities/user_progress.py +129,Customers and Suppliers,客户和供应商
DocType: Item Attribute,From Range,从范围
@@ -5774,7 +5767,7 @@
,Employee Information,员工资料
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +242,Healthcare Practitioner not available on {0},医疗从业者在{0}上不可用
DocType: Stock Entry Detail,Additional Cost,额外费用
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +59,"Can not filter based on Voucher No, if grouped by Voucher",按凭证分类后不能根据凭证编号过滤
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +57,"Can not filter based on Voucher No, if grouped by Voucher",按凭证分类后不能根据凭证编号过滤
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +975,Make Supplier Quotation,创建供应商报价
DocType: Quality Inspection,Incoming,来料检验
apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,销售和采购的默认税收模板被创建。
@@ -5786,7 +5779,7 @@
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +68,Posting Date cannot be future date,记帐日期不能是未来的日期
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Row # {0}: Serial No {1} does not match with {2} {3},行＃{0}：序列号{1}不相匹配{2} {3}
DocType: Stock Entry,Target Warehouse Address,目标仓库地址
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +89,Casual Leave,事假
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +64,Casual Leave,事假
DocType: Agriculture Task,End Day,结束日期
DocType: Batch,Batch ID,批次ID
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,Note: {0},注： {0}
@@ -5813,7 +5806,7 @@
DocType: Material Request,% Ordered,% 已排序
DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",对于基于课程的学生组，课程将从入学课程中的每个学生确认。
DocType: Employee Grade,Employee Grade,员工职级
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +106,Piecework,计件工作
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +81,Piecework,计件工作
apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,平均买入价
DocType: Share Balance,From No,来自No
DocType: Task,Actual Time (in Hours),实际时间（小时）
@@ -5828,7 +5821,7 @@
DocType: Share Balance,Is Company,是公司？
DocType: Stock Ledger Entry,Stock Ledger Entry,库存分类帐分录
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +190,{0} on Half day Leave on {1},半天{0}离开{1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +88,Same item has been entered multiple times,同一物料重复输入了多次（不同的行）
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,同一物料重复输入了多次（不同的行）
DocType: Department,Leave Block List,禁止休假日列表
DocType: Purchase Invoice,Tax ID,纳税登记号
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Item {0} is not setup for Serial Nos. Column must be blank,项目{0}没有启用序列好管理功能，序列号必须留空
@@ -5845,12 +5838,12 @@
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",所有项目合计{0}为零，可能你应该改变“基于分布式费用”
apps/erpnext/erpnext/hr/utils.py +152,To date can not be less than from date,迄今为止不能少于起始日期
DocType: Opportunity,To Discuss,待讨论
-apps/erpnext/erpnext/stock/stock_ledger.py +378,{0} units of {1} needed in {2} to complete this transaction.,{0}单位{1}在{2}完成此交易所需。
+apps/erpnext/erpnext/stock/stock_ledger.py +382,{0} units of {1} needed in {2} to complete this transaction.,{0}单位{1}在{2}完成此交易所需。
DocType: Loan Type,Rate of Interest (%) Yearly,利息率的比例（％）年
DocType: Support Settings,Forum URL,论坛URL
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +75,Temporary Accounts,临时科目
apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +40,Source Location is required for the asset {0},源位置对资产{0}是必需的
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Black,黑
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +159,Black,黑
DocType: BOM Explosion Item,BOM Explosion Item,BOM展开物料
DocType: Shareholder,Contact List,联系人列表
DocType: Account,Auditor,审计员
@@ -5868,12 +5861,12 @@
DocType: Leave Type,Maximum Continuous Days Applicable,单次最长连续休假天数
apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1}未注册批次{2}
apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +118,"Asset {0} cannot be scrapped, as it is already {1}",资产{0}不能被废弃，因为它已经是{1}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,需要的支票
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +93,Cheques Required,需要的支票
DocType: Task,Total Expense Claim (via Expense Claim),总费用报销（通过费用报销）
apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,标记为缺勤
DocType: Job Applicant Source,Job Applicant Source,求职者来源
apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +328,IGST Amount,IGST金额
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,未能设立公司
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +41,Failed to setup company,未能设立公司
DocType: Asset Repair,Asset Repair,资产修复
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +155,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,汇率
@@ -5919,7 +5912,7 @@
DocType: BOM Scrap Item,BOM Scrap Item,物料清单废料
apps/erpnext/erpnext/accounts/page/pos/pos.js +906,Submitted orders can not be deleted,提交的订单不能被删除
apps/erpnext/erpnext/accounts/doctype/account/account.py +121,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",账户余额已设置为'借方'，不能设置为'贷方'
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +360,Quality Management,质量管理
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +391,Quality Management,质量管理
apps/erpnext/erpnext/assets/doctype/asset/asset.py +52,Item {0} has been disabled,物料{0}已被禁用
DocType: Project,Total Billable Amount (via Timesheets),总可计费用金额（通过工时单）
DocType: Agriculture Task,Previous Business Day,前一个营业日
@@ -5931,6 +5924,7 @@
DocType: Employee External Work History,Employee External Work History,员工外部就职经历
apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +691,Job card {0} created,已创建作业卡{0}
DocType: Opening Invoice Creation Tool,Purchase,采购
+apps/erpnext/erpnext/public/js/controllers/transaction.js +285, Created,创建于
apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,结余数量
apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +20,Goals cannot be empty,目标不能为空
apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +18,Enrolling students,招收学生
@@ -5942,7 +5936,7 @@
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,重新启动订阅
DocType: Linked Plant Analysis,Linked Plant Analysis,链接的工厂分析
apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +358,Transporter ID,承运商ID
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +317,Value Proposition,价值主张
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +222,Value Proposition,价值主张
DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,供应商的货币转换为公司的本币后的单价
DocType: Purchase Invoice Item,Service End Date,服务结束日期
apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},行＃{0}：与排时序冲突{1}
@@ -5950,7 +5944,7 @@
DocType: Purchase Invoice Item,Allow Zero Valuation Rate,允许评估价为0
DocType: Bank Guarantee,Receiving,接收
DocType: Training Event Employee,Invited,已邀请
-apps/erpnext/erpnext/config/accounts.py +346,Setup Gateway accounts.,设置网关科目。
+apps/erpnext/erpnext/config/accounts.py +276,Setup Gateway accounts.,设置网关科目。
DocType: Employee,Employment Type,员工类别
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,固定资产
DocType: Payment Entry,Set Exchange Gain / Loss,设置汇兑损益
@@ -5974,14 +5968,14 @@
apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},默认情况下存在的活动类型的作业成本活动类型 - {0}
DocType: Work Order,Planned Operating Cost,计划运营成本
DocType: Academic Term,Term Start Date,条款起始日期
-apps/erpnext/erpnext/config/accounts.py +515,List of all share transactions,所有股份交易清单
+apps/erpnext/erpnext/config/accounts.py +440,List of all share transactions,所有股份交易清单
DocType: Supplier,Is Transporter,是运输方
DocType: Shopify Settings,Import Sales Invoice from Shopify if Payment is marked,如果付款已标记，则从Shopify导入销售发票
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,商机计数
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,商机计数
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,必须设置试用期开始日期和试用期结束日期
apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,平均率
-apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,支付计划中的总付款金额必须等于总计/圆整的总计
+apps/erpnext/erpnext/controllers/accounts_controller.py +808,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,支付计划中的总付款金额必须等于总计/圆整的总计
DocType: Subscription Plan Detail,Plan,计划
apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,基于总帐的银行对账单余额
DocType: Job Applicant,Applicant Name,申请人姓名
@@ -6020,7 +6014,7 @@
DocType: Workstation,per hour,每小时
DocType: Blanket Order,Purchasing,采购
DocType: Announcement,Announcement,公告
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +129,Customer LPO,客户采购订单号
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +130,Customer LPO,客户采购订单号
DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.",对于基于批次的学生组，学生批次将由课程注册中的每位学生进行验证。
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +51,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,无法删除，因为此仓库有库存分类账分录。
apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,分配
@@ -6028,20 +6022,20 @@
DocType: Expense Claim Advance,Expense Claim Advance,费用报销预付款
DocType: Lab Test,Report Preference,报表偏好
apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,志愿者信息。
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Project Manager,工程经理
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +96,Project Manager,工程经理
,Quoted Item Comparison,项目报价比较
apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},{0}和{1}之间的得分重叠
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +356,Dispatch,调度
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +387,Dispatch,调度
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +75,Max discount allowed for item: {0} is {1}%,物料{0}的最大折扣为 {1}%
apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +191,Net Asset value as on,净资产值作为
DocType: Crop,Produce,生产
DocType: Hotel Settings,Default Taxes and Charges,默认税费
DocType: Account,Receivable,应收账款
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +321,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,行＃{0}：不能更改供应商的采购订单已经存在
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +325,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,行＃{0}：不能更改供应商的采购订单已经存在
DocType: Stock Entry,Material Consumption for Manufacture,生产所需的材料消耗
DocType: Item Alternative,Alternative Item Code,替代物料代码
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 +1067,Select Items to Manufacture,选择待生产物料
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1068,Select Items to Manufacture,选择待生产物料
DocType: Delivery Stop,Delivery Stop,交付停止
apps/erpnext/erpnext/accounts/page/pos/pos.js +974,"Master data syncing, it might take some time",主数据同步，这可能需要一些时间
DocType: Item,Material Issue,发料
@@ -6085,6 +6079,7 @@
apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,在提交之前输入银行或贷款机构的名称。
apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,必须提交{0}
DocType: POS Profile,Item Groups,物料组
+DocType: Company,Standard Working Hours,标准工作时长（小时）
DocType: Sales Order Item,For Production,生产
DocType: Payment Request,payment_url,支付_链接
DocType: Exchange Rate Revaluation Account,Balance In Account Currency,科目币别余额
@@ -6106,7 +6101,7 @@
DocType: Production Plan,Include Subcontracted Items,包括转包物料
apps/erpnext/erpnext/projects/doctype/project/project.py +281,Join,加入
apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +81,Shortage Qty,短缺数量
-apps/erpnext/erpnext/stock/doctype/item/item.py +788,Item variant {0} exists with same attributes,相同属性物料变体{0}已存在
+apps/erpnext/erpnext/stock/doctype/item/item.py +792,Item variant {0} exists with same attributes,相同属性物料变体{0}已存在
DocType: Loan,Repay from Salary,从工资偿还
apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +405,Requesting payment against {0} {1} for amount {2},请求对付款{0} {1}量{2}
DocType: Additional Salary,Salary Slip,工资单
@@ -6134,7 +6129,7 @@
DocType: Assessment Result Detail,Assessment Result Detail,评价结果详细
DocType: Employee Education,Employee Education,员工教育
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,在物料组中有重复物料组
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1241,It is needed to fetch Item Details.,需要获取物料详细信息。
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1247,It is needed to fetch Item Details.,需要获取物料详细信息。
DocType: Fertilizer,Fertilizer Name,肥料名称
DocType: Salary Slip,Net Pay,净支付金额
DocType: Cash Flow Mapping Accounts,Account,科目
@@ -6150,7 +6145,7 @@
apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,销售的潜在机会
DocType: Shareholder,Folio no.,对开本页码.
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +251,Invalid {0},无效的{0}
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +93,Sick Leave,病假
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +68,Sick Leave,病假
DocType: Email Digest,Email Digest,邮件摘要
DocType: Delivery Note,Billing Address Name,帐单地址名称
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +22,Department Stores,百货
@@ -6176,7 +6171,7 @@
DocType: Purchase Invoice Item,Service Stop Date,服务停止日期
apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,最后订单金额
DocType: Cash Flow Mapper,e.g Adjustments for:,例如调整：
-apps/erpnext/erpnext/stock/doctype/item/item.py +300," {0} Retain Sample is based on batch, please check Has Batch No to retain sample of item",{0}保留样品基于批次，请检查有批次否保留样品
+apps/erpnext/erpnext/stock/doctype/item/item.py +304," {0} Retain Sample is based on batch, please check Has Batch No to retain sample of item",{0}保留样品基于批次，请检查有批次否保留样品
DocType: Task,Is Milestone,是里程碑
DocType: Certification Application,Yet to appear,尚未出现
DocType: Delivery Stop,Email Sent To,电子邮件发送给
@@ -6191,14 +6186,14 @@
DocType: Subscription Plan,Payment Plan,付款计划
DocType: Shopping Cart Settings,Enable purchase of items via the website,通过网站启用采购项目
apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +296,Currency of the price list {0} must be {1} or {2},价格清单{0}的货币必须是{1}或{2}
-apps/erpnext/erpnext/config/accounts.py +532,Subscription Management,订阅管理
+apps/erpnext/erpnext/config/accounts.py +561,Subscription Management,订阅管理
DocType: Appraisal,Appraisal Template,评估模板
apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +255,To Pin Code,要密码
DocType: Soil Texture,Ternary Plot,三元剧情
DocType: Amazon MWS Settings,Check this to enable a scheduled Daily synchronization routine via scheduler,选中此选项可通过调度程序启用计划的每日同步例程
DocType: Item Group,Item Classification,物料分类
DocType: Driver,License Number,许可证号
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Business Development Manager,业务发展经理
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +94,Business Development Manager,业务发展经理
DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,维护访问目的
apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,发票患者登记
DocType: Crop,Period,期
@@ -6225,7 +6220,7 @@
DocType: Certification Application,Name of Applicant,申请人名称
apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,制造方面的时间表。
apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,小计
-apps/erpnext/erpnext/stock/doctype/item/item.py +727,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,存货业务发生后不能更改变体物料的属性。需要新建新物料。
+apps/erpnext/erpnext/stock/doctype/item/item.py +731,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,存货业务发生后不能更改变体物料的属性。需要新建新物料。
apps/erpnext/erpnext/config/integrations.py +18,GoCardless SEPA Mandate,GoCardless SEPA授权
DocType: Healthcare Practitioner,Charges,费用
DocType: Production Plan,Get Items For Work Order,为工单获取物料
@@ -6237,7 +6232,7 @@
apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`冻结老于此天数的库存`应该比％d天小。
DocType: Tax Rule,Purchase Tax Template,进项税模板
apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,为您的公司设定您想要实现的销售目标。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1549,Healthcare Services,医疗服务
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1553,Healthcare Services,医疗服务
,Project wise Stock Tracking,工程级库存追踪
DocType: GST HSN Code,Regional,区域性
apps/erpnext/erpnext/config/healthcare.py +50,Laboratory,实验室
@@ -6246,7 +6241,7 @@
DocType: Item Customer Detail,Ref Code,参考代码
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +75,Customer Group is Required in POS Profile,POS Profile中需要客户组
DocType: HR Settings,Payroll Settings,薪资设置
-apps/erpnext/erpnext/config/accounts.py +169,Match non-linked Invoices and Payments.,匹配无链接的发票和付款。
+apps/erpnext/erpnext/config/accounts.py +142,Match non-linked Invoices and Payments.,匹配无链接的发票和付款。
DocType: POS Settings,POS Settings,POS设置
apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,下订单
DocType: Email Digest,New Purchase Orders,新建采购订单
@@ -6272,7 +6267,7 @@
apps/erpnext/erpnext/accounts/doctype/account/account.py +53,Account {0}: You can not assign itself as parent account,科目{0}不能是自己的上级科目
DocType: Purchase Invoice Item,Price List Rate,价格清单单价
apps/erpnext/erpnext/utilities/activation.py +72,Create customer quotes,创建客户报价
-apps/erpnext/erpnext/public/js/controllers/transaction.js +879,Service Stop Date cannot be after Service End Date,服务停止日期不能在服务结束日期之后
+apps/erpnext/erpnext/public/js/controllers/transaction.js +885,Service Stop Date cannot be after Service End Date,服务停止日期不能在服务结束日期之后
DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",根据此仓库显示“有库存”或“无库存”状态。
apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),物料清单(BOM)
DocType: Item,Average time taken by the supplier to deliver,供应商交货时间的平均值
@@ -6284,7 +6279,7 @@
apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,小时
DocType: Project,Expected Start Date,预计开始日期
DocType: Purchase Invoice,04-Correction in Invoice,04-发票纠正
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1040,Work Order already created for all items with BOM,已经为包含物料清单的所有料品创建工单
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1041,Work Order already created for all items with BOM,已经为包含物料清单的所有料品创建工单
DocType: Payment Request,Party Details,往来单位详细信息
apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant Details Report,变量详细信息报表
DocType: Setup Progress Action,Setup Progress Action,设置进度动作
@@ -6306,11 +6301,11 @@
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 +537,Row {0}: An Reorder entry already exists for this warehouse {1},第{0}行：仓库{1}中已存在重订货记录
+apps/erpnext/erpnext/stock/doctype/item/item.py +541,Row {0}: An Reorder entry already exists for this warehouse {1},第{0}行：仓库{1}中已存在重订货记录
apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.",已有报价的情况下，不能更改状态为遗失。
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,CWIP Account,CWIP账户
apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,培训反馈
-apps/erpnext/erpnext/config/accounts.py +211,Tax Withholding rates to be applied on transactions.,税收预扣税率适用于交易。
+apps/erpnext/erpnext/config/accounts.py +184,Tax Withholding rates to be applied on transactions.,税收预扣税率适用于交易。
DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,供应商记分卡标准
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},请选择开始日期和结束日期的项目{0}
DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-
@@ -6345,7 +6340,7 @@
DocType: Purchase Invoice Item,Amount (Company Currency),金额（公司货币）
DocType: Agriculture Analysis Criteria,Agriculture User,农业用户
apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Valid till date cannot be before transaction date,有效期至日期不得在交易日之前
-apps/erpnext/erpnext/stock/stock_ledger.py +382,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} {1}在需要{2}在{3} {4}：{5}来完成这一交易单位。
+apps/erpnext/erpnext/stock/stock_ledger.py +386,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} {1}在需要{2}在{3} {4}：{5}来完成这一交易单位。
DocType: Fee Schedule,Student Category,学生组
DocType: Announcement,Student,学生
apps/erpnext/erpnext/healthcare/doctype/clinical_procedure/clinical_procedure.js +98,Stock quantity to start procedure is not available in the warehouse. Do you want to record a Stock Transfer,仓库中不提供开始操作的库存数量。你想记录股票转移吗？
@@ -6356,7 +6351,7 @@
apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +79,Please enter message before sending,在发送前，请填写留言
DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,供应商副本
DocType: Asset,Custodian,保管人
-apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,POS配置
+apps/erpnext/erpnext/config/accounts.py +543,Point-of-Sale Profile,POS配置
apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0}应该是0到100之间的一个值
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},从{1}到{2}的{0}付款
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,无担保贷款
@@ -6389,10 +6384,10 @@
DocType: Item,Has Serial No,有序列号
DocType: Employee,Date of Issue,签发日期
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"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 +174,Row #{0}: Set Supplier for item {1},行＃{0}：设置供应商项目{1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +173,Row #{0}: Set Supplier for item {1},行＃{0}：设置供应商项目{1}
DocType: Global Defaults,Default Distance Unit,默认距离单位
apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Hours value must be greater than zero.,行{0}：小时值必须大于零。
-apps/erpnext/erpnext/stock/doctype/item/item.py +220,Website Image {0} attached to Item {1} cannot be found,网站图像{0}附加到物料{1}无法找到
+apps/erpnext/erpnext/stock/doctype/item/item.py +224,Website Image {0} attached to Item {1} cannot be found,网站图像{0}附加到物料{1}无法找到
DocType: Issue,Content Type,内容类型
DocType: Asset,Assets,资产
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,电脑
@@ -6421,7 +6416,7 @@
,Average Commission Rate,平均佣金率
DocType: Share Balance,No of Shares,股份数目
DocType: Taxable Salary Slab,To Amount,金额(止)
-apps/erpnext/erpnext/stock/doctype/item/item.py +475,'Has Serial No' can not be 'Yes' for non-stock item,不能为非库存物料勾选'是否有序列号'
+apps/erpnext/erpnext/stock/doctype/item/item.py +479,'Has Serial No' can not be 'Yes' for non-stock item,不能为非库存物料勾选'是否有序列号'
apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,选择状态
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance can not be marked for future dates,考勤不能选未来的日期
DocType: Support Search Source,Post Description Key,发布说明密钥
@@ -6431,7 +6426,7 @@
DocType: Opportunity,Sales Stage,销售阶段
DocType: Purchase Taxes and Charges,Account Head,帐号头
DocType: Company,HRA Component,HRA组件
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +142,Electrical,电气
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Electrical,电气
apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,添加您的组织的其余部分用户。您还可以添加邀请客户到您的门户网站通过从联系人中添加它们
DocType: Stock Entry,Total Value Difference (Out - In),总价值差（输出 - ）
DocType: Grant Application,Requested Amount,请求金额
@@ -6464,7 +6459,7 @@
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Salary Slip of employee {0} already created for time sheet {1},工时单{1}的员工{0}工资单已创建
DocType: Vehicle Log,Odometer,里程表
DocType: Production Plan Item,Ordered Qty,订单数量
-apps/erpnext/erpnext/stock/doctype/item/item.py +818,Item {0} is disabled,物料{0}已被禁用
+apps/erpnext/erpnext/stock/doctype/item/item.py +822,Item {0} is disabled,物料{0}已被禁用
DocType: Stock Settings,Stock Frozen Upto,库存冻结止
apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +1021,BOM does not contain any stock item,物料清单不包含任何库存物料
DocType: Chapter,Chapter Head,章节开头
@@ -6487,7 +6482,7 @@
DocType: Sales Invoice Timesheet,Billing Hours,计入账单的小时
DocType: Project,Total Sales Amount (via Sales Order),总销售额（通过销售订单）
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +529,Default BOM for {0} not found,默认BOM {0}未找到
-apps/erpnext/erpnext/stock/doctype/item/item.py +541,Row #{0}: Please set reorder quantity,行＃{0}：请设置再订购数量
+apps/erpnext/erpnext/stock/doctype/item/item.py +545,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: Share Transfer,To Folio No,对开本No
@@ -6525,14 +6520,14 @@
If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","例如：ABCD #####
如果设置了序列但是没有在交易中输入序列号，那么系统会根据序列自动生产序列号。如果要强制手动输入序列号，请不要勾选此项。"
DocType: Upload Attendance,Upload Attendance,上传考勤记录
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +645,BOM and Manufacturing Quantity are required,物料清单和生产量是必需的
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +62,Ageing Range 2,账龄范围2
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +648,BOM and Manufacturing Quantity are required,物料清单和生产量是必需的
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +35,Ageing Range 2,账龄范围2
DocType: SG Creation Tool Course,Max Strength,最大力量
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,安装预置
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +29,Installing presets,安装预置
DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +113,No Delivery Note selected for Customer {},没有为客户{}选择销售出货单
apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,员工{0}没有最大福利金额
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1210,Select Items based on Delivery Date,根据交货日期选择物料
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1211,Select Items based on Delivery Date,根据交货日期选择物料
DocType: Grant Application,Has any past Grant Record,有过去的赠款记录吗？
,Sales Analytics,销售分析
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},可用{0}
@@ -6556,7 +6551,7 @@
DocType: Purchase Invoice Item,Raw Materials Supplied Cost,已提供的原材料成本
DocType: Selling Settings,Settings for Selling Module,销售模块的设置
DocType: Hotel Room Reservation,Hotel Room Reservation,酒店房间预订
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,顾客服务
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +388,Customer Service,顾客服务
DocType: BOM,Thumbnail,缩略图
apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +383,No contacts with email IDs found.,找不到与电子邮件ID的联系人。
DocType: Item Customer Detail,Item Customer Detail,物料客户信息
@@ -6568,7 +6563,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/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +83,"Schedules for {0} overlaps, do you want to proceed after skiping overlaped slots ?",{0}计划任务重叠，是否要在滑动重叠的插槽后继续？
-apps/erpnext/erpnext/config/accounts.py +326,Default settings for accounting transactions.,业务会计的默认设置。
+apps/erpnext/erpnext/config/accounts.py +256,Default settings for accounting transactions.,业务会计的默认设置。
apps/erpnext/erpnext/hr/doctype/leave_period/leave_period.js +8,Grant Leaves,准予假期
DocType: Restaurant,Default Tax Template,默认税收模板
apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +71,{0} Students have been enrolled,{0}学生已被注册
@@ -6586,7 +6581,7 @@
DocType: Task,Closing Date,结算日期
DocType: Sales Order Item,Produced Quantity,生产的产品数量
DocType: Item Price,Quantity that must be bought or sold per UOM,每个UOM必须购买或出售的数量
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Engineer,工程师
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +89,Engineer,工程师
DocType: Employee Tax Exemption Category,Max Amount,最大金额
DocType: Journal Entry,Total Amount Currency,总金额币种
apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,搜索子组件
@@ -6610,7 +6605,7 @@
DocType: Shopify Tax Account,Shopify Tax/Shipping Title,Shopify税/运输标题
apps/erpnext/erpnext/projects/doctype/project/project.js +54,Gantt Chart,甘特图
DocType: Crop Cycle,Cycle Type,循环类型
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +102,Part-time,兼任
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +77,Part-time,兼任
DocType: Employee,Applicable Holiday List,适用于该员工的假期列表
DocType: Employee,Cheque,支票
DocType: Training Event,Employee Emails,员工电子邮件
@@ -6639,7 +6634,7 @@
apps/erpnext/erpnext/assets/doctype/asset/asset.py +60,Available for use date is required,需要使用可用日期
DocType: Request for Quotation,Supplier Detail,供应商详细
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +181,Error in formula or condition: {0},公式或条件错误:{0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,发票金额
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +119,Invoiced Amount,发票金额
apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,标准重量必须达100％
apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,考勤
apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,库存产品
@@ -6662,7 +6657,7 @@
DocType: Company,Series for Asset Depreciation Entry (Journal Entry),固定资产折旧凭证命名序列（手工凭证）
DocType: Membership,Member Since,自...成为会员
DocType: Purchase Invoice,Advance Payments,预付款
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1750,Please select Healthcare Service,请选择医疗保健服务
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1754,Please select Healthcare Service,请选择医疗保健服务
DocType: Purchase Taxes and Charges,On Net Total,基于净总计
apps/erpnext/erpnext/controllers/item_variant.py +92,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},物料{4}的属性{0}其属性值必须{1}到{2}范围内，且增量{3}
DocType: Restaurant Reservation,Waitlisted,轮候
@@ -6680,7 +6675,7 @@
DocType: Purchase Invoice,Contact Email,联络人电邮
apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,费用创作待定
DocType: Appraisal Goal,Score Earned,已得分数
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +222,Notice Period,通知期
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Notice Period,通知期
DocType: Asset Category,Asset Category Name,资产类别名称
apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,这是一个根区域，无法被编辑。
apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,新销售人员的姓名
@@ -6704,7 +6699,7 @@
DocType: Payment Reconciliation,Receivable / Payable Account,应收/应付账款
DocType: Delivery Note Item,Against Sales Order Item,针对的销售订单项
DocType: Company,Company Logo,公司标志
-apps/erpnext/erpnext/stock/doctype/item/item.py +783,Please specify Attribute Value for attribute {0},请指定属性值的属性{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +787,Please specify Attribute Value for attribute {0},请指定属性值的属性{0}
DocType: QuickBooks Migrator,Default Warehouse,默认仓库
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +55,Budget cannot be assigned against Group Account {0},预算不能分派给群组类科目{0}
DocType: Shopping Cart Settings,Show Price,显示价格
@@ -6718,7 +6713,7 @@
DocType: Appraisal,Total Score (Out of 5),总分（满分5分）
DocType: Student Attendance Tool,Batch,批次
DocType: Support Search Source,Query Route String,查询路由字符串
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1172,Update rate as per last purchase,根据上次购买更新率
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1173,Update rate as per last purchase,根据上次购买更新率
DocType: Donor,Donor Type,捐助者类型
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Auto repeat document updated,自动重复文件更新
apps/erpnext/erpnext/stock/doctype/item/item.js +29,Balance,余额
@@ -6734,7 +6729,7 @@
DocType: Assessment Result,Total Score,总得分
DocType: Crop Cycle,ISO 8601 standard,ISO 8601标准
DocType: Journal Entry,Debit Note,借项通知单
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1513,You can only redeem max {0} points in this order.,您只能按此顺序兑换最多{0}个积分。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1517,You can only redeem max {0} points in this order.,您只能按此顺序兑换最多{0}个积分。
DocType: Expense Claim,HR-EXP-.YYYY.-,HR-EXP-.YYYY.-
apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +102,Please enter API Consumer Secret,请输入API消费者密码
DocType: Stock Entry,As per Stock UOM,按库存的基础单位
@@ -6748,11 +6743,11 @@
DocType: Journal Entry,Total Debit,总借方金额
DocType: Travel Request Costing,Sponsored Amount,赞助金额
DocType: Manufacturing Settings,Default Finished Goods Warehouse,默认成品仓库
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +316,Please select Patient,请选择患者
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +380,Please select Patient,请选择患者
apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,销售人员
DocType: Hotel Room Package,Amenities,设施
DocType: QuickBooks Migrator,Undeposited Funds Account,未存入资金账户
-apps/erpnext/erpnext/config/accounts.py +271,Budget and Cost Center,预算和成本中心
+apps/erpnext/erpnext/config/accounts.py +201,Budget and Cost Center,预算和成本中心
apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,不允许多种默认付款方式
DocType: Sales Invoice,Loyalty Points Redemption,忠诚积分兑换
,Appointment Analytics,约定分析
@@ -6817,7 +6812,7 @@
DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,餐厅订单录入项目
DocType: Purchase Invoice,Rounded Total (Company Currency),圆整后金额（公司货币）
apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,不能转换到组，因为已选择账户类型。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +272,{0} {1} has been modified. Please refresh.,{0} {1}已被修改过，请刷新。
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +276,{0} {1} has been modified. Please refresh.,{0} {1}已被修改过，请刷新。
DocType: Leave Block List,Stop users from making Leave Applications on following days.,禁止用户在以下日期提交假期申请。
apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.",如果忠诚度积分无限期到期，请将到期时间保持为空或0。
DocType: Asset Maintenance Team,Maintenance Team Members,维护团队成员
@@ -6841,7 +6836,7 @@
apps/erpnext/erpnext/accounts/party.py +30,{0}: {1} does not exists,{0}：{1}不存在
apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,选择批号
apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,到GSTIN
-apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,对客户开出的账单。
+apps/erpnext/erpnext/config/accounts.py +14,Bills raised to Customers.,对客户开出的账单。
DocType: Healthcare Settings,Invoice Appointments Automatically,发票自动约定
apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,工程编号
DocType: Salary Component,Variable Based On Taxable Salary,基于应纳税工资的变量
@@ -6882,7 +6877,7 @@
apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js +30,This is a root healthcare service unit and cannot be edited.,这是根医疗保健服务单位，不能编辑。
DocType: Asset Repair,Repair Status,维修状态
apps/erpnext/erpnext/public/js/event.js +31,Add Sales Partners,添加销售合作伙伴
-apps/erpnext/erpnext/config/accounts.py +84,Accounting journal entries.,会计记账日历分录。
+apps/erpnext/erpnext/config/accounts.py +45,Accounting journal entries.,会计记账日历分录。
DocType: Travel Request,Travel Request,出差申请
DocType: Delivery Note Item,Available Qty at From Warehouse,源仓库可用数量
apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,请先选择员工记录
@@ -6916,10 +6911,9 @@
DocType: Company,Default Deferred Revenue Account,默认递延收入科目
DocType: Project,Second Email,第二封邮件
DocType: Budget,Action if Annual Budget Exceeded on Actual,年度预算超出实际的行动
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +127,Not Available,不可用
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +129,Not Available,不可用
DocType: Pricing Rule,Min Qty,最小数量
apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +41,Disable Template,禁用模板
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +105,Please select Healthcare Practitioner and Date,请选择医疗从业者和日期
DocType: Bank Statement Transaction Invoice Item,Transaction Date,交易日期
DocType: Production Plan Item,Planned Qty,计划数量
DocType: Company,Date of Incorporation,注册成立日期
@@ -6930,6 +6924,7 @@
DocType: Purchase Invoice,Net Total (Company Currency),总净金额（公司货币）
DocType: Delivery Note,Air,空气
apps/erpnext/erpnext/education/doctype/academic_year/academic_year.py +14,The Year End Date cannot be earlier than the Year Start Date. Please correct the dates and try again.,年度结束日期不能早于年度开始日期。请更正日期，然后再试一次。
+DocType: Purchase Order,Set Target Warehouse,设置目标仓库（收货仓）
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +277,{0} is not in Optional Holiday List,{0}不在可选节日列表中
DocType: Notification Control,Purchase Receipt Message,采购收据单信息
DocType: Amazon MWS Settings,JP,J.P
@@ -6960,7 +6955,7 @@
apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +21,"Cannot Submit, Employees left to mark attendance",无法提交，不能为已离职员工登记考勤
DocType: Inpatient Record,Admission,准入
apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},对...的准入{0}
-apps/erpnext/erpnext/config/accounts.py +295,"Seasonality for setting budgets, targets etc.",设置季节性的预算，目标等。
+apps/erpnext/erpnext/config/accounts.py +225,"Seasonality for setting budgets, targets etc.",设置季节性的预算，目标等。
DocType: Supplier Scorecard Scoring Variable,Variable Name,变量名
apps/erpnext/erpnext/stock/get_item_details.py +163,"Item {0} is a template, please select one of its variants",物料{0}是一个模板，请选择它的一个变体
DocType: Purchase Invoice Item,Deferred Expense,递延费用
@@ -6970,10 +6965,10 @@
DocType: Purchase Order,Advance Paid,已支付的预付款
DocType: Manufacturing Settings,Overproduction Percentage For Sales Order,销售订单超额生产百分比
DocType: Item,Item Tax,物料税项
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +950,Material to Supplier,给供应商的材料
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +951,Material to Supplier,给供应商的材料
DocType: Soil Texture,Loamy Sand,泥沙
DocType: Production Plan,Material Request Planning,材料申请计划
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +705,Excise Invoice,消费税发票
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +708,Excise Invoice,消费税发票
apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}出现％不止一次
DocType: Expense Claim,Employees Email Id,员工的邮件地址
DocType: Employee Attendance Tool,Marked Attendance,已标记的考勤
@@ -6990,7 +6985,7 @@
apps/erpnext/erpnext/setup/default_success_action.py +13,{0} has been submitted successfully,{0}已成功提交
DocType: Loan,Loan Type,贷款类型
DocType: Scheduling Tool,Scheduling Tool,调度工具
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Credit Card,信用卡
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Credit Card,信用卡
DocType: BOM,Item to be manufactured or repacked,待生产或者重新包装的物料
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +766,Syntax error in condition: {0},条件中的语法错误：{0}
DocType: Fee Structure,EDU-FST-.YYYY.-,EDU-FST-.YYYY.-
@@ -7021,7 +7016,7 @@
DocType: Travel Itinerary,Preferred Area for Lodging,住宿的首选地区
apps/erpnext/erpnext/config/selling.py +184,Analytics,Analytics（分析）
apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,购物车是空的
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +424,"Item {0} has no Serial No. Only serilialized items \
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +430,"Item {0} has no Serial No. Only serilialized items \
can have delivery based on Serial No",物料{0}没有序列号。只有有序列号的物料 \可以根据序列号进行交付
DocType: Vehicle,Model,模型
DocType: Work Order,Actual Operating Cost,实际运行成本
@@ -7045,7 +7040,7 @@
DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,支付完成后将用户转到所选网页。
DocType: Company,Existing Company,现有的公司
DocType: Healthcare Settings,Result Emailed,结果已发邮件
-apps/erpnext/erpnext/controllers/buying_controller.py +99,"Tax Category has been changed to ""Total"" because all the Items are non-stock items",税项类别已更改为“合计”，因为所有物料均为非库存物料
+apps/erpnext/erpnext/controllers/buying_controller.py +101,"Tax Category has been changed to ""Total"" because all the Items are non-stock items",税项类别已更改为“合计”，因为所有物料均为非库存物料
apps/erpnext/erpnext/hr/doctype/leave_period/leave_period.py +35,To date can not be equal or less than from date,迄今为止不能等于或少于日期
apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,没什么可改变的
apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,请选择一个csv文件
@@ -7054,10 +7049,10 @@
DocType: Student Leave Application,Mark as Present,标记为现
DocType: Supplier Scorecard,Indicator Color,指示灯颜色
DocType: Purchase Order,To Receive and Bill,待收货与开票
-apps/erpnext/erpnext/controllers/buying_controller.py +679,Row #{0}: Reqd by Date cannot be before Transaction Date,行号{0}：按日期请求不能在交易日期之前
+apps/erpnext/erpnext/controllers/buying_controller.py +691,Row #{0}: Reqd by Date cannot be before Transaction Date,行号{0}：按日期请求不能在交易日期之前
apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,特色产品
apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,选择序列号
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,设计师
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +99,Designer,设计师
apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,条款和条件模板
DocType: Delivery Trip,Delivery Details,交货细节
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},类型{1}税费表的行{0}必须有成本中心
@@ -7083,7 +7078,7 @@
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,交货天数
DocType: Cash Flow Mapping,Is Income Tax Expense,是所得税费用？
apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,您的订单已发货！
-apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},行＃{0}：过帐日期必须是相同的采购日期{1}资产的{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +693,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 +125,Please enter Sales Orders in the above table,请在上表中输入销售订单
,Stock Summary,库存摘要