fix: conflicts
diff --git a/erpnext/translations/ps.csv b/erpnext/translations/ps.csv
index 4d08f3b..7bd2199 100644
--- a/erpnext/translations/ps.csv
+++ b/erpnext/translations/ps.csv
@@ -43,7 +43,6 @@
DocType: Exchange Rate Revaluation Account,New Exchange Rate,د نوی بدلولو کچه
apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py,Currency is required for Price List {0},د اسعارو د بیې په لېست کې د اړتیا {0}
DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* به په راکړې ورکړې محاسبه شي.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource > HR Settings,مهرباني وکړئ د بشري سرچینو> HR ترتیبات کې د کارمند نوم ورکولو سیسټم تنظیم کړئ
DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT -YYYY-
DocType: Purchase Order,Customer Contact,پيرودونکو سره اړيکي
DocType: Shift Type,Enable Auto Attendance,د آٹو ګډون فعال کړئ
@@ -94,6 +93,7 @@
DocType: SMS Center,All Supplier Contact,ټول عرضه سره اړيکي
DocType: Support Settings,Support Settings,د ملاتړ امستنې
apps/erpnext/erpnext/erpnext_integrations/doctype/exotel_settings/exotel_settings.py,Invalid credentials,ناباوره سندونه
+apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js,Mark Work From Home,له کور څخه کار په نښه کړئ
apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,ITC Available (whether in full op part),ITC شتون لري (ایا په بشپړ انتخابي برخه کې)
DocType: Amazon MWS Settings,Amazon MWS Settings,د ایمیزون MWS ترتیبات
apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Processing Vouchers,پروسس واوچرز
@@ -384,6 +384,7 @@
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,ټاکل شوي کړنلارې
apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,یواځې POS ښودل
DocType: Supplier Group,Supplier Group Name,د سپلویزی ګروپ نوم
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,د شتون په توګه نښه کول د <b></b>
DocType: Driver,Driving License Categories,د موټر چلولو جوازونو کټګوري
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,مهرباني وکړئ د سپارلو نېټه ولیکئ
DocType: Depreciation Schedule,Make Depreciation Entry,د استهالک د داخلولو د کمکیانو لپاره
@@ -403,7 +404,6 @@
apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py,Membership Details,د غړیتوب تفصیلات
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,{0} {1}: Supplier is required against Payable account {2},{0} د {1}: عرضه ده د راتلوونکې ګڼون په وړاندې د اړتيا {2}
apps/erpnext/erpnext/config/buying.py,Items and Pricing,توکي او د بیې ټاکل
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer > Customer Group > Territory,پیرودونکي> د پیرودونکي ګروپ> سیمه
apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html,Total hours: {0},Total ساعتونو: {0}
apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py,From Date should be within the Fiscal Year. Assuming From Date = {0},له نېټه بايد د مالي کال په چوکاټ کې وي. فرض له نېټه = {0}
DocType: Patient Medical Record,HLC-PMR-.YYYY.-,HLC-PMR -YYYY-
@@ -765,6 +765,7 @@
DocType: Healthcare Settings,Require Lab Test Approval,د لابراتوار ازموینې ته اړتیا
DocType: Attendance,Working Hours,کار ساعتونه
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html,Total Outstanding,بشپړ شوی
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -> {1}) not found for item: {2},د UOM د بدلون فاکتور ({0} -> {1}) د توکي لپاره ونه موندل شو: {2}
DocType: Naming Series,Change the starting / current sequence number of an existing series.,د پیل / اوسني تسلسل کې د شته لړ شمېر کې بدلون راولي.
DocType: Accounts Settings,Percentage you are allowed to bill more against the amount ordered. For example: If the order value is $100 for an item and tolerance is set as 10% then you are allowed to bill for $110.,سلنه تاسو ته اجازه درکول شوې چې د غوښتل شوې اندازې په مقابل کې نور بیلونه ورکړئ. د مثال په توګه: که چیرې د آرډر ارزښت د یو توکي لپاره $ 100 دی او زغم د 10 as په توګه ټاکل شوی وي نو بیا تاسو ته د. 110 ډالرو بیل کولو اجازه درکول کیږي.
DocType: Dosage Strength,Strength,ځواک
@@ -1244,7 +1245,6 @@
DocType: Pricing Rule Item Group,Pricing Rule Item Group,د مقرراتو د توکو ګروپ
DocType: Travel Itinerary,Travel To,سفر ته
apps/erpnext/erpnext/config/accounts.py,Exchange Rate Revaluation master.,د تبادلې نرخ بیا ارزونې ماسټر.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup > Numbering Series,مهرباني وکړئ د تنظیم کولو له لارې د شمیره ورکولو لړۍ له لارې د ګډون لپاره د شمېرنې لړۍ تنظیم کړئ
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Write Off Amount,مقدار ولیکئ پړاو
DocType: Leave Block List Allow,Allow User,کارن اجازه
DocType: Journal Entry,Bill No,بیل نه
@@ -1597,6 +1597,7 @@
DocType: Sales Team,Incentives,هڅوونکي
apps/erpnext/erpnext/accounts/general_ledger.py,Values Out Of Sync,له همغږۍ وتلې ارزښتونه
apps/erpnext/erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py,Difference Value,د توپیر ارزښت
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup > Numbering Series,مهرباني وکړئ د تنظیم کولو له لارې د شمیره ورکولو لړۍ له لارې د ګډون لپاره د شمېرنې لړۍ تنظیم کړئ
DocType: SMS Log,Requested Numbers,غوښتنه شميرې
DocType: Volunteer,Evening,شاملیږي
DocType: Quiz,Quiz Configuration,د کوز تشکیلات
@@ -1763,6 +1764,7 @@
DocType: Student Admission,Publish on website,په ويب پاڼه د خپرېدو
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Supplier Invoice Date cannot be greater than Posting Date,عرضه صورتحساب نېټه نه شي کولای پست کوي نېټه څخه ډيره وي
DocType: Installation Note,MAT-INS-.YYYY.-,MAT-INS -YYYY-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code > Item Group > Brand,د توکو کوډ> د توکو ګروپ> نښه
DocType: Subscription,Cancelation Date,د تایید نیټه
DocType: Purchase Invoice Item,Purchase Order Item,نظم د قالب پیري
DocType: Agriculture Task,Agriculture Task,کرهنیز ټیم
@@ -2274,6 +2276,7 @@
DocType: Agriculture Analysis Criteria,Agriculture,د کرنې
apps/erpnext/erpnext/manufacturing/doctype/blanket_order/blanket_order.js,Create Sales Order,د پلور امر جوړول
apps/erpnext/erpnext/assets/doctype/asset/asset.py,Accounting Entry for Asset,د شتمنیو لپاره د محاسبې داخله
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,{0} is not a group node. Please select a group node as parent cost center,{0} د ګروپ نوډ ندي. مهرباني وکړئ د ګروپ نوډ د اصلي لګښت مرکز په توګه وټاکئ
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Block Invoice,د انو انو بلاک
apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.js,Quantity to Make,د مقدار کولو لپاره مقدار
apps/erpnext/erpnext/accounts/page/pos/pos.js,Sync Master Data,پرانیځئ ماسټر معلوماتو
@@ -2359,7 +2362,6 @@
DocType: Target Detail,Target Distribution,د هدف د ویش
DocType: Purchase Invoice,06-Finalization of Provisional assessment,06 - د انتقالي ارزونې ارزونه
apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Parties and Addresses,د ګوندونو او ادرسونو واردول
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -> {1}) not found for item: {2},د UOM د بدلون فاکتور ({0} -> {1}) د توکي لپاره ونه موندل شو: {2}
DocType: Salary Slip,Bank Account No.,بانکي حساب شمیره
DocType: Naming Series,This is the number of the last created transaction with this prefix,دا په دې مختاړی د تېرو جوړ معامله شمیر
DocType: Supplier Scorecard,"Scorecard variables can be used, as well as:
@@ -3340,7 +3342,6 @@
apps/erpnext/erpnext/education/doctype/fee_structure/fee_structure.js,Create Fee Schedule,د فیس مهال ویش جوړ کړئ
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py,Repeat Customer Revenue,تکرار پيرودونکو د عوایدو
DocType: Soil Texture,Silty Clay Loam,د سپیټ مټ لوام
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education > Education Settings,مهرباني وکړئ د ښوونې او روزنې ترتیبات کې د ښوونکي نوم ورکولو سیسټم تنظیم کړئ
DocType: Quiz,Enter 0 to waive limit,د معاف کولو حد ته 0 دننه کړئ
DocType: Bank Statement Settings,Mapped Items,نقشه شوی توکي
DocType: Amazon MWS Settings,IT,IT
@@ -3399,6 +3400,7 @@
DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,د کټګورۍ د رایو کارډونه
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,Row {0}: Bill of Materials not found for the Item {1},د کتارونو تر {0}: د مواد بیل نه د سامان موندل {1}
DocType: Contract Fulfilment Checklist,Requirement,اړتیاوې
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource > HR Settings,مهرباني وکړئ د بشري سرچینو> HR ترتیبات کې د کارمند نوم ورکولو سیسټم تنظیم کړئ
DocType: Journal Entry,Accounts Receivable,حسابونه ترلاسه
DocType: Quality Goal,Objectives,موخې
DocType: HR Settings,Role Allowed to Create Backdated Leave Application,د پخوانۍ رخصتۍ غوښتنلیک جوړولو لپاره رول ته اجازه ورکړل شوې
@@ -3537,6 +3539,7 @@
DocType: Student Applicant,Applied,تطبیقی
apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Details of Outward Supplies and inward supplies liable to reverse charge,د بیروني تحویلیو او داخلي تحویلیو جزییات د ریورس چارج لپاره مسؤل دي
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Re-open,Re علني
+apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py,Not permitted. Please disable the Lab Test Template,اجازه نشته مهرباني وکړئ د لیب ازمونې ټیمپلیټ غیر فعال کړئ
DocType: Sales Invoice Item,Qty as per Stock UOM,Qty هر دحمل UOM په توګه
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Name,Guardian2 نوم
apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,Root Company,د روټ شرکت
@@ -3622,7 +3625,6 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please click on 'Generate Schedule' to get schedule,لطفا د مهال ویش به په 'تولید مهال ویش' کیکاږۍ
DocType: Item,"Purchase, Replenishment Details",د پیرودلو ، بیا ډکولو جزییات
DocType: Products Settings,Enable Field Filters,د ساحې فلټرونه فعال کړئ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code > Item Group > Brand,د توکو کوډ> د توکو ګروپ> نښه
apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot be Purchase Item also",د "پیرودونکي چمتو شوي توکی" د پیرود توکي هم نشي کیدی
DocType: Blanket Order Item,Ordered Quantity,امر مقدار
apps/erpnext/erpnext/public/js/setup_wizard.js,"e.g. ""Build tools for builders""",د بیلګې په توګه "د جوړوونکي وسایلو جوړولو"
@@ -4086,7 +4088,7 @@
DocType: Authorization Rule,Applicable To (Role),د تطبیق وړ د (رول)
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html,Pending Leaves,د ځنډېدلو پاڼي
DocType: BOM Update Tool,Replace BOM,BOM بدله کړئ
-apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py,Code {0} already exist,کود {0} لا دمخه شتون لري
+apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py,Code {0} already exist,کود {0} لا دمخه شتون لري
DocType: Patient Encounter,Procedures,کړنلارې
apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Sales orders are not available for production,د خرڅلاو امرونه د تولید لپاره شتون نلري
DocType: Asset Movement,Purpose,هدف
@@ -4151,6 +4153,8 @@
DocType: Grant Application,Grant Application Details ,د غوښتنلیک توضیحات
DocType: Employee Separation,Employee Separation,د کار کولو جلا کول
DocType: BOM Item,Original Item,اصلي توکي
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+ to cancel this document","مهرباني وکړئ د دې سند لغوه کولو لپاره کارمند <a href=""#Form/Employee/{0}"">{0}</a> delete حذف کړئ"
apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,د ډاټا تاریخ
apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},فیس سوابق ايجاد - {0}
DocType: Asset Category Account,Asset Category Account,د شتمنیو د حساب کټه ګورۍ
@@ -4528,7 +4532,7 @@
,Salary Register,معاش د نوم ثبتول
DocType: Company,Default warehouse for Sales Return,د پلور بیرته راتګ لپاره اصلي ګودام
DocType: Pick List,Parent Warehouse,Parent ګدام
-DocType: Subscription,Net Total,خالص Total
+DocType: C-Form Invoice Detail,Net Total,خالص Total
apps/erpnext/erpnext/stock/doctype/batch/batch.py,"Set item's shelf life in days, to set expiry based on manufacturing date plus shelf-life.",په ورځو کې د توکي شیلف ژوند تنظیم کړئ ، د تیاری نیټې پلس شیلف - ژوند پر بنسټ د پای ټاکل.
apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Default BOM not found for Item {0} and Project {1},Default هیښ لپاره توکی ونه موندل {0} او د پروژې د {1}
apps/erpnext/erpnext/regional/italy/utils.py,Row {0}: Please set the Mode of Payment in Payment Schedule,قطار {0}: مهرباني وکړئ د تادیې مهال ویش کې د تادیې حالت تنظیم کړئ
@@ -4641,7 +4645,7 @@
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Target warehouse is mandatory for row {0},هدف ګودام لپاره چي په کتارونو الزامی دی {0}
apps/erpnext/erpnext/config/retail.py,Retail Operations,پرچون عملیات
DocType: Cheque Print Template,Primary Settings,لومړنۍ امستنې
-DocType: Attendance Request,Work From Home,له کور څخه کار
+DocType: Attendance,Work From Home,له کور څخه کار
DocType: Purchase Invoice,Select Supplier Address,انتخاب عرضه پته
apps/erpnext/erpnext/public/js/event.js,Add Employees,مامورین ورزیات کړئ
DocType: Purchase Invoice Item,Quality Inspection,د کیفیت د تفتیش
@@ -4654,6 +4658,8 @@
DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,قانوني نهاد / مستقلې سره د حسابونه د يو جلا چارت د سازمان پورې.
DocType: Payment Request,Mute Email,ګونګ دبرېښنا ليک
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco",د خوړو، او نوشابه & تنباکو
+apps/erpnext/erpnext/controllers/buying_controller.py,"Cannot cancel this document as it is linked with submitted asset {0}.\
+ Please cancel the it to continue.",دا لاسوند لغوه کولی نشی ځکه چې دا د تسلیم شوي شتمني {0} سره تړل شوی. \ مهرباني وکړئ جاري وساتو یې دا لغوه کړئ.
DocType: Account,Account Number,ګڼون شمېره
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Can only make payment against unbilled {0},يوازې په وړاندې پیسې unbilled {0}
DocType: Call Log,Missed,ورک شوی
@@ -4877,8 +4883,6 @@
DocType: QuickBooks Migrator,Authorization URL,د اجازې یو آر ایل
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Amount {0} {1} {2} {3},مقدار د {0} د {1} {2} {3}
DocType: Account,Depreciation,د استهالک
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
- to cancel this document","مهرباني وکړئ د دې سند لغوه کولو لپاره کارمند <a href=""#Form/Employee/{0}"">{0}</a> delete حذف کړئ"
apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py,The number of shares and the share numbers are inconsistent,د ونډې شمېره او د شمېره شمېره متناقض دي
apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Supplier(s),عرضه (s)
DocType: Employee Attendance Tool,Employee Attendance Tool,د کارګر د حاضرۍ اوزار
@@ -5156,6 +5160,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}",د خوښو ته پیښی {0}، ځکه چې د کارګر ته لاندې خرڅلاو هغه اشخاص چې د وصل يو کارن تذکرو نه لري {1}
DocType: Timesheet,Billing Details,د بیلونو په بشپړه توګه کتل
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,سرچینه او هدف ګدام بايد توپير ولري
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource > HR Settings,مهرباني وکړئ د بشري سرچینو> HR ترتیبات کې د کارمند نوم ورکولو سیسټم تنظیم کړئ
apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,تادیات ناکام شول. مهرباني وکړئ د نورو جزیاتو لپاره د ګرمسیرless حساب وګورئ
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},اجازه نه سټاک معاملو د اوسمهالولو په پرتله د زړو {0}
DocType: Stock Entry,Inspection Required,تفتیش مطلوب
@@ -5184,7 +5189,6 @@
DocType: Cheque Print Template,Cheque Height,آرډر لوړوالی
DocType: Supplier,Supplier Details,عرضه نورولوله
DocType: Setup Progress,Setup Progress,پرمختللی پرمختګ
-DocType: Expense Claim,Approval Status,تصویب حالت
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,From value must be less than to value in row {0},له ارزښت باید په پرتله د ارزښت په قطار کمه وي {0}
DocType: Program,Intro Video,انٹرو ویډیو
DocType: Manufacturing Settings,Default Warehouses for Production,د تولید لپاره اصلي ګودامونه
@@ -5387,6 +5391,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,اوسني هیښ او نوي هیښ نه شي کولای ورته وي
apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,معاش ټوټه ID
apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,نېټه د تقاعد باید په پرتله د داخلیدل نېټه ډيره وي
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier > Supplier Type,عرضه کونکي> عرضه کونکي ډول
apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,ګڼ شمیر متغیرات
DocType: Sales Invoice,Against Income Account,په وړاندې پر عايداتو باندې حساب
apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}٪ تحویلوونکی
@@ -5518,7 +5523,6 @@
DocType: Purchase Invoice,Rounded Total,غونډ مونډ Total
apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,Slots for {0} are not added to the schedule,د {0} لپاره سلاټونه په مهال ویش کې شامل نه دي
DocType: Product Bundle,List items that form the package.,لست کې د اقلامو چې د بنډل جوړوي.
-apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py,Not permitted. Please disable the Test Template,اجازه نشته. مهرباني وکړئ د ازموینې چوکاټ غیر فعال کړئ
DocType: Sales Invoice,Distance (in km),فاصله (په کیلو متر)
apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,سلنه تخصيص بايد مساوي له 100٪ وي
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,لطفا د ګوند په ټاکلو مخکې نوکرې نېټه وټاکئ
@@ -5649,7 +5653,6 @@
DocType: Purchase Invoice,Price List Exchange Rate,د بیې په لېست د بدلولو نرخ
apps/erpnext/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py,All Supplier Groups,د ټولو سپلویزی ګروپونه
DocType: Employee Boarding Activity,Required for Employee Creation,د کارموندنې د جوړولو لپاره اړین دی
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier > Supplier Type,عرضه کونکي> عرضه کونکي ډول
apps/erpnext/erpnext/accounts/doctype/account/account.py,Account Number {0} already used in account {1},د حساب شمیره {0} د مخه په حساب کې کارول شوې {1}
DocType: GoCardless Mandate,Mandate,منډې
DocType: Hotel Room Reservation,Booked,کتاب شوی
@@ -5715,7 +5718,6 @@
DocType: Sales Partner,Sales Partner Name,خرڅلاو همکار نوم
apps/erpnext/erpnext/hooks.py,Request for Quotations,د داوطلبۍ غوښتنه
DocType: Payment Reconciliation,Maximum Invoice Amount,اعظمي صورتحساب مقدار
-apps/erpnext/erpnext/accounts/doctype/bank_account/test_bank_account.py,BankAccount.validate_iban() failed for empty IBAN,دبانک اکاونټ.ثوالیت_بیان () د IBAN خالي لپاره ناکام شو
DocType: Normal Test Items,Normal Test Items,د عادي ازموینې توکي
DocType: QuickBooks Migrator,Company Settings,د شرکت ترتیبونه
DocType: Additional Salary,Overwrite Salary Structure Amount,د معاشاتو جوړښت مقدار بیرته اخیستل
@@ -5869,6 +5871,7 @@
DocType: Leave Allocation,Leave Period,د پریښودلو موده
DocType: Item,Default Material Request Type,Default د موادو غوښتنه ډول
DocType: Supplier Scorecard,Evaluation Period,د ارزونې موده
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer > Customer Group > Territory,پیرودونکي> د پیرودونکي ګروپ> سیمه
apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js,Unknown,نامعلوم
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Work Order not created,د کار امر ندی جوړ شوی
DocType: Shipping Rule,Shipping Rule Conditions,انتقال حاکمیت شرايط
@@ -6218,6 +6221,7 @@
DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,رول اجازه ګنګل حسابونه ایډیټ ګنګل توکي ټاکل شوی
DocType: Supplier Scorecard Scoring Variable,Path,پټه
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,ته د پنډو لګښت مرکز بدلوي نشي کولای، ځکه دا د ماشوم غوټو لري
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -> {1}) not found for item: {2},د UOM د بدلون فاکتور ({0} -> {1}) د توکي لپاره ونه موندل شو: {2}
DocType: Production Plan,Total Planned Qty,ټول پلان شوي مقدار
apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,معاملې دمخه د بیان څخه بیرته اخیستل شوي
apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,د پرانستلو په ارزښت
@@ -6225,8 +6229,11 @@
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,سریال #
DocType: Material Request Plan Item,Required Quantity,اړین مقدار
DocType: Lab Test Template,Lab Test Template,د لابراتوار ازموینه
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier > Supplier Type,عرضه کونکي> عرضه کونکي ډول
apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,د پلور حساب
DocType: Purchase Invoice Item,Total Weight,ټول وزن
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+ to cancel this document","مهرباني وکړئ د دې سند لغوه کولو لپاره کارمند <a href=""#Form/Employee/{0}"">{0}</a> delete حذف کړئ"
DocType: Pick List Item,Pick List Item,د لړ توکي غوره کړه
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Commission on Sales,د کمیسیون په خرڅلاو
DocType: Job Offer Term,Value / Description,د ارزښت / Description
@@ -6340,6 +6347,7 @@
DocType: Contract,Signed On,لاسلیک شوی
DocType: Bank Account,Party Type,ګوند ډول
DocType: Discounted Invoice,Discounted Invoice,تخفیف انوائس
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,د شتون په توګه نښه کول د <b></b>
DocType: Payment Schedule,Payment Schedule,د تادیاتو مهال ویش
apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,No Employee found for the given employee field value. '{}': {},د ورکړل شوي کارمند ساحې ارزښت لپاره هیڅ کارمند ونه موندل شو. '{}':}
DocType: Item Attribute Value,Abbreviation,لنډیزونه
@@ -6433,6 +6441,7 @@
DocType: Purchase Order,To Receive,تر لاسه
DocType: Leave Period,Holiday List for Optional Leave,د اختیاري لیږد لپاره د رخصتي لیست
DocType: Item Tax Template,Tax Rates,د مالیې نرخونه
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code > Item Group > Brand,د توکو کوډ> د توکو ګروپ> نښه
DocType: Asset,Asset Owner,د شتمنی مالک
DocType: Item,Website Content,د ویب پا Contentې مینځپانګه
DocType: Bank Account,Integration ID,د ادغام ID
@@ -6440,7 +6449,6 @@
DocType: Employee,Personal Email,د شخصي ليک
apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py,Total Variance,Total توپیر
DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",که چېرې توانول شوی، دا سيستم به د محاسبې زياتونې لپاره د انبار په اتوماتيک ډول وروسته.
-apps/erpnext/erpnext/accounts/doctype/bank_account/test_bank_account.py,BankAccount.validate_iban() accepted invalid IBAN {},BankAccount. માન્યate_iban () غیرقانوني IBAN ومنل {}
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Brokerage,صرافي
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Attendance for employee {0} is already marked for this day,د {0} کارمند په ګډون لا د مخه د دې ورځې لپاره په نښه
DocType: Work Order Operation,"in Minutes
@@ -6558,6 +6566,7 @@
DocType: Stock Entry Detail,Additional Cost,اضافي لګښت
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher",نه ګټمنو نه پر بنسټ کولای شي Filter، که ګروپ له خوا د ګټمنو
DocType: Quality Inspection,Incoming,راتلونکي
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup > Numbering Series,مهرباني وکړئ د تنظیم کولو له لارې د شمیره ورکولو لړۍ له لارې د ګډون لپاره د شمېرنې لړۍ تنظیم کړئ
apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,د پلور او اخیستلو لپاره د اصلي مالیې ټیکنالوژي جوړېږي.
apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,د ارزونې پایلې ریکارډ {0} لا د مخه وجود لري.
DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.",بېلګه: ABCD. #####. که چیرې سلسله جوړه شي او بسته نه په لیږد کې ذکر شوي، نو د دې لړۍ پر بنسټ به د اتوماتیک بچ شمیره جوړه شي. که تاسو غواړئ چې په ښکاره توګه د دې شیدو لپاره د بچ نښې یادونه وکړئ، دا خالي کړئ. یادونه: دا ترتیب به د سټاک په سیسټمونو کې د نومونې سیریلیز انفکس په ترڅ کې لومړیتوب واخلي.
@@ -6708,6 +6717,7 @@
apps/erpnext/erpnext/regional/report/irs_1099/irs_1099.js,Print IRS 1099 Forms,د IRS 1099 فورمې چاپ کړئ
DocType: Asset,Check if Asset requires Preventive Maintenance or Calibration,وګورئ که چیرې شتمنۍ د مخنیوي ساتنه یا تعقیب ته اړتیا ولري
apps/erpnext/erpnext/public/js/setup_wizard.js,Company Abbreviation cannot have more than 5 characters,د شرکت لنډیز نشي کولی له 5 څخه ډیر ټکي ولري
+apps/erpnext/erpnext/setup/doctype/company/company.py,Parent Company must be a group company,اصلي شرکت باید د ګروپ شرکت وي
DocType: Employee,Reports to,د راپورونو له
,Unpaid Expense Claim,معاش اخراجاتو ادعا
DocType: Payment Entry,Paid Amount,ورکړل مقدار
@@ -6795,6 +6805,7 @@
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Opp Count,د کارموندنۍ شمېرنې
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Both Trial Period Start Date and Trial Period End Date must be set,د آزموینې دواړه د پیل نیټه د پیل نیټه او د آزموینې دورې پای نیټه باید وټاکل شي
apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,اوسط کچه
+DocType: Appointment,Appointment With,د سره ټاکل
apps/erpnext/erpnext/controllers/accounts_controller.py,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,د تادیاتو مهال ویش کې د مجموعي تادیاتو اندازه باید د ګردي / ګردي ګرد مجموعي سره مساوي وي
apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate","پیرودونکي چمتو شوي توکی" نشي کولی د ارزښت نرخ ولري
DocType: Subscription Plan Detail,Plan,پلان
@@ -6893,6 +6904,7 @@
DocType: BOM,Rate Of Materials Based On,کچه د موادو پر بنسټ
DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.",که چیرې فعال شي، ساحه اکادمیکه اصطالح به د پروګرام په شمول کولو کې وسیله وي.
apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies",د معافیت ، نیل درج شوي او غیر جی ایس ټي داخلي تحویلیو ارزښتونه
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer > Customer Group > Territory,پیرودونکي> د پیرودونکي ګروپ> سیمه
apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>شرکت</b> لازمي فلټر دی.
apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,څلورڅنډی په ټولو
DocType: Purchase Taxes and Charges,On Item Quantity,د توکو مقدار
@@ -6925,7 +6937,6 @@
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Opp/Lead %,د کارموندنۍ / مشري٪
DocType: Bank Guarantee,Bank Account Info,د بانک حساب ورکولو معلومات
DocType: Bank Guarantee,Bank Guarantee Type,د بانکي تضمین ډول
-apps/erpnext/erpnext/accounts/doctype/bank_account/test_bank_account.py,BankAccount.validate_iban() failed for valid IBAN {},BankAccount. માન્યate_iban () د اعتبار وړ IBAN لپاره ناکام شو {
DocType: Payment Schedule,Invoice Portion,د انوائس پوسشن
,Asset Depreciations and Balances,د شتمنیو Depreciations او انډول.
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Amount {0} {1} transferred from {2} to {3},مقدار د {0} د {1} څخه انتقال {2} د {3}
@@ -6939,6 +6950,7 @@
apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,په کمښت کې Qty
DocType: Purchase Invoice,Input Service Distributor,ننوت خدمت توزیع کونکی
apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,د قالب variant {0} سره ورته صفاتو شتون
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education > Education Settings,مهرباني وکړئ د ښوونې او روزنې ترتیبات کې د ښوونکي نوم ورکولو سیسټم تنظیم کړئ
DocType: Loan,Repay from Salary,له معاش ورکول
DocType: Exotel Settings,API Token,د API ټوکن
apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Requesting payment against {0} {1} for amount {2},د غوښتنې په وړاندې د پیسو {0} د {1} لپاره د اندازه {2}
@@ -7577,7 +7589,6 @@
apps/erpnext/erpnext/crm/doctype/email_campaign/email_campaign.py,Please set up the Campaign Schedule in the Campaign {0},مهرباني وکړئ د کمپاین {0} کې د کمپاین مهالویش تنظیم کړئ
apps/erpnext/erpnext/config/buying.py,Price List master.,د بیې په لېست بادار.
DocType: Task,Review Date,کتنه نېټه
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,د حاضرۍ نښه په توګه <b></b>
DocType: BOM,Allow Alternative Item,د متبادل توکي اجازه ورکړئ
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,د پیرود رسید هیڅ توکی نلري د دې لپاره چې برقرار نمونه فعاله وي.
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Invoice Grand Total,انوائس عالي مجموعه
@@ -7804,7 +7815,6 @@
DocType: Amazon MWS Settings,Max Retry Limit,د Max Max Retry Limit
apps/erpnext/erpnext/accounts/page/pos/pos.js,Price List not found or disabled,بیې په لېست کې ونه موندل او يا معيوب
DocType: Content Activity,Last Activity ,وروستی فعالیت
-DocType: Student Applicant,Approved,تصویب شوې
DocType: Pricing Rule,Price,د بیې
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Employee relieved on {0} must be set as 'Left',د کارګر د کرارۍ د {0} بايد جوړ شي د "کيڼ '
DocType: Guardian,Guardian,ګارډین
@@ -7975,6 +7985,7 @@
DocType: GL Entry,To Rename,نوم بدلول
DocType: Stock Entry,Repack,Repack
apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Select to add Serial Number.,د سریال شمیره اضافه کولو لپاره غوره کړئ.
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education > Education Settings,مهرباني وکړئ د ښوونې او روزنې ترتیبات کې د ښوونکي نوم ورکولو سیسټم تنظیم کړئ
apps/erpnext/erpnext/regional/italy/utils.py,Please set Fiscal Code for the customer '%s',مهرباني وکړئ د پیرودونکي لپاره مالي کوډ تنظیم کړئ '٪ s'
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select the Company first,مهرباني وکړئ لومړی شرکت غوره کړئ
DocType: Item Attribute,Numeric Values,شمېريزو ارزښتونه
@@ -7991,6 +8002,7 @@
apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html,Cart is Empty,کراچۍ ده خالي
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Item {0} has no Serial No. Only serilialized items \
can have delivery based on Serial No",توکي {0} لري د سیریل نمبر نه یواځې سیریلیز شوي توکي \ د سیریل نمبر پر اساس ترسیل کولی شي
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Depreciated Amount,تخفیف شوې اندازه
DocType: Vehicle,Model,د نمونوي
DocType: Work Order,Actual Operating Cost,واقعي عملياتي لګښت
DocType: Payment Entry,Cheque/Reference No,آرډر / ماخذ نه