[Translation] Updated Translations (#12212)

diff --git a/erpnext/translations/ps.csv b/erpnext/translations/ps.csv
index a241c75..def3922 100644
--- a/erpnext/translations/ps.csv
+++ b/erpnext/translations/ps.csv
@@ -3,12 +3,12 @@
 DocType: Patient,Divorced,طلاق
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,اجازه د قالب چې په یوه معامله څو ځله زياته شي
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,د موادو {0} سفر مخکې له دې ګرنټی ادعا بندول لغوه کړه
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,د استهلاکي تولیداتو
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,د استهلاکي تولیداتو
 DocType: Purchase Receipt,Subscription Detail,د ګډون تفصیل
 DocType: Supplier Scorecard,Notify Supplier,خبرتیاوو سپارل
 DocType: Item,Customer Items,پيرودونکو لپاره توکي
 DocType: Project,Costing and Billing,لګښت او اولګښت
-apps/erpnext/erpnext/accounts/doctype/account/account.py +52,Account {0}: Parent account {1} can not be a ledger,ګڼون {0}: Parent حساب {1} نه شي د پنډو وي
+apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,ګڼون {0}: Parent حساب {1} نه شي د پنډو وي
 DocType: Item,Publish Item to hub.erpnext.com,ته hub.erpnext.com د قالب د خپرېدو
 apps/erpnext/erpnext/config/setup.py +88,Email Notifications,ليک د خبرتیا
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,ارزونې
@@ -20,10 +20,9 @@
 DocType: Restaurant Order Entry,Click Enter To Add,د اضافو لپاره داخل کړه ټک وکړئ
 DocType: Employee,Rented,د کشت
 DocType: Purchase Order,PO-,تبديليږي
-DocType: POS Profile,Applicable for User,د کارن د تطبيق وړ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",ودرول تولید نظم نه لغوه شي کولای، نو دا د لومړي Unstop لغوه
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +216,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",ودرول تولید نظم نه لغوه شي کولای، نو دا د لومړي Unstop لغوه
 DocType: Vehicle Service,Mileage,ګټه
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,آيا تاسو په رښتيا غواړئ چې دا شتمني راټولوي؟
+apps/erpnext/erpnext/assets/doctype/asset/asset.js +240,Do you really want to scrap this asset?,آيا تاسو په رښتيا غواړئ چې دا شتمني راټولوي؟
 DocType: Drug Prescription,Update Schedule,د مهال ویش تازه کول
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,انتخاب Default عرضه
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},د اسعارو د بیې په لېست کې د اړتیا {0}
@@ -32,8 +31,8 @@
 DocType: Patient Appointment,Check availability,د لاسرسي کتنه
 DocType: Job Applicant,Job Applicant,دنده متقاضي
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,دا په دې عرضه په وړاندې د معاملو پر بنسټ. د تفصیلاتو لپاره په لاندی مهال ویش وګورئ
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,د حقوقي
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},واقعي ډول د ماليې په قطار د قالب بیه نه وي شامل شي کولای {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,د حقوقي
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},واقعي ډول د ماليې په قطار د قالب بیه نه وي شامل شي کولای {0}
 DocType: Bank Guarantee,Customer,پيرودونکو
 DocType: Purchase Receipt Item,Required By,د غوښتل شوي By
 DocType: Delivery Note,Return Against Delivery Note,پر وړاندې د سپارنې يادونه Return
@@ -41,79 +40,91 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),د بدلولو نرخ باید په توګه ورته وي {0} د {1} ({2})
 DocType: Sales Invoice,Customer Name,پیریدونکي نوم
 DocType: Vehicle,Natural Gas,طبیعی ګاز
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},بانکي حساب په توګه نه ونومول شي کولای {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},بانکي حساب په توګه نه ونومول شي کولای {0}
 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 +196,Outstanding for {0} cannot be less than zero ({1}),بيالنس د {0} کولای شي او نه د صفر څخه کم ({1})
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,د پروسې لپاره د معاشونو نشتوالی شتون نلري.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +343,There are no submitted Salary Slips to process.,د پروسې لپاره د معاشونو نشتوالی شتون نلري.
 DocType: Manufacturing Settings,Default 10 mins,افتراضي 10 دقیقه
 DocType: Leave Type,Leave Type Name,پريږدئ ډول نوم
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,وښایاست خلاص
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,دا اړینه ده چې دا عمل خپل ځان ته د پورته ذکر شوي تکرار لپاره ونیسو
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,لړۍ Updated په بریالیتوب
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,بشپړ ی وګوره
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural ژورنال انفاذ ته وسپارل
 DocType: Pricing Rule,Apply On,Apply د
 DocType: Item Price,Multiple Item prices.,څو د قالب بيه.
 ,Purchase Order Items To Be Received,د اخستلو امر توکي ترلاسه شي
 DocType: SMS Center,All Supplier Contact,ټول عرضه سره اړيکي
 DocType: Support Settings,Support Settings,د ملاتړ امستنې
-apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,د تمی د پای نیټه نه شي کولای په پرتله د تمی د پیل نیټه کمه وي
+apps/erpnext/erpnext/projects/doctype/project/project.py +72,Expected End Date can not be less than Expected Start Date,د تمی د پای نیټه نه شي کولای په پرتله د تمی د پیل نیټه کمه وي
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,د کتارونو تر # {0}: کچه باید په توګه ورته وي {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,نوي اجازه کاریال
 ,Batch Item Expiry Status,دسته شمیره د پای حالت
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,بانک مسوده
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,بانک مسوده
+DocType: Membership,membership validaty section,د غړیتوب تصدیق کول برخه
 DocType: Mode of Payment Account,Mode of Payment Account,د تادیاتو حساب اکر
 DocType: Consultation,Consultation,مشورې
-apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,خرڅلاو او راستنیدنه
+DocType: Accounts Settings,Show Payment Schedule in Print,په چاپ کې د تادياتو مهال ویش ښکاره کړئ
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +19,Sales and Returns,خرڅلاو او راستنیدنه
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,انکړپټه ښودل تانبه
 DocType: Academic Term,Academic Term,علمي مهاله
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,د مادي
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +670,Quantity,کمیت
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,جوړوي جدول نه خالي وي.
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,ویب پاڼه جوړول
+DocType: Opening Invoice Creation Tool Item,Quantity,کمیت
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +544,Accounts table cannot be blank.,جوړوي جدول نه خالي وي.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),پورونه (مسؤلیتونه)
 DocType: Employee Education,Year of Passing,د تصویب کال
 DocType: Item,Country of Origin,د استوګنی اصلی ځای
+DocType: Soil Texture,Soil Texture Criteria,د خاوری د جوړښت معیارونه
 apps/erpnext/erpnext/templates/includes/product_page.js +24,In Stock,په ګدام کښي
+apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,د اړیکو لومړني تفصیلات
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,د پرانیستې مسایل
 DocType: Production Plan Item,Production Plan Item,تولید پلان د قالب
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +144,User {0} is already assigned to Employee {1},کارن {0} لا د مخه د کارکونکو ګمارل {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},کارن {0} لا د مخه د کارکونکو ګمارل {1}
 DocType: Lab Test Groups,Add new line,نوې کرښه زیاته کړئ
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,روغتیایی پاملرنه
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,روغتیایی پاملرنه
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),د ځنډ په پیسو (ورځې)
+DocType: Payment Terms Template Detail,Payment Terms Template Detail,د تادیاتو شرایط سانچہ تفصیل
 DocType: Lab Prescription,Lab Prescription,د لابراتوار نسخه
 apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,د قیمت په اساس ترتیب کړئ
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,خدمتونو د اخراجاتو
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +888,Serial Number: {0} is already referenced in Sales Invoice: {1},مسلسله شمېره: {0} د مخکې نه په خرڅلاو صورتحساب ماخذ: {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Invoice,صورتحساب
-DocType: Maintenance Schedule Item,Periodicity,Periodicity
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,Serial Number: {0} is already referenced in Sales Invoice: {1},مسلسله شمېره: {0} د مخکې نه په خرڅلاو صورتحساب ماخذ: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +874,Invoice,صورتحساب
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,د ساتلو د ذخیرې انټرنټ جوړ کړئ
+DocType: Purchase Invoice Item,Item Weight Details,د وزن وزن توضیحات
+DocType: Asset Maintenance Log,Periodicity,Periodicity
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,مالي کال د {0} ته اړتیا لیدل کیږي
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,د دفاع
+DocType: Crop Cycle,The minimum distance between rows of plants for optimum growth,د مطلوب ودې لپاره د نباتاتو قطارونو تر منځ لږ تر لږه فاصله
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +21,Defense,د دفاع
 DocType: Salary Component,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),نمره (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},د کتارونو تر {0}: {1} {2} سره سمون نه خوري {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,Row {0}: {1} {2} does not match with {3},د کتارونو تر {0}: {1} {2} سره سمون نه خوري {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,د کتارونو تر # {0}:
 DocType: Timesheet,Total Costing Amount,Total لګښت مقدار
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,پیرودونکي> پیرودونکي ګروپ> ساحه
 DocType: Delivery Note,Vehicle No,موټر نه
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,مهرباني غوره بیې لېست
 DocType: Accounts Settings,Currency Exchange Settings,د بدلولو تبادله
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,د کتارونو تر # {0}: د تادیاتو سند ته اړتيا ده چې د trasaction بشپړ
 DocType: Production Order Operation,Work In Progress,کار په جریان کښی
-apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,مهرباني غوره نیټه
+apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,مهرباني غوره نیټه
 DocType: Employee,Holiday List,رخصتي بشپړفهرست
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,محاسب
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,محاسب
 DocType: Hub Settings,Selling Price List,د نرخ پلور لیست
 DocType: Patient,Tobacco Current Use,تمباکو اوسنی کارول
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +21,Selling Rate,د پلور کچه
 DocType: Cost Center,Stock User,دحمل کارن
+DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Company,Phone No,تيليفون نه
-apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,کورس ویش جوړ:
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},نوي {0}: # {1}
+DocType: Delivery Trip,Initial Email Notification Sent,د بریښناليک بریښنالیک لیږل
 ,Sales Partners Commission,خرڅلاو همکاران کمیسیون
+DocType: Soil Texture,Sandy Clay Loam,د سیني مټې لوام
 DocType: Purchase Invoice,Rounding Adjustment,د سمون تکرار
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,اختصاري نه شي کولای 5 څخه زیات وي
 DocType: Physician Schedule Time Slot,Physician Schedule Time Slot,د ډاکټرانو مهال ویش وخت وخت
 DocType: Payment Request,Payment Request,د پیسو غوښتنه
 DocType: Asset,Value After Depreciation,ارزښت د استهالک وروسته
-DocType: Employee,O+,اې +
+DocType: Student,O+,اې +
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +18,Related,اړوند
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,د حاضرۍ نېټه نه شي کولای د کارکوونکي د یوځای نېټې څخه کم وي
 DocType: Grading Scale,Grading Scale Name,د رتبو او مقياس نوم
@@ -126,149 +137,154 @@
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} د {1} په هر فعال مالي کال نه.
 DocType: Packed Item,Parent Detail docname,Parent تفصیلي docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",ماخذ: {0}، شمیره کوډ: {1} او پيرودونکو: {2}
-apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,کيلوګرام
+apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,کيلوګرام
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,د دنده پرانيستل.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,BOM is not specified for subcontracting item {0} at row {1},BOM د فرعي قرارداد کولو توکي لپاره {0} د صفر {1} لپاره مشخص نه دی
 DocType: Item Attribute,Increment,بهرمن
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,د وخت موده
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,وټاکئ ګدام ...
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,د اعلاناتو
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +6,Advertising,د اعلاناتو
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,همدې شرکت څخه یو ځل بیا ننوتل
 DocType: Patient,Married,واده
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},لپاره نه اجازه {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,له توکي ترلاسه کړئ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},دحمل د سپارنې يادونه په وړاندې د تازه نه شي {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,له توکي ترلاسه کړئ
+DocType: Price List,Price Not UOM Dependant,بیه د UOM پرځای نه ده
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},دحمل د سپارنې يادونه په وړاندې د تازه نه شي {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},د محصول د {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,هیڅ توکي لست
+DocType: Asset Repair,Error Description,تېروتنه
 DocType: Payment Reconciliation,Reconcile,پخلا
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,دغذا
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,دغذا
 DocType: Quality Inspection Reading,Reading 1,لوستلو 1
-DocType: Process Payroll,Make Bank Entry,بانک د انفاذ د کمکیانو لپاره
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,د تقاعد د بسپنو
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,بل د استهالک نېټه مخکې رانيول نېټه نه شي
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,د تقاعد د بسپنو
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,بل د استهالک نېټه مخکې رانيول نېټه نه شي
+DocType: Crop,Perennial,پیړۍ
 DocType: Consultation,Consultation Date,د مشورې نیټه
 apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,د محصول لیست او د ERPNext کاروونکو لپاره پلټنه
 DocType: SMS Center,All Sales Person,ټول خرڅلاو شخص
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** میاشتنی ویش ** تاسو سره مرسته کوي که تاسو د خپل کاروبار د موسمي لري د بودجې د / د هدف په ټول مياشتو وویشي.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,نه توکي موندل
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1742,Not items found,نه توکي موندل
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,معاش جوړښت ورک
 DocType: Lead,Person Name,کس نوم
 DocType: Sales Invoice Item,Sales Invoice Item,خرڅلاو صورتحساب د قالب
 DocType: Account,Credit,د اعتبار
 DocType: POS Profile,Write Off Cost Center,ولیکئ پړاو لګښت مرکز
-apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""",د بيلګې په توګه: "لومړنی ښوونځی" یا "پوهنتون"
-apps/erpnext/erpnext/config/stock.py +32,Stock Reports,دحمل راپورونه
+apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""",د بيلګې په توګه: "لومړنی ښوونځی" یا "پوهنتون"
+apps/erpnext/erpnext/config/stock.py +28,Stock Reports,دحمل راپورونه
 DocType: Warehouse,Warehouse Detail,ګدام تفصیلي
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},پورونو د حد لپاره د مشتريانو د اوښتي دي {0} د {1} / {2}
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,د دورې د پای نیټه نه وروسته د کال د پای د تعليمي کال د نېټه چې د اصطلاح ده سره تړاو لري په پرتله وي (تعليمي کال د {}). لطفا د خرما د اصلاح او بیا کوښښ وکړه.
-apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","آیا ثابته شتمني" کولای وناکتل نه وي، ځکه چې د توکي په وړاندې د شتمنیو د ثبت شتون لري
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},پورونو د حد لپاره د مشتريانو د اوښتي دي {0} د {1} / {2}
+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 +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","آیا ثابته شتمني" کولای وناکتل نه وي، ځکه چې د توکي په وړاندې د شتمنیو د ثبت شتون لري
+DocType: Delivery Trip,Departure Time,د روانېدو وخت
 DocType: Vehicle Service,Brake Oil,لنت ترمز د تیلو
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,پېرودونکي> پیرودونکي ګروپ> ساحه
 DocType: Tax Rule,Tax Type,د مالياتو ډول
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,د ماليې وړ مقدار
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +561,Taxable Amount,د ماليې وړ مقدار
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},تاسو اختيار نه لري چې مخکې ثبت کرښې زیاتولی او یا تازه {0}
 DocType: BOM,Item Image (if not slideshow),د قالب د انځور (که سلاید نه)
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(قيامت Rate / 60) * د عملیاتو د وخت
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Row # {0}: د حوالې سند ډول باید د لګښتونو یا ژورنال ننوتلو څخه یو وي
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,انتخاب هیښ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1076,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Row # {0}: د حوالې سند ډول باید د لګښتونو یا ژورنال ننوتلو څخه یو وي
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +964,Select BOM,انتخاب هیښ
 DocType: SMS Log,SMS Log,SMS ننوتنه
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,د تحویلوونکی سامان لګښت
+apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,د کارمندانو ته ورکړل شوي وړاندیز شوي مقدار اداره کړئ
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,د {0} د رخصتۍ له تاريخ او د تاريخ تر منځ نه ده
 DocType: Student Log,Student Log,د زده کونکو د ننوتنه
 DocType: Quality Inspection,Get Specification Details,ترلاسه کړئ د ځانګړتیاوو په بشپړه توګه کتل
 apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,د عرضه کوونکي موقف نمونه.
 DocType: Lead,Interested,علاقمند
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +171,Opening,د پرانستلو
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +28,From {0} to {1},څخه د {0} د {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +219,Opening,د پرانستلو
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +29,From {0} to {1},څخه د {0} د {1}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,د مالیې په ټاکلو کې پاتې راغلل
 DocType: Item,Copy From Item Group,کاپي له قالب ګروپ
+DocType: Delivery Trip,Delivery Notification,د سپارلو خبرتیا
 DocType: Journal Entry,Opening Entry,د پرانستلو په انفاذ
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,حساب د معاشونو يوازې
 DocType: Employee Loan,Repay Over Number of Periods,بيرته د د پړاوونه شمیره
 DocType: Stock Entry,Additional Costs,اضافي لګښتونو
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Account with existing transaction can not be converted to group.,د موجوده د راکړې ورکړې حساب ته ډلې بدل نه شي.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Account with existing transaction can not be converted to group.,د موجوده د راکړې ورکړې حساب ته ډلې بدل نه شي.
 DocType: Lead,Product Enquiry,د محصول د ږنو
-DocType: Academic Term,Schools,د ښوونځيو
-DocType: School Settings,Validate Batch for Students in Student Group,لپاره د زده کونکو د زده ګروپ دسته اعتباري
+DocType: Education Settings,Validate Batch for Students in Student Group,لپاره د زده کونکو د زده ګروپ دسته اعتباري
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},نه رخصت شی پيدا نشول لپاره کارکوونکي {0} د {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,مهرباني وکړئ لومړی شرکت ته ننوځي
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +358,Please select Company first,مهرباني غوره شرکت لومړۍ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Company first,مهرباني غوره شرکت لومړۍ
 DocType: Employee Education,Under Graduate,لاندې د فراغت
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,هدف د
 DocType: BOM,Total Cost,ټولیز لګښت،
+DocType: Soil Analysis,Ca/K,Ca / K
 DocType: Journal Entry Account,Employee Loan,د کارګر د پور
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,فعالیت ننوتنه:
 DocType: Fee Schedule,Send Payment Request Email,د بریښناليک غوښتن لیک استول
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,{0} د قالب په سيستم شتون نه لري يا وخت تېر شوی دی
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,املاک
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +259,Item {0} does not exist in the system or has expired,{0} د قالب په سيستم شتون نه لري يا وخت تېر شوی دی
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,املاک
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,د حساب اعلامیه
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,د درملو د
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +41,Pharmaceuticals,د درملو د
 DocType: Purchase Invoice Item,Is Fixed Asset,ده ثابته شتمني
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +234,"Available qty is {0}, you need {1}",موجود qty دی {0}، تاسو بايد د {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +251,"Available qty is {0}, you need {1}",موجود qty دی {0}، تاسو بايد د {1}
 DocType: Expense Claim Detail,Claim Amount,ادعا مقدار
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +51,Duplicate customer group found in the cutomer group table,دوه ګونو مشتريانو د ډلې په cutomer ډلې جدول کې وموندل
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +56,Duplicate customer group found in the cutomer group table,دوه ګونو مشتريانو د ډلې په cutomer ډلې جدول کې وموندل
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,عرضه ډول / عرضه
 DocType: Naming Series,Prefix,هغه مختاړی
 apps/erpnext/erpnext/hr/email_alert/training_scheduled/training_scheduled.html +7,Event Location,د موقع ځای
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Consumable,د مصرف
-DocType: Employee,B-,B-
-DocType: Upload Attendance,Import Log,د وارداتو ننوتنه
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +68,Consumable,د مصرف
+DocType: Student,B-,B-
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,د ډول د جوړون توکو غوښتنه پر بنسټ د پورته معیارونو پر وباسي
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,په بریالیتوب سره ندی ثبت شوی.
-DocType: Training Result Employee,Grade,ټولګي
+DocType: Assessment Result,Grade,ټولګي
 DocType: Restaurant Table,No of Seats,د څوکیو شمیر
 DocType: Subscription,"To add dynamic subject, use jinja tags like
 
 <div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","د متحرک موضوع اضافه کولو لپاره، د جینج ټګګ په څیر کاروئ <div style=""""><pre style=""""> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,تحویلوونکی By عرضه
+DocType: Asset Maintenance Task,Asset Maintenance Task,د شتمنیو ساتنه
 DocType: SMS Center,All Contact,ټول سره اړيکي
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,تولید نظم لا سره د هیښ ټول توکي جوړ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,کلنی معاش
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +952,Production Order already created for all items with BOM,تولید نظم لا سره د هیښ ټول توکي جوړ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +230,Annual Salary,کلنی معاش
 DocType: Daily Work Summary,Daily Work Summary,هره ورځ د کار لنډیز
 DocType: Period Closing Voucher,Closing Fiscal Year,مالي کال تړل
-apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} د {1} ده کنګل
-apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,لورينه وکړئ د د حسابونو چارټ جوړولو موجوده شرکت وټاکئ
+apps/erpnext/erpnext/accounts/party.py +380,{0} {1} is frozen,{0} د {1} ده کنګل
+apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,لورينه وکړئ د د حسابونو چارټ جوړولو موجوده شرکت وټاکئ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,دحمل داخراجاتو
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,وټاکئ هدف ګدام
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,وټاکئ هدف ګدام
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +103,Select Target Warehouse,وټاکئ هدف ګدام
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +103,Select Target Warehouse,وټاکئ هدف ګدام
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,لطفا غوره تماس بريښناليک
-DocType: Program Enrollment,School Bus,د ښوونځي بس
 DocType: Journal Entry,Contra Entry,Contra انفاذ
 DocType: Journal Entry Account,Credit in Company Currency,په شرکت د پیسو د اعتبار
 DocType: Lab Test UOM,Lab Test UOM,د لابراتوار ازموینه
 DocType: Delivery Note,Installation Status,نصب او وضعیت
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +135,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +135,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",تاسو غواړئ چې د حاضرۍ د اوسمهالولو؟ <br> اوسنی: {0} \ <br> حاضر: {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +325,Accepted + Rejected Qty must be equal to Received quantity for Item {0},منل + رد Qty باید د قالب برابر رارسيدلي مقدار وي {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +326,Accepted + Rejected Qty must be equal to Received quantity for Item {0},منل + رد Qty باید د قالب برابر رارسيدلي مقدار وي {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,رسولو لپاره خام توکي د رانيول
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +149,At least one mode of payment is required for POS invoice.,د پیسو تر لږه یوه اکر لپاره POS صورتحساب ته اړتيا لري.
+DocType: Agriculture Analysis Criteria,Fertilizer,سرې
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +150,At least one mode of payment is required for POS invoice.,د پیسو تر لږه یوه اکر لپاره POS صورتحساب ته اړتيا لري.
 DocType: Products Settings,Show Products as a List,انکړپټه ښودل محصوالت په توګه بشپړفهرست
-DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
-All dates and employee combination in the selected period will come in the template, with existing attendance records",دانلود د کينډۍ، د مناسبو معلوماتو د ډکولو او د دوتنه کې ضمیمه کړي. د ټاکل شوې مودې په ټولو نیټې او کارمند ترکیب به په کېنډۍ کې راغلي، د موجوده حاضري سوابق
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,{0} د قالب فعاله نه وي او يا د ژوند د پای ته رسیدلی دی شوی
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +507,Item {0} is not active or end of life has been reached,{0} د قالب فعاله نه وي او يا د ژوند د پای ته رسیدلی دی شوی
 DocType: Student Admission Program,Minimum Age,لږ تر لږه عمر
-apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,بېلګه: د اساسي ریاضیاتو
-apps/erpnext/erpnext/controllers/accounts_controller.py +657,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",په قطار {0} په قالب کچه د ماليې شامل دي، چې په قطارونو ماليه {1} هم باید شامل شي
-apps/erpnext/erpnext/config/hr.py +218,Settings for HR Module,د بشري حقونو د څانګې ماډل امستنې
+apps/erpnext/erpnext/utilities/user_progress.py +187,Example: Basic Mathematics,بېلګه: د اساسي ریاضیاتو
+apps/erpnext/erpnext/controllers/accounts_controller.py +769,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",په قطار {0} په قالب کچه د ماليې شامل دي، چې په قطارونو ماليه {1} هم باید شامل شي
+apps/erpnext/erpnext/config/hr.py +223,Settings for HR Module,د بشري حقونو د څانګې ماډل امستنې
 DocType: SMS Center,SMS Center,SMS مرکز
 DocType: Sales Invoice,Change Amount,د بدلون لپاره د مقدار
 DocType: BOM Update Tool,New BOM,نوي هیښ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +117,Please enter Delivery Date,مهرباني وکړئ د سپارلو نېټه ولیکئ
+DocType: Driver,Driving License Categories,د موټر چلولو جوازونو کټګوري
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,مهرباني وکړئ د سپارلو نېټه ولیکئ
 DocType: Depreciation Schedule,Make Depreciation Entry,د استهالک د داخلولو د کمکیانو لپاره
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,غوښتنه ډول
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,د کارګر د کمکیانو لپاره
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,broadcasting
-apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),د POS د سیٹ اپ طریقه (آنلاین / آف لائن)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,د اجرا
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,broadcasting
+apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),د POS د سیٹ اپ طریقه (آنلاین / آف لائن)
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,د اجرا
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,د عملیاتو په بشپړه توګه کتل ترسره.
-DocType: Serial No,Maintenance Status,د ساتنې حالت
+DocType: Asset Maintenance Log,Maintenance Status,د ساتنې حالت
+apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,د غړیتوب تفصیلات
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} د {1}: عرضه ده د راتلوونکې ګڼون په وړاندې د اړتيا {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,توکي او د بیې ټاکل
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Total ساعتونو: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},له نېټه بايد د مالي کال په چوکاټ کې وي. فرض له نېټه = {0}
 DocType: Drug Prescription,Interval,انټرالول
-DocType: Customer,Individual,انفرادي
-DocType: Interest,Academics User,پوهانو کارن
+DocType: Grant Application,Individual,انفرادي
+DocType: Academic Term,Academics User,پوهانو کارن
 DocType: Cheque Print Template,Amount In Figure,اندازه په شکل کې
 DocType: Employee Loan Application,Loan Info,د پور پيژندنه
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,د ساتنې کتنو پلان.
@@ -281,17 +297,19 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,د بیې په لېست باید د شځينه يا خرڅول د تطبيق وړ وي
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},نصب او نېټې لپاره د قالب د سپارلو نېټې مخکې نه شي {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),تخفیف پر بیې لېست کچه)٪ (
-apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,بایو کیمیا
+apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,د توکي ټکي
+apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,بایو کیمیا
 DocType: Offer Letter,Select Terms and Conditions,منتخب اصطلاحات او شرایط
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,له جملې څخه د ارزښت
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Out Value,له جملې څخه د ارزښت
 DocType: Production Planning Tool,Sales Orders,خرڅلاو امر
 DocType: Purchase Taxes and Charges,Valuation,سنجي
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +373,Set as Default,د جال په توګه ترتیب کړئ
 ,Purchase Order Trends,پیري نظم رجحانات
 apps/erpnext/erpnext/utilities/user_progress.py +75,Go to Customers,ګمرکونو ته لاړ شئ
 apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,د مادیاتو په غوښتنه په کېکاږلو سره په لاندې لینک رسی شي
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,د کال لپاره د پاڼي تخصيص.
 DocType: SG Creation Tool Course,SG Creation Tool Course,SG خلقت اسباب کورس
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Insufficient Stock,ناکافي دحمل
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Insufficient Stock,ناکافي دحمل
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,ناتوانې ظرفیت د پلان او د وخت د معلومولو
 DocType: Email Digest,New Sales Orders,نوي خرڅلاو امر
 DocType: Bank Guarantee,Bank Account,د بانک ګڼوڼ
@@ -299,67 +317,69 @@
 apps/erpnext/erpnext/projects/doctype/project_type/project_type.py +13,You cannot delete Project Type 'External',تاسو د پروژې ډول &#39;بهرني&#39; نه ړنګولی شئ
 DocType: Employee,Create User,کارن جوړول
 DocType: Selling Settings,Default Territory,default خاوره
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,ټلويزيون د
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,ټلويزيون د
 DocType: Production Order Operation,Updated via 'Time Log',روز &#39;د وخت څېره&#39; له لارې
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +427,Advance amount cannot be greater than {0} {1},پرمختللی اندازه نه شي کولای څخه ډيره وي {0} د {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +428,Advance amount cannot be greater than {0} {1},پرمختللی اندازه نه شي کولای څخه ډيره وي {0} د {1}
 DocType: Naming Series,Series List for this Transaction,د دې پیسو د انتقال د لړۍ بشپړفهرست
 DocType: Company,Enable Perpetual Inventory,دايمي موجودي فعال
 DocType: Company,Default Payroll Payable Account,Default د معاشاتو د راتلوونکې حساب
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +51,Update Email Group,تازه بريښناليک ګروپ
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,تازه بريښناليک ګروپ
 DocType: Sales Invoice,Is Opening Entry,ده انفاذ پرانيستل
 DocType: Lab Test Template,"If unchecked, the item wont be appear in Sales Invoice, but can be used in group test creation. ",که ناباوره شوی وي، توکي به د پلورنې انوونټ کې حاضر نه وي، مګر د ډله ایزې ازموینې په جوړولو کې کارول کیدی شي.
 DocType: Customer Group,Mention if non-standard receivable account applicable,یادونه که غیر معیاري ترلاسه حساب د تطبيق وړ
 DocType: Course Schedule,Instructor Name,د لارښوونکي نوم
 DocType: Supplier Scorecard,Criteria Setup,معیار معیار
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,For Warehouse is required before Submit,د ګدام مخکې اړتیا سپارل
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +199,For Warehouse is required before Submit,د ګدام مخکې اړتیا سپارل
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,د ترلاسه
 DocType: Sales Partner,Reseller,د پلورنې
 DocType: Codification Table,Medical Code,روغتیایی کود
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.",که وکتل، به په مادي غوښتنې غیر سټاک توکي شامل دي.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,مهرباني وکړئ د شرکت ته ننوځي
 DocType: Delivery Note Item,Against Sales Invoice Item,په وړاندې د خرڅلاو صورتحساب د قالب
+DocType: Agriculture Analysis Criteria,Linked Doctype,تړل شوي دکتیک ډول
 ,Production Orders in Progress,په پرمختګ تولید امر
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,له مالي خالص د نغدو
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save",LocalStorage ډک شي، نه د ژغورلو نه
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2332,"LocalStorage is full , did not save",LocalStorage ډک شي، نه د ژغورلو نه
 DocType: Lead,Address & Contact,پته تماس
 DocType: Leave Allocation,Add unused leaves from previous allocations,د تیرو تخصیص ناکارول پاڼي ورزیات کړئ
 DocType: Sales Partner,Partner website,همکار ویب پاڼه
 DocType: Restaurant Order Entry,Add Item,Add د قالب
 DocType: Lab Test,Custom Result,د ګمرکي پایلې
-apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,تماس نوم
+DocType: Delivery Stop,Contact Name,تماس نوم
 DocType: Course Assessment Criteria,Course Assessment Criteria,کورس د ارزونې معیارونه
-DocType: Process Payroll,Creates salary slip for above mentioned criteria.,لپاره د پورته ذکر معیارونو معاش ټوټه.
 DocType: POS Customer Group,POS Customer Group,POS پيرودونکو ګروپ
+DocType: Land Unit,Land Unit describing various land assets,د ځمکې واحد د بیالبیلو ځمکو شتمنیو تشریح کوي
 DocType: Cheque Print Template,Line spacing for amount in words,لپاره په لفظ اندازه ليکې تشه
 DocType: Vehicle,Additional Details,اضافي نورولوله
-apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Assessment Plan: ,د ارزونې پلان:
+apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Assessment Plan: ,د ارزونې پلان:
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,نه توضيحات ورکړل
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,لپاره د اخیستلو غوښتنه وکړي.
 DocType: Lab Test,Submitted Date,سپارل شوی نیټه
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,دا کار د وخت د سکيچ جوړ د دې پروژې پر وړاندې پر بنسټ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,خالص د معاشونو نه شي کولای 0 څخه کم وي
+DocType: Payment Term,Credit Months,د کریډیټ میاشت
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,خالص د معاشونو نه شي کولای 0 څخه کم وي
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription",د سیسټم څخه د تکرار غلطی خبرتیاوو لیږلو مخه نیولو لپاره، موږ په ګډون کې د معلولینو ساحه وګورئ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,یوازې د ټاکل اجازه Approver دا اجازه او د غوښتنليک وسپاري
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,کرارولو نېټه بايد په پرتله په یوځای کېدو نېټه ډيره وي
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,روان شو هر کال
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,د کتارونو تر {0}: مهرباني وکړئ وګورئ &#39;آیا پرمختللی&#39; حساب په وړاندې د {1} که دا د يو داسې پرمختللي ننوتلو ده.
-apps/erpnext/erpnext/stock/utils.py +212,Warehouse {0} does not belong to company {1},ګدام {0} نه شرکت سره تړاو نه لري {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,کرارولو نېټه بايد په پرتله په یوځای کېدو نېټه ډيره وي
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,روان شو هر کال
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,د کتارونو تر {0}: مهرباني وکړئ وګورئ &#39;آیا پرمختللی&#39; حساب په وړاندې د {1} که دا د يو داسې پرمختللي ننوتلو ده.
+apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},ګدام {0} نه شرکت سره تړاو نه لري {1}
 DocType: Email Digest,Profit & Loss,ګټه او زیان
-apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,ني
+apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,ني
 DocType: Task,Total Costing Amount (via Time Sheet),Total لګښت مقدار (د وخت پاڼه له لارې)
-apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,لطفا د زده کونکو د شاګردانو له ډلې څخه فارغ کړئ
+apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +69,Please setup Students under Student Groups,لطفا د زده کونکو د شاګردانو له ډلې څخه فارغ کړئ
 DocType: Item Website Specification,Item Website Specification,د قالب د ځانګړتیاوو وېب پاڼه
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,د وتو بنديز لګېدلی
-apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},{0} د قالب په خپلو د ژوند پای ته ورسېدئ {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,بانک توکي
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,کلنی
+apps/erpnext/erpnext/stock/doctype/item/item.py +709,Item {0} has reached its end of life on {1},{0} د قالب په خپلو د ژوند پای ته ورسېدئ {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Bank Entries,بانک توکي
+DocType: Crop,Annual,کلنی
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,دحمل پخلاينې د قالب
 DocType: Stock Entry,Sales Invoice No,خرڅلاو صورتحساب نه
 DocType: Material Request Item,Min Order Qty,Min نظم Qty
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,د زده کونکو د ګروپ خلقت اسباب کورس
 DocType: Lead,Do Not Contact,نه د اړيکې
-apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,هغه خلک چې په خپل سازمان د درس
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,د پوستکالي د پراختیا
+apps/erpnext/erpnext/utilities/user_progress.py +207,People who teach at your organisation,هغه خلک چې په خپل سازمان د درس
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,د پوستکالي د پراختیا
 DocType: Item,Minimum Order Qty,لږ تر لږه نظم Qty
 DocType: Pricing Rule,Supplier Type,عرضه ډول
 DocType: Course Scheduling Tool,Course Start Date,د کورس د پیل نیټه
@@ -368,58 +388,64 @@
 DocType: Item,Publish in Hub,په مرکز د خپرېدو
 DocType: Student Admission,Student Admission,د زده کونکو د شاملیدو
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,{0} د قالب دی لغوه
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,د موادو غوښتنه
+apps/erpnext/erpnext/stock/doctype/item/item.py +729,Item {0} is cancelled,{0} د قالب دی لغوه
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +948,Material Request,د موادو غوښتنه
 DocType: Bank Reconciliation,Update Clearance Date,تازه چاڼېزو نېټه
 DocType: Item,Purchase Details,رانيول نورولوله
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},د قالب {0} په خام مواد &#39;جدول په اخستلو امر ونه موندل {1}
-DocType: Patient Relation,Relation,د خپلوي
-DocType: Shipping Rule,Worldwide Shipping,د نړۍ په نقل
-DocType: Patient Relation,Mother,مور
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},د قالب {0} په خام مواد &#39;جدول په اخستلو امر ونه موندل {1}
+DocType: Salary Slip,Total Principal Amount,ټول اصلي مقدار
+DocType: Student Guardian,Relation,د خپلوي
+DocType: Student Guardian,Mother,مور
 DocType: Restaurant Reservation,Reservation End Time,د خوندیتوب پای وخت
+DocType: Crop,Biennial,دوه کلن
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,له پېرودونکي تاييد امر.
 DocType: Purchase Receipt Item,Rejected Quantity,رد مقدار
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,د پیسو غوښتنه {0} جوړه شوې
-apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,لږ حساسیت
+apps/erpnext/erpnext/education/doctype/fees/fees.py +80,Payment request {0} created,د پیسو غوښتنه {0} جوړه شوې
+apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +72,Open Orders,پرانیستونکي څیزونه
+apps/erpnext/erpnext/healthcare/setup.py +255,Low Sensitivity,لږ حساسیت
 DocType: Notification Control,Notification Control,خبرتیا د کنټرول
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,مهرباني وکړئ یوځل بیا تایید کړئ کله چې تاسو خپل زده کړې بشپړې کړې
 DocType: Lead,Suggestions,وړانديزونه
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,ټولګې د قالب په دې خاوره ګروپ-هوښيار بودجې. تاسو هم کولای شو د ويش د ټاکلو موسمي شامل دي.
+DocType: Payment Term,Payment Term Name,د تادیاتو اصطالح نوم
 DocType: Healthcare Settings,Create documents for sample collection,د نمونو راټولولو لپاره اسناد چمتو کړئ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +276,Payment against {0} {1} cannot be greater than Outstanding Amount {2},په وړاندې د پیسو {0} د {1} نه شي وتلي مقدار څخه ډيره وي {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +274,Payment against {0} {1} cannot be greater than Outstanding Amount {2},په وړاندې د پیسو {0} د {1} نه شي وتلي مقدار څخه ډيره وي {2}
 DocType: Supplier,Address HTML,پته د HTML
 DocType: Lead,Mobile No.,د موبايل په شمیره
 DocType: Maintenance Schedule,Generate Schedule,تولید مهال ويش
 DocType: Purchase Invoice Item,Expense Head,اخراجاتو مشر
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Please select Charge Type first,مهرباني وکړئ لومړی د ټاکلو مسؤوليت په ډول
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +163,Please select Charge Type first,مهرباني وکړئ لومړی د ټاکلو مسؤوليت په ډول
+DocType: Crop,"You can define all the tasks which need to carried out for this crop here. The day field is used to mention the day on which the task needs to be carried out, 1 being the 1st day, etc.. ",تاسو کولی شئ ټول هغه دندې وټاکئ کوم چې دلته د دې فصل لپاره ترسره کیږي. د ورځې ساحه د هغې ورځې د یادولو لپاره کارول کیږي چې دنده یې باید ترسره شي، 1 لومړی ورځ، او نور.
 DocType: Student Group Student,Student Group Student,د زده کونکو د ګروپ د زده کوونکو
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,تازه
+DocType: Asset Maintenance Task,2 Yearly,دوه کلن
+DocType: Education Settings,Education Settings,د زده کړې ترتیبات
 DocType: Vehicle Service,Inspection,تفتیش
 DocType: Supplier Scorecard Scoring Standing,Max Grade,لوړې درجې
 DocType: Email Digest,New Quotations,نوي Quotations
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,د کارکوونکو د برېښناليک معاش ټوټه پر بنسټ د خوښې ایمیل کې د کارګر ټاکل
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,په لست کې د اجازه لومړی Approver به د تلواله اجازه Approver په توګه جوړ شي
 DocType: Tax Rule,Shipping County,انتقال County
-apps/erpnext/erpnext/config/desktop.py +159,Learn,وکړئ
+apps/erpnext/erpnext/config/desktop.py +167,Learn,وکړئ
 DocType: Asset,Next Depreciation Date,بل د استهالک نېټه
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,فعالیت لګښت په سلو کې د کارګر
 DocType: Accounts Settings,Settings for Accounts,لپاره حسابونه امستنې
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +663,Supplier Invoice No exists in Purchase Invoice {0},په رانيول صورتحساب عرضه صورتحساب شتون نه لري {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +667,Supplier Invoice No exists in Purchase Invoice {0},په رانيول صورتحساب عرضه صورتحساب شتون نه لري {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Manage خرڅلاو شخص د ونو.
 DocType: Job Applicant,Cover Letter,د خط کور
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,بيالنس Cheques او سپما او پاکول
 DocType: Item,Synced With Hub,دفارسی د مرکزي
-DocType: Vehicle,Fleet Manager,د بیړیو د مدير
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},د کتارونو تر # {0}: {1} نه شي لپاره توکی منفي وي {2}
+DocType: Driver,Fleet Manager,د بیړیو د مدير
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},د کتارونو تر # {0}: {1} نه شي لپاره توکی منفي وي {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,غلط شفر
 DocType: Item,Variant Of,د variant
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',بشپړ Qty نه شي کولای په پرتله &#39;Qty تولید&#39; وي
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Completed Qty can not be greater than 'Qty to Manufacture',بشپړ Qty نه شي کولای په پرتله &#39;Qty تولید&#39; وي
 DocType: Period Closing Voucher,Closing Account Head,حساب مشر تړل
 DocType: Employee,External Work History,بهرني کار تاریخ
 DocType: Physician,Time per Appointment,د تقاعد وخت
 apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,متحدالمال ماخذ کې تېروتنه
 DocType: Appointment Type,Is Inpatient,په داخل کښی دی
-apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Guardian1 نوم
+apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Guardian1 نوم
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,په وييکي (صادراتو) به د لیدو وړ وي يو ځل تاسو تسلیمی يادونه وژغوري.
 DocType: Cheque Print Template,Distance from left edge,کيڼې څنډې څخه فاصله
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} د [{1}] واحدونه (# فورمه / د قالب / {1}) په [{2}] وموندل (# فورمه / تون / د {2})
@@ -428,20 +454,22 @@
 DocType: BOM Item,Rate & Amount,اندازه او مقدار
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,دا د دې شرکت په وړاندې د راکړې ورکړې پر بنسټ دی. د جزیاتو لپاره لاندې مهال ویش وګورئ
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,د اتومات د موادو غوښتنه رامنځته کېدو له امله دبرېښنا ليک خبر
-apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,مقاومت
+apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,مقاومت
 DocType: Journal Entry,Multi Currency,څو د اسعارو
-DocType: Payment Reconciliation Invoice,Invoice Type,صورتحساب ډول
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,د سپارنې پرمهال یادونه
+DocType: Opening Invoice Creation Tool,Invoice Type,صورتحساب ډول
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,د سپارنې پرمهال یادونه
 DocType: Consultation,Encounter Impression,اغیزه اغیزه
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,مالیات ترتیبول
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,د شتمنيو د دلال لګښت
-apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,د پیسو د داخلولو بدل شوی دی وروسته کش تاسو دا. دا بیا لطفا وباسي.
-apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} په قالب د مالياتو د دوه ځله ننوتل
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,د شتمنيو د دلال لګښت
+DocType: Volunteer,Morning,سهار
+apps/erpnext/erpnext/accounts/utils.py +347,Payment Entry has been modified after you pulled it. Please pull it again.,د پیسو د داخلولو بدل شوی دی وروسته کش تاسو دا. دا بیا لطفا وباسي.
+apps/erpnext/erpnext/stock/doctype/item/item.py +464,{0} entered twice in Item Tax,{0} په قالب د مالياتو د دوه ځله ننوتل
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,لنډيز دې اوونۍ او په تمه د فعالیتونو لپاره
 DocType: Student Applicant,Admitted,اعتراف وکړ
 DocType: Workstation,Rent Cost,د کرايې لګښت
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,اندازه د استهالک وروسته
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97,Upcoming Calendar Events,راتلونکو جنتري پیښې
+apps/erpnext/erpnext/public/js/templates/item_quick_entry.html +1,Variant Attributes,مختلف ډولونه
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +85,Please select month and year,لطفا مياشت او کال وټاکئ
 DocType: Employee,Company Email,شرکت دبرېښنا ليک
 DocType: GL Entry,Debit Amount in Account Currency,په حساب د اسعارو ډیبیټ مقدار
@@ -451,33 +479,35 @@
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,بانک / د نقدو پیسو د ګوند پر وړاندې او یا د داخلي د لیږد لپاره د معاملو
 DocType: Shipping Rule,Valid for Countries,لپاره د اعتبار وړ هیوادونه
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,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,دا د قالب يو کينډۍ ده او په معاملو کې نه شي کارېدلی. د قالب صفاتو به د بېرغونو کې کاپي شي، مګر نه کاپي &#39;ټاکل شوې ده
+DocType: Grant Application,Grant Application,د وړیا مرستو غوښتنه
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Total نظم نیول کیږی
-apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).",د کارګر ونومول شي (لکه د اجرايي، رييس او داسې نور).
+apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).",د کارګر ونومول شي (لکه د اجرايي، رييس او داسې نور).
 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 +558,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},د کتارونو تر # {0}: رانيول صورتحساب د شته شتمنیو په وړاندې نه شي کولای شي د {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +602,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},د کتارونو تر # {0}: رانيول صورتحساب د شته شتمنیو په وړاندې نه شي کولای شي د {1}
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[متوجه] د بیاکتنې لپاره د٪ s لپاره تېروتنه
+DocType: Land Unit,LInked Analysis,محدود معلومات
 DocType: Item Tax,Tax Rate,د مالياتو د Rate
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} لپاره د کارګر لا ځانګړې {1} لپاره موده {2} د {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,انتخاب د قالب
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +915,Select Item,انتخاب د قالب
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,پیري صورتحساب {0} لا وسپارل
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},د کتارونو تر # {0}: دسته نه باید ورته وي {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,د غیر ګروپ ته واړوئ
-apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,دسته (ډېر) د یو قالب.
 DocType: C-Form Invoice Detail,Invoice Date,صورتحساب نېټه
 DocType: GL Entry,Debit Amount,ډیبیټ مقدار
-apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},هلته يوازې کولای شي په هر شرکت 1 حساب وي {0} د {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,مهرباني مل وګورئ
+apps/erpnext/erpnext/accounts/party.py +251,There can only be 1 Account per Company in {0} {1},هلته يوازې کولای شي په هر شرکت 1 حساب وي {0} د {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +426,Please see attachment,مهرباني مل وګورئ
 DocType: Purchase Order,% Received,٪ د ترلاسه
-apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,د زده کونکو د ډلو جوړول
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Setup د مخه بشپړ !!
+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 +24,Credit Note Amount,اعتبار يادونه مقدار
 DocType: Setup Progress Action,Action Document,د عمل سند
+DocType: Chapter Member,Website URL,د ویب پاڼې یو آر ایل
 ,Finished Goods,پای ته سامانونه
 DocType: Delivery Note,Instructions,لارښوونه:
 DocType: Quality Inspection,Inspected By,تفتیش By
-DocType: Maintenance Visit,Maintenance Type,د ساتنې ډول
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} په کورس کې شامل نه {2}
+DocType: Asset Maintenance Log,Maintenance Type,د ساتنې ډول
+apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} په کورس کې شامل نه {2}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},شعبه {0} نه د سپارنې يادونه سره تړاو نه لري {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext قالب
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,سامان ورزیات کړئ
@@ -488,33 +518,35 @@
 DocType: Packed Item,Packed Item,ډک د قالب
 apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,د معاملو اخلي تلواله امستنو.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},فعالیت لګښت فعالیت ډول پر وړاندې د کارکوونکی د {0} شته - {1}
-apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory field - Get Students From,اجباري ډګر - لاسه زده کونکو له
-apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory field - Get Students From,اجباري ډګر - لاسه زده کونکو له
+apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory field - Get Students From,اجباري ډګر - لاسه زده کونکو له
+apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory field - Get Students From,اجباري ډګر - لاسه زده کونکو له
 DocType: Program Enrollment,Enrolled courses,ثبت شوي کورسونه
 DocType: Program Enrollment,Enrolled courses,ثبت شوي کورسونه
 DocType: Currency Exchange,Currency Exchange,د پیسو د بدلولو
-DocType: Asset,Item Name,د قالب نوم
+DocType: Opening Invoice Creation Tool Item,Item Name,د قالب نوم
 DocType: Authorization Rule,Approving User  (above authorized value),تصویب کارن (اجازه ارزښت پورته)
 DocType: Email Digest,Credit Balance,پورونو د بیلانس
 DocType: Employee,Widowed,کونډې
 DocType: Request for Quotation,Request for Quotation,لپاره د داوطلبۍ غوښتنه
 DocType: Healthcare Settings,Require Lab Test Approval,د لابراتوار ازموینې ته اړتیا
 DocType: Salary Slip Timesheet,Working Hours,کار ساعتونه
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,بشپړ شوی
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,د پیل / اوسني تسلسل کې د شته لړ شمېر کې بدلون راولي.
 DocType: Dosage Strength,Strength,ځواک
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,یو نوی پيرودونکو جوړول
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1523,Create a new Customer,یو نوی پيرودونکو جوړول
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",که څو د بیو د اصولو دوام پراخیدل، د کاروونکو څخه پوښتنه کيږي چي د لومړیتوب ټاکل لاسي د شخړې حل کړي.
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,رانيول امر جوړول
 ,Purchase Register,رانيول د نوم ثبتول
-DocType: Course Scheduling Tool,Rechedule,Rechedule
+DocType: Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,د تطبيق په تور
 DocType: Workstation,Consumable Cost,د مصرف لګښت
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) باید رول لري &#39;اجازه Approver&#39;
 DocType: Purchase Receipt,Vehicle Date,موټر نېټه
 DocType: Student Log,Medical,د طب
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,د له لاسه ورکولو لامل
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,سرب د خاوند نه شي کولی چې په غاړه په توګه ورته وي
-apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,ځانګړې اندازه کولای بوختوکارګرانو مقدار څخه زياته نه
+apps/erpnext/erpnext/accounts/doctype/account/account.js +52,Update Account Number,د نوي حساب ورکولو شمیره
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,سرب د خاوند نه شي کولی چې په غاړه په توګه ورته وي
+apps/erpnext/erpnext/accounts/utils.py +353,Allocated amount can not greater than unadjusted amount,ځانګړې اندازه کولای بوختوکارګرانو مقدار څخه زياته نه
 DocType: Announcement,Receiver,د اخيستونکي
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},Workstation په لاندې نېټو بند دی هر رخصتي بشپړفهرست په توګه: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,فرصتونه
@@ -530,7 +562,7 @@
 DocType: Lab Test Template,No Result,نه د پايلو
 DocType: Purchase Invoice Item,Quantity and Rate,کمیت او Rate
 DocType: Delivery Note,% Installed,٪ ولګول شو
-apps/erpnext/erpnext/utilities/user_progress.py +209,Classrooms/ Laboratories etc where lectures can be scheduled.,درسي / لابراتوارونو او نور هلته د لکچر کولای ټاکل شي.
+apps/erpnext/erpnext/utilities/user_progress.py +227,Classrooms/ Laboratories etc where lectures can be scheduled.,درسي / لابراتوارونو او نور هلته د لکچر کولای ټاکل شي.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,مهرباني وکړئ د شرکت نوم د لومړي ننوځي
 DocType: Purchase Invoice,Supplier Name,عرضه کوونکي نوم
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,د ERPNext لارښود ادامه
@@ -538,41 +570,46 @@
 DocType: Email Digest,Pending Purchase Orders,رانيول امر په تمه
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,په اتوماتيک ډول سریال ترانسفارمرونو د ټاکلو په موخه د پر بنسټ د FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,چيک عرضه صورتحساب شمېر لوړوالی
+apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +34,Primary Address Details,د ابتدائی پته تفصیلات
 DocType: Vehicle Service,Oil Change,د تیلو د بدلون
+DocType: Asset Maintenance Log,Asset Maintenance Log,د شتمنیو ساتنه لوستل
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',&#39;د Case شمیره&#39; کولای &#39;له Case شمیره&#39; لږ نه وي
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Non Profit,غیر ګټه
+DocType: Chapter,Non Profit,غیر ګټه
 DocType: Production Order,Not Started,پیل نه دی
 DocType: Lead,Channel Partner,چینل همکار
 DocType: Account,Old Parent,زاړه Parent
-apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,اجباري ډګر - تعليمي کال د
-apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,اجباري ډګر - تعليمي کال د
+apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,اجباري ډګر - تعليمي کال د
+apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,اجباري ډګر - تعليمي کال د
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} is not associated with {2} {3},{0} {1} د {2} {3} سره تړاو نلري.
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,د مقدماتي متن چې د دغې ایمیل يوې برخې په توګه ځي دتنظيمولو. هر معامله جلا مقدماتي متن لري.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +157,Please set default payable account for the company {0},مهرباني وکړئ د شرکت لپاره د تلوالیزه د تادیې وړ ګڼون جوړ {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +182,Please set default payable account for the company {0},مهرباني وکړئ د شرکت لپاره د تلوالیزه د تادیې وړ ګڼون جوړ {0}
 DocType: Setup Progress Action,Min Doc Count,د کانونو شمیرنه
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,د ټولو د توليد د پروسې Global امستنې.
 DocType: Accounts Settings,Accounts Frozen Upto,جوړوي ګنګل ترمړوندونو پورې
 DocType: SMS Log,Sent On,ته وليږدول د
-apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,ځانتیا د {0} په صفات جدول څو ځلې غوره
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,Attribute {0} selected multiple times in Attributes Table,ځانتیا د {0} په صفات جدول څو ځلې غوره
 DocType: HR Settings,Employee record is created using selected field. ,د کارګر ریکارډ انتخاب ډګر په کارولو سره جوړ.
 DocType: Sales Order,Not Applicable,کاروړی نه دی
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,د رخصتۍ د بادار.
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +77,Opening Invoice Item,د انوائس توکي پرانیزي
 DocType: Request for Quotation Item,Required Date,د اړتیا نېټه
 DocType: Delivery Note,Billing Address,دبیل پته
 DocType: BOM,Costing,لګښت
 DocType: Tax Rule,Billing County,د بیلونو په County
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",که وکتل، د مالیې د مقدار په پام کې به شي ځکه چې لا له وړاندې په د چاپ Rate / چاپ مقدار شامل
 DocType: Request for Quotation,Message for Supplier,د عرضه پيغام
+DocType: Driver,DRIVER-.#####,ډرایور -. #####
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Total Qty
-apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +62,Guardian2 Email ID,Guardian2 بريښناليک ID
+apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +62,Guardian2 Email ID,Guardian2 بريښناليک ID
 DocType: Item,Show in Website (Variant),په ویب پاڼه ښودل (متحول)
 DocType: Employee,Health Concerns,روغتیا اندیښنې
-DocType: Process Payroll,Select Payroll Period,انتخاب د معاشاتو د دورې
+DocType: Payroll Entry,Select Payroll Period,انتخاب د معاشاتو د دورې
 DocType: Purchase Invoice,Unpaid,معاش
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,خرڅلاو لپاره خوندي دي
 DocType: Packing Slip,From Package No.,له مجموعې شمیره
 DocType: Item Attribute,To Range,ته Range
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,امنيت او د سپما
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",د ارزښت د میتود بدل نه شي، لکه د ځينو توکو په وړاندې د معاملو چې دا نه لري شته د خپل ارزښت د میتود
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",د ارزښت د میتود بدل نه شي، لکه د ځينو توکو په وړاندې د معاملو چې دا نه لري شته د خپل ارزښت د میتود
 apps/erpnext/erpnext/config/healthcare.py +133,Test Sample Master.,نمونه ماډل ازمویه
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Total پاڼي تخصيص الزامی دی
 DocType: Patient,AB Positive,AB مثبت دی
@@ -594,37 +631,41 @@
 DocType: Training Event,Workshop,د ورکشاپ
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,د پیرودونکو لارښوونه وڅېړئ
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,لست د خپل پېرېدونکي يو څو. هغوی کولی شي، سازمانونو یا وګړو.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,عرضه کوونکي&gt; د عرضه کوونکي ډول
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,بس برخي د جوړولو
 DocType: POS Profile User,POS Profile User,د پی ایس پی پی ایل کارن
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,مستقيم عايداتو
 DocType: Patient Appointment,Date TIme,نیټه او وخت
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account",نه په حساب پر بنسټ کولای شي Filter، که د حساب ګروپ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,اداري مامور
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,لطفا کورس انتخاب
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,لطفا کورس انتخاب
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,اداري مامور
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,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,د کوډیزشن جدول
 DocType: Timesheet Detail,Hrs,بجو
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,مهرباني وکړئ د شرکت وټاکئ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +350,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,لطفا د ګدام د کوم لپاره چې د موادو غوښتنه به راپورته شي ننوځي
 DocType: Production Order,Additional Operating Cost,اضافي عملياتي لګښت
 DocType: Lab Test Template,Lab Routine,لابراتوار
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,د سينګار
-apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items",ته لېږدونه، لاندې شتمنۍ باید د دواړو توکي ورته وي
+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 +526,"To merge, following properties must be same for both items",ته لېږدونه، لاندې شتمنۍ باید د دواړو توکي ورته وي
 DocType: Shipping Rule,Net Weight,خالص وزن
 DocType: Employee,Emergency Phone,بيړنۍ تيليفون
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,کشاورزی
 ,Serial No Warranty Expiry,شعبه ګرنټی د پای
 DocType: Sales Invoice,Offline POS Name,د نالیکي POS نوم
-apps/erpnext/erpnext/utilities/user_progress.py +159,Student Application,د زده کونکي غوښتنلیک
-apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,لطفا لپاره قدمه 0٪ ټولګي تعریف
-apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,لطفا لپاره قدمه 0٪ ټولګي تعریف
+apps/erpnext/erpnext/utilities/user_progress.py +177,Student Application,د زده کونکي غوښتنلیک
+apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,لطفا لپاره قدمه 0٪ ټولګي تعریف
+apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,لطفا لپاره قدمه 0٪ ټولګي تعریف
 DocType: Sales Order,To Deliver,ته تحویل
 DocType: Purchase Invoice Item,Item,د قالب
-apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,لوړ حساسیت
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,سریال نه توکی نه شي کولای یوه برخه وي
+apps/erpnext/erpnext/healthcare/setup.py +256,High Sensitivity,لوړ حساسیت
+apps/erpnext/erpnext/config/non_profit.py +48,Volunteer Type information.,رضاکارانه ډول ډول ډول معلومات
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,Serial no item cannot be a fraction,سریال نه توکی نه شي کولای یوه برخه وي
 DocType: Journal Entry,Difference (Dr - Cr),توپير (ډاکټر - CR)
 DocType: Account,Profit and Loss,ګټه او زیان
 DocType: Patient,Risk Factors,د خطر فکتورونه
@@ -633,6 +674,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,د اداره کولو په ټیکه
 DocType: Vital Signs,Body Temperature,د بدن درجه
 DocType: Project,Project will be accessible on the website to these users,پروژه به د دغو کاروونکو په ویب پاڼه د السرسي وړ وي
+DocType: Detected Disease,Disease,ناروغ
 apps/erpnext/erpnext/config/projects.py +24,Define Project type.,د پروژې ډول تعریف کړئ.
 DocType: Supplier Scorecard,Weighting Function,د وزن کولو دنده
 DocType: Physician,OP Consulting Charge,د OP مشاورت چارج
@@ -641,27 +683,29 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +62,Account {0} does not belong to company: {1},ګڼون {0} نه پورې شرکت نه لري چې: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +51,Abbreviation already used for another company,Abbreviation لا د بل شرکت لپاره کارول
 DocType: Selling Settings,Default Customer Group,Default پيرودونکو ګروپ
+DocType: Asset Repair,ARLOG-,ARLOG-
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",که ناتوان، &#39;غونډ مونډ Total&#39; ډګر به په هيڅ معامله د لیدو وړ وي
 DocType: BOM,Operating Cost,عادي لګښت
+DocType: Crop,Produced Items,تولید شوي توکي
 DocType: Sales Order Item,Gross Profit,ټولټال ګټه
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,بهرمن نه شي کولای 0 وي
 DocType: Production Planning Tool,Material Requirement,مادي غوښتنې
 DocType: Company,Delete Company Transactions,شرکت معاملې ړنګول
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,ماخذ نه او ماخذ نېټه د بانک د راکړې ورکړې الزامی دی
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Reference No and Reference Date is mandatory for Bank transaction,ماخذ نه او ماخذ نېټه د بانک د راکړې ورکړې الزامی دی
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Add / سمول مالیات او په تور
 DocType: Payment Entry Reference,Supplier Invoice No,عرضه صورتحساب نه
 DocType: Territory,For reference,د ماخذ
 DocType: Healthcare Settings,Appointment Confirmation,د تایید تصدیق
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions",ړنګ نه شي کولای شعبه {0}، لکه څنګه چې په سټاک معاملو کارول
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),تړل د (سي آر)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +253,Closing (Cr),تړل د (سي آر)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,سلام
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,خوځول د قالب
 DocType: Serial No,Warranty Period (Days),ګرنټی د دورې (ورځې)
 DocType: Installation Note Item,Installation Note Item,نصب او يادونه د قالب
 DocType: Production Plan Item,Pending Qty,تصویبه Qty
 DocType: Budget,Ignore,له پامه
-apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} د {1} فعاله نه وي
-apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,د چاپ Setup چک ابعادو
+apps/erpnext/erpnext/accounts/party.py +384,{0} {1} is not active,{0} د {1} فعاله نه وي
+apps/erpnext/erpnext/config/accounts.py +272,Setup cheque dimensions for printing,د چاپ Setup چک ابعادو
 DocType: Salary Slip,Salary Slip Timesheet,معاش ټوټه Timesheet
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,عرضه ګدام د فرعي قرارداد رانيول رسيد اجباري
 DocType: Pricing Rule,Valid From,د اعتبار له
@@ -669,19 +713,21 @@
 DocType: Pricing Rule,Sales Partner,خرڅلاو همکار
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,د ټولو سپلویر کټګورډونه.
 DocType: Buying Settings,Purchase Receipt Required,رانيول رسيد اړین
-apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,سنجي Rate فرض ده که پرانيستل دحمل ته ننوتل
+apps/erpnext/erpnext/stock/doctype/item/item.py +144,Valuation Rate is mandatory if Opening Stock entered,سنجي Rate فرض ده که پرانيستل دحمل ته ننوتل
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,هیڅ ډول ثبتونې په صورتحساب جدول کې وموندل
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,لطفا د شرکت او د ګوند ډول لومړی انتخاب
-apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,د مالي / جوړوي کال.
+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} لپاره پۀ پروفايل کې {0} ډیزاین وټاکئ، مهربانۍ په سم ډول بې معیوب شوی
+apps/erpnext/erpnext/config/accounts.py +293,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 +162,"Sorry, Serial Nos cannot be merged",بښنه غواړو، سریال وځيري نه مدغم شي
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +63,Territory is Required in POS Profile,علاقه د POS پروفیور ته اړتیا ده
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +68,Territory is Required in POS Profile,علاقه د POS پروفیور ته اړتیا ده
 DocType: Supplier,Prevent RFQs,د آر ایف پی څخه مخنیوی وکړئ
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,د کمکیانو لپاره د خرڅلاو د ترتیب پر اساس
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +168,Salary Slip submitted for period from {0} to {1},د معاش معاش چې د {1} څخه تر {1} پورې مودې لپاره وسپارل شو
 DocType: Project Task,Project Task,د پروژې د کاري
 ,Lead Id,سرب د Id
 DocType: C-Form Invoice Detail,Grand Total,ستره مجموعه
-DocType: Training Event,Course,کورس
+DocType: Assessment Plan,Course,کورس
 DocType: Timesheet,Payslip,ورقې
 apps/erpnext/erpnext/public/js/pos/pos.html +4,Item Cart,د توکي په ګاډۍ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +38,Fiscal Year Start Date should not be greater than Fiscal Year End Date,مالي کال د پیل نیټه باید په پرتله مالي کال د پای نیټه زيات نه وي
@@ -694,7 +740,9 @@
 DocType: Job Applicant,Resume Attachment,سوانح ضميمه
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,تکرار پېرودونکي
 DocType: Leave Control Panel,Allocate,تخصيص
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +804,Sales Return,خرڅلاو Return
+apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +108,Create Variant,بڼه جوړه کړئ
+DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,د انوائس د جوړولو وسیله پرانیزي
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +851,Sales Return,خرڅلاو Return
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,نوټ: ټولې اختصاص پاڼي {0} بايد نه مخکې تصویب پاڼو څخه کم وي {1} د مودې لپاره
 ,Total Stock Summary,Total سټاک لنډيز
 DocType: Announcement,Posted By,خپرندوی
@@ -705,9 +753,9 @@
 apps/erpnext/erpnext/config/selling.py +28,Customer database.,پيرودونکو ډیټابیس.
 DocType: Quotation,Quotation To,د داوطلبۍ
 DocType: Lead,Middle Income,د منځني عايداتو
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),د پرانستلو په (آر)
-apps/erpnext/erpnext/stock/doctype/item/item.py +849,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.,د قالب اندازه Default اداره {0} نه شي په مستقيمه شي ځکه بدل مو چې ځينې راکړې ورکړې (ص) سره د یو بل UOM لا کړې. تاسو به اړ یو نوی د قالب د بل Default UOM ګټه رامنځ ته کړي.
-apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,ځانګړې اندازه نه کېدای شي منفي وي
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Opening (Cr),د پرانستلو په (آر)
+apps/erpnext/erpnext/stock/doctype/item/item.py +835,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.,د قالب اندازه Default اداره {0} نه شي په مستقيمه شي ځکه بدل مو چې ځينې راکړې ورکړې (ص) سره د یو بل UOM لا کړې. تاسو به اړ یو نوی د قالب د بل Default UOM ګټه رامنځ ته کړي.
+apps/erpnext/erpnext/accounts/utils.py +351,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,مهرباني وکړئ د شرکت جوړ
 DocType: Purchase Order Item,Billed Amt,د بلونو د نننیو
@@ -715,32 +763,37 @@
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,يو منطقي ګدام چې پر وړاندې د سټاک زياتونې دي.
 DocType: Repayment Schedule,Principal Amount,د مدیر مقدار
 DocType: Employee Loan Application,Total Payable Interest,ټول د راتلوونکې په زړه پوری
-apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +59,Total Outstanding: {0},ټول ټاکل شوي: {0}
+apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +60,Total Outstanding: {0},ټول ټاکل شوي: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,خرڅلاو صورتحساب Timesheet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},ماخذ نه &amp; ماخذ نېټه لپاره اړتیا ده {0}
-DocType: Process Payroll,Select Payment Account to make Bank Entry,انتخاب د پیسو حساب ته د بانک د داخلولو لپاره
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,Reference No & Reference Date is required for {0},ماخذ نه &amp; ماخذ نېټه لپاره اړتیا ده {0}
+DocType: Payroll Entry,Select Payment Account to make Bank Entry,انتخاب د پیسو حساب ته د بانک د داخلولو لپاره
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll",د پاڼو، لګښت د ادعاوو او د معاشونو د اداره کارکوونکی د اسنادو جوړول
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,د نسخه دوره
 DocType: Restaurant Reservation,Restaurant Reservation,د رستورانت ساتنه
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,د پروپوزل ليکلو
+DocType: Land Unit,Land Unit Name,د ځمکې واحد
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,د پروپوزل ليکلو
 DocType: Payment Entry Deduction,Payment Entry Deduction,د پیسو د داخلولو Deduction
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,پورته کول
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,پیرودونکي د بریښنالیک له لارې خبرتیاوي
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,بل خرڅلاو کس {0} د همدې کارکوونکی پېژند شتون لري
+DocType: Employee Advance,Claimed Amount,ادعا شوې پیسې
 DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests",که لپاره شیان دي چې فرعي قرارداد به په مادي غوښتنې شامل شي چک، خام مواد
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,بادارانو
 DocType: Assessment Plan,Maximum Assessment Score,اعظمي ارزونه نمره
-apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,تازه بانک د راکړې ورکړې نیټی
+apps/erpnext/erpnext/config/accounts.py +138,Update Bank Transaction Dates,تازه بانک د راکړې ورکړې نیټی
 apps/erpnext/erpnext/config/projects.py +36,Time Tracking,د وخت د معلومولو
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,دوه ګونو لپاره لېږدول
+apps/erpnext/erpnext/hr/doctype/employee_advance/employee_advance.py +49,Row {0}# Paid Amount cannot be greater than requested advance amount,Row {0} ادا شوي پیسې نشي کولی د غوښتل شوي وړاندیز شوي مقدار څخه زیات وي
 DocType: Fiscal Year Company,Fiscal Year Company,مالي کال د شرکت
 DocType: Packing Slip Item,DN Detail,DN تفصیلي
 DocType: Training Event,Conference,کنفرانس
 DocType: Timesheet,Billed,د بلونو د
 DocType: Batch,Batch Description,دسته Description
-apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,د زده کوونکو د ډلو جوړول
-apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,د زده کوونکو د ډلو جوړول
-apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.",د پیسو ليدونکی حساب نه جوړ، لطفا په لاسي يوه د جوړولو.
+apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,د زده کوونکو د ډلو جوړول
+apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,د زده کوونکو د ډلو جوړول
+apps/erpnext/erpnext/accounts/utils.py +724,"Payment Gateway Account not created, please create one manually.",د پیسو ليدونکی حساب نه جوړ، لطفا په لاسي يوه د جوړولو.
 DocType: Supplier Scorecard,Per Year,په کال کې
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,په دې پروګرام کې د داخلیدو لپاره د DOB مطابق
+apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,په دې پروګرام کې د داخلیدو لپاره د DOB مطابق
 DocType: Sales Invoice,Sales Taxes and Charges,خرڅلاو مالیات او په تور
 DocType: Employee,Organization Profile,اداره پېژندنه
 DocType: Vital Signs,Height (In Meter),لوړې کچې (په مترۍ کې)
@@ -748,25 +801,25 @@
 DocType: Vehicle Service,Vehicle Service,موټر خدمتونه
 apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,په خپلکارې توګه د پر بنسټ د شرايطو نظر غوښتنه اچول کیږي.
 DocType: Employee,Reason for Resignation,د استعفا دليل
-apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,د نتائجو د کينډۍ.
+apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,د نتائجو د کينډۍ.
 DocType: Sales Invoice,Credit Note Issued,اعتبار يادونه خپور شوی
 DocType: Project Task,Weight,د وزن
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,صورتحساب / ژورنال انفاذ په بشپړه توګه کتل
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} &#39;{1} نه مالي کال په {2}
 DocType: Buying Settings,Settings for Buying Module,د شځينه ماډل امستنې
-apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},د شتمنیو د {0} نه شرکت سره تړاو نه لري {1}
+apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},د شتمنیو د {0} نه شرکت سره تړاو نه لري {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,Please enter Purchase Receipt first,مهرباني وکړئ لومړی رانيول رسيد ننوځي
 DocType: Buying Settings,Supplier Naming By,عرضه کوونکي نوم By
 DocType: Activity Type,Default Costing Rate,Default لګښت کچه
 DocType: Maintenance Schedule,Maintenance Schedule,د ساتنې او مهال ويش
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.",بيا د بیې اصول دي فلتر څخه پر بنسټ د پيرودونکو، پيرودونکو ګروپ، خاوره، عرضه، عرضه ډول، د کمپاین، خرڅلاو همکار او نور
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,په موجودي خالص د بدلون
-apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,د کارګر د پور د مدیریت
+apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,د کارګر د پور د مدیریت
 DocType: Employee,Passport Number,د پاسپورټ ګڼه
-apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,سره د اړیکو Guardian2
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +120,Manager,مدير
+apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,سره د اړیکو Guardian2
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,مدير
 DocType: Payment Entry,Payment From / To,د پیسو له / د
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +127,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},د پورونو د نوي محدودیت دی لپاره د پیریدونکو د اوسني بيالنس مقدار څخه لږ. پورونو د حد لري تيروخت وي {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},د پورونو د نوي محدودیت دی لپاره د پیریدونکو د اوسني بيالنس مقدار څخه لږ. پورونو د حد لري تيروخت وي {0}
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,&#39;پر بنسټ&#39; او &#39;ډله په&#39; کولای شي په څېر نه وي
 DocType: Sales Person,Sales Person Targets,خرڅلاو شخص موخې
 DocType: Installation Note,IN-,د داخل
@@ -775,43 +828,46 @@
 DocType: Lab Test Template,Compound,مرکب
 DocType: Student Batch Name,Batch Name,دسته نوم
 DocType: Fee Validity,Max number of visit,د کتنې ډیره برخه
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet جوړ:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,Please set default Cash or Bank account in Mode of Payment {0},لطفا د تادیاتو په اکر کې default د نغدي او يا بانک حساب جوړ {0}
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +24,Enroll,کې شامل کړي
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timesheet جوړ:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +920,Please set default Cash or Bank account in Mode of Payment {0},لطفا د تادیاتو په اکر کې default د نغدي او يا بانک حساب جوړ {0}
+apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,کې شامل کړي
 DocType: GST Settings,GST Settings,GST امستنې
 DocType: Selling Settings,Customer Naming By,پيرودونکو نوم By
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,به د زده کوونکو په توګه د زده کوونکو د حاضرۍ میاشتنی رپوټ وړاندې ښيي
 DocType: Depreciation Schedule,Depreciation Amount,د استهالک مقدار
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,د ګروپ ته واړوئ
+DocType: Delivery Trip,TOUR-.#####,ټور -. #####
 DocType: Activity Cost,Activity Type,فعالیت ډول
 DocType: Request for Quotation,For individual supplier,د انفرادي عرضه
 DocType: BOM Operation,Base Hour Rate(Company Currency),اډه قيامت کچه (د شرکت د اسعارو)
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,تحویلوونکی مقدار
-DocType: Supplier,Fixed Days,ثابته ورځې
-apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests,د لابراتوار آزموینه
+DocType: Company,Fixed Days,ثابته ورځې
 DocType: Quotation Item,Item Balance,د قالب بیلانس
 DocType: Sales Invoice,Packing List,بسته بشپړفهرست
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,رانيول امر ته عرضه ورکړل.
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publishing
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +43,Publishing,Publishing
 DocType: Activity Cost,Projects User,د پروژو د کارن
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,په مصرف
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +157,{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 +227,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,{0} د ساتنې په سفر کې باید بندول د دې خرڅلاو نظم مخکې لغوه شي
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +242,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,{0} د ساتنې په سفر کې باید بندول د دې خرڅلاو نظم مخکې لغوه شي
+DocType: Asset Maintenance Log,AML-,AML-
 DocType: Item,Material Transfer,د توکو لېږدونه د
 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 +211,Opening (Dr),د پرانستلو په (ډاکټر)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Dr),د پرانستلو په (ډاکټر)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},نوکرې timestamp باید وروسته وي {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,د بیاکتنې اسناد چمتو کولو لپاره
 ,GST Itemised Purchase Register,GST مشخص کړل رانيول د نوم ثبتول
+DocType: Course Scheduling Tool,Reschedule,بیا پیل کړئ
 DocType: Employee Loan,Total Interest Payable,ټولې ګټې د راتلوونکې
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,تيرماښام لګښت مالیات او په تور
 DocType: Production Order Operation,Actual Start Time,واقعي د پیل وخت
 DocType: BOM Operation,Operation Time,د وخت د عملياتو
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,فنلند
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,اډه
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +315,Finish,فنلند
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +412,Base,اډه
 DocType: Timesheet,Total Billed Hours,Total محاسبې ته ساعتونه
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,مقدار ولیکئ پړاو
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1438,Write Off Amount,مقدار ولیکئ پړاو
 DocType: Leave Block List Allow,Allow User,کارن اجازه
 DocType: Journal Entry,Bill No,بیل نه
 DocType: Company,Gain/Loss Account on Asset Disposal,د شتمنيو د برطرف ګټې / زیان اکانټ
@@ -827,33 +883,38 @@
 DocType: Student Attendance,Student Attendance,د زده کوونکو د حاضرۍ
 DocType: Sales Invoice Timesheet,Time Sheet,د وخت پاڼه
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush خام مواد پر بنسټ
-DocType: Interest,Interest,په زړه پوري
+DocType: Lead,Lead is an Organization,رهبري سازمان دی
+DocType: Guardian Interest,Interest,په زړه پوري
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,مخکې خرڅلاو
 DocType: Purchase Receipt,Other Details,نور جزئيات
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Suplier
 DocType: Lab Test,Test Template,ټسټ ټکي
 DocType: Restaurant Order Entry Item,Served,خدمت شوی
+apps/erpnext/erpnext/config/non_profit.py +13,Chapter information.,د فصل فصل.
 DocType: Account,Accounts,حسابونه
 DocType: Vehicle,Odometer Value (Last),Odometer ارزښت (په تېره)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,د عرضه کوونکي د سکورډ معیار معیارونه.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Marketing,بازار موندنه
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,بازار موندنه
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +290,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 +545,Row #{0}: Asset {1} does not linked to Item {2},د کتارونو تر # {0}: د شتمنیو د {1} نه د قالب تړاو نه {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +377,Preview Salary Slip,د مخکتنې معاش ټوټه
+apps/erpnext/erpnext/controllers/accounts_controller.py +589,Row #{0}: Asset {1} does not linked to Item {2},د کتارونو تر # {0}: د شتمنیو د {1} نه د قالب تړاو نه {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +394,Preview Salary Slip,د مخکتنې معاش ټوټه
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,ګڼون {0} په څو ځله داخل شوي دي
 DocType: Account,Expenses Included In Valuation,لګښتونه شامل په ارزښت
+apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +23,You can only renew if your membership expires within 30 days,تاسو کولی شئ یواځې نوی توب وکړئ که ستاسو غړیتوب په 30 ورځو کې پای ته ورسیږي
+DocType: Land Unit,Longitude,اوږد مهاله
 ,Absent Student Report,غیر حاضر زده کوونکو راپور
+DocType: Crop,Crop Spacing UOM,د کرهنې فاصله UOM
 DocType: Email Digest,Next email will be sent on:,بل برېښليک به واستول شي په:
 DocType: Offer Letter Term,Offer Letter Term,وړاندې لیک مهاله
 DocType: Supplier Scorecard,Per Week,په اونۍ کې
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,د قالب د بېرغونو لري.
-apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,ټول زده کونکي
+apps/erpnext/erpnext/stock/doctype/item/item.py +639,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,دحمل ارزښت
-apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,د فیس ریکارډ به په پس منظر کې رامنځته شي. د کومې غلطۍ په صورت کې د تېروتنې پیغام به د شیشې په وخت کې نوي شي.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,شرکت {0} نه شته
+apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +42,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,د فیس ریکارډ به په پس منظر کې رامنځته شي. د کومې غلطۍ په صورت کې د تېروتنې پیغام به د شیشې په وخت کې نوي شي.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +241,Company {0} does not exist,شرکت {0} نه شته
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} د اعتبار اعتبار لري {1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,د ونې ډول
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Qty مصرف د هر واحد
@@ -861,55 +922,61 @@
 DocType: Material Request Item,Quantity and Warehouse,کمیت او ګدام
 DocType: Hub Settings,Unregister,ندی راجستر
 DocType: Sales Invoice,Commission Rate (%),کمیسیون کچه)٪ (
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,مهرباني غوره پروګرام
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,مهرباني غوره پروګرام
+apps/erpnext/erpnext/education/doctype/student_group/student_group.py +24,Please select Program,مهرباني غوره پروګرام
+apps/erpnext/erpnext/education/doctype/student_group/student_group.py +24,Please select Program,مهرباني غوره پروګرام
 DocType: Project,Estimated Cost,اټکل شوی لګښت
 DocType: Purchase Order,Link to material requests,مخونه چې د مادي غوښتنو
 DocType: Hub Settings,Publish,خپرول
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,فضایي
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +7,Aerospace,فضایي
 DocType: Journal Entry,Credit Card Entry,کریډیټ کارټ انفاذ
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,شرکت او حسابونه
 apps/erpnext/erpnext/config/healthcare.py +108,Appointment Type Master,د استیناف ډول ماسټر
-apps/erpnext/erpnext/config/stock.py +22,Goods received from Suppliers.,توکو څخه عرضه ترلاسه کړ.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +58,In Value,په ارزښت
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,In Value,په ارزښت
 DocType: Lead,Campaign Name,د کمپاین نوم
 DocType: Selling Settings,Close Opportunity After Days,بندول فرصت ورځې وروسته
 ,Reserved,خوندي دي
+DocType: Driver,License Details,د جواز توضیحات
 DocType: Purchase Order,Supply Raw Materials,رسولو لپاره خام مواد
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,اوسني شتمني
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} يو سټاک د قالب نه دی
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,{0} is not a stock Item,{0} يو سټاک د قالب نه دی
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',مهرباني وکړئ خپل روزنې ته د روزنې ځوابونه او بیا وروسته &#39;نوی&#39; په واسطه ټریننګ سره شریک کړئ.
 DocType: Mode of Payment Account,Default Account,default اکانټ
+apps/erpnext/erpnext/stock/doctype/item/item.py +262,Please select Sample Retention Warehouse in Stock Settings first,مهرباني وکړئ لومړی د سټارټ سایټونو کې د نمونې ساتنه ګودام غوره کړئ
 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,اداره کوونکۍ باید جوړ شي که فرصت څخه په غاړه کړې
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,لطفا اونیز پړاو ورځ وټاکئ
 DocType: Patient,O Negative,اې منفي
 DocType: Production Order Operation,Planned End Time,پلان د پاي وخت
 ,Sales Person Target Variance Item Group-Wise,خرڅلاو شخص د هدف وړ توپیر د قالب ګروپ تدبيراومصلحت
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,Account with existing transaction cannot be converted to ledger,سره د موجوده د راکړې ورکړې په پام بدل نه شي چې د پنډو
+apps/erpnext/erpnext/accounts/doctype/account/account.py +95,Account with existing transaction cannot be converted to ledger,سره د موجوده د راکړې ورکړې په پام بدل نه شي چې د پنډو
+apps/erpnext/erpnext/config/non_profit.py +33,Memebership Type Details,د یادښت ډولونه
 DocType: Delivery Note,Customer's Purchase Order No,پيرودونکو د اخستلو امر نه
 DocType: Budget,Budget Against,د بودجې پر وړاندې د
 DocType: Employee,Cell Number,ګرځنده شمیره
-apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,د موټرونو د موادو غوښتنه تولید شوی
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,د ورکړل شوي معیارونو لپاره هیڅ کارمند نشته. وګورۍ چې د معاش سلپسونه لا دمخه ندي رامینځته شوي.
+apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,د موټرونو د موادو غوښتنه تولید شوی
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,له لاسه
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,تاسې کولای شی نه په اوسنیو کوپون &#39;پر وړاندې د ژورنال انفاذ&#39; کالم ننوځي
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,تاسې کولای شی نه په اوسنیو کوپون &#39;پر وړاندې د ژورنال انفاذ&#39; کالم ننوځي
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,د توليدي خوندي دي
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,د انرژۍ د
+DocType: Soil Texture,Sand,رڼا
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,د انرژۍ د
 DocType: Opportunity,Opportunity From,فرصت له
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,میاشتنی معاش خبرپاڼه.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,د {0}: {1} سیریل شمېره د 2 {2} لپاره اړین ده. تاسو {3} چمتو کړی.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +881,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,د {0}: {1} سیریل شمېره د 2 {2} لپاره اړین ده. تاسو {3} چمتو کړی.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,مهرباني وکړئ یو میز انتخاب کړئ
 DocType: BOM,Website Specifications,وېب پاڼه ځانګړتیاو
 DocType: Special Test Items,Particulars,درسونه
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,انټي بيوټيټ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: د {0} د ډول {1}
 DocType: Warranty Claim,CI-,CI-
-apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,د کتارونو تر {0}: د تغیر فکتور الزامی دی
-DocType: Employee,A+,A +
+apps/erpnext/erpnext/controllers/buying_controller.py +292,Row {0}: Conversion Factor is mandatory,د کتارونو تر {0}: د تغیر فکتور الزامی دی
+DocType: Student,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",څو د بیو د اصول سره ورته معیارونه شتون، لطفا له خوا لومړیتوب وګومارل شخړې حل کړي. بيه اصول: {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,نه خنثی کولای شي او یا هیښ لغوه په توګه دا ده چې له نورو BOMs سره تړاو لري
-DocType: Opportunity,Maintenance,د ساتنې او
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +504,Cannot deactivate or cancel BOM as it is linked with other BOMs,نه خنثی کولای شي او یا هیښ لغوه په توګه دا ده چې له نورو BOMs سره تړاو لري
+DocType: Asset,Maintenance,د ساتنې او
 DocType: Item Attribute Value,Item Attribute Value,د قالب ځانتیا ارزښت
+DocType: Item,Maximum sample quantity that can be retained,د نمونې خورا مهم مقدار چې ساتل کیدی شي
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +393,Row {0}# Item {1} cannot be transferred more than {2} against Purchase Order {3},صف {0} # آئٹم {1} نشي کولی د {2} څخه زیات د پیرودلو په وړاندې لیږدول {3}
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,خرڅلاو مبارزو.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,Timesheet د کمکیانو لپاره
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -940,21 +1007,24 @@
 DocType: Expense Claim Detail,Expense Claim Type,اخراجاتو ادعا ډول
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,کولر په ګاډۍ تلواله امستنو
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +26,Add Timeslots,مهال ویشونه زیات کړئ
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},د شتمنیو د پرزه ژورنال انفاذ له لارې د {0}
+apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},د شتمنیو د پرزه ژورنال انفاذ له لارې د {0}
 DocType: Employee Loan,Interest Income Account,په زړه د عوايدو د حساب
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,د ټېکنالوجۍ
+apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,د دعوت کولو لیږل بیاکتنه
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,د ټېکنالوجۍ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,دفتر د ترمیم لګښتونه
 apps/erpnext/erpnext/utilities/user_progress.py +51,Go to ,ورتګ
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,ترتیبول بريښناليک حساب
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,مهرباني وکړئ لومړی د قالب ته ننوځي
+DocType: Asset Repair,Downtime,رخصتۍ
 DocType: Account,Liability,Liability
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,تحریم مقدار نه شي کولای په کتارونو ادعا مقدار څخه ډيره وي {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +234,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,تحریم مقدار نه شي کولای په کتارونو ادعا مقدار څخه ډيره وي {0}.
 DocType: Salary Detail,Do not include in total,په مجموع کې شامل نه کړئ
 DocType: Company,Default Cost of Goods Sold Account,د حساب د پلورل شوو اجناسو Default لګښت
-apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,بیې په لېست کې نه ټاکل
+apps/erpnext/erpnext/stock/get_item_details.py +362,Price List not selected,بیې په لېست کې نه ټاکل
 DocType: Employee,Family Background,د کورنۍ مخينه
 DocType: Request for Quotation Supplier,Send Email,برېښنا لیک ولېږه
-apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},خبرداری: ناسم ضميمه {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +218,Warning: Invalid Attachment {0},خبرداری: ناسم ضميمه {0}
+DocType: Item,Max Sample Quantity,د مکس نمونې مقدار
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,نه د اجازې د
 apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,غوښتل شوی غوښتنه
 DocType: Vital Signs,Heart Rate / Pulse,د زړه درجه / پلس
@@ -962,33 +1032,35 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",پر بنسټ د ګوند چاڼ، غوره ګوند د لومړي ډول
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},&#39;تازه دحمل&#39; چک نه شي ځکه چې توکي له لارې ونه وېشل {0}
 DocType: Vehicle,Acquisition Date,د استملاک نېټه
-apps/erpnext/erpnext/utilities/user_progress.py +125,Nos,وځيري
+apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,وځيري
 DocType: Item,Items with higher weightage will be shown higher,سره د لوړو weightage توکي به د لوړو ښودل شي
+apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,د لابراتوار آزموینې او حیاتي نښانې
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,بانک پخلاينې تفصیلي
-apps/erpnext/erpnext/controllers/accounts_controller.py +549,Row #{0}: Asset {1} must be submitted,د کتارونو تر # {0}: د شتمنیو د {1} بايد وسپارل شي
+apps/erpnext/erpnext/controllers/accounts_controller.py +593,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: Subscription,Stopped,ودرول
 DocType: Item,If subcontracted to a vendor,که قرارداد ته د يو خرڅوونکي په
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +111,Student Group is already updated.,د زده کوونکو د ډلې لا تازه.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +111,Student Group is already updated.,د زده کوونکو د ډلې لا تازه.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,د زده کوونکو د ډلې لا تازه.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,د زده کوونکو د ډلې لا تازه.
 DocType: SMS Center,All Customer Contact,ټول پيرودونکو سره اړيکي
-apps/erpnext/erpnext/config/stock.py +158,Upload stock balance via csv.,پورته سټاک csv له لارې د توازن.
-DocType: Warehouse,Tree Details,د ونو په بشپړه توګه کتل
+DocType: Land Unit,Tree Details,د ونو په بشپړه توګه کتل
 DocType: Training Event,Event Status,دکمپاینونو حالت
+DocType: Volunteer,Availability Timeslot,د لاسرسي مهال ویش
 ,Support Analytics,د ملاتړ Analytics
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +352,"If you have any questions, please get back to us.",که تاسې کومه پوښتنه لري، نو لطفا بېرته له موږ سره ترلاسه کړي.
 DocType: Item,Website Warehouse,وېب پاڼه ګدام
 DocType: Payment Reconciliation,Minimum Invoice Amount,لږ تر لږه صورتحساب مقدار
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} د {1}: لګښت مرکز {2} کوي چې د دې شرکت سره تړاو نه لري {3}
+apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),خپل خط سر ته پورته کړئ (دا ویب دوستانه د 900px په 100px سره وساتئ)
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} د {1}: Account {2} نه شي کولای د يو ګروپ وي
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,د قالب د کتارونو تر {idx}: {doctype} {docname} په پورته نه شته &#39;{doctype}&#39; جدول
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Timesheet {0} لا د مخه د بشپړې او يا لغوه
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Timesheet {0} لا د مخه د بشپړې او يا لغوه
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,نه دندو
 DocType: Item Variant Settings,Copy Fields to Variant,د ویډیو لپاره کاپی ډګرونه
 DocType: Asset,Opening Accumulated Depreciation,د استهلاک د پرانيستلو
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,نمره باید لږ تر لږه 5 يا ور سره برابر وي
 DocType: Program Enrollment Tool,Program Enrollment Tool,پروګرام شمولیت اوزار
-apps/erpnext/erpnext/config/accounts.py +343,C-Form records,C-فورمه سوابق
+apps/erpnext/erpnext/config/accounts.py +335,C-Form records,C-فورمه سوابق
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,پيرودونکو او عرضه
 DocType: Email Digest,Email Digest Settings,Email Digest امستنې
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,تاسو د خپلې سوداګرۍ لپاره مننه!
@@ -999,43 +1071,48 @@
 DocType: HR Settings,Retirement Age,د تقاعد عمر
 DocType: Bin,Moving Average Rate,حرکت اوسط نرخ
 DocType: Production Planning Tool,Select Items,انتخاب سامان
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} بیل په وړاندې د {1} مورخ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +370,{0} against Bill {1} dated {2},{0} بیل په وړاندې د {1} مورخ {2}
 apps/erpnext/erpnext/utilities/user_progress.py +24,Setup Institution,د تاسیساتو بنسټ
 DocType: Program Enrollment,Vehicle/Bus Number,په موټر کې / بس نمبر
-apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,کورس د مهال ويش
+apps/erpnext/erpnext/education/doctype/course/course.js +17,Course Schedule,کورس د مهال ويش
 DocType: Request for Quotation Supplier,Quote Status,د حالت حالت
 DocType: Maintenance Visit,Completion Status,تکميل حالت
 DocType: HR Settings,Enter retirement age in years,په کلونو کې د تقاعد د عمر وليکئ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,هدف ګدام
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,لطفا یو ګودام انتخاب
+DocType: Crop,Target Warehouse,هدف ګدام
+DocType: Payroll Employee Detail,Payroll Employee Detail,د پیسو کارمندان تفصیل
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +128,Please select a warehouse,لطفا یو ګودام انتخاب
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,مهرباني وکړئ د سیٹ اپ&gt; شمېره لړۍ له لارې د حاضریدو لړۍ سیسټم
 DocType: Cheque Print Template,Starting location from left edge,کيڼې څنډې څخه پیل ځای
 DocType: Item,Allow over delivery or receipt upto this percent,د وړاندې کولو یا رسید ترمړوندونو پورې دې په سلو کې اجازه باندې
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,د وارداتو د حاضرۍ
 apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,ټول د قالب ډلې
-DocType: Process Payroll,Activity Log,فعالیت ننوتنه
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,خالصه ګټه / له لاسه ورکول
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,په اتوماتيک ډول د معاملو د سپارلو پېغام کمپوز.
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,مهرباني وکړئ د سایټ نوم نومول د Setup&gt; ترتیباتو له لارې {0} لپاره د نومونې لړۍ وټاکئ
 DocType: Production Order,Item To Manufacture,د قالب تولید
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} د {1} حالت دی {2}
+DocType: Water Analysis,Collection Temperature ,د درجه بندي درجه
 DocType: Employee,Provide Email Address registered in company,دبرېښنا ليک پته په شرکت ثبت برابرول
 DocType: Shopping Cart Settings,Enable Checkout,فعال رایستل
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,نظم ته د پیسو پیري
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,وړاندوینی Qty
 DocType: Sales Invoice,Payment Due Date,د پیسو له امله نېټه
 DocType: Drug Prescription,Interval UOM,د UOM منځګړیتوب
-apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,د قالب variant {0} لا د همدې صفتونو شتون لري
+apps/erpnext/erpnext/stock/doctype/item/item.js +489,Item Variant {0} already exists with same attributes,د قالب variant {0} لا د همدې صفتونو شتون لري
 DocType: Item,Hub Publishing Details,د هوب د خپرولو توضیحات
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',&#39;پرانیستل&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,د پرانستې ته ایا
 DocType: Notification Control,Delivery Note Message,د سپارنې پرمهال يادونه پيغام
 DocType: Lab Test Template,Result Format,د پایلو فارم
 DocType: Expense Claim,Expenses,لګښتونه
+DocType: Delivery Stop,Delivery Notes,د سپارلو یادښتونه
 DocType: Item Variant Attribute,Item Variant Attribute,د قالب variant ځانتیا
 ,Purchase Receipt Trends,رانيول رسيد رجحانات
-DocType: Process Payroll,Bimonthly,د جلسو
+DocType: Payroll Entry,Bimonthly,د جلسو
 DocType: Vehicle Service,Brake Pad,لنت ترمز Pad
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Research & Development,د څیړنې او پراختیا
+DocType: Fertilizer,Fertilizer Contents,د سرې وړ توکي
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,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,Total محاسبې ته مقدار
@@ -1047,16 +1124,18 @@
 DocType: Sales Team,Incentives,هڅوونکي
 apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,د هب لپاره راجستر کول
 DocType: SMS Log,Requested Numbers,غوښتنه شميرې
+DocType: Volunteer,Evening,شاملیږي
 DocType: Production Planning Tool,Only Obtain Raw Materials,یوازې خام مواد په لاس راوړئ
-apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,د اجرآتو ارزونه.
+DocType: Customer,Bypass credit limit check at Sales Order,د پلور په حکم کې د کریډیټ محدودیت چک وګورئ
+apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,د اجرآتو ارزونه.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",توانمنوونکې &#39;کولر په ګاډۍ څخه استفاده وکړئ، په توګه، کولر په ګاډۍ دی فعال شوی او هلته بايد کولر په ګاډۍ لږ تر لږه يو د مالياتو د حاکمیت وي
-apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",د پیسو د داخلولو {0} دی تړاو نظم {1}، وګورئ که دا بايد په توګه په دې صورتحساب مخکې کش شي په وړاندې.
+apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",د پیسو د داخلولو {0} دی تړاو نظم {1}، وګورئ که دا بايد په توګه په دې صورتحساب مخکې کش شي په وړاندې.
 DocType: Sales Invoice Item,Stock Details,دحمل په بشپړه توګه کتل
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,د پروژې د ارزښت
 apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,Point-of-خرڅول
 DocType: Fee Schedule,Fee Creation Status,د فیس جوړولو وضعیت
 DocType: Vehicle Log,Odometer Reading,Odometer لوستلو
-apps/erpnext/erpnext/accounts/doctype/account/account.py +119,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",ګڼون بیلانس د مخه په پور، تاسو ته د ټاکل &#39;بیلانس باید&#39; په توګه &#39;ګزارې&#39; اجازه نه
+apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",ګڼون بیلانس د مخه په پور، تاسو ته د ټاکل &#39;بیلانس باید&#39; په توګه &#39;ګزارې&#39; اجازه نه
 DocType: Account,Balance must be,توازن باید
 DocType: Hub Settings,Publish Pricing,د بیې د خپرېدو
 DocType: Notification Control,Expense Claim Rejected Message,اخراجاتو ادعا رد پيغام
@@ -1065,12 +1144,15 @@
 DocType: Purchase Invoice Item,Rejected Qty,رد Qty
 DocType: Setup Progress Action,Action Field,کاري ساحه
 DocType: Healthcare Settings,Manage Customer,د مشتریانو اداره کول
+DocType: Delivery Trip,Delivery Stops,د سپارلو موده
 DocType: Salary Slip,Working Days,کاري ورځې
 DocType: Serial No,Incoming Rate,راتلونکي Rate
 DocType: Packing Slip,Gross Weight,ناخالصه وزن
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,حب فعال کړئ
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,د خپل شرکت نوم د کوم لپاره چې تاسو دا سيستم د جوړولو.
+apps/erpnext/erpnext/public/js/setup_wizard.js +110,The name of your company for which you are setting up this system.,د خپل شرکت نوم د کوم لپاره چې تاسو دا سيستم د جوړولو.
 DocType: HR Settings,Include holidays in Total no. of Working Days,په Total رخصتي شامل نه. د کاري ورځې
+apps/erpnext/erpnext/setup/setup_wizard/operations/sample_data.py +108,Setup your Institute in ERPNext,خپل انسټیټیوټ په ERPNext کې تنظیم کړئ
+DocType: Agriculture Analysis Criteria,Plant Analysis,د پلان شننه
 DocType: Job Applicant,Hold,ونیسئ
 DocType: Employee,Date of Joining,د داخلیدل نېټه
 DocType: Naming Series,Update Series,تازه لړۍ
@@ -1078,27 +1160,30 @@
 DocType: Restaurant Table,Minimum Seating,لږ تر لږه څوکۍ
 DocType: Item Attribute,Item Attribute Values,د قالب ځانتیا ارزښتونه
 DocType: Examination Result,Examination Result,د ازموینې د پایلو د
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,رانيول رسيد
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +843,Purchase Receipt,رانيول رسيد
 ,Received Items To Be Billed,ترلاسه توکي چې د محاسبې ته شي
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Submitted Salary Slips,ته وسپارل معاش رسید
-apps/erpnext/erpnext/config/accounts.py +311,Currency exchange rate master.,د اسعارو د تبادلې نرخ د بادار.
+apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,د اسعارو د تبادلې نرخ د بادار.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +198,Reference Doctype must be one of {0},ماخذ Doctype بايد د يو شي {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},ته د وخت د عملياتو په راتلونکو {0} ورځو کې د څوکۍ د موندلو توان نلري {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +322,Unable to find Time Slot in the next {0} days for Operation {1},ته د وخت د عملياتو په راتلونکو {0} ورځو کې د څوکۍ د موندلو توان نلري {1}
 DocType: Production Order,Plan material for sub-assemblies,فرعي شوراګانو لپاره پلان مواد
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,خرڅلاو همکارانو او خاوره
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +581,BOM {0} must be active,هیښ {0} بايد فعال وي
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,هیښ {0} بايد فعال وي
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +221,Closing (Opening + Total),تړل (کلینګ + ټول)
 DocType: Journal Entry,Depreciation Entry,د استهالک د داخلولو
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,مهرباني وکړئ لومړی انتخاب سند ډول
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,لغوه مواد ليدنه {0} بندول د دې د ساتنې سفر مخکې
+DocType: Crop Cycle,ISO 8016 standard,د ISO 8016 معیارونه
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},شعبه {0} نه د قالب سره تړاو نه لري {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,مطلوب Qty
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,د موجوده معامله ګودامونو ته د پنډو بدل نه شي.
 DocType: Bank Reconciliation,Total Amount,جمله پیسی
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,د انټرنېټ Publishing
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +32,Internet Publishing,د انټرنېټ Publishing
 DocType: Prescription Duration,Number,شمېره
 DocType: Medical Code,Medical Code Standard,د طبی کوډ معیار
+DocType: Soil Texture,Clay Composition (%),د مڼې جوړښت (٪)
 DocType: Production Planning Tool,Production Orders,تولید امر
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +62,Balance Value,توازن ارزښت
+apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,مهرباني وکړئ مخکې له دې چې دنده وټاکئ خوندي وساتئ.
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Balance Value,توازن ارزښت
 DocType: Lab Test,Lab Technician,د لابراتوار تخنیکین
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,د پلورنې د بیې لېست
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
@@ -1110,31 +1195,33 @@
 DocType: Supplier,Default Payable Accounts,Default د راتلوونکې حسابونه
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,د کارګر {0} فعاله نه وي او یا موجود ندی
 DocType: Fee Structure,Components,د اجزاو
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},لطفا په قالب د شتمنیو کټه ګورۍ ته ننوځي {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,د قالب تانبه {0} تازه
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},لطفا په قالب د شتمنیو کټه ګورۍ ته ننوځي {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,د قالب تانبه {0} تازه
 DocType: Quality Inspection Reading,Reading 6,لوستلو 6
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
 of this",تولید شي. که ځنډ کیږي، تاسو باید په دستي توګه د &quot;میاشتې په ورځ تکرار&quot; بدل کړئ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,نه شی کولای د {0} د {1} {2} کومه منفي بيالنس صورتحساب پرته
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +945,Cannot {0} {1} {2} without any negative outstanding invoice,نه شی کولای د {0} د {1} {2} کومه منفي بيالنس صورتحساب پرته
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,پیري صورتحساب پرمختللی
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},د کتارونو تر {0}: پورونو د ننوتلو سره د نه تړاو شي کولای {1}
-apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,لپاره د مالي کال د بودجې تعریف کړي.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +197,Row {0}: Credit entry can not be linked with a {1},د کتارونو تر {0}: پورونو د ننوتلو سره د نه تړاو شي کولای {1}
+apps/erpnext/erpnext/config/accounts.py +246,Define budget for a financial year.,لپاره د مالي کال د بودجې تعریف کړي.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Default بانک / د نقدو پیسو حساب به په POS صورتحساب په اتوماتيک ډول پرلیکه شي کله چې دا اکر انتخاب.
 DocType: Lead,LEAD-,په پرلپسې ډول
 DocType: Employee,Permanent Address Is,دايمي پته ده
 DocType: Production Order Operation,Operation completed for how many finished goods?,لپاره څومره توکو د عملیاتو د بشپړه شوې؟
-apps/erpnext/erpnext/public/js/setup_wizard.js +47,The Brand,د دتوليد
+DocType: Payment Terms Template,Payment Terms Template,د تادیاتو شرایط سانچہ
+apps/erpnext/erpnext/public/js/setup_wizard.js +51,The Brand,د دتوليد
 DocType: Employee,Exit Interview Details,د وتلو سره مرکه په بشپړه توګه کتل
 DocType: Item,Is Purchase Item,آیا د رانيول د قالب
-DocType: Asset,Purchase Invoice,رانيول صورتحساب
+DocType: Journal Entry Account,Purchase Invoice,رانيول صورتحساب
 DocType: Stock Ledger Entry,Voucher Detail No,ګټمنو تفصیلي نه
-apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,نوي خرڅلاو صورتحساب
+apps/erpnext/erpnext/accounts/page/pos/pos.js +780,New Sales Invoice,نوي خرڅلاو صورتحساب
 DocType: Stock Entry,Total Outgoing Value,Total باورلیک ارزښت
 DocType: Physician,Appointments,ټاکنې
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,پرانيستل نېټه او د بندولو نېټه باید ورته مالي کال په چوکاټ کې وي
 DocType: Lead,Request for Information,معلومات د غوښتنې لپاره
 ,LeaderBoard,LeaderBoard
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,پرانیځئ نالیکی صورتحساب
+DocType: Sales Invoice Item,Rate With Margin (Company Currency),د مارجې سره اندازه (د شرکت پیسو)
+apps/erpnext/erpnext/accounts/page/pos/pos.js +793,Sync Offline Invoices,پرانیځئ نالیکی صورتحساب
 DocType: Payment Request,Paid,ورکړل
 DocType: Program Fee,Program Fee,پروګرام فیس
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1144,13 +1231,14 @@
 DocType: Guardian,Guardian Name,ګارډین نوم
 DocType: Cheque Print Template,Has Print Format,لري چاپ شکل
 DocType: Employee Loan,Sanctioned,تحریم
-apps/erpnext/erpnext/accounts/page/pos/pos.js +73, is mandatory. Maybe Currency Exchange record is not created for ,الزامی دی. ښايي د پیسو د بدلولو ریکارډ نه ده لپاره جوړ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},د کتارونو تر # {0}: مهرباني وکړئ سریال لپاره د قالب نه مشخص {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +622,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",لپاره &#39;د محصول د بنډل په&#39; توکي، ګدام، شعبه او دسته نه به د &#39;پروپیلن لیست جدول کې له پام کې ونیول شي. که ګدام او دسته هيڅ لپاره د هر &#39;د محصول د بنډل په&#39; توکی د ټولو بسته بنديو توکو يو شان دي، د هغو ارزښتونو په اصلي شمیره جدول داخل شي، ارزښتونو به کاپي شي چې د &#39;پروپیلن لیست جدول.
-DocType: Job Opening,Publish on website,په ويب پاڼه د خپرېدو
-apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,مشتریانو ته د مالونو.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +641,Supplier Invoice Date cannot be greater than Posting Date,عرضه صورتحساب نېټه نه شي کولای پست کوي نېټه څخه ډيره وي
+apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,الزامی دی. ښايي د پیسو د بدلولو ریکارډ نه ده لپاره جوړ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +117,Row #{0}: Please specify Serial No for Item {1},د کتارونو تر # {0}: مهرباني وکړئ سریال لپاره د قالب نه مشخص {1}
+DocType: Crop Cycle,Crop Cycle,د کرهنې سائیکل
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",لپاره &#39;د محصول د بنډل په&#39; توکي، ګدام، شعبه او دسته نه به د &#39;پروپیلن لیست جدول کې له پام کې ونیول شي. که ګدام او دسته هيڅ لپاره د هر &#39;د محصول د بنډل په&#39; توکی د ټولو بسته بنديو توکو يو شان دي، د هغو ارزښتونو په اصلي شمیره جدول داخل شي، ارزښتونو به کاپي شي چې د &#39;پروپیلن لیست جدول.
+DocType: Student Admission,Publish on website,په ويب پاڼه د خپرېدو
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +645,Supplier Invoice Date cannot be greater than Posting Date,عرضه صورتحساب نېټه نه شي کولای پست کوي نېټه څخه ډيره وي
 DocType: Purchase Invoice Item,Purchase Order Item,نظم د قالب پیري
+DocType: Agriculture Task,Agriculture Task,کرهنیز ټیم
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,نامستقیم عايداتو
 DocType: Student Attendance Tool,Student Attendance Tool,د زده کوونکو د حاضرۍ اوزار
 DocType: Restaurant Menu,Price List (Auto created),د بیې لیست (آٹو جوړ شوی)
@@ -1158,57 +1246,62 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,متفرقه
 ,Company Name,دکمپنی نوم
 DocType: SMS Center,Total Message(s),Total پيغام (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,د انتقال انتخاب د قالب
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +913,Select Item for Transfer,د انتقال انتخاب د قالب
 DocType: Purchase Invoice,Additional Discount Percentage,اضافي کمښت سلنه
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,ښکاره د په مرسته د ټولو ویډیوګانو يو لست
+DocType: Agriculture Analysis Criteria,Soil Texture,د خاوری جوړښت
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,د بانک انتخاب حساب مشر هلته پوستې شو امانت.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,اجازه د کارونکي چې په معاملو د بیې په لېست Rate د سمولو
 DocType: Pricing Rule,Max Qty,Max Qty
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
 						Please enter a valid Invoice",د کتارونو تر {0}: صورتحساب {1} ناباوره دی، دا به لغوه شي / نه شته. \ یوه د اعتبار وړ صورتحساب ولیکۍ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,د کتارونو تر {0}: خرڅلاو / د اخستلو د امر په وړاندې د پیسو باید د تل لپاره له مخکې په نښه شي
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,کيمياوي
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,د کتارونو تر {0}: خرڅلاو / د اخستلو د امر په وړاندې د پیسو باید د تل لپاره له مخکې په نښه شي
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +16,Chemical,کيمياوي
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Default بانک / د نقدو پیسو حساب به په معاش ژورنال انفاذ په اتوماتيک ډول پرلیکه شي کله چې دا اکر انتخاب.
 DocType: BOM,Raw Material Cost(Company Currency),لومړنیو توکو لګښت (شرکت د اسعارو)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,ټول توکي لا له وړاندې د دې تولید نظم ته انتقال شوي دي.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +758,All items have already been transferred for this Production Order.,ټول توکي لا له وړاندې د دې تولید نظم ته انتقال شوي دي.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},د کتارونو تر # {0}: اندازه کېدای شي نه په ميزان کې کارول په پرتله زیات وي {1} {2}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},د کتارونو تر # {0}: اندازه کېدای شي نه په ميزان کې کارول په پرتله زیات وي {1} {2}
-apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,متره
+apps/erpnext/erpnext/utilities/user_progress.py +144,Meter,متره
 DocType: Workstation,Electricity Cost,د بريښنا د لګښت
 DocType: HR Settings,Don't send Employee Birthday Reminders,آيا د کارګر کالیزې په دوراني ډول نه استوي
+DocType: Expense Claim,Total Advance Amount,د ټولې پرمختیا مقدار
+DocType: Delivery Stop,Estimated Arrival,اټکل شوی رایی
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,ترتیبونه ساتل
+DocType: Delivery Stop,Notified by Email,د بریښناليک لخوا خبر شوی
 apps/erpnext/erpnext/hub_node/page/hub/hub.js +683,Requested Products,غوښتل شوي محصولات
 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 +48,Upload your letter head and logo. (you can edit them later).,پورته ستاسو لیک مشر او لوګو. (کولی شئ چې وروسته د سمولو لپاره).
+apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,پورته ستاسو لیک مشر او لوګو. (کولی شئ چې وروسته د سمولو لپاره).
 DocType: Timesheet Detail,Bill,بیل
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,بل د استهالک نېټه ده ته ننوتل په توګه په تېرو نیټه
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +204,White,سپین
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,بل د استهالک نېټه ده ته ننوتل په توګه په تېرو نیټه
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,سپین
 DocType: SMS Center,All Lead (Open),ټول کوونکۍ (خلاص)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),د کتارونو تر {0}: Qty لپاره نه {4} په ګودام {1} د ننوتلو وخت امخ د ({2} {3})
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +248,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),د کتارونو تر {0}: Qty لپاره نه {4} په ګودام {1} د ننوتلو وخت امخ د ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,ترلاسه کړئ پرمختګونه ورکړل
 DocType: Item,Automatically Create New Batch,په خپلکارې توګه د نوي دسته جوړول
 DocType: Item,Automatically Create New Batch,په خپلکارې توګه د نوي دسته جوړول
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Make ,د کمکیانو لپاره د
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +808,Make ,د کمکیانو لپاره د
 DocType: Student Admission,Admission Start Date,د شاملیدو د پیل نیټه
 DocType: Journal Entry,Total Amount in Words,په وييکي Total مقدار
+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 +158,Order Type must be one of {0},نظم ډول باید د یو وي {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +126,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,پرانيستل Qty
 DocType: Healthcare Settings,Appointment Reminder,د استیناف یادونې
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,مهرباني وکړئ د بدلون لپاره د مقدار حساب ته ننوځي
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,مهرباني وکړئ د بدلون لپاره د مقدار حساب ته ننوځي
 DocType: Student Batch Name,Student Batch Name,د زده کونکو د دسته نوم
 DocType: Consultation,Doctor,ډاکټر
 DocType: Holiday List,Holiday List Name,رخصتي بشپړفهرست نوم
 DocType: Repayment Schedule,Balance Loan Amount,د توازن د پور مقدار
-apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,مهال ويش کورس
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,دحمل غوراوي
+apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,مهال ويش کورس
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Stock Options,دحمل غوراوي
 DocType: Journal Entry Account,Expense Claim,اخراجاتو ادعا
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,آيا تاسو په رښتيا غواړئ چې د دې پرزه د شتمنیو بيازېرمل؟
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},د Qty {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.js +254,Do you really want to restore this scrapped asset?,آيا تاسو په رښتيا غواړئ چې د دې پرزه د شتمنیو بيازېرمل؟
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +380,Qty for {0},د Qty {0}
 DocType: Leave Application,Leave Application,رخصت کاریال
 DocType: Patient,Patient Relation,د ناروغ اړیکه
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,پريږدئ تخصيص اوزار
@@ -1224,19 +1317,23 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},مهرباني وکړئ مشخص یو {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,په اندازه او ارزښت نه بدلون لرې توکي.
 DocType: Delivery Note,Delivery To,ته د وړاندې کولو
-apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,ځانتیا جدول الزامی دی
+apps/erpnext/erpnext/stock/doctype/item/item.js +384,Variant creation has been queued.,د ويیرټ جوړول په ليکه کې ليکل شوی.
+apps/erpnext/erpnext/stock/doctype/item/item.py +668,Attribute table is mandatory,ځانتیا جدول الزامی دی
 DocType: Production Planning Tool,Get Sales Orders,خرڅلاو امر ترلاسه کړئ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} کېدای شي منفي نه وي
 DocType: Training Event,Self-Study,د ځان سره مطالعه
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,تخفیف
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +537,Discount,تخفیف
+DocType: Membership,Membership,غړیتوب
 DocType: Asset,Total Number of Depreciations,Total د Depreciations شمېر
 DocType: Sales Invoice Item,Rate With Margin,کچه د څنډی څخه
 DocType: Sales Invoice Item,Rate With Margin,کچه د څنډی څخه
 DocType: Workstation,Wages,د معاشونو
-DocType: Task,Urgent,Urgent
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},مهرباني وکړئ مشخص لپاره چي په کتارونو {0} په جدول کې یو باوري د کتارونو تر تذکرو د {1}
+DocType: Asset Maintenance,Maintenance Manager Name,د ترمیم مدیر نوم
+DocType: Agriculture Task,Urgent,Urgent
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},مهرباني وکړئ مشخص لپاره چي په کتارونو {0} په جدول کې یو باوري د کتارونو تر تذکرو د {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 +664,Please select a field to edit from numpad,مهرباني وکړئ د نمپاد څخه د سمون لپاره یو ډګر وټاکئ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +723,Please select a field to edit from numpad,مهرباني وکړئ د نمپاد څخه د سمون لپاره یو ډګر وټاکئ
+apps/erpnext/erpnext/stock/doctype/item/item.py +253,Cannot be a fixed asset item as Stock Ledger is created.,د سایټ لیجر پیدا کیږي لکه څنګه چې ثابت شوي شتمنۍ نشي کیدی.
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,د سرپاڼې ته لاړ شئ او ERPNext په کارولو پيل کوي
 DocType: Item,Manufacturer,جوړوونکی
 DocType: Landed Cost Item,Purchase Receipt Item,رانيول رسيد د قالب
@@ -1245,12 +1342,11 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,په خرڅلاو نظم / د بشپړو شویو جنسونو ګدام خوندي دي ګدام
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Selling Amount,پلورل مقدار
 DocType: Repayment Schedule,Interest Amount,په زړه مقدار
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +109,You are the Expense Approver for this record. Please Update the 'Status' and Save,تاسو د دې ریکارډ د اخراجاتو Approver. لطفا د &#39;حالت او د Save اوسمهالی
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,تاسو د دې ریکارډ د اخراجاتو Approver. لطفا د &#39;حالت او د Save اوسمهالی
 DocType: Serial No,Creation Document No,خلقت Document No
 DocType: Issue,Issue,Issue
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation_dashboard.py +11,Records,ریکارډونه
 DocType: Asset,Scrapped,پرزه
-apps/erpnext/erpnext/config/stock.py +200,"Attributes for Item Variants. e.g Size, Color etc.",لپاره د قالب تانبه خصوصیتونه. د مثال په اندازه، رنګ او نور
 DocType: Purchase Invoice,Returns,په راستنېدو
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,WIP ګدام
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},شعبه {0} ترمړوندونو مراقبت د قرارداد په اساس دی {1}
@@ -1259,7 +1355,8 @@
 DocType: Tax Rule,Shipping State,انتقال د بهرنیو چارو
 ,Projected Quantity as Source,وړاندوینی مقدار په توګه سرچینه
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,د قالب بايد د کارولو تڼی څخه رانيول معاملو لپاره توکي ترلاسه کړئ &#39;زياته شي
-DocType: Employee,A-,خبرتیاوي
+DocType: Delivery Trip,Delivery Trip,د لېږد سفر
+DocType: Student,A-,خبرتیاوي
 DocType: Production Planning Tool,Include non-stock items,غیر سټاک توکي شامل دي
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,خرڅلاو داخراجاتو
 DocType: Consultation,Diagnosis,تشخیص
@@ -1267,8 +1364,8 @@
 DocType: GL Entry,Against,په وړاندې
 DocType: Item,Default Selling Cost Center,Default پلورل لګښت مرکز
 DocType: Sales Partner,Implementation Partner,د تطبیق همکار
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,زیپ کوډ
-apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},خرڅلاو نظم {0} دی {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1613,ZIP Code,زیپ کوډ
+apps/erpnext/erpnext/controllers/selling_controller.py +245,Sales Order {0} is {1},خرڅلاو نظم {0} دی {1}
 DocType: Opportunity,Contact Info,تماس پيژندنه
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,جوړول دحمل توکي
 DocType: Packing Slip,Net Weight UOM,خالص وزن UOM
@@ -1280,20 +1377,23 @@
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,د پای نیټه نه شي کولای په پرتله د پیل نیټه کمه وي
 DocType: Sales Person,Select company name first.,انتخاب شرکت نوم د لومړي.
 apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,ټيټ لوړ
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +202,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 بدله کړئ او په ټولو BOMs کې وروستي قیمت تازه کړئ
 apps/erpnext/erpnext/controllers/selling_controller.py +24,To {0} | {1} {2},د {0} | {1} {2}
+DocType: Delivery Trip,Driver Name,د موټر نوم
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,منځنی عمر
-DocType: School Settings,Attendance Freeze Date,د حاضرۍ کنګل نېټه
-DocType: School Settings,Attendance Freeze Date,د حاضرۍ کنګل نېټه
-apps/erpnext/erpnext/utilities/user_progress.py +89,List a few of your suppliers. They could be organizations or individuals.,لست ستاسو د عرضه کوونکو د څو. هغوی کولی شي، سازمانونو یا وګړو.
+DocType: Education Settings,Attendance Freeze Date,د حاضرۍ کنګل نېټه
+DocType: Education Settings,Attendance Freeze Date,د حاضرۍ کنګل نېټه
+apps/erpnext/erpnext/utilities/user_progress.py +107,List a few of your suppliers. They could be organizations or individuals.,لست ستاسو د عرضه کوونکو د څو. هغوی کولی شي، سازمانونو یا وګړو.
 apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,ښکاره ټول محصولات د
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),لږ تر لږه مشري عمر (ورځې)
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),لږ تر لږه مشري عمر (ورځې)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +57,All BOMs,ټول BOMs
 DocType: Patient,Default Currency,default د اسعارو
 DocType: Expense Claim,From Employee,له کارګر
-apps/erpnext/erpnext/controllers/accounts_controller.py +407,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,خبرداری: د سیستم به راهیسې لپاره د قالب اندازه overbilling وګورئ نه {0} د {1} صفر ده
+DocType: Driver,Cellphone Number,د ګرڅنده ټیلیفون شمېره
+apps/erpnext/erpnext/controllers/accounts_controller.py +451,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,خبرداری: د سیستم به راهیسې لپاره د قالب اندازه overbilling وګورئ نه {0} د {1} صفر ده
 DocType: Journal Entry,Make Difference Entry,بدلون د داخلولو د کمکیانو لپاره
 DocType: Upload Attendance,Attendance From Date,د حاضرۍ له نېټه
 DocType: Appraisal Template Goal,Key Performance Area,د اجراآتو مهم Area
@@ -1302,20 +1402,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +229,{0} {1} must be submitted,{0} د {1} بايد وسپارل شي
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +151,Quantity must be less than or equal to {0},مقدار باید د لږ-تر یا مساوي وي {0}
 DocType: SMS Center,Total Characters,Total خویونه
+DocType: Employee Advance,Claimed,ادعا شوې
+DocType: Crop,Row Spacing,د قطار فاصله
 apps/erpnext/erpnext/controllers/buying_controller.py +161,Please select BOM in BOM field for Item {0},لطفا هیښ لپاره د قالب په هیښ برخه کې غوره {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-فورمه صورتحساب تفصیلي
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,قطعا د پخلاينې د صورتحساب
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +42,Contribution %,بسپنه٪
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +212,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}",لکه څنګه چې هر د خريداري امستنې که د اخستلو امر مطلوب ==: هو، بیا د رانيول صورتحساب د رامنځته کولو، د کارونکي باید د اخستلو امر لومړي لپاره توکی جوړ {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}",لکه څنګه چې هر د خريداري امستنې که د اخستلو امر مطلوب ==: هو، بیا د رانيول صورتحساب د رامنځته کولو، د کارونکي باید د اخستلو امر لومړي لپاره توکی جوړ {0}
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,ستاسو د مرجع شرکت ليکنې د کارت شمېرې. د مالياتو د شمېر او نور
 DocType: Sales Partner,Distributor,ویشونکی-
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,خرید په ګاډۍ نقل حاکمیت
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +233,Production Order {0} must be cancelled before cancelling this Sales Order,تولید نظم {0} بايد بندول د دې خرڅلاو نظم مخکې لغوه شي
-apps/erpnext/erpnext/public/js/controllers/transaction.js +68,Please set 'Apply Additional Discount On',مهرباني وکړئ ټاکل &#39;د اضافي کمښت Apply&#39;
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Production Order {0} must be cancelled before cancelling this Sales Order,تولید نظم {0} بايد بندول د دې خرڅلاو نظم مخکې لغوه شي
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',مهرباني وکړئ ټاکل &#39;د اضافي کمښت Apply&#39;
 ,Ordered Items To Be Billed,امر توکي چې د محاسبې ته شي
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,له Range لري چې کم وي په پرتله د Range
 DocType: Global Defaults,Global Defaults,Global افتراضیو
-apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,د پروژې د مرستې په جلب
+apps/erpnext/erpnext/projects/doctype/project/project.py +226,Project Collaboration Invitation,د پروژې د مرستې په جلب
 DocType: Salary Slip,Deductions,د مجرايي
 DocType: Leave Allocation,LAL/,لعل /
 DocType: Setup Progress Action,Action Name,د عمل نوم
@@ -1323,49 +1425,51 @@
 apps/erpnext/erpnext/regional/india/utils.py +24,First 2 digits of GSTIN should match with State number {0},د GSTIN لومړی 2 ګڼې باید سره د بهرنیو چارو شمېر سمون {0}
 DocType: Purchase Invoice,Start date of current invoice's period,بیا د روان صورتحساب د مودې نېټه
 DocType: Salary Slip,Leave Without Pay,پرته له معاشونو څخه ووځي
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,د ظرفیت د پلان کې تېروتنه
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +366,Capacity Planning Error,د ظرفیت د پلان کې تېروتنه
 ,Trial Balance for Party,د محاکمې بیلانس د ګوندونو
 DocType: Lead,Consultant,مشاور
 DocType: Salary Slip,Earnings,عوايد
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +391,Finished Item {0} must be entered for Manufacture type entry,{0} پای ته قالب بايد د جوړون ډول د ننوتلو لپاره د داخل شي
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +416,Finished Item {0} must be entered for Manufacture type entry,{0} پای ته قالب بايد د جوړون ډول د ننوتلو لپاره د داخل شي
 apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,پرانيستل محاسبې بیلانس
 ,GST Sales Register,GST خرڅلاو د نوم ثبتول
 DocType: Sales Invoice Advance,Sales Invoice Advance,خرڅلاو صورتحساب پرمختللی
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,هېڅ غوښتنه
+apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,خپل ډومین انتخاب کړئ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},بل د بودجې د ریکارډ &#39;{0}&#39; لا د وړاندې موجود {1} &#39;{2}&#39; مالي کال لپاره د {3}
+DocType: Item Variant Settings,Fields will be copied over only at time of creation.,ساحې به یوازې د جوړونې په وخت کې کاپي شي.
 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/install_fixtures.py +113,Management,مدیریت
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,مدیریت
 DocType: Cheque Print Template,Payer Settings,د ورکوونکي امستنې
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""",دا به د د variant د قالب کوډ appended شي. د بیلګې په توګه، که ستا اختصاري دی &quot;SM&quot;، او د توکي کوډ دی &quot;T-کميس&quot;، د variant توکی کوډ به &quot;T-کميس-SM&quot;
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,خالص د معاشونو (په لفظ) به د ليدو وړ وي. هر کله چې تاسو د معاش ټوټه وژغوري.
 DocType: Purchase Invoice,Is Return,آیا بیرته
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,احتیاط
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,بیرته / ګزارې يادونه
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +81,Caution,احتیاط
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,بیرته / ګزارې يادونه
 DocType: Price List Country,Price List Country,بیې په لېست کې د هېواد
 DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +205,{0} valid serial nos for Item {1},{0} لپاره د قالب د اعتبار وړ سریال ترانسفارمرونو د {1}
+apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} لپاره د قالب د اعتبار وړ سریال ترانسفارمرونو د {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,د قالب قانون د سریال شمیره بدلون نه شي کولای
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +26,POS Profile {0} already created for user: {1} and company {2},POS پيژند {0} لا کارن لپاره جوړ: {1} او د شرکت {2}
-DocType: Sales Invoice Item,UOM Conversion Factor,UOM د تغیر فکتور
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +23,Please enter Item Code to get Batch Number,لطفا شمیره کود داخل ته د بستې شمېره تر لاسه
+DocType: Purchase Invoice Item,UOM Conversion Factor,UOM د تغیر فکتور
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,لطفا شمیره کود داخل ته د بستې شمېره تر لاسه
 DocType: Stock Settings,Default Item Group,Default د قالب ګروپ
 DocType: Employee Loan,Partially Disbursed,په نسبی ډول مصرف
+apps/erpnext/erpnext/config/non_profit.py +73,Grant information.,د مرستې معلومات.
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,عرضه ډیټابیس.
 DocType: Account,Balance Sheet,توازن پاڼه
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',لګښت لپاره مرکز سره د قالب کوډ &#39;د قالب
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +748,Cost Center For Item with Item Code ',لګښت لپاره مرکز سره د قالب کوډ &#39;د قالب
 DocType: Fee Validity,Valid Till,دقیقه
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",د پیسو په اکر کې نده شکل بندي شوې ده. مهرباني وکړئ وګورئ، چې آيا حساب په د تادياتو د اکر یا د POS پېژندنه ټاکل شوي دي.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2473,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",د پیسو په اکر کې نده شکل بندي شوې ده. مهرباني وکړئ وګورئ، چې آيا حساب په د تادياتو د اکر یا د POS پېژندنه ټاکل شوي دي.
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,ورته توکی نه شي کولای شي د څو ځله ننوتل.
-apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups",لا حسابونو شي ډلو لاندې کړې، خو د زياتونې شي غیر ډلو په وړاندې د
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +30,"Further accounts can be made under Groups, but entries can be made against non-Groups",لا حسابونو شي ډلو لاندې کړې، خو د زياتونې شي غیر ډلو په وړاندې د
 DocType: Lead,Lead,سرب د
 DocType: Email Digest,Payables,Payables
 DocType: Course,Course Intro,کورس سریزه
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,مهرباني وکړئ د سیٹ اپ&gt; شمېره لړۍ له لارې د حاضریدو لړۍ سیسټم
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,دحمل انفاذ {0} جوړ
-apps/erpnext/erpnext/controllers/buying_controller.py +297,Row #{0}: Rejected Qty can not be entered in Purchase Return,د کتارونو تر # {0}: رد Qty په رانيول بیرته نه داخل شي
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +97,Stock Entry {0} created,دحمل انفاذ {0} جوړ
+apps/erpnext/erpnext/controllers/buying_controller.py +298,Row #{0}: Rejected Qty can not be entered in Purchase Return,د کتارونو تر # {0}: رد Qty په رانيول بیرته نه داخل شي
 ,Purchase Order Items To Be Billed,د اخستلو امر توکي چې د محاسبې ته شي
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +45,Updating estimated arrival times.,د رسیدلو اټکل وخت.
 DocType: Purchase Invoice Item,Net Rate,خالص Rate
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,مهرباني وکړئ یو پیرود غوره کړئ
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +147,Please select a customer,مهرباني وکړئ یو پیرود غوره کړئ
 DocType: Purchase Invoice Item,Purchase Invoice Item,صورتحساب د قالب پیري
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,دحمل د پنډو توکي او GL توکي د ټاکل رانيول معاملو لپاره reposted دي
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,د قالب 1
@@ -1379,28 +1483,31 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +20,Order Count,نظم د شمېرنې
 DocType: Global Defaults,Current Fiscal Year,روان مالي کال
 DocType: Purchase Order,Group same items,ګروپ ورته توکي
-DocType: Global Defaults,Disable Rounded Total,نافعال مونډ Total
+DocType: Purchase Invoice,Disable Rounded Total,نافعال مونډ Total
 DocType: Employee Loan Application,Repayment Info,دبيرته پيژندنه
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,'توکي' نه شي کولای تش وي
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +446,'Entries' cannot be empty,'توکي' نه شي کولای تش وي
+DocType: Maintenance Team Member,Maintenance Role,د ساتنې رول
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},{0} دوه ګونو قطار سره ورته {1}
 ,Trial Balance,د محاکمې بیلانس
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,مالي کال د {0} ونه موندل شو
-apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,مامورین ترتیبول
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +438,Fiscal Year {0} not found,مالي کال د {0} ونه موندل شو
+apps/erpnext/erpnext/config/hr.py +305,Setting up Employees,مامورین ترتیبول
 DocType: Sales Order,SO-,اصطالح
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,مهرباني وکړئ لومړی مختاړی وټاکئ
-DocType: Employee,O-,فرنګ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +185,Research,د څیړنې
+DocType: Student,O-,فرنګ
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,د څیړنې
 DocType: Maintenance Visit Purpose,Work Done,کار وشو
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,مهرباني وکړی په صفات جدول کې لږ تر لږه يو د خاصه مشخص
 DocType: Announcement,All Students,ټول زده کوونکي
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,{0} د قالب باید یو غیر سټاک وي
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +45,Item {0} must be a non-stock item,{0} د قالب باید یو غیر سټاک وي
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,محتویات پنډو
 DocType: Grading Scale,Intervals,انټروال
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,ژر
-apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group",د قالب ګروپ سره په همدې نوم شتون لري، لطفا توکی نوم بدل کړي او يا د توکي ډلې نوم
-apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,د زده کوونکو د موبايل په شمیره
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,د نړۍ پاتې
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,"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 +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,Gross د معاشونو
 DocType: Item,Is Item from Hub,د هب څخه توکي دي
@@ -1418,8 +1525,6 @@
 DocType: Student,STUD.,خپلو پټيو کې.
 DocType: Production Order,Qty To Manufacture,Qty تولید
 DocType: Email Digest,New Income,نوي عايداتو
-DocType: School Settings,School Settings,د ښوونځي امستنې
-DocType: School Settings,School Settings,د ښوونځي امستنې
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,ټول د اخیستلو دوران عين اندازه وساتي
 DocType: Opportunity Item,Opportunity Item,فرصت د قالب
 ,Student and Guardian Contact Details,د زده کوونکو او د ګارډین د اړیکې جزئیات
@@ -1431,26 +1536,27 @@
 DocType: Patient Appointment,More Info,نور معلومات
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +178,Valuation Rate required for Item in row {0},سنجي Rate په قطار لپاره د قالب اړتیا {0}
 DocType: Supplier Scorecard,Scorecard Actions,د کوډ کارډ کړنې
-apps/erpnext/erpnext/utilities/user_progress.py +148,Example: Masters in Computer Science,مثال په توګه: په کمپیوټر ساینس د ماسټرۍ
+apps/erpnext/erpnext/utilities/user_progress.py +166,Example: Masters in Computer Science,مثال په توګه: په کمپیوټر ساینس د ماسټرۍ
 DocType: Purchase Invoice,Rejected Warehouse,رد ګدام
 DocType: GL Entry,Against Voucher,په وړاندې د ګټمنو
 DocType: Item,Default Buying Cost Center,Default د خريداري لګښت مرکز
 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/accounts/page/pos/pos.js +74, to ,ته
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,ته
 DocType: Supplier Quotation Item,Lead Time in days,په ورځو په غاړه وخت
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +58,Accounts Payable Summary,حسابونه د راتلوونکې لنډيز
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +337,Payment of salary from {0} to {1},څخه د {0} د معاش د ورکړې د {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +321,Payment of salary from {0} to {1},څخه د {0} د معاش د ورکړې د {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},نه اجازه کنګل حساب د سمولو {0}
 DocType: Journal Entry,Get Outstanding Invoices,يو وتلي صورتحساب ترلاسه کړئ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,خرڅلاو نظم {0} د اعتبار وړ نه دی
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,خرڅلاو نظم {0} د اعتبار وړ نه دی
 DocType: Supplier Scorecard,Warn for new Request for Quotations,د کوډونو لپاره د نوی غوښتنه لپاره خبردارۍ
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,رانيول امر تاسو سره مرسته پلان او ستاسو د اخیستلو تعقيب
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged",بښنه غواړو، شرکتونو نه مدغم شي
+apps/erpnext/erpnext/setup/doctype/company/company.py +215,"Sorry, companies cannot be merged",بښنه غواړو، شرکتونو نه مدغم شي
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,د لابراتوار ازموینه
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",په مادي غوښتنه د Issue / انتقال مجموعي مقدار {0} د {1} \ نه غوښتنه کمیت لپاره د قالب {2} څخه ډيره وي {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,د کوچنیو
-DocType: Employee,Employee Number,د کارګر شمېر
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,د کوچنیو
+DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,د انوائس د جوړولو وسیله توکي پرانیزي
+DocType: Education Settings,Employee Number,د کارګر شمېر
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Case (ونه) نشته د مخه په استعمال. له Case هیڅ هڅه {0}
 DocType: Project,% Completed,٪ بشپړ شوي
 ,Invoiced Amount (Exculsive Tax),د رسیدونو مقدار (Exculsive د مالياتو)
@@ -1460,17 +1566,20 @@
 DocType: Item,Auto re-order,د موټرونو د بيا نظم
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Total السته
 DocType: Employee,Place of Issue,د صادریدو ځای
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Contract,د قرارداد د
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +101,Contract,د قرارداد د
+DocType: Plant Analysis,Laboratory Testing Datetime,د لابراتواري آزموینی ازموینه
 DocType: Email Digest,Add Quote,Add بیه
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +869,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion عامل لپاره UOM ضروري دي: {0} په شمیره: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +932,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion عامل لپاره UOM ضروري دي: {0} په شمیره: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,غیر مستقیم مصارف
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,د کتارونو تر {0}: Qty الزامی دی
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,د کرنې
-apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,پرانیځئ ماسټر معلوماتو
-apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,ستاسو د تولیداتو يا خدمتونو
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +88,Row {0}: Qty is mandatory,د کتارونو تر {0}: Qty الزامی دی
+DocType: Agriculture Analysis Criteria,Agriculture,د کرنې
+apps/erpnext/erpnext/accounts/page/pos/pos.js +785,Sync Master Data,پرانیځئ ماسټر معلوماتو
+DocType: Asset Repair,Repair Cost,د ترمیم لګښت
+apps/erpnext/erpnext/utilities/user_progress.py +135,Your Products or Services,ستاسو د تولیداتو يا خدمتونو
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,ننوتل کې ناکام شو
 DocType: Special Test Items,Special Test Items,د ځانګړي ازموینې توکي
 DocType: Mode of Payment,Mode of Payment,د تادیاتو اکر
-apps/erpnext/erpnext/stock/doctype/item/item.py +190,Website Image should be a public file or website URL,وېب پاڼه د انځور بايد د عامه دوتنه يا ويب URL وي
+apps/erpnext/erpnext/stock/doctype/item/item.py +192,Website Image should be a public file or website URL,وېب پاڼه د انځور بايد د عامه دوتنه يا ويب URL وي
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,هیښ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,دا یو د ريښي توکی ډلې او نه تصحيح شي.
@@ -1478,50 +1587,52 @@
 DocType: Vehicle,Fuel UOM,د تیلو د UOM
 DocType: Warehouse,Warehouse Contact Info,ګدام تماس پيژندنه
 DocType: Payment Entry,Write Off Difference Amount,ولیکئ پړاو بدلون مقدار
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{0}: Employee email not found, hence email not sent",{0}: د کارګر ایمیل ونه موندل، نو برېښناليک نه استول
+DocType: Volunteer,Volunteer Name,رضاکار نوم
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +434,"{0}: Employee email not found, hence email not sent",{0}: د کارګر ایمیل ونه موندل، نو برېښناليک نه استول
 DocType: Item,Foreign Trade Details,د بهرنیو چارو د سوداګرۍ نورولوله
 ,Assessment Plan Status,د ارزونې پلان حالت
 DocType: Email Digest,Annual Income,د کلني عايداتو
 DocType: Serial No,Serial No Details,شعبه نورولوله
 DocType: Purchase Invoice Item,Item Tax Rate,د قالب د مالياتو Rate
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +67,Please select Physician and Date,مهرباني وکړئ د ډاکټر او تاریخ ټاکنه وکړئ
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +75,Please select Physician and Date,مهرباني وکړئ د ډاکټر او تاریخ ټاکنه وکړئ
 DocType: Student Group Student,Group Roll Number,ګروپ رول شمیره
 DocType: Student Group Student,Group Roll Number,ګروپ رول شمیره
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",د {0}، يوازې د پور حسابونو بل ډیبیټ د ننوتلو په وړاندې سره وتړل شي
-apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,د ټولو دنده وزن Total باید 1. مهرباني وکړی د ټولو د پروژې د دندو وزن سره سم عیار
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,د سپارنې پرمهال يادونه {0} نه سپارل
-apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,د قالب {0} باید یو فرعي قرارداد د قالب وي
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry",د {0}، يوازې د پور حسابونو بل ډیبیټ د ننوتلو په وړاندې سره وتړل شي
+apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,د ټولو دنده وزن Total باید 1. مهرباني وکړی د ټولو د پروژې د دندو وزن سره سم عیار
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,د سپارنې پرمهال يادونه {0} نه سپارل
+apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,د قالب {0} باید یو فرعي قرارداد د قالب وي
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,پلازمیینه تجهیزاتو
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",د بیې د حاکمیت لومړی پر بنسټ ټاکل &#39;Apply د&#39; ډګر، چې کولای شي د قالب، د قالب ګروپ یا نښې وي.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,مهرباني وکړئ لومړی د کوډ کوډ ولیکئ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +245,Please set the Item Code first,مهرباني وکړئ لومړی د کوډ کوډ ولیکئ
 DocType: Item,ITEM-,ITEM-
-apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,د خرڅلاو ټيم ټولې سلنه بايد 100 وي
+apps/erpnext/erpnext/controllers/selling_controller.py +119,Total allocated percentage for sales team should be 100,د خرڅلاو ټيم ټولې سلنه بايد 100 وي
 DocType: Sales Invoice Item,Edit Description,سمول Description
 DocType: Antibiotic,Antibiotic,انټي بيوټيټ
 ,Team Updates,ټيم اوسمهالونه
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +885,For Supplier,د عرضه
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +910,For Supplier,د عرضه
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,د خوښو حساب ډول په معاملو دې حساب په ټاکلو کې مرسته کوي.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (شرکت د اسعارو)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,چاپ شکل جوړول
-apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +5,Fee Created,فیس جوړه شوه
+apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +5,Fee Created,فیس جوړه شوه
 apps/erpnext/erpnext/utilities/bot.py +39,Did not find any item called {0},ايا په نامه کوم توکی نه پیدا {0}
 DocType: Supplier Scorecard Criteria,Criteria Formula,معیار معیارول
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Total باورلیک
-apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +47,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",هلته يوازې کولای 0 یا د خالي ارزښت له مخې يو نقل حاکمیت حالت وي. &quot;ارزښت&quot;
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +39,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",هلته يوازې کولای 0 یا د خالي ارزښت له مخې يو نقل حاکمیت حالت وي. &quot;ارزښت&quot;
 DocType: Authorization Rule,Transaction,د راکړې ورکړې
 DocType: Patient Appointment,Duration,موده
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,یادونه: دا لګښت د مرکز یو ګروپ دی. آیا ډلو په وړاندې د محاسبې زياتونې نه.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,د ماشومانو د ګدام د دې ګودام موجود دی. تاسو نه شي کولای د دې ګودام ړنګول.
 DocType: Item,Website Item Groups,وېب پاڼه د قالب ډلې
 DocType: Purchase Invoice,Total (Company Currency),Total (شرکت د اسعارو)
-apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,سریال {0} ننوتل څخه یو ځل بیا
-DocType: Depreciation Schedule,Journal Entry,په ورځپانه کی ثبت شوی مطلب
+apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,سریال {0} ننوتل څخه یو ځل بیا
+DocType: Journal Entry,Journal Entry,په ورځپانه کی ثبت شوی مطلب
+DocType: Expense Claim Advance,Unclaimed amount,نا اعلان شوي مقدار
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} په پرمختګ توکي
 DocType: Workstation,Workstation Name,Workstation نوم
 DocType: Grading Scale Interval,Grade Code,ټولګي کوډ
 DocType: POS Item Group,POS Item Group,POS د قالب ګروپ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ولېږئ Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},هیښ {0} نه د قالب سره تړاو نه لري {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +591,BOM {0} does not belong to Item {1},هیښ {0} نه د قالب سره تړاو نه لري {1}
 DocType: Sales Partner,Target Distribution,د هدف د ویش
 DocType: Salary Slip,Bank Account No.,بانکي حساب شمیره
 DocType: Naming Series,This is the number of the last created transaction with this prefix,دا په دې مختاړی د تېرو جوړ معامله شمیر
@@ -1537,11 +1648,11 @@
 DocType: BOM Operation,Workstation,Workstation
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,لپاره د داوطلبۍ عرضه غوښتنه
 DocType: Healthcare Settings,Registration Message,د نوم ليکنې پیغام
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,هډوتري
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,هډوتري
 DocType: Prescription Dosage,Prescription Dosage,نسخه ډوز
 DocType: Attendance,HR Manager,د بشري حقونو څانګې د مدير
-apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,لطفا یو شرکت غوره
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,امتیاز څخه ځي
+apps/erpnext/erpnext/accounts/party.py +178,Please select a Company,لطفا یو شرکت غوره
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +92,Privilege Leave,امتیاز څخه ځي
 DocType: Purchase Invoice,Supplier Invoice Date,عرضه صورتحساب نېټه
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,په هر
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,تاسو باید د خرید په ګاډۍ وتوانوي
@@ -1553,7 +1664,7 @@
 ,BOM Browser,هیښ د لټووني
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,مهرباني وکړئ د دې روزنیز پروګرام لپاره خپل حالت تازه کړئ
 DocType: Purchase Taxes and Charges,Add or Deduct,Add یا وضع
-apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,د تداخل حالاتو تر منځ وموندل:
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +148,Overlapping conditions found between:,د تداخل حالاتو تر منځ وموندل:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,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,Total نظم ارزښت
 apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,د خوړو د
@@ -1561,7 +1672,7 @@
 DocType: Maintenance Schedule Item,No of Visits,نه د ليدنې
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},د ساتنې او ویش {0} په وړاندې د شته {1}
 apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,ایا غواړئ خپل توکي د هب ته خپور کړئ؟
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,شمولیت محصل
+apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +36,Enrolling student,شمولیت محصل
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},د تړل د حساب اسعارو باید د {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},د ټولو موخو ټکي مبلغ بايد 100. وي دا د {0}
 DocType: Project,Start and End Dates,بیا او نیټی پای
@@ -1573,7 +1684,7 @@
 DocType: Rename Tool,Utilities,ګټورتوب
 DocType: POS Profile,Accounting,د محاسبې
 DocType: Employee,EMP/,د چاپېريال د /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,لطفا د يووړل توکی دستو انتخاب
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +133,Please select batches for batched item ,لطفا د يووړل توکی دستو انتخاب
 DocType: Asset,Depreciation Schedules,د استهالک ویش
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,کاریال موده نه شي بهر رخصت تخصيص موده وي
 DocType: Activity Cost,Projects,د پروژو
@@ -1586,7 +1697,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Avg دورځني باورلیک
 DocType: POS Profile,Campaign,د کمپاین
 DocType: Supplier,Name and Type,نوم او ډول
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',تصویب حالت بايد د تصویب &#39;يا&#39; رد &#39;
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +66,Approval Status must be 'Approved' or 'Rejected',تصویب حالت بايد د تصویب &#39;يا&#39; رد &#39;
 DocType: Physician,Contacts and Address,اړیکې او پته
 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',&#39;د تمی د پیل نیټه د&#39; نه وي زیات &#39;د تمی د پای نیټه&#39;
@@ -1594,14 +1705,15 @@
 DocType: Holiday List,Holidays,رخصتۍ
 DocType: Sales Order Item,Planned Quantity,پلان شوي مقدار
 DocType: Purchase Invoice Item,Item Tax Amount,د قالب د مالیې د مقدار
+DocType: Water Analysis,Water Analysis Criteria,د اوبو تحلیل معیار
 DocType: Item,Maintain Stock,دحمل ساتل
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,دحمل توکي لا د تولید لپاره د نظم رامنځته
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Stock Entries already created for Production Order ,دحمل توکي لا د تولید لپاره د نظم رامنځته
 DocType: Employee,Prefered Email,prefered دبرېښنا ليک
 DocType: Student Admission,Eligibility and Details,وړتیا او تفصیلات
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,په ثابته شتمني خالص د بدلون
 DocType: Leave Control Panel,Leave blank if considered for all designations,خالي پريږدئ که د ټولو هغو کارونو په پام کې
-apps/erpnext/erpnext/controllers/accounts_controller.py +663,Charge of type 'Actual' in row {0} cannot be included in Item Rate,د ډول &#39;واقعي په قطار چارج په قالب Rate نه {0} شامل شي
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +359,Max: {0},اعظمي: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +775,Charge of type 'Actual' in row {0} cannot be included in Item Rate,د ډول &#39;واقعي په قطار چارج په قالب Rate نه {0} شامل شي
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +381,Max: {0},اعظمي: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,له Datetime
 DocType: Email Digest,For Company,د شرکت
 apps/erpnext/erpnext/config/support.py +17,Communication log.,د مخابراتو يادښت.
@@ -1610,18 +1722,19 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,د خريداري مقدار
 DocType: Sales Invoice,Shipping Address Name,استونې پته نوم
 DocType: Material Request,Terms and Conditions Content,د قرارداد شرايط منځپانګه
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,نه شي کولای په پرتله 100 وي
-apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,{0} د قالب يو سټاک د قالب نه دی
+apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,د غلطۍ شتون شتون لري د کورس مهال ویش جوړول
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,cannot be greater than 100,نه شي کولای په پرتله 100 وي
+apps/erpnext/erpnext/stock/doctype/item/item.py +720,Item {0} is not a stock Item,{0} د قالب يو سټاک د قالب نه دی
 DocType: Maintenance Visit,Unscheduled,ناپلان شوې
 DocType: Employee,Owned,د دولتي
 DocType: Salary Detail,Depends on Leave Without Pay,په پرته د معاشونو اذن سره تړلی دی
 DocType: Pricing Rule,"Higher the number, higher the priority",د شمېر د لوړو، لوړو لومړیتوب
 ,Purchase Invoice Trends,پیري صورتحساب رجحانات
 DocType: Employee,Better Prospects,ته ښه زمينه
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",د کتارونو تر # {0}: د د ستې {1} لري یوازې {2} qty. لطفا بل batch چې {3} qty موجود ټاکلو او یا د څو کتارونو د قطار ویشل، د موضوع له څو دستو ورسوي /
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +119,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",د کتارونو تر # {0}: د د ستې {1} لري یوازې {2} qty. لطفا بل batch چې {3} qty موجود ټاکلو او یا د څو کتارونو د قطار ویشل، د موضوع له څو دستو ورسوي /
 DocType: Vehicle,License Plate,منښتليک ذريعه
 DocType: Appraisal,Goals,موخې
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,د POS پېژندګلوی غوره کړه
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +343,Select POS Profile,د POS پېژندګلوی غوره کړه
 DocType: Warranty Claim,Warranty / AMC Status,ګرنټی / AMC حالت
 ,Accounts Browser,حسابونه د لټووني
 DocType: Payment Entry Reference,Payment Entry Reference,د پیسو د داخلولو ماخذ
@@ -1630,24 +1743,27 @@
 ,Batch-Wise Balance History,دسته تدبيراومصلحت سره انډول تاریخ
 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/install_fixtures.py +101,Apprentice,شاګرد
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,شاګرد
 DocType: Purchase Invoice,Company GSTIN,شرکت GSTIN
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,منفي مقدار اجازه نه وي
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",د مالياتو د تفصیل جدول توکی په توګه یو تار د بادار څخه راوړل شوی او په دې برخه کې ساتل کيږي. د مالیات او په تور لپاره کارول کيږي
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,کارکوونکی کولای شي چې د ځان راپور نه ورکوي.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +159,Employee cannot report to himself.,کارکوونکی کولای شي چې د ځان راپور نه ورکوي.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",که په پام کې ده کنګل، زياتونې پورې محدود کاروونکو اجازه لري.
 DocType: Email Digest,Bank Balance,بانک دبیلانس
-apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},د محاسبې د داخلولو لپاره د {0}: {1} ولري يوازې په اسعارو کړې: {2}
+apps/erpnext/erpnext/accounts/party.py +243,Accounting Entry for {0}: {1} can only be made in currency: {2},د محاسبې د داخلولو لپاره د {0}: {1} ولري يوازې په اسعارو کړې: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.",دنده پېژنڅېر، وړتوبونه اړتیا او داسې نور
 DocType: Journal Entry Account,Account Balance,موجوده حساب
-apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,د معاملو د ماليې حاکمیت.
+apps/erpnext/erpnext/config/accounts.py +183,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),Total مالیات او په تور (شرکت د اسعارو)
+DocType: Weather,Weather Parameter,د موسم پیرس
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,وښایاست ناتړل مالي کال د P &amp; L توازن
 DocType: Lab Test Template,Collection Details,د راټولولو تفصیلات
+DocType: POS Profile,Allow Print Before Pay,د پیسو دمخه د چاپ اجازه ورکړه
+DocType: Land Unit,Linked Soil Texture,د خاوری لاندی ساختمان
 DocType: Shipping Rule,Shipping Account,انتقال حساب
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} د {1}: Account {2} ده ناچارنده
 apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,د کمکیانو لپاره د خرڅلاو امر تاسو ته د خپل کاري پلان کې مرسته وکړي او پر وخت ورسوي
@@ -1655,44 +1771,48 @@
 DocType: Stock Entry,Total Additional Costs,Total اضافي لګښتونو
 DocType: Course Schedule,SH,SH
 DocType: BOM,Scrap Material Cost(Company Currency),د اوسپنې د موادو لګښت (شرکت د اسعارو)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Sub Assemblies,فرعي شورا
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +66,Sub Assemblies,فرعي شورا
 DocType: Asset,Asset Name,د شتمنیو نوم
 DocType: Project,Task Weight,کاري وزن
 DocType: Shipping Rule Condition,To Value,ته ارزښت
 DocType: Asset Movement,Stock Manager,دحمل مدير
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +144,Source warehouse is mandatory for row {0},سرچینه ګودام لپاره چي په کتارونو الزامی دی {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,بسته بنديو ټوټه
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Source warehouse is mandatory for row {0},سرچینه ګودام لپاره چي په کتارونو الزامی دی {0}
+apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +38,The Payment Term at row {0} is possibly a duplicate.,په صف کې {0} د تادیاتو موده ممکن یو نقل وي.
+apps/erpnext/erpnext/public/js/setup_wizard.js +30,Agriculture (beta),کرنه (بیٹا)
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +856,Packing Slip,بسته بنديو ټوټه
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,دفتر کرایې
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Setup SMS ورننوتلو امستنې
+DocType: Disease,Common Name,عام نوم
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,د وارداتو کې ناکام شو!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,کومه پته نه زياته کړه تر اوسه.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation کاري قيامت
 DocType: Vital Signs,Blood Pressure,د وينې فشار
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +121,Analyst,شنونکي
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,شنونکي
 DocType: Item,Inventory,موجودي
 DocType: Item,Sales Details,د پلورنې په بشپړه توګه کتل
 DocType: Quality Inspection,QI-,QI-
 DocType: Opportunity,With Items,د هغو اقلامو
+DocType: Asset Maintenance,Maintenance Team,د ساتنی ټیم
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,In Qty,په Qty
-DocType: School Settings,Validate Enrolled Course for Students in Student Group,لپاره د زده کونکو د زده ګروپ اعتباري زده کورس
+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/install_fixtures.py +143,Government,د دولت
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,د دولت
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,اخراجاتو ادعا {0} لپاره د وسایطو د ننوتنه مخکې نه شتون لري
-apps/erpnext/erpnext/public/js/setup_wizard.js +60,Institute Name,د انستیتوت نوم
+apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,د انستیتوت نوم
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,لطفا د قسط اندازه ولیکۍ
 apps/erpnext/erpnext/config/stock.py +305,Item Variants,د قالب تانبه
-DocType: Company,Services,خدمتونه
+apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,خدمتونه
 DocType: HR Settings,Email Salary Slip to Employee,Email معاش د کارکونکو ټوټه
 DocType: Cost Center,Parent Cost Center,Parent لګښت مرکز
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1017,Select Possible Supplier,ممکنه عرضه وټاکئ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1039,Select Possible Supplier,ممکنه عرضه وټاکئ
 DocType: Sales Invoice,Source,سرچینه
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,انکړپټه ښودل تړل
 DocType: Leave Type,Is Leave Without Pay,ده پرته د معاشونو د وتو
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,د شتمنیو کټه ګورۍ لپاره شتمن توکی الزامی دی
+apps/erpnext/erpnext/stock/doctype/item/item.py +250,Asset Category is mandatory for Fixed Asset item,د شتمنیو کټه ګورۍ لپاره شتمن توکی الزامی دی
 DocType: Fee Validity,Fee Validity,د فیس اعتبار
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,هیڅ ډول ثبتونې په قطعا د جدول کې وموندل
-apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},دا {0} د شخړو د {1} د {2} {3}
+apps/erpnext/erpnext/education/utils.py +19,This {0} conflicts with {1} for {2} {3},دا {0} د شخړو د {1} د {2} {3}
 DocType: Student Attendance Tool,Students HTML,زده کوونکو د HTML
 DocType: POS Profile,Apply Discount,Apply کمښت
 DocType: GST HSN Code,GST HSN Code,GST HSN کوډ
@@ -1707,16 +1827,18 @@
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,وړل
 DocType: Student,Date of Leaving,د پریښودل نېټه
 DocType: Pricing Rule,For Price List,د بیې په لېست کې
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,اجرايي پلټنه
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +27,Executive Search,اجرايي پلټنه
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +55,Setting defaults,د غوراوي ترتیبونه
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,لامل جوړول
 DocType: Maintenance Schedule,Schedules,مهال ويش
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,د پیسو پروفیسر د پوائنټ خرڅلاو کارولو لپاره اړین دی
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +451,POS Profile is required to use Point-of-Sale,د پیسو پروفیسر د پوائنټ خرڅلاو کارولو لپاره اړین دی
 DocType: Purchase Invoice Item,Net Amount,خالص مقدار
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,{0} د {1} شوی نه دی سپارل نو د عمل نه بشپړ شي
 DocType: Purchase Order Item Supplied,BOM Detail No,هیښ تفصیلي نه
 DocType: Landed Cost Voucher,Additional Charges,اضافي تور
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),اضافي کمښت مقدار (شرکت د اسعارو)
 DocType: Supplier Scorecard,Supplier Scorecard,د کټګورۍ کره کارت
+DocType: Plant Analysis,Result Datetime,د پاټا وخت
 apps/erpnext/erpnext/accounts/doctype/account/account.js +21,Please create new account from Chart of Accounts.,لطفا د حسابونو چارټ نوی ګڼون جوړ کړی.
 ,Support Hour Distribution,د ملاتړ وخت تقسیمول
 DocType: Maintenance Visit,Maintenance Visit,د ساتنې او سفر
@@ -1726,10 +1848,12 @@
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,تازه چاپ شکل
 DocType: Landed Cost Voucher,Landed Cost Help,تيرماښام لګښت مرسته
 DocType: Purchase Invoice,Select Shipping Address,انتخاب استونې پته
+apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,د یادونې تفصیلات
 DocType: Leave Block List,Block Holidays on important days.,په مهمو ورځو د بنديز رخصتۍ.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +71,Accounts Receivable Summary,حسابونه ترلاسه لنډيز
 DocType: Employee Loan,Monthly Repayment Amount,میاشتنی پور بيرته مقدار
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,مهرباني وکړئ د کار کوونکو د اسنادو د کارکونکو رول جوړ جوړ کارن تذکرو برخه
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,د انوګانو پرانیستل
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +195,Please set User ID field in an Employee record to set Employee Role,مهرباني وکړئ د کار کوونکو د اسنادو د کارکونکو رول جوړ جوړ کارن تذکرو برخه
 DocType: UOM,UOM Name,UOM نوم
 DocType: GST HSN Code,HSN Code,HSN کوډ
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,مرستې مقدار
@@ -1737,25 +1861,25 @@
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,دا وسیله تاسو سره مرسته کوي د اوسمهالولو لپاره او يا د ونډې د کمیت او د ارزښت په سيستم ورکوی. دا په خاصه توګه کارول سيستم ارزښتونو او هغه څه چې په حقیقت کې په خپل ګودامونه شتون همغږې ته.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,په کلیمو کې به د ليدو وړ وي. هر کله چې تاسو تسلیمی يادونه وژغوري.
 DocType: Expense Claim,EXP,متفرقه
-apps/erpnext/erpnext/config/stock.py +205,Brand master.,دتوليد بادار.
-apps/erpnext/erpnext/schools/utils.py +50,Student {0} - {1} appears Multiple times in row {2} & {3},د زده کونکو د {0} - {1} په قطار څو ځله ښکاري {2} &amp; {3}
+DocType: Water Analysis,Container,کانټینر
+apps/erpnext/erpnext/education/utils.py +50,Student {0} - {1} appears Multiple times in row {2} & {3},د زده کونکو د {0} - {1} په قطار څو ځله ښکاري {2} &amp; {3}
 DocType: Healthcare Settings,Manage Sample Collection,د نمونې ټولګه سمبال کړئ
 DocType: Program Enrollment Tool,Program Enrollments,د پروګرام د شموليت
 DocType: Patient,Tobacco Past Use,د تمباکو پخوانی کارول
 DocType: Sales Invoice Item,Brand Name,دتوليد نوم
 DocType: Purchase Receipt,Transporter Details,ته لېږدول، په بشپړه توګه کتل
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,Default ګودام لپاره غوره توکی اړتیا
-apps/erpnext/erpnext/utilities/user_progress.py +125,Box,بکس
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,ممکنه عرضه
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2657,Default warehouse is required for selected item,Default ګودام لپاره غوره توکی اړتیا
+apps/erpnext/erpnext/utilities/user_progress.py +143,Box,بکس
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1036,Possible Supplier,ممکنه عرضه
 DocType: Budget,Monthly Distribution,میاشتنی ویش
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,د اخيستونکي بشپړفهرست تش دی. لطفا رامنځته اخيستونکي بشپړفهرست
-apps/erpnext/erpnext/public/js/setup_wizard.js +29,Healthcare (beta),روغتیایی پاملرنې (بیٹا)
+apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),روغتیایی پاملرنې (بیٹا)
 DocType: Production Plan Sales Order,Production Plan Sales Order,تولید پلان خرڅلاو نظم
 DocType: Sales Partner,Sales Partner Target,خرڅلاو همکار هدف
 DocType: Loan Type,Maximum Loan Amount,اعظمي پور مقدار
 DocType: Pricing Rule,Pricing Rule,د بیې د حاکمیت
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},د زده کوونکو د دوه ګونو رول شمېر {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},د زده کوونکو د دوه ګونو رول شمېر {0}
+apps/erpnext/erpnext/education/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},د زده کوونکو د دوه ګونو رول شمېر {0}
+apps/erpnext/erpnext/education/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},د زده کوونکو د دوه ګونو رول شمېر {0}
 DocType: Budget,Action if Annual Budget Exceeded,که کړنه کلنۍ بودیجه زیات شو
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,د نظم پیري موادو غوښتنه
 DocType: Shopping Cart Settings,Payment Success URL,د پیسو د برياليتوب په حافظی
@@ -1770,50 +1894,55 @@
 DocType: C-Form,III,III
 apps/erpnext/erpnext/config/stock.py +310,Opening Stock Balance,پرانيستل دحمل بیلانس
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} بايد يوازې يو ځل داسې ښکاري
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},نه ډیر اجازه tranfer {0} په پرتله {1} د اخستلو د امر په وړاندې د {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},د پاڼو په بریالیتوب سره ځانګړې {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,نه سامان ته واچوئ
 DocType: Shipping Rule Condition,From Value,له ارزښت
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,دفابريکي مقدار الزامی دی
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +581,Manufacturing Quantity is mandatory,دفابريکي مقدار الزامی دی
 DocType: Employee Loan,Repayment Method,دبيرته طريقه
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website",که وکتل، د کور مخ کې به د دغې ویب پاڼې د تلواله د قالب ګروپ وي
 DocType: Quality Inspection Reading,Reading 4,لوستلو 4
-apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,د شرکت د لګښت د ادعا.
+apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,د شرکت د لګښت د ادعا.
 apps/erpnext/erpnext/utilities/activation.py +118,"Students are at the heart of the system, add all your students",زده کوونکي دي د نظام په زړه کې، ستاسو د ټولو زده کوونکو اضافه
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},د کتارونو تر # {0}: چاڼېزو نېټې {1} نه مخکې آرډر نېټه وي {2}
+DocType: Asset Maintenance Task,Certificate Required,سند ضروري دی
 DocType: Company,Default Holiday List,افتراضي رخصتي بشپړفهرست
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +190,Row {0}: From Time and To Time of {1} is overlapping with {2},د کتارونو تر {0}: د وخت او د وخت د {1} له ده سره د تداخل {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,دحمل مسؤلیتونه
 DocType: Purchase Invoice,Supplier Warehouse,عرضه ګدام
 DocType: Opportunity,Contact Mobile No,د تماس د موبايل په هيڅ
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,د شرکت غوره کول
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +382,Select Company,د شرکت غوره کول
 ,Material Requests for which Supplier Quotations are not created,مادي غوښتنې د کوم لپاره چې عرضه Quotations دي جوړ نه
+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} نه لري د اصلي پی ایس پی پېژني. د دې کارن لپاره د {1} په صف کې اصلي ځای وګورئ.
 DocType: Student Group,Set 0 for no limit,جوړ 0 لپاره پرته، حدود نه
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,په هغه ورځ (s) چې تاسو د رخصتۍ درخواست دي رخصتي. تاسو ته اړتيا نه لري د درخواست.
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,صف {idx}: {field} اړین دی چې د پرانیستلو {invoice_type} انوګانې جوړ کړي
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,بیا ولېږې قطعا د ليک
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,نوې دنده
 DocType: Consultation,Appointment,تقویت
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,د داوطلبۍ د کمکیانو لپاره د
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,نور راپورونه
+apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,مهرباني وکړئ لږترلږه یو ډومین انتخاب کړئ.
 DocType: Dependent Task,Dependent Task,اتکا کاري
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},لپاره د اندازه کولو واحد default تغیر فکتور باید 1 په قطار وي {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +430,Conversion factor for default Unit of Measure must be 1 in row {0},لپاره د اندازه کولو واحد default تغیر فکتور باید 1 په قطار وي {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},د ډول رخصت {0} په پرتله نور نه شي {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,له مخکې پلان لپاره د X ورځو عملیاتو کوښښ وکړئ.
 DocType: HR Settings,Stop Birthday Reminders,Stop کالیزې په دوراني ډول
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +250,Please set Default Payroll Payable Account in Company {0},لطفا په شرکت Default د معاشاتو د راتلوونکې حساب جوړ {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +235,Please set Default Payroll Payable Account in Company {0},لطفا په شرکت Default د معاشاتو د راتلوونکې حساب جوړ {0}
 DocType: SMS Center,Receiver List,د اخيستونکي بشپړفهرست
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,د لټون د قالب
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1083,Search Item,د لټون د قالب
+DocType: Payment Schedule,Payment Amount,د تادياتو مقدار
 DocType: Patient Appointment,Referring Physician,ډاکټر ته حواله کول
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,په مصرف مقدار
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,په نغدو خالص د بدلون
 DocType: Assessment Plan,Grading Scale,د رتبو او مقياس
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,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 +612,Already completed,لا د بشپړ
+apps/erpnext/erpnext/stock/doctype/item/item.py +425,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 +616,Already completed,لا د بشپړ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,دحمل په لاس کې
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,د وارداتو بریالی!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},د پیسو غوښتنه د مخکې نه شتون {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,د خپریدلو سامان لګښت
 DocType: Physician,Hospital,روغتون
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},اندازه بايد زيات نه وي {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +384,Quantity must not be more than {0},اندازه بايد زيات نه وي {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,مخکینی مالي کال تړل نه دی
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),عمر (ورځې)
 DocType: Quotation Item,Quotation Item,د داوطلبۍ د قالب
@@ -1823,14 +1952,15 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,شعبه {0} کمیت {1} نه شي کولای یوه برخه وي
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,عرضه ډول بادار.
 DocType: Purchase Order Item,Supplier Part Number,عرضه برخه شمېر
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,conversion کچه نه شي کولای 0 يا 1 وي
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,conversion کچه نه شي کولای 0 يا 1 وي
 DocType: Subscription,Reference Document,ماخذ لاسوند
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} د {1} ده لغوه یا ودرول
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +209,{0} {1} is cancelled or stopped,{0} د {1} ده لغوه یا ودرول
 DocType: Accounts Settings,Credit Controller,اعتبار کنټرولر
+DocType: Grant Application,Applicant Type,د غوښتنلیک ډول
 DocType: Delivery Note,Vehicle Dispatch Date,چلاونه د موټرو نېټه
 DocType: Healthcare Settings,Default Medical Code Standard,اصلي طبی کوډ معياري
 DocType: Purchase Invoice Item,HSN/SAC,HSN / د ژېړو
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +234,Purchase Receipt {0} is not submitted,رانيول رسيد {0} نه سپارل
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +237,Purchase Receipt {0} is not submitted,رانيول رسيد {0} نه سپارل
 DocType: Company,Default Payable Account,Default د راتلوونکې اکانټ
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.",د انلاین سودا کراچۍ امستنې لکه د لېږد د اصولو، د نرخونو لست نور
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}٪ محاسبې ته
@@ -1839,43 +1969,46 @@
 DocType: Party Account,Party Account,ګوند حساب
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,بشري منابع
 DocType: Lead,Upper Income,د مشرانو پر عايداتو
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +41,Reject,رد
+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,هیښ د قالب
 DocType: Appraisal,For Employee,د کارګر
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,د تادياتو د داخلولو د کمکیانو لپاره د
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,د کتارونو تر {0}: عرضه په وړاندې پرمختللی باید ډیبیټ شي
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Supplier must be debit,د کتارونو تر {0}: عرضه په وړاندې پرمختللی باید ډیبیټ شي
 DocType: Company,Default Values,تلواله ارزښتونو ته
+DocType: Membership,INR,INR
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{} د فریکونسي Digest
 DocType: Expense Claim,Total Amount Reimbursed,Total مقدار بیرته
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,دا په دې د موټرو پر وړاندې د يادښتونه پر بنسټ. د تفصیلاتو لپاره په لاندی مهال ویش وګورئ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},په وړاندې د عرضه صورتحساب {0} د میاشتې په {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Against Supplier Invoice {0} dated {1},په وړاندې د عرضه صورتحساب {0} د میاشتې په {1}
 DocType: Customer,Default Price List,Default د بیې په لېست
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,د شتمنیو د غورځنګ ریکارډ {0} جوړ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,د شتمنیو د غورځنګ ریکارډ {0} جوړ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,تاسې کولای شی نه ړنګول مالي کال {0}. مالي {0} کال په توګه په نړیوال امستنې default ټاکل
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,یو ورته پیرود چې ورته نوم یې شتون لري لا دمخه لا شتون لري
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +183,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,دا به د معاش سلپس وسپاري او د ثانوي ژورنال ننوتنې چمتو کړي. ایا تاسو غواړئ چې پرمختګ وکړئ؟
+DocType: Purchase Invoice,Total Net Weight,د ټول ټیټ وزن
 DocType: Journal Entry,Entry Type,د ننوتلو ډول
-apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,نه د ارزونې پلان سره تړاو لري له دې ارزونې ډله
+apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,نه د ارزونې پلان سره تړاو لري له دې ارزونې ډله
 ,Customer Credit Balance,پيرودونکو پور بیلانس
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Accounts Payable,په حسابونه د راتلوونکې خالص د بدلون
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',لپاره د پیریدونکو د &#39;Customerwise کمښت&#39; ته اړتيا
-apps/erpnext/erpnext/config/accounts.py +148,Update bank payment dates with journals.,د بانک د پیسو سره ژورنالونو خرما د اوسمهالولو.
+apps/erpnext/erpnext/config/accounts.py +140,Update bank payment dates with journals.,د بانک د پیسو سره ژورنالونو خرما د اوسمهالولو.
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,د بیې
 DocType: Quotation,Term Details,اصطلاح په بشپړه توګه کتل
-DocType: Project,Total Sales Cost (via Sales Order),د پلورنې مجموعه لګښت (له لارې د خرڅلاو نظم)
-DocType: Project,Total Sales Cost (via Sales Order),د پلورنې مجموعه لګښت (له لارې د خرڅلاو نظم)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,په پرتله {0} د زده کوونکو لپاره له دغه زده ډلې نور شامل نه شي.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,په پرتله {0} د زده کوونکو لپاره له دغه زده ډلې نور شامل نه شي.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,اداره کوونکۍ سازمان د شمېرنې
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,اداره کوونکۍ سازمان د شمېرنې
-apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} بايد په پرتله ډيره وي 0
+apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} بايد په پرتله ډيره وي 0
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +17,Stock Available,د استوګنې شتون
 DocType: Manufacturing Settings,Capacity Planning For (Days),د ظرفیت د پلان د (ورځې)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,د تدارکاتو
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,د توکو نه لري او په اندازه او ارزښت کوم بدلون.
-apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,اجباري ډګر - پروګرام
-apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,اجباري ډګر - پروګرام
+apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,اجباري ډګر - پروګرام
+apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,اجباري ډګر - پروګرام
 DocType: Special Test Template,Result Component,د پایلو برخې
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,ګرنټی ادعا
 ,Lead Details,سرب د نورولوله
+DocType: Volunteer,Availability and Skills,شتون او مهارتونه
 DocType: Salary Slip,Loan repayment,دبيرته
 DocType: Purchase Invoice,End date of current invoice's period,د روان صورتحساب د دورې د پای نیټه
 DocType: Pricing Rule,Applicable For,د تطبیق لپاره
@@ -1886,14 +2019,14 @@
 DocType: Shipping Rule Country,Shipping Rule Country,انتقال د حاکمیت د هېواد
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,پريږدئ او د حاضرۍ
 DocType: Maintenance Visit,Partially Completed,تر یوه بریده بشپړ شوي
-apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,منځنی حساسیت
+apps/erpnext/erpnext/healthcare/setup.py +257,Moderate Sensitivity,منځنی حساسیت
 DocType: Leave Type,Include holidays within leaves as leaves,دننه د پاڼو په توګه پاڼي رخصتي شامل دي
 DocType: Sales Invoice,Packed Items,ډک توکی
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,سریال نمبر په وړاندې تضمین ادعا
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,'Total',&#39;ټول&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +71,'Total',&#39;ټول&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,خرید په ګاډۍ فعال کړه
 DocType: Employee,Permanent Address,دایمی استو ګنځی
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",په پرتله Grand Total په وړاندې د {0} د {1} زیات نه شي ورکول پرمختللی \ {2}
 DocType: Patient,Medication,درمل
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,لطفا توکی کوډ وټاکئ
@@ -1904,37 +2037,43 @@
 DocType: Purchase Invoice,Additional Discount,اضافي کمښت
 DocType: Selling Settings,Selling Settings,خرڅول امستنې
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,عمل تایید کړئ
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,په آنلاین توګه لیلام
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,په آنلاین توګه لیلام
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,لطفا يا مقدار يا ارزښت Rate یا دواړه مشخص
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,تحقق
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,محتویات یی په ګاډۍ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,بازار موندنه داخراجاتو
 ,Item Shortage Report,د قالب په کمښت کې راپور
-apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",د وزن دی، \ n لطفا ذکر &quot;وزن UOM&quot; هم
+apps/erpnext/erpnext/stock/doctype/item/item.js +275,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",د وزن دی، \ n لطفا ذکر &quot;وزن UOM&quot; هم
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,د موادو غوښتنه د دې دحمل د داخلولو لپاره په کار وړل
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,بل د استهالک نېټه د نوي شتمنیو الزامی دی
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,بل د استهالک نېټه د نوي شتمنیو الزامی دی
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,جلا کورس د هر دسته بنسټ ګروپ
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,جلا کورس د هر دسته بنسټ ګروپ
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,د يو قالب واحد واحد.
 DocType: Fee Category,Fee Category,فیس کټه ګورۍ
+DocType: Agriculture Task,Next Business Day,د سوداګرۍ بله ورځ
+DocType: Customer,Primary Contact Detail,د لومړني اړیکو تفصیل
 DocType: Drug Prescription,Dosage by time interval,د وخت وقفې سره دوسیه
 ,Student Fee Collection,د زده کونکو د فیس کلکسیون
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +23,Appointment Duration (mins),د تقاعد موده (منٹ)
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,د هر دحمل ونقل د محاسبې د داخلولو د کمکیانو لپاره
 DocType: Leave Allocation,Total Leaves Allocated,ټولې پاڼې د تخصيص
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},ګدام په کتارونو هیڅ اړتیا {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,لطفا د اعتبار وړ مالي کال د پیل او پای نیټی
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +163,Warehouse required at Row No {0},ګدام په کتارونو هیڅ اړتیا {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Please enter valid Financial Year Start and End Dates,لطفا د اعتبار وړ مالي کال د پیل او پای نیټی
 DocType: Employee,Date Of Retirement,نېټه د تقاعد
 DocType: Upload Attendance,Get Template,ترلاسه کينډۍ
 DocType: Material Request,Transferred,سپارل
 DocType: Vehicle,Doors,دروازو
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,ERPNext Setup بشپړ!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +117,ERPNext Setup Complete!,ERPNext Setup بشپړ!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,د ناروغ د ثبت لپاره فیس راټول کړئ
+apps/erpnext/erpnext/stock/doctype/item/item.py +650,Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item,د ذخیرې له معاملې وروسته امتیازات نشي راوولی. یو نوی توکي جوړ کړئ او نوي شي ته ذخیره انتقال کړئ
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,د مالياتو د تګلاردا
 DocType: Packing Slip,PS-,PS-
+DocType: Member,Non Profit Member,غیر انتفاعي غړی
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} د {1}: لګښت مرکز د &#39;ګټه او زیان&#39; ګڼون اړتیا {2}. لطفا يو default لپاره د دې شرکت د لګښت مرکز جوړ.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +118,A Customer Group exists with same name please change the Customer name or rename the Customer Group,A پيرودونکو ګروپ سره په همدې نوم موجود دی لطفا د پيرودونکو نوم بدل کړي او يا د مراجعينو د ګروپ نوم بدلولی شی
+DocType: Payment Schedule,Payment Term,د تادیاتو موده
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +146,A Customer Group exists with same name please change the Customer name or rename the Customer Group,A پيرودونکو ګروپ سره په همدې نوم موجود دی لطفا د پيرودونکو نوم بدل کړي او يا د مراجعينو د ګروپ نوم بدلولی شی
+DocType: Land Unit,Area,سیمه
 apps/erpnext/erpnext/public/js/templates/contact_list.html +37,New Contact,نوي سره اړيکي
 DocType: Territory,Parent Territory,Parent خاوره
 DocType: Sales Invoice,Place of Supply,د تجهیز ځای
@@ -1944,39 +2083,40 @@
 DocType: Announcement,Instructor,د لارښوونکي
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +61,Select Item (optional),توکي غوره کړئ (اختیاري)
 DocType: Fee Schedule Student Group,Fee Schedule Student Group,د فیس شیدو محصل ګروپ
-DocType: Employee,AB+,AB +
+DocType: Student,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.",که د دې توکي د بېرغونو لري، نو دا په خرڅلاو امر او نور نه ټاکل شي
 DocType: Lead,Next Contact By,بل د تماس By
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},مقدار په قطار د {0} د قالب اړتیا {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +314,Quantity required for Item {0} in row {1},مقدار په قطار د {0} د قالب اړتیا {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},ګدام {0} په توګه د قالب اندازه موجود نه ړنګ شي {1}
 DocType: Quotation,Order Type,نظم ډول
 ,Item-wise Sales Register,د قالب-هوښيار خرڅلاو د نوم ثبتول
 DocType: Asset,Gross Purchase Amount,Gross رانيول مقدار
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,د توازن خلاصول
 DocType: Asset,Depreciation Method,د استهالک Method
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,د نالیکي
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +64,Offline,د نالیکي
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,آیا دا د مالياتو په اساسي Rate شامل دي؟
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Total هدف
+DocType: Soil Texture,Sand Composition (%),د رڼا جوړښت (٪)
 DocType: Job Applicant,Applicant for a Job,د دنده متقاضي
 DocType: Production Plan Material Request,Production Plan Material Request,تولید پلان د موادو غوښتنه
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Production Orders created,نه تولید امر جوړ
 DocType: Stock Reconciliation,Reconciliation JSON,پخلاینې JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,ډېر زيات ستنې. په راپور کې د صادرولو او د چاپولو لپاره دا وېړې پاڼې د درخواست په کارولو.
 DocType: Purchase Invoice Item,Batch No,دسته نه
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},د کوټو لپاره غوښتنه: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,د مراجعينو د اخستلو امر په وړاندې د څو خرڅلاو فرمانونو په اجازه
 DocType: Student Group Instructor,Student Group Instructor,د زده کوونکو د ډلې د لارښوونکي
-apps/erpnext/erpnext/schools/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 +197,Main,اصلي
-apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,variant
+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 +194,Main,اصلي
+apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,چې د خپلې راکړې ورکړې شمیر لړ جوړ مختاړی
 DocType: Employee Attendance Tool,Employees HTML,د کارکوونکو د HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,Default هیښ ({0}) باید د دې توکي او يا د هغې کېنډۍ فعاله وي
+apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default BOM ({0}) must be active for this item or its template,Default هیښ ({0}) باید د دې توکي او يا د هغې کېنډۍ فعاله وي
 DocType: Employee,Leave Encashed?,ووځي 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 +1088,Make Purchase Order,د کمکیانو لپاره د اخستلو امر
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1137,Make Purchase Order,د کمکیانو لپاره د اخستلو امر
 DocType: SMS Center,Send To,لېږل
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},لپاره اجازه او ډول په کافي اندازه رخصت توازن نه شته {0}
 DocType: Payment Reconciliation Payment,Allocated amount,ځانګړې اندازه
@@ -1984,38 +2124,40 @@
 DocType: Sales Invoice Item,Customer's Item Code,پيرودونکو د قالب کوډ
 DocType: Stock Reconciliation,Stock Reconciliation,دحمل پخلاينې
 DocType: Territory,Territory Name,خاوره نوم
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Work-in-Progress Warehouse is required before Submit,کار-in-پرمختګ ګدام مخکې اړتیا سپارل
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Work-in-Progress Warehouse is required before Submit,کار-in-پرمختګ ګدام مخکې اړتیا سپارل
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,د دنده متقاضي.
 DocType: Purchase Order Item,Warehouse and Reference,ګدام او ماخذ
 DocType: Supplier,Statutory info and other general information about your Supplier,قانوني معلومات او ستاسو د عرضه په هکله د نورو عمومي معلومات
 DocType: Item,Serial Nos and Batches,سریال وځيري او دستو
 DocType: Item,Serial Nos and Batches,سریال وځيري او دستو
-apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,د زده کوونکو د ډلې پياوړتيا
-apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,د زده کوونکو د ډلې پياوړتيا
+apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,د زده کوونکو د ډلې پياوړتيا
+apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,د زده کوونکو د ډلې پياوړتيا
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,ژورنال په وړاندې د انفاذ {0} نه کوم السوري {1} د ننوتلو لري
-apps/erpnext/erpnext/config/hr.py +137,Appraisals,ارزونه
+apps/erpnext/erpnext/config/hr.py +142,Appraisals,ارزونه
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,د روزنې پیښې
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},دوه شعبه لپاره د قالب ته ننوتل {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,لپاره يو نقل د حاکمیت شرط
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,ولیکۍ
-apps/erpnext/erpnext/controllers/accounts_controller.py +423,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings",په قطار د {0} شمیره overbill نه شي کولای {1} څخه زيات {2}. ته-د بیلونو په اجازه، لطفا په اخیستلو ته امستنې جوړ
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +212,Please set filter based on Item or Warehouse,لطفا چاڼګر جوړ پر بنسټ د قالب یا ګدام
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +167,Please enter ,ولیکۍ
+apps/erpnext/erpnext/controllers/accounts_controller.py +467,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings",په قطار د {0} شمیره overbill نه شي کولای {1} څخه زيات {2}. ته-د بیلونو په اجازه، لطفا په اخیستلو ته امستنې جوړ
+apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +43,Maintenance Log,د ساتنې ساتنه
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +234,Please set filter based on Item or Warehouse,لطفا چاڼګر جوړ پر بنسټ د قالب یا ګدام
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),د دې بسته خالص وزن. (په توګه د توکو خالص وزن مبلغ په اتوماتيک ډول محاسبه)
 DocType: Sales Order,To Deliver and Bill,ته کول او د بیل
 DocType: Student Group,Instructors,د ښوونکو
 DocType: GL Entry,Credit Amount in Account Currency,په حساب د اسعارو د پورونو مقدار
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,هیښ {0} بايد وسپارل شي
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +588,BOM {0} must be submitted,هیښ {0} بايد وسپارل شي
 DocType: Authorization Control,Authorization Control,د واک ورکولو د کنټرول
-apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},د کتارونو تر # {0}: رد ګدام رد د قالب په وړاندې د الزامی دی {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,د پیسو
+apps/erpnext/erpnext/controllers/buying_controller.py +309,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},د کتارونو تر # {0}: رد ګدام رد د قالب په وړاندې د الزامی دی {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +808,Payment,د پیسو
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"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,ستاسو د امر اداره
 DocType: Production Order Operation,Actual Time and Cost,واقعي وخت او لګښت
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},د اعظمي {0} د موادو غوښتنه کولای {1} په وړاندې د خرڅلاو نظم شي لپاره د قالب جوړ {2}
+DocType: Crop,Crop Spacing,د کرهنې فاصله
 DocType: Course,Course Abbreviation,کورس Abbreviation
 DocType: Student Leave Application,Student Leave Application,د زده کوونکو ته لاړل کاریال
 DocType: Item,Will also apply for variants,به هم د بېرغونو درخواست
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}",د شتمنیو د نه لغوه شي، لکه څنګه چې د مخه دی {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +160,"Asset cannot be cancelled, as it is already {0}",د شتمنیو د نه لغوه شي، لکه څنګه چې د مخه دی {0}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},کارکوونکی د {0} په نيمه ورځ په {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Total کار ساعتونو کې باید په پرتله max کار ساعتونو زيات نه وي {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,د
@@ -2025,9 +2167,9 @@
 DocType: Quality Inspection Reading,Reading 10,لوستلو 10
 DocType: Hub Category,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/install_fixtures.py +125,Associate,ملګري
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,ملګري
 DocType: Asset Movement,Asset Movement,د شتمنیو غورځنګ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,د نوي په ګاډۍ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,د نوي په ګاډۍ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,{0} د قالب يو serialized توکی نه دی
 DocType: SMS Center,Create Receiver List,جوړول د اخيستونکي بشپړفهرست
 DocType: Vehicle,Wheels,په عرابو
@@ -2038,18 +2180,21 @@
 DocType: Activity Cost,Activity Cost,فعالیت لګښت
 DocType: Sales Invoice Timesheet,Timesheet Detail,Timesheet تفصیلي
 DocType: Purchase Receipt Item Supplied,Consumed Qty,په مصرف Qty
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,د مخابراتو
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +52,Telecommunications,د مخابراتو
+apps/erpnext/erpnext/accounts/party.py +266,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 +680,Row {0}: Due Date cannot be before posting date,صف {0}: د تاریخ نیټه د نیټې نیټې څخه مخکې نشي کیدی
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,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,خرڅلاو صورتحساب رجحانات
 DocType: Leave Application,Apply / Approve Leaves,Apply / پاڼي منظور کړل
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,د
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',آيا د قطار ته مراجعه يوازې که د تور د ډول دی په تیره د کتارونو تر مقدار &#39;یا د&#39; مخکینی کتارونو تر Total &#39;
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',آيا د قطار ته مراجعه يوازې که د تور د ډول دی په تیره د کتارونو تر مقدار &#39;یا د&#39; مخکینی کتارونو تر Total &#39;
 DocType: Sales Order Item,Delivery Warehouse,د سپارنې پرمهال ګدام
-apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,د مالي لګښت په مرکزونو کې ونه ده.
+apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,د مالي لګښت په مرکزونو کې ونه ده.
 DocType: Serial No,Delivery Document No,د سپارنې سند نه
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},لطفا په شرکت لاسته راغلې ګټه پر شتمنیو برطرف / زیان حساب &#39;جوړ {0}
+apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},لطفا په شرکت لاسته راغلې ګټه پر شتمنیو برطرف / زیان حساب &#39;جوړ {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,سامان له معاملو رانيول ترلاسه کړئ
 DocType: Serial No,Creation Date,جوړېدنې نېټه
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},{0} د قالب کې د بیې په لېست کې څو ځلې ښکاري {1}
@@ -2062,20 +2207,21 @@
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,تازه ځواب
 apps/erpnext/erpnext/public/js/utils.js +226,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 +25,Batch ID is mandatory,دسته تذکرو الزامی دی
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,دسته تذکرو الزامی دی
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +26,Batch ID is mandatory,دسته تذکرو الزامی دی
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +26,Batch ID is mandatory,دسته تذکرو الزامی دی
 DocType: Sales Person,Parent Sales Person,Parent خرڅلاو شخص
 apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,لوړ لوړوالی
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,لومړی پروګرام غوره کړئ
+apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,لومړی پروګرام غوره کړئ
 DocType: Patient Appointment,Patient Age,د ناروغۍ عمر
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,د پروژو د اداره کولو
 DocType: Supplier,Supplier of Goods or Services.,د اجناسو يا خدمتونو د عرضه.
 DocType: Budget,Fiscal Year,پولي کال، مالي کال
+DocType: Asset Maintenance Log,Planned,پلان شوی
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,د رسیدونکي اصلي رسیدونکي حسابونه باید وکارول شي که چیرې ناروغانو ته د مشورې ورکولو تورونه ونه سپارل شي.
 DocType: Vehicle Log,Fuel Price,د ګازو د بیو
 DocType: Budget,Budget,د بودجې د
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,پرانيستی
-apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,د ثابت د شتمنیو د قالب باید یو غیر سټاک وي.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +51,Set Open,پرانيستی
+apps/erpnext/erpnext/stock/doctype/item/item.py +247,Fixed Asset Item must be a non-stock item.,د ثابت د شتمنیو د قالب باید یو غیر سټاک وي.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",د بودجې د {0} په وړاندې د ګمارل نه شي، ځکه چې نه يو عايد يا اخراجاتو حساب
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,السته
 DocType: Student Admission,Application Form Route,د غوښتنليک فورمه لار
@@ -2089,12 +2235,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,{0} د قالب د سریال ترانسفارمرونو د تشکیلاتو نه ده. د قالب د بادار د وګورئ
 DocType: Maintenance Visit,Maintenance Time,د ساتنې او د وخت
 ,Amount to Deliver,اندازه کول
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},ورته سامان څو ځله ننوتل شوی. {0}
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,د دورې د پیل نیټه نه شي کولای د کال د پیل د تعليمي کال د نېټه چې د اصطلاح ده سره تړاو لري په پرتله مخکې وي (تعليمي کال د {}). لطفا د خرما د اصلاح او بیا کوښښ وکړه.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +324,Same item has been entered multiple times. {0},ورته سامان څو ځله ننوتل شوی. {0}
+apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,د دورې د پیل نیټه نه شي کولای د کال د پیل د تعليمي کال د نېټه چې د اصطلاح ده سره تړاو لري په پرتله مخکې وي (تعليمي کال د {}). لطفا د خرما د اصلاح او بیا کوښښ وکړه.
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +192,There were errors.,تېروتنې وې.
 DocType: Guardian,Guardian Interests,ګارډین علاقه
 DocType: Naming Series,Current Value,اوسنی ارزښت
-apps/erpnext/erpnext/controllers/accounts_controller.py +240,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,لپاره د نېټې {0} څو مالي کلونو کې شتون لري. لطفا د مالي کال په شرکت جوړ
-DocType: School Settings,Instructor Records to be created by,د روزونکي ریکارډونه باید جوړ شي
+apps/erpnext/erpnext/controllers/accounts_controller.py +263,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: Delivery Note Item,Against Sales Order,په وړاندې د خرڅلاو د ترتیب پر اساس
 ,Serial No Status,شعبه حالت
@@ -2105,19 +2252,20 @@
 						must be greater than or equal to {2}",د کتارونو تر {0}: د ټاکل {1} Periodicity، له او تر اوسه پورې \ تر منځ توپیر باید په پرتله لویه یا د مساوي وي {2}
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,دا په دحمل پر بنسټ. وګورئ: {0} تفصيل لپاره د
 DocType: Pricing Rule,Selling,پلورل
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},مقدار د {0} د {1} مجرايي په وړاندې د {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +379,Amount {0} {1} deducted against {2},مقدار د {0} د {1} مجرايي په وړاندې د {2}
 DocType: Employee,Salary Information,معاش معلومات
 DocType: Sales Person,Name and Employee ID,نوم او د کارګر ID
-apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,له امله نېټه پست کوي نېټه مخکې نه شي
+apps/erpnext/erpnext/accounts/party.py +311,Due Date cannot be before Posting Date,له امله نېټه پست کوي نېټه مخکې نه شي
 DocType: Website Item Group,Website Item Group,وېب پاڼه د قالب ګروپ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,دندې او مالیات
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,لطفا ماخذ نېټې ته ننوځي
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Please enter Reference date,لطفا ماخذ نېټې ته ننوځي
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} د پیسو زياتونې له خوا فلتر نه شي {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,د قالب شمیره جدول کې چې به وېبپاڼه کې ښودل شي
 DocType: Purchase Order Item Supplied,Supplied Qty,تهيه Qty
 DocType: Purchase Order Item,Material Request Item,د موادو غوښتنه د قالب
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,د قالب ډلې ونه ده.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +160,Cannot refer row number greater than or equal to current row number for this Charge type,نه قطار شمېر په پرتله لویه یا مساوي دې مسؤوليت په ډول د اوسني قطار شمېر ته راجع
+DocType: Payroll Entry,Get Employee Details,د کارمندانو جزئیات ترلاسه کړئ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,Cannot refer row number greater than or equal to current row number for this Charge type,نه قطار شمېر په پرتله لویه یا مساوي دې مسؤوليت په ډول د اوسني قطار شمېر ته راجع
 DocType: Asset,Sold,پلورل
 ,Item-wise Purchase History,د قالب-هوښيار رانيول تاریخ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},لطفا شعبه لپاره د قالب زياته کړه راوړلو په &#39;تولید مهال ویش&#39; کلیک {0}
@@ -2129,7 +2277,7 @@
 DocType: Sales Invoice,Accounting Details,د محاسبې په بشپړه توګه کتل
 apps/erpnext/erpnext/setup/doctype/company/company.js +84,Delete all the Transactions for this Company,دا د شرکت د ټولو معاملې ړنګول
 DocType: Patient,O Positive,اې مثبت
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,د کتارونو تر # {0}: عملیات {1} نه د {2} په تولید د پای ته د مالونو qty بشپړ نظم # {3}. لطفا د وخت کندي له لارې د عملیاتو د حالت د اوسمهالولو
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +195,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,د کتارونو تر # {0}: عملیات {1} نه د {2} په تولید د پای ته د مالونو qty بشپړ نظم # {3}. لطفا د وخت کندي له لارې د عملیاتو د حالت د اوسمهالولو
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,پانګه اچونه
 DocType: Issue,Resolution Details,د حل په بشپړه توګه کتل
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,تخصیصونه
@@ -2141,6 +2289,7 @@
 DocType: Employee Loan Application,Total Payable Amount,ټول د راتلوونکې مقدار
 DocType: Task,Expected Time (in hours),د تمی د وخت (په ساعتونو)
 DocType: Item Reorder,Check in (group),په چک (ډله)
+DocType: Soil Texture,Silt,Silt
 ,Qty to Order,Qty ته اخلي.
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked",د حساب Liability یا مساوات لاندې مشر، په کوم کې ګټه / له لاسه ورکول به بک شي
 apps/erpnext/erpnext/config/projects.py +31,Gantt chart of all tasks.,د ټولو دندو Gantt چارت.
@@ -2150,7 +2299,7 @@
 DocType: Course,Default Grading Scale,Default د رتبو مقياس
 DocType: Appraisal,For Employee Name,د کارګر نوم
 DocType: Holiday List,Clear Table,روښانه جدول
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +98,Available slots,شتون لري
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +106,Available slots,شتون لري
 DocType: C-Form Invoice Detail,Invoice No,د انوائس شمیره
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +350,Make Payment,د تادیاتو د کمکیانو لپاره د
 DocType: Room,Room Name,کوټه نوم
@@ -2162,6 +2311,7 @@
 ,Campaign Efficiency,د کمپاین موثريت
 DocType: Discussion,Discussion,د بحث
 DocType: Payment Entry,Transaction ID,د راکړې ورکړې ID
+DocType: Volunteer,Anytime,هرکله
 DocType: Patient,Surgical History,جراحي تاریخ
 DocType: Employee,Resignation Letter Date,د استعفا ليک نېټه
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,د بیې اصول دي لا فلتر پر بنسټ اندازه.
@@ -2169,9 +2319,11 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},لطفا د ټولګې لپاره د کارمند په یوځای کېدو د نېټه {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Total اولګښت مقدار (د وخت پاڼه له لارې)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,تکرار پيرودونکو د عوایدو
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1}) باید رول &#39;اخراجاتو Approver&#39; لري
-apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,جوړه
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,د تولید لپاره د هیښ او Qty وټاکئ
+DocType: Soil Texture,Silty Clay Loam,د سپیټ مټ لوام
+DocType: Chapter,Chapter,فصل
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +200,{0} ({1}) must have role 'Expense Approver',{0} ({1}) باید رول &#39;اخراجاتو Approver&#39; لري
+apps/erpnext/erpnext/utilities/user_progress.py +143,Pair,جوړه
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +959,Select BOM and Qty for Production,د تولید لپاره د هیښ او Qty وټاکئ
 DocType: Asset,Depreciation Schedule,د استهالک ويش
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,خرڅلاو همکار پتې او د اړيکو
 DocType: Bank Reconciliation Detail,Against Account,په وړاندې حساب
@@ -2179,37 +2331,41 @@
 DocType: Maintenance Schedule Detail,Actual Date,واقعي نېټه
 DocType: Item,Has Batch No,لري دسته نه
 apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},کلنی اولګښت: {0}
-apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),اجناسو او خدماتو د مالياتو د (GST هند)
+apps/erpnext/erpnext/config/accounts.py +200,Goods and Services Tax (GST India),اجناسو او خدماتو د مالياتو د (GST هند)
 DocType: Delivery Note,Excise Page Number,وسیله Page شمېر
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory",شرکت، له تاريخ او د نېټه الزامی دی
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +225,"Company, From Date and To Date is mandatory",شرکت، له تاريخ او د نېټه الزامی دی
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,مشوره ترلاسه کړئ
 DocType: Asset,Purchase Date,رانيول نېټه
-DocType: Employee,Personal Details,د شخصي نورولوله
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},مهرباني وکړئ ټاکل په شرکت د شتمنيو د استهالک لګښت مرکز &#39;{0}
+DocType: Volunteer,Volunteer Type,داوطلب ډول
+DocType: Student,Personal Details,د شخصي نورولوله
+apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},مهرباني وکړئ ټاکل په شرکت د شتمنيو د استهالک لګښت مرکز &#39;{0}
 ,Maintenance Schedules,د ساتنې او ویش
 DocType: Task,Actual End Date (via Time Sheet),واقعي د پای نیټه (د وخت پاڼه له لارې)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},مقدار د {0} د {1} په وړاندې د {2} {3}
+DocType: Soil Texture,Soil Type,د خاوری ډول
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},مقدار د {0} د {1} په وړاندې د {2} {3}
 ,Quotation Trends,د داوطلبۍ رجحانات
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},د قالب ګروپ نه د توکی په توکی بادار ذکر {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,د حساب ډیبیټ باید یو ترلاسه حساب وي
-DocType: Shipping Rule Condition,Shipping Amount,انتقال مقدار
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,د حساب ډیبیټ باید یو ترلاسه حساب وي
+DocType: Shipping Rule,Shipping Amount,انتقال مقدار
 DocType: Supplier Scorecard Period,Period Score,د دورې کچه
 apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,پېرېدونکي ورزیات کړئ
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,انتظار مقدار
 DocType: Lab Test Template,Special,ځانګړې
-DocType: Purchase Invoice Item,Conversion Factor,د تغیر فکتور
+DocType: Purchase Order Item Supplied,Conversion Factor,د تغیر فکتور
 DocType: Purchase Order,Delivered,تحویلوونکی
 ,Vehicle Expenses,موټر داخراجاتو
 DocType: Serial No,Invoice Details,صورتحساب نورولوله
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},ګټور ژوند وروسته د ارزښت د تمې باید په پرتله لویه یا د مساوي وي {0}
-apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,پېل کول
+DocType: Grant Application,Show on Website,په ویب پاڼه کې ښودل
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},ګټور ژوند وروسته د ارزښت د تمې باید په پرتله لویه یا د مساوي وي {0}
+apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,پېل کول
 DocType: Hub Category,Hub Category,حب کټګوري
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,موټر شمېر
 DocType: Employee Loan,Loan Amount,د پور مقدار
+apps/erpnext/erpnext/utilities/user_progress.py +88,Add Letterhead,ليټريډ زياتول
 DocType: Program Enrollment,Self-Driving Vehicle,د ځان د چلونې د وسایطو د
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,د کټګورۍ د رایو کارډونه
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},د کتارونو تر {0}: د مواد بیل نه د سامان موندل {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +420,Row {0}: Bill of Materials not found for the Item {1},د کتارونو تر {0}: د مواد بیل نه د سامان موندل {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,ټولې پاڼي {0} نه لږ وي لا تصویب پاڼي {1} مودې لپاره په پرتله
 DocType: Journal Entry,Accounts Receivable,حسابونه ترلاسه
 ,Supplier-Wise Sales Analytics,عرضه تدبيراومصلحت خرڅلاو Analytics
@@ -2221,28 +2377,29 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)",د موروپلار کورس (پرېږدئ خالي، که دا د موروپلار کورس برخه نه ده)
 DocType: Leave Control Panel,Leave blank if considered for all employee types,خالي پريږدئ که د کارمند ټول ډولونه په پام کې
 DocType: Landed Cost Voucher,Distribute Charges Based On,په تور د وېشلو پر بنسټ
-apps/erpnext/erpnext/hooks.py +140,Timesheets,دحاضري
+apps/erpnext/erpnext/hooks.py +144,Timesheets,دحاضري
 DocType: HR Settings,HR Settings,د بشري حقونو څانګې امستنې
 DocType: Salary Slip,net pay info,خالص د معاشونو پيژندنه
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,دا ارزښت د اصلي خرڅلاو نرخ لیست کې تازه شوی دی.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,Expense Claim is pending approval. Only the Expense Approver can update status.,اخراجاتو ادعا ده د تصویب په تمه ده. يوازې د اخراجاتو Approver کولای حالت د اوسمهالولو.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +122,Expense Claim is pending approval. Only the Expense Approver can update status.,اخراجاتو ادعا ده د تصویب په تمه ده. يوازې د اخراجاتو Approver کولای حالت د اوسمهالولو.
 DocType: Email Digest,New Expenses,نوي داخراجاتو
 DocType: Purchase Invoice,Additional Discount Amount,اضافي کمښت مقدار
 DocType: Consultation,Patient Details,د ناروغ توضیحات
 DocType: Patient,B Positive,B مثبت
-apps/erpnext/erpnext/controllers/accounts_controller.py +531,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",د کتارونو تر # {0}: Qty باید 1، لکه توکی يوه ثابته شتمني ده. لورينه وکړئ د څو qty جلا قطار وکاروي.
+apps/erpnext/erpnext/controllers/accounts_controller.py +575,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",د کتارونو تر # {0}: Qty باید 1، لکه توکی يوه ثابته شتمني ده. لورينه وکړئ د څو qty جلا قطار وکاروي.
 DocType: Leave Block List Allow,Leave Block List Allow,پريږدئ بالک بشپړفهرست اجازه
-apps/erpnext/erpnext/setup/doctype/company/company.py +291,Abbr can not be blank or space,Abbr نه شي خالي يا ځای وي
+apps/erpnext/erpnext/setup/doctype/company/company.py +288,Abbr can not be blank or space,Abbr نه شي خالي يا ځای وي
 DocType: Patient Medical Record,Patient Medical Record,د ناروغ درملنه
-apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,د غیر ګروپ ګروپ
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,لوبې
+apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,د غیر ګروپ ګروپ
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,لوبې
 DocType: Loan Type,Loan Name,د پور نوم
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Total واقعي
 DocType: Lab Test UOM,Test UOM,د ام ای امتحان
 DocType: Student Siblings,Student Siblings,د زده کونکو د ورور
-apps/erpnext/erpnext/utilities/user_progress.py +125,Unit,د واحد
-apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,مهرباني وکړئ د شرکت مشخص
+apps/erpnext/erpnext/utilities/user_progress.py +143,Unit,د واحد
+apps/erpnext/erpnext/stock/get_item_details.py +136,Please specify Company,مهرباني وکړئ د شرکت مشخص
 ,Customer Acquisition and Loyalty,پيرودونکو د استملاک او داری
+DocType: Asset Maintenance Task,Maintenance Task,د ساتنې ساتنه
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,ګدام ځای کې چې تاسو د رد په پېژندتورو سټاک ساتلو
 DocType: Production Order,Skip Material Transfer,ته وګرځه توکو لېږدونه د
 DocType: Production Order,Skip Material Transfer,ته وګرځه توکو لېږدونه د
@@ -2253,70 +2410,73 @@
 DocType: Issue,Support,د ملاتړ
 ,BOM Search,هیښ پلټنه
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",په هوب کې &quot;په اسٹاک کې&quot; یا &quot;نه په ذخیره&quot; کې خپور کړئ په دې ګودام کې موجود زیرمې پورې اړه لري.
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),تړل د (+ تول پرانيستل)
 DocType: Vehicle,Fuel Type,د تیلو د ډول
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,لطفا په شرکت اسعارو مشخص
 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} به منفي {1} لپاره د قالب {2} په ګدام {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,مادي غوښتنې لاندې پر بنسټ د قالب د بيا نظم په کچه دي په اتوماتيک ډول راپورته شوې
 DocType: Email Digest,Pending Sales Orders,انتظار خرڅلاو امر
-apps/erpnext/erpnext/controllers/accounts_controller.py +279,Account {0} is invalid. Account Currency must be {1},ګڼون {0} ناباوره دی. حساب د اسعارو باید د {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +302,Account {0} is invalid. Account Currency must be {1},ګڼون {0} ناباوره دی. حساب د اسعارو باید د {1}
 DocType: Healthcare Settings,Remind Before,مخکې یادونه وکړئ
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},په قطار UOM تغیر فکتور ته اړتيا ده {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",د کتارونو تر # {0}: ماخذ لاسوند ډول باید د خرڅلاو نظم یو، خرڅلاو صورتحساب یا ژورنال انفاذ وي
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1060,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",د کتارونو تر # {0}: ماخذ لاسوند ډول باید د خرڅلاو نظم یو، خرڅلاو صورتحساب یا ژورنال انفاذ وي
 DocType: Salary Component,Deduction,مجرايي
+DocType: Item,Retain Sample,نمونه ساتل
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,د کتارونو تر {0}: له وخت او د وخت فرض ده.
 DocType: Stock Reconciliation Item,Amount Difference,اندازه بدلون
-apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},د قالب بیه لپاره زياته کړه {0} په بیې په لېست کې د {1}
+apps/erpnext/erpnext/stock/get_item_details.py +349,Item Price added for {0} in Price List {1},د قالب بیه لپاره زياته کړه {0} په بیې په لېست کې د {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,مهرباني وکړئ او دې د پلورنې کس ته ننوځي د کارګر Id
 DocType: Territory,Classification of Customers by region,له خوا د سيمې د پېرېدونکي طبقه
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,توپیر رقم بايد صفر وي
+apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +71,In Production,په تولید کې
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +59,Difference Amount must be zero,توپیر رقم بايد صفر وي
 DocType: Project,Gross Margin,Gross څنډی
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,مهرباني وکړئ لومړی تولید د قالب ته ننوځي
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,محاسبه شوې بانک اعلامیه توازن
 DocType: Normal Test Template,Normal Test Template,د عادي امتحان ټکي
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,معيوبينو د کارونکي عکس
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +764,Quotation,د داوطلبۍ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +957,Cannot set a received RFQ to No Quote,نشي کولی د ترلاسه شوي آر ایف پی ترلاسه کولو لپاره هیڅ معرفي نه کړي
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +913,Quotation,د داوطلبۍ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,نشي کولی د ترلاسه شوي آر ایف پی ترلاسه کولو لپاره هیڅ معرفي نه کړي
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Total Deduction
 ,Production 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 +201,Cost Updated,لګښت Updated
-DocType: Employee,Date of Birth,د زیږون نیټه
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,د توکو کود&gt; توکي ګروپ&gt; برنامه
+DocType: Patient,Date of Birth,د زیږون نیټه
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,{0} د قالب لا ته راوړل شوي دي
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** مالي کال ** د مالي کال استازيتوب کوي. ټول د محاسبې زياتونې او نورو لويو معاملو ** مالي کال په وړاندې تعقیبیږي **.
 DocType: Opportunity,Customer / Lead Address,پيرودونکو / سوق پته
-DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,د سپریري کرایډ کارټ Setup
-apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,د ارزونې پلان نوم
-apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},خبرداری: په ضمیمه کی ناسم ایس ایس د سند د {0}
+apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,د ارزونې پلان نوم
+apps/erpnext/erpnext/stock/doctype/item/item.py +222,Warning: Invalid SSL certificate on attachment {0},خبرداری: په ضمیمه کی ناسم ایس ایس د سند د {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads",لامل تاسو سره مرسته ترلاسه سوداګرۍ، ټولې خپلې اړيکې او نور ستاسو د لامل اضافه
 DocType: Production Order Operation,Actual Operation Time,واقعي عملياتو د وخت
 DocType: Authorization Rule,Applicable To (User),د تطبیق وړ د (کارن)
 DocType: Purchase Taxes and Charges,Deduct,وضع
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,Job Description
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Job Description,Job Description
 DocType: Student Applicant,Applied,تطبیقی
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,Re علني
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +859,Re-open,Re علني
 DocType: Sales Invoice Item,Qty as per Stock UOM,Qty هر دحمل UOM په توګه
-apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 نوم
+apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2 نوم
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series",ځانګړي خویونه پرته &quot;-&quot; &quot;.&quot;، &quot;#&quot;، او &quot;/&quot; نه په نوم لړ اجازه
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",وساتئ د خرڅلاو د کمپاینونو Track. د ياه، قیمت د روان وساتئ، خرڅلاو نظم او نور له مبارزو ته ورستون د پانګونې کچه معلومه کړي.
 DocType: Expense Claim,Approver,Approver
 ,SO Qty,SO Qty
 DocType: Guardian,Work Address,د کار پته
 DocType: Appraisal,Calculate Total Score,ټولې نمرې محاسبه
-DocType: Request for Quotation,Manufacturing Manager,دفابريکي مدير
+DocType: Asset Repair,Manufacturing Manager,دفابريکي مدير
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},شعبه {0} لاندې ترمړوندونو تضمین دی {1}
-apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,بیلتون د سپارنې يادونه په چمدان.
-apps/erpnext/erpnext/hooks.py +107,Shipments,مالونو
+DocType: Plant Analysis Criteria,Minimum Permissible Value,لږ تر لږه اجازه ورکول ارزښت
+apps/erpnext/erpnext/education/doctype/guardian/guardian.py +42,User {0} already exists,کارن {0} لا د مخه موجود دی
+apps/erpnext/erpnext/hooks.py +109,Shipments,مالونو
 DocType: Payment Entry,Total Allocated Amount (Company Currency),ټولې مقدار (شرکت د اسعارو)
 DocType: Purchase Order Item,To be delivered to customer,د دې لپاره چې د پېرېدونکو ته وسپارل شي
 DocType: BOM,Scrap Material Cost,د اوسپنې د موادو لګښت
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +227,Serial No {0} does not belong to any Warehouse,شعبه {0} نه د هر ډول ګدام سره تړاو نه لري
+DocType: Grant Application,Email Notification Sent,د بریښناليک خبرتیا استول شوی
 DocType: Purchase Invoice,In Words (Company Currency),په وييکي (شرکت د اسعارو)
-DocType: Asset,Supplier,عرضه
+DocType: Pricing Rule,Supplier,عرضه
 DocType: Consultation,Consultation Time,د مشورې وخت
 DocType: C-Form,Quarter,پدې ربع کې
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,متفرقه لګښتونو
@@ -2330,115 +2490,123 @@
 DocType: Email Digest,Note: Email will not be sent to disabled users,يادونه: دبرېښنا ليک به د معلولينو کارنان نه واستول شي
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,د عمل له شمیره
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,د عمل له شمیره
-apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,د توکو ډول ډولونه
+apps/erpnext/erpnext/stock/doctype/item/item.js +105,Item Variant Settings,د توکو ډول ډولونه
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,وټاکئ شرکت ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,خالي پريږدئ که د ټولو څانګو په پام کې
-apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).",د کار ډولونه (د دایمي، قرارداد، intern او داسې نور).
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} لپاره د قالب الزامی دی {1}
-DocType: Process Payroll,Fortnightly,جلالت
+apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).",د کار ډولونه (د دایمي، قرارداد، intern او داسې نور).
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} لپاره د قالب الزامی دی {1}
+DocType: Payroll Entry,Fortnightly,جلالت
 DocType: Currency Exchange,From Currency,څخه د پیسو د
 DocType: Vital Signs,Weight (In Kilogram),وزن (کلوگرام)
+DocType: Chapter,"chapters/chapter_name
+leave blank automatically set after saving chapter.",فصلونه / فصل_ نوم نومیږي په خپل ځان سره په محفوظ ډول د سپما د فصل وروسته.
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",لطفا په تيروخت کي يو قطار تخصيص مقدار، صورتحساب ډول او صورتحساب شمېر غوره
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,د نوي رانيول لګښت
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,د نوي رانيول لګښت
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +97,Sales Order required for Item {0},خرڅلاو نظم لپاره د قالب اړتیا {0}
+DocType: Grant Application,Grant Description,د وړاندوینه تفصیل
 DocType: Purchase Invoice Item,Rate (Company Currency),کچه (د شرکت د اسعارو)
 DocType: Student Guardian,Others,نور
 DocType: Payment Entry,Unallocated Amount,Unallocated مقدار
 apps/erpnext/erpnext/templates/includes/product_page.js +71,Cannot find a matching Item. Please select some other value for {0}.,کولی کوم ساری توکی ونه موندل. لورينه وکړئ د {0} يو شمېر نورو ارزښت ټاکي.
 DocType: POS Profile,Taxes and Charges,مالیه او په تور
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.",د تولید یا د خدمت دی چې اخيستي، پلورل او يا په ګدام کې وساتل.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,مهرباني وکړئ د بشري منابعو&gt; بشري سیسټمونو کې د کارمندانو نومونې سیستم ترتیب کړئ
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,نه زیات تازه
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +154,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,آیا تور د ډول په توګه په تیره د کتارونو تر مقدار &#39;انتخاب نه یا د&#39; په تیره د کتارونو تر Total لپاره په اول قطار
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,آیا تور د ډول په توګه په تیره د کتارونو تر مقدار &#39;انتخاب نه یا د&#39; په تیره د کتارونو تر Total لپاره په اول قطار
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,پدې کې د دې سایپ سره تړلي ټول سکډډرډونه شامل دي
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,د ماشومانو د قالب باید د محصول د بنډل نه وي. لطفا توکی لرې `{0}` او وژغوري
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,بانکداري
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,بانکداري
 apps/erpnext/erpnext/utilities/activation.py +108,Add Timesheets,Add ویشونو
 DocType: Vehicle Service,Service Item,د خدمتونو د قالب
 DocType: Bank Guarantee,Bank Guarantee,بانکي تضمین
 DocType: Bank Guarantee,Bank Guarantee,بانکي تضمین
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,لطفا د مهال ویش به په &#39;تولید مهال ویش&#39; کیکاږۍ
-apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,غلطيو په داسې حال کې دا الندې جدول ړنګول وو:
 DocType: Bin,Ordered Quantity,امر مقدار
-apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""",د بیلګې په توګه &quot;د جوړوونکي وسایلو جوړولو&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""",د بیلګې په توګه &quot;د جوړوونکي وسایلو جوړولو&quot;
 DocType: Grading Scale,Grading Scale Intervals,د رتبو مقیاس انټروالونه
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} د {1}: د {2} د محاسبې انفاذ کولای شي يوازې په اسعارو کړې: {3}
-DocType: Production Order,In Process,په بهیر کې
+DocType: Fee Schedule,In Process,په بهیر کې
 DocType: Authorization Rule,Itemwise Discount,نورتسهیالت کمښت
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,د مالي حسابونو د ونو.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} خرڅلاو نظم په وړاندې د {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +362,{0} against Sales Order {1},{0} خرڅلاو نظم په وړاندې د {1}
 DocType: Account,Fixed Asset,د ثابت د شتمنیو
 apps/erpnext/erpnext/config/stock.py +320,Serialized Inventory,Serialized موجودي
 DocType: Employee Loan,Account Info,حساب پيژندنه
 DocType: Activity Type,Default Billing Rate,Default اولګښت Rate
 DocType: Fees,Include Payment,د پیسو ورکړه
-apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} د زده کوونکو ډلو جوړ.
-apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} د زده کوونکو ډلو جوړ.
+apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} د زده کوونکو ډلو جوړ.
+apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} د زده کوونکو ډلو جوړ.
 DocType: Sales Invoice,Total Billing Amount,Total اولګښت مقدار
 apps/erpnext/erpnext/hr/doctype/daily_work_summary_settings/daily_work_summary_settings.py +17,There must be a default incoming Email Account enabled for this to work. Please setup a default incoming Email Account (POP/IMAP) and try again.,هلته باید یو default راتلونکي ليک حساب د دې کار چارن وي. لطفا د تشکیلاتو د اصلي راتلونکي ليک حساب (POP / IMAP) او بیا کوښښ وکړه.
-DocType: Healthcare Settings,Receivable Account,ترلاسه اکانټ
-apps/erpnext/erpnext/controllers/accounts_controller.py +553,Row #{0}: Asset {1} is already {2},د کتارونو تر # {0}: د شتمنیو د {1} ده لا د {2}
+apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,د فیس جوړښت او د زده کوونکو ګروپ {0} پروګرام مختلف دی.
+DocType: Fee Schedule,Receivable Account,ترلاسه اکانټ
+apps/erpnext/erpnext/controllers/accounts_controller.py +597,Row #{0}: Asset {1} is already {2},د کتارونو تر # {0}: د شتمنیو د {1} ده لا د {2}
 DocType: Quotation Item,Stock Balance,دحمل بیلانس
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,ته قطعا د خرڅلاو د ترتیب پر اساس
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +119,CEO,اجرايوي ريس
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,اجرايوي ريس
 DocType: Purchase Invoice,With Payment of Tax,د مالیې تادیه کولو سره
 DocType: Expense Claim Detail,Expense Claim Detail,اخراجاتو ادعا تفصیلي
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,د عرضه TRIPLICATE
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,لطفا صحيح حساب وټاکئ
-DocType: Item,Weight UOM,وزن UOM
+DocType: Land Unit,Is Container,کنټینر دی
+DocType: Crop Cycle,This will be day 1 of the crop cycle,دا به د فصل دورې 1 ورځ وي
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +869,Please select correct account,لطفا صحيح حساب وټاکئ
+DocType: Purchase Invoice Item,Weight UOM,وزن UOM
 DocType: Salary Structure Employee,Salary Structure Employee,معاش جوړښت د کارګر
-DocType: Patient,Blood Group,د وينې ګروپ
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js +45,Show Variant Attributes,مختلف ډولونه ښکاره کړئ
+DocType: Student,Blood Group,د وينې ګروپ
 DocType: Course,Course Name,کورس نوم
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,هغه کارنان چې کولای شي یو ځانګړي کارکوونکي د رخصتۍ غوښتنلیکونه تصویب
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,دفتر او تجهیزاتو
 DocType: Purchase Invoice Item,Qty,Qty
 DocType: Fiscal Year,Companies,د شرکتونو
 DocType: Supplier Scorecard,Scoring Setup,د سایټ لګول
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,برقی سامانونه
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +24,Electronics,برقی سامانونه
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,د موادو غوښتنه راپورته کړي کله سټاک بیا نظم درجی ته ورسیږي
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Full-time,پوره وخت
-DocType: Salary Structure,Employees,د کارکوونکو
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +98,Full-time,پوره وخت
+DocType: Payroll Entry,Employees,د کارکوونکو
 DocType: Employee,Contact Details,د اړیکو نیولو معلومات
 DocType: C-Form,Received Date,ترلاسه نېټه
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.",که تاسو په خرڅلاو مالیات او په تور کينډۍ د يوې معياري کېنډۍ جوړ، وټاکئ او پر تڼی لاندې ځای کلیک کړی.
 DocType: BOM Scrap Item,Basic Amount (Company Currency),اساسي مقدار (شرکت د اسعارو)
 DocType: Student,Guardians,ساتونکو
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,بيې به که بیې په لېست کې نه دی جوړ نه ښودل شي
-apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,لطفا د دې نقل حاکمیت يو هېواد مشخص او يا د نړۍ په نقل وګورئ
 DocType: Stock Entry,Total Incoming Value,Total راتلونکي ارزښت
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,ډیبیټ ته اړتيا ده
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,ډیبیټ ته اړتيا ده
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team",ویشونو لپاره activites ستاسو د ډلې له خوا تر سره د وخت، لګښت او د بلونو د تګلورې کې مرسته وکړي
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,رانيول بیې لېست
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,د عرضه کونکي سکورټ کارډ متغیرات.
 DocType: Offer Letter Term,Offer Term,وړاندیز مهاله
-DocType: Quality Inspection,Quality Manager,د کیفیت د مدير
+DocType: Asset,Quality Manager,د کیفیت د مدير
 DocType: Job Applicant,Job Opening,دنده پرانیستل
 DocType: Payment Reconciliation,Payment Reconciliation,قطعا د پخلاينې
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,مهرباني غوره قی کس نوم
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,تکنالوژي
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +51,Technology,تکنالوژي
 DocType: Hub Settings,Unregister from Hub,د هب څخه ناباوره کول
 apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},Total معاش: {0}
 DocType: BOM Website Operation,BOM Website Operation,هیښ وېب پاڼه د عملياتو
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,وړاندیزلیک
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,مادي غوښتنې (MRP) او د تولید امر کړي.
 DocType: Supplier Scorecard,Supplier Score,د سپرایټ شمیره
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +76,Total Invoiced Amt,Total رسیدونو د نننیو
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +87,Total Invoiced Amt,Total رسیدونو د نننیو
 DocType: Supplier,Warn RFQs,د آر ایف اسو خبرداری
 DocType: BOM,Conversion Rate,conversion Rate
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,د محصول د لټون
-DocType: Physician Schedule Time Slot,To Time,ته د وخت
+DocType: Assessment Plan,To Time,ته د وخت
 DocType: Authorization Rule,Approving Role (above authorized value),رول (اجازه ارزښت پورته) تصویب
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,د حساب د پور باید یو د راتلوونکې حساب وي
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,مهرباني وکړئ د زده کونکي داخلي انتخاب وټاکئ کوم چې د ورکړل شوې زده کونکي غوښتونکي لپاره ضروري دی
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},هیښ مخنیوی دی: {0} نه شي مور او يا ماشوم وي {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,د حساب د پور باید یو د راتلوونکې حساب وي
+apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,مهرباني وکړئ د زده کونکي داخلي انتخاب وټاکئ کوم چې د ورکړل شوې زده کونکي غوښتونکي لپاره ضروري دی
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +338,BOM recursion: {0} cannot be parent or child of {2},هیښ مخنیوی دی: {0} نه شي مور او يا ماشوم وي {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,مهرباني وکړئ د قیمتونو د خپریدو لپاره د قیمت لیست غوره کړئ
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +38,Budget List,د بودجې لیست
 DocType: Production Order Operation,Completed Qty,بشپړ Qty
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry",د {0}، يوازې ډیبیټ حسابونو کولای شي د پور بل د ننوتلو په وړاندې سره وتړل شي
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +146,"For {0}, only debit accounts can be linked against another credit entry",د {0}، يوازې ډیبیټ حسابونو کولای شي د پور بل د ننوتلو په وړاندې سره وتړل شي
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,د بیې په لېست {0} معلول دی
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},د کتارونو تر {0}: بشپړ Qty نه زيات وي د {1} لپاره عمليات {2}
 DocType: Manufacturing Settings,Allow Overtime,اضافه اجازه
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",Serialized شمیره {0} سټاک پخلاينې سټاک انفاذ په کارولو سره، لطفا ګټه نه تازه شي
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",Serialized شمیره {0} سټاک پخلاينې سټاک انفاذ په کارولو سره، لطفا ګټه نه تازه شي
 DocType: Training Event Employee,Training Event Employee,د روزنې دکمپاینونو د کارګر
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +976,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,ډیری نمونې - {1} د بچ لپاره ساتل کیدی شي {1} او توکي {2}.
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +6,Add Time Slots,د وخت سلایډونه زیات کړئ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} پرلپسې لپاره د قالب اړتیا {1}. تاسي چمتو {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,اوسنی ارزښت Rate
@@ -2455,10 +2623,13 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,لا لګښت مرکزونه کولای شي ډلو لاندې کړې خو زياتونې شي غیر ډلو په وړاندې د
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,کارنان او حلال
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},تولید امر ايجاد شده: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Production Orders Created: {0},تولید امر ايجاد شده: {0}
 DocType: Branch,Branch,څانګه
+DocType: Soil Analysis,Ca/(K+Ca+Mg),Ca / (K + Ca + Mg)
+DocType: Delivery Trip,Fulfillment User,بشپړ کونکي
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,د چاپونې او د عالمه
 DocType: Company,Total Monthly Sales,ټول میاشتنۍ پلورنه
+DocType: Agriculture Analysis Criteria,Weather,هوا
 DocType: Bin,Actual Quantity,واقعي اندازه
 DocType: Shipping Rule,example: Next Day Shipping,مثال په توګه: بل د ورځې په نقل
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,شعبه {0} ونه موندل شو
@@ -2467,16 +2638,17 @@
 DocType: Fee Schedule Program,Student Batch,د زده کونکو د دسته
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,د زده کوونکو د کمکیانو لپاره د
 DocType: Supplier Scorecard Scoring Standing,Min Grade,د ماین درجه
-apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},تاسو ته په دغه پروژه کې همکاري بلل شوي دي: {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +214,You have been invited to collaborate on the project: {0},تاسو ته په دغه پروژه کې همکاري بلل شوي دي: {0}
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},طبيب نشته په {0}
 DocType: Leave Block List Date,Block Date,د بنديز نېټه
+DocType: Crop,Crop,فصل
 DocType: Purchase Receipt,Supplier Delivery Note,د عرضه کولو وړاندې کول یادښت
-apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,اوس غوښتنه وکړه
+apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +70,Apply Now,اوس غوښتنه وکړه
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},واقعي Qty {0} / انتظار Qty {1}
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},واقعي Qty {0} / انتظار Qty {1}
 DocType: Purchase Invoice,E-commerce GSTIN,ای کامرس GSTIN
 DocType: Sales Order,Not Delivered,نه تحویلوونکی
-apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,د تمه شوې نیټه د لیږد نیټه مخکې نشي کیدی
+apps/erpnext/erpnext/controllers/buying_controller.py +422,Expected Date cannot be before Transaction Date,د تمه شوې نیټه د لیږد نیټه مخکې نشي کیدی
 ,Bank Clearance Summary,بانک چاڼېزو لنډيز
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.",جوړول او هره ورځ، هفته وار او ماهوار ایمیل digests اداره کړي.
 DocType: Appraisal Goal,Appraisal Goal,د ارزونې موخه
@@ -2485,20 +2657,22 @@
 DocType: Fee Schedule,Fee Structure,د فیس جوړښت
 DocType: Timesheet Detail,Costing Amount,لګښت مقدار
 DocType: Student Admission Program,Application Fee,د غوښتنلیک فیس
-DocType: Process Payroll,Submit Salary Slip,سپارل معاش ټوټه
-apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,لپاره د قالب {0} د {1}٪ ده Maxiumm تخفیف
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +50,Submit Salary Slip,سپارل معاش ټوټه
+apps/erpnext/erpnext/controllers/selling_controller.py +133,Maxiumm discount for Item {0} is {1}%,لپاره د قالب {0} د {1}٪ ده Maxiumm تخفیف
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,په حجم د وارداتو
 DocType: Sales Partner,Address & Contacts,پته او د اړيکې
 DocType: SMS Log,Sender Name,استوونکی نوم
+DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,د زراعت تحلیل معیار
 apps/erpnext/erpnext/hub_node/page/hub/hub.js +193,Sort by Criteria,د معیارونو له مخې ترتیب کړئ
 DocType: POS Profile,[Select],[انتخاب]
 DocType: Vital Signs,Blood Pressure (diastolic),د وینی فشار
 DocType: SMS Log,Sent To,لیږل شوی ورته
+DocType: Agriculture Task,Holiday Management,د رخصتۍ اداره
 DocType: Payment Request,Make Sales Invoice,د کمکیانو لپاره د خرڅلاو صورتحساب
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,دکمپیوتر
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,بل د تماس نېټه نه شي کولای د پخوا په وي
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +51,Next Contact Date cannot be in the past,بل د تماس نېټه نه شي کولای د پخوا په وي
 DocType: Company,For Reference Only.,د ماخذ یوازې.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,انتخاب دسته نه
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2538,Select Batch No,انتخاب دسته نه
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},باطلې {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Fee Validity,Reference Inv,حواله انو
@@ -2510,12 +2684,12 @@
 DocType: Employee,Employment Details,د کار په بشپړه توګه کتل
 DocType: Employee,New Workplace,نوی کارځای
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,د ټاکلو په توګه تړل شوي
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Barcode {0},سره Barcode نه د قالب {0}
+apps/erpnext/erpnext/stock/get_item_details.py +125,No Item with Barcode {0},سره Barcode نه د قالب {0}
 DocType: Normal Test Items,Require Result Value,د مطلوب پایلې ارزښت
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Case شمیره نه شي کولای 0 وي
 DocType: Item,Show a slideshow at the top of the page,د پاڼې په سر کې یو سلاید وښایاست
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,دوکانونه
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +517,Boms,Boms
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Stores,دوکانونه
 DocType: Project Type,Projects Manager,د پروژې مدیر
 DocType: Serial No,Delivery Time,د لېږدون وخت
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Ageing پر بنسټ
@@ -2530,17 +2704,19 @@
 DocType: Rename Tool,Rename Tool,ونوموئ اوزار
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,تازه لګښت
 DocType: Item Reorder,Item Reorder,د قالب ترمیمي
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,انکړپټه ښودل معاش ټوټه
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,د انتقال د موادو
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +463,Show Salary Slip,انکړپټه ښودل معاش ټوټه
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +848,Transfer Material,د انتقال د موادو
 DocType: Fees,Send Payment Request,د تادیاتو غوښتنه واستوئ
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",د عملیاتو، د عملیاتي مصارفو ليکئ او نه ستاسو په عملیاتو یو بې ساری عملياتو ورکړي.
+DocType: Water Analysis,Origin,اصلي
 apps/erpnext/erpnext/controllers/status_updater.py +201,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,دغه سند له خوا حد دی {0} د {1} لپاره توکی {4}. آیا تاسو د ورته په وړاندې د بل {3} {2}؟
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1006,Please set recurring after saving,لطفا جوړ ژغورلو وروسته تکراري
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,انتخاب بدلون اندازه حساب
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1086,Please set recurring after saving,لطفا جوړ ژغورلو وروسته تکراري
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,Select change amount account,انتخاب بدلون اندازه حساب
 DocType: Purchase Invoice,Price List Currency,د اسعارو بیې لېست
 DocType: Naming Series,User must always select,کارن بايد تل انتخاب
 DocType: Stock Settings,Allow Negative Stock,د منفی دحمل اجازه
 DocType: Installation Note,Installation Note,نصب او یادونه
+DocType: Soil Texture,Clay,مٹی
 DocType: Topic,Topic,موضوع
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,له مالي نقدو پیسو د جریان
 DocType: Budget Account,Budget Account,د بودجې د حساب
@@ -2549,34 +2725,38 @@
 DocType: Grading Scale Interval,Grade Description,ټولګي Description
 DocType: Stock Entry,Purchase Receipt No,رانيول رسيد نه
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,ارنست د پیسو
-DocType: Process Payroll,Create Salary Slip,معاش ټوټه جوړول
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,د واردکوونکو
+DocType: Asset Maintenance Log,Actions performed,کړنې ترسره شوې
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),د بودیجو سرچینه (مسؤلیتونه)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +381,Quantity in row {0} ({1}) must be same as manufactured quantity {2},په قطار مقدار {0} ({1}) بايد په توګه جوړيږي اندازه ورته وي {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +406,Quantity in row {0} ({1}) must be same as manufactured quantity {2},په قطار مقدار {0} ({1}) بايد په توګه جوړيږي اندازه ورته وي {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,د کارګر
+DocType: Asset Repair,Failure Date,د ناکامي نیټه
 DocType: Sample Collection,Collected Time,راغونډ شوی وخت
 DocType: Company,Sales Monthly History,د پلور میاشتني تاریخ
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,انتخاب دسته
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} د {1} په بشپړه توګه بیل
+DocType: Asset Maintenance Task,Next Due Date,د بلې نیټې نیټه
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +214,Select Batch,انتخاب دسته
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,{0} {1} is fully billed,{0} د {1} په بشپړه توګه بیل
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,مهم علامات
 DocType: Training Event,End Time,د پاي وخت
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +63,Active Salary Structure {0} found for employee {1} for the given dates,د فعالو معاش جوړښت {0} لپاره د ورکړل شوي نیټی لپاره کارکوونکي {1} موندل
 DocType: Payment Entry,Payment Deductions or Loss,د پیسو وضع او يا له لاسه ورکول
+DocType: Soil Analysis,Soil Analysis Criterias,د خاورې تجزیه کول Criterias
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,د پلورنې يا رانيول کره د قرارداد د شرطونو.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,له خوا د ګټمنو ګروپ
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,ایا تاسو ډاډه یاست چې تاسو دا ټاکل رد کړئ؟
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +195,Are you sure you want to cancel this appointment?,ایا تاسو ډاډه یاست چې تاسو دا ټاکل رد کړئ؟
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,خرڅلاو نل
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,Please set default account in Salary Component {0},لطفا په معاش برخه default ګڼون جوړ {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +201,Please set default account in Salary Component {0},لطفا په معاش برخه default ګڼون جوړ {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,اړتیا ده
 DocType: Rename Tool,File to Rename,د نوم بدلول د دوتنې
 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/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},حساب {0} سره د شرکت د {1} کې د حساب اکر سره سمون نه خوري: {2}
-apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},مشخص هیښ {0} لپاره د قالب نه شته {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,د ساتنې او ویش {0} بايد بندول د دې خرڅلاو نظم مخکې لغوه شي
+apps/erpnext/erpnext/controllers/buying_controller.py +271,Specified BOM {0} does not exist for Item {1},مشخص هیښ {0} لپاره د قالب نه شته {1}
+DocType: Soil Texture,Sandy Loam,سندی لوام
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +232,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,د ساتنې او ویش {0} بايد بندول د دې خرڅلاو نظم مخکې لغوه شي
 DocType: POS Profile,Applicable for Users,د کاروونکو لپاره کارول
 DocType: Notification Control,Expense Claim Approved,اخراجاتو ادعا تصویب
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,د کارکوونکي معاش ټوټه {0} لا په دې موده کې جوړ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,Pharmaceutical
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,Pharmaceutical
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,د رانیولې سامان لګښت
 DocType: Selling Settings,Sales Order Required,خرڅلاو نظم مطلوب
 DocType: Purchase Invoice,Credit To,د اعتبار
@@ -2586,77 +2766,77 @@
 DocType: Supplier Scorecard,Warn for new Purchase Orders,د نویو پیرودونکو لپاره خبرداری
 DocType: Quality Inspection Reading,Reading 9,لوستلو 9
 DocType: Supplier,Is Frozen,ده ګنګل
-apps/erpnext/erpnext/stock/utils.py +217,Group node warehouse is not allowed to select for transactions,ګروپ غوټه ګودام اجازه نه وي چې د معاملو وټاکئ
+apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,ګروپ غوټه ګودام اجازه نه وي چې د معاملو وټاکئ
 DocType: Buying Settings,Buying Settings,د خريداري امستنې
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,لپاره د ختم ښه قالب هیښ شمیره
 DocType: Upload Attendance,Attendance To Date,د نېټه حاضرۍ
 DocType: Request for Quotation Supplier,No Quote,هیڅ ارزښت نشته
 DocType: Warranty Claim,Raised By,راپورته By
 DocType: Payment Gateway Account,Payment Account,د پیسو حساب
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +880,Please specify Company to proceed,مهرباني وکړئ د شرکت مشخص چې مخکې لاړ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +906,Please specify Company to proceed,مهرباني وکړئ د شرکت مشخص چې مخکې لاړ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,په حسابونه ترلاسه خالص د بدلون
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Compensatory Off,د معاوضې پړاو
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,د معاوضې پړاو
 DocType: Offer Letter,Accepted,منل
-apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,سازمان د
-apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,سازمان د
+DocType: Grant Application,Organization,سازمان د
+DocType: Grant Application,Organization,سازمان د
 DocType: BOM Update Tool,BOM Update Tool,د بوم تازه ډاټا
-apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company",د ګوند حساب ندی مشخص شوی، مهرباني وکړئ په کمپنۍ کې د ډیزاین ډیزاین حساب ترتیب کړئ
 DocType: SG Creation Tool Course,Student Group Name,د زده کونکو د ډلې نوم
-apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,د فیس جوړول
+apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,د فیس جوړول
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,لطفا باوري تاسو په رښتيا غواړئ چې د دې شرکت د ټولو معاملو کې د ړنګولو. ستاسو بادار ارقام به پاتې شي دا. دا عمل ناکړل نه شي.
 DocType: Room,Room Number,کوټه شمېر
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},باطلې مرجع {0} د {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) د نه په پام کې quanitity څخه ډيره وي ({2}) په تولید نظم {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +187,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) د نه په پام کې quanitity څخه ډيره وي ({2}) په تولید نظم {3}
 DocType: Shipping Rule,Shipping Rule Label,انتقال حاکمیت نښه د
+DocType: Journal Entry Account,Payroll Entry,د معاشونو داخله
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,کارن فورم
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,خام مواد نه شي خالي وي.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"Could not update stock, invoice contains drop shipping item.",کیدای شي سټاک د اوسمهالولو لپاره نه، صورتحساب لرونکی د څاڅکی انتقال توکی.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,خام مواد نه شي خالي وي.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"Could not update stock, invoice contains drop shipping item.",کیدای شي سټاک د اوسمهالولو لپاره نه، صورتحساب لرونکی د څاڅکی انتقال توکی.
 DocType: Lab Test Sample,Lab Test Sample,د لابراتوار ازموینه
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,د چټک ژورنال انفاذ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,د چټک ژورنال انفاذ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,تاسو نه شي کولای کچه بدلون که هیښ agianst مواد یاد
 DocType: Restaurant,Invoice Series Prefix,د انوائس سایډ پریفسکس
 DocType: Employee,Previous Work Experience,مخکینی کاری تجربه
 DocType: Stock Entry,For Quantity,د مقدار
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},لطفا د قطار د {0} د قالب ته ننوځي پلان Qty {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} د {1} نه سپارل
-apps/erpnext/erpnext/config/stock.py +27,Requests for items.,لپاره شیان غوښتنې.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +102,Google Maps integration is not enabled,د ګوګل نقشه انډول فعال نه دی
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +239,{0} {1} is not submitted,{0} د {1} نه سپارل
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,جلا د توليد په موخه به د هر بشپړ ښه توکی جوړ شي.
+DocType: Member,Membership Expiry Date,د غړیتوب پای نیټه
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} بايد په بدل کې سند منفي وي
 ,Minutes to First Response for Issues,د مسایل لومړی غبرګون دقيقو
 DocType: Purchase Invoice,Terms and Conditions1,اصطلاحات او Conditions1
-apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,د انستیتوت نوم د کوم لپاره چې تاسو دا سيستم د جوړولو.
+apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,د انستیتوت نوم د کوم لپاره چې تاسو دا سيستم د جوړولو.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",د محاسبې د ننوتلو د دې نېټې کنګل کړي، څوک کولای شي / رول د لاندې ټاکل شوي پرته د ننوتلو لپاره تعديلوي.
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,لطفا د توليد ساتنې مهال ویش مخکې د سند د ژغورلو
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,په ټولو بومونو کې تازه قیمت تازه شوی
-DocType: Fee Schedule,Successful,بریالی
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,د پروژې د حالت
 DocType: UOM,Check this to disallow fractions. (for Nos),وګورئ دا ښیی disallow. (د وځيري)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,دغه لانديني تولید امر جوړ شو:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,The following Production Orders were created:,دغه لانديني تولید امر جوړ شو:
 DocType: Student Admission Program,Naming Series (for Student Applicant),نوم لړۍ (لپاره د زده کونکو د متقاضي)
 DocType: Delivery Note,Transporter Name,لېږدول نوم
 DocType: Authorization Rule,Authorized Value,اجازه ارزښت
 DocType: BOM,Show Operations,خپرونه عملیاتو په
 ,Minutes to First Response for Opportunity,لپاره د فرصت د لومړی غبرګون دقيقو
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Absent,Total حاضر
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +794,Item or Warehouse for row {0} does not match Material Request,د قالب یا ګدام لپاره چي په کتارونو {0} سمون نه خوري د موادو غوښتنه
-apps/erpnext/erpnext/config/stock.py +194,Unit of Measure,د اندازه کولو واحد
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +823,Item or Warehouse for row {0} does not match Material Request,د قالب یا ګدام لپاره چي په کتارونو {0} سمون نه خوري د موادو غوښتنه
+apps/erpnext/erpnext/config/stock.py +187,Unit of Measure,د اندازه کولو واحد
 DocType: Fiscal Year,Year End Date,کال د پای نیټه
 DocType: Task Depends On,Task Depends On,کاري پورې تړلی دی د
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +999,Opportunity,فرصت
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1024,Opportunity,فرصت
 ,Completed Production Orders,بشپړ تولید امر
 DocType: Operation,Default Workstation,default Workstation
 DocType: Notification Control,Expense Claim Approved Message,اخراجاتو ادعا تصویب پيغام
 DocType: Payment Entry,Deductions or Loss,د مجرايي او يا له لاسه ورکول
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +247,{0} {1} is closed,{0} د {1} ده تړل
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +245,{0} {1} is closed,{0} د {1} ده تړل
 DocType: Email Digest,How frequently?,څنګه په وار وار؟
-apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +57,Total Collected: {0},ټول راغونډ شوي: {0}
+apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +58,Total Collected: {0},ټول راغونډ شوي: {0}
 DocType: Purchase Receipt,Get Current Stock,روانه دحمل ترلاسه کړئ
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,د توکو د بیل ونو
 DocType: Student,Joining Date,په یوځای کېدو نېټه
 ,Employees working on a holiday,د کارکوونکو په رخصتۍ کار کوي
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,مارک حاضر
 DocType: Project,% Complete Method,٪ بشپړ Method
-apps/erpnext/erpnext/healthcare/setup.py +180,Drug,نشه يي توکي
+apps/erpnext/erpnext/healthcare/setup.py +181,Drug,نشه يي توکي
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},د ساتنې د پيل نيټه د شعبه د سپارلو نېټې مخکې نه شي {0}
 DocType: Production Order,Actual End Date,واقعي د پای نیټه
 DocType: BOM,Operating Cost (Company Currency),عادي لګښت (شرکت د اسعارو)
@@ -2664,12 +2844,12 @@
 DocType: Authorization Rule,Applicable To (Role),د تطبیق وړ د (رول)
 DocType: BOM Update Tool,Replace BOM,BOM بدله کړئ
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +110,Code {0} already exist,کود {0} لا دمخه شتون لري
-DocType: Stock Entry,Purpose,هدف
+DocType: Employee Advance,Purpose,هدف
 DocType: Company,Fixed Asset Depreciation Settings,د ثابت د شتمنیو د استهالک امستنې
 DocType: Item,Will also apply for variants unless overrridden,مګر overrridden به د بېرغونو هم تر غوږو
 DocType: Purchase Invoice,Advances,پرمختګونه
 DocType: Production Order,Manufacture against Material Request,د موادو غوښتنه په وړاندې د تولید
-apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +10,Assessment Group: ,د ارزونې ډله:
+apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +10,Assessment Group: ,د ارزونې ډله:
 DocType: Item Reorder,Request for,لپاره غوښتنه
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,تصویب کارن نه شي کولای په همدې توګه د کارونکي د واکمنۍ ته د تطبیق وړ وي
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),اساسي کچه (په سلو کې دحمل UOM په توګه)
@@ -2677,24 +2857,27 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,پرته د معاشونو د وتو سره تصويب اجازه کاریال اسنادو سمون نه خوري
 DocType: Campaign,Campaign-.####,کمپاين - ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,نور ګامونه
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,لطفا په ښه کچه د مشخص توکو د رسولو
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +794,Please supply the specified items at the best possible rates,لطفا په ښه کچه د مشخص توکو د رسولو
+DocType: Membership,USD,امریکايي ډالر
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,انوائس جوړ کړئ
 DocType: Selling Settings,Auto close Opportunity after 15 days,د موټرونو په 15 ورځو وروسته نږدې فرصت
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,د پیرود کارډونه د {1} د سایټ کارډ ولاړ کیدو له امله {0} ته اجازه نه لري.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,د پیرود کارډونه د {1} د سایټ کارډ ولاړ کیدو له امله {0} ته اجازه نه لري.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,د پای کال
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / مشري٪
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / مشري٪
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,د قرارداد د پای نیټه باید په پرتله د داخلیدل نېټه ډيره وي
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,د قرارداد د پای نیټه باید په پرتله د داخلیدل نېټه ډيره وي
+DocType: Driver,Driver,چلوونکی
 DocType: Vital Signs,Nutrition Values,د تغذيې ارزښتونه
 DocType: Lab Test Template,Is billable,د اعتبار وړ دی
 DocType: Delivery Note,DN-,DN-
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}",دواړه &quot;د معالج مهال ویش&quot; او د تقاعد وخت &quot;باید د ډاکټر {0} لپاره وټاکل شي.
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,د دریمې ډلې د ویشونکی- / پلورونکي / کمیسیون اجنټ / غړيتوب لری / د پلورنې لپاره د يو کميسون د شرکتونو توليدات پلوري.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} د اخستلو د امر په وړاندې د {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +374,{0} against Purchase Order {1},{0} د اخستلو د امر په وړاندې د {1}
 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,دا يو مثال ویب پاڼه د Auto-تولید څخه ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Ageing Range 1
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +226,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.
 
 #### Note
@@ -2718,22 +2901,26 @@
 10. Add or Deduct: Whether you want to add or deduct the tax.",معياري ماليې کېنډۍ، چې کولی شي د ټولو رانيول معاملې استعمال شي. دا کېنډۍ د لري د ماليې سرونو او هم د نورو لګښتونو سرونه په څېر &quot;نقل&quot;، &quot;د بيمې&quot; لست، &quot;اداره&quot; نور #### نوټ د ماليې کچه تاسو دلته تعريف به د ټولو ** سامان د ماليې معياري کچه وي * *. که ** ** توکي چې د مختلفو کچه لري شتون لري، دوی بايد په ** د قالب د مالياتو زياته شي. ** په ** ** د قالب بادار جدول. #### د یورتان Description 1. محاسبه ډول: - دا کیدای شي په ** Net Total ** (چې د اساسي اندازه مجموعه). - ** د مخکینی کتارونو تر ټولو څخه / مقدار ** (لپاره مجموعي مالياتو يا په تور). که تاسو دا غورونه وټاکئ، ماليه به په توګه د تیرو قطار سلنه (چې د ماليې په جدول) اندازه او یا د ټولو استعمال شي. - ** واقعي ** (په توګه يادونه وکړه). 2. د حساب مشر: د حساب د پنډو لاندې چې دغه ماليه به بک شي 3. لګښت مرکز: که د ماليې / چارج عايد (لکه د انتقال) نه لري او يا لګښت ته اړتيا لري په لګښت د مرکز په وړاندې بک شي. 4. Description: د ماليې Description (چې به په رسیدونو / يادي چاپ شي). 5. Rate: د مالیاتو کچه. 6. اندازه: د مالياتو اندازه. 7. ټول: په دې برخه مجموعي ټولو څخه. 8. وليکئ د کتارونو: که پر بنسټ &quot;مخکینی کتارونو تر Total&quot; تاسو د قطار شمېر چې به د دې محاسبې سره اډه (default د تیر قطار دی) په توګه ونيول شي وټاکئ. 9. په پام کې د مالياتو يا چارج لپاره: په دې برخه کې له تاسې سره د مالياتو / چارج یوازې یوازې د ټولو (نه د توکی ارزښت زیات) او يا د دواړو لپاره د ارزښت د (د ټولو څخه يوه برخه نه) نه لري او يا مشخص شي. 10. زیات کړي او یا وضع: که تاسو غواړئ چې زیاتولی او یا د مالیه وضع کړي.
 DocType: Homepage,Homepage,کورپاڼه
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,طبیب غوره کړئ ...
+DocType: Grant Application,Grant Application Details ,د غوښتنلیک توضیحات
 DocType: Purchase Receipt Item,Recd Quantity,Recd مقدار
-apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},فیس سوابق ايجاد - {0}
+apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +59,Fee Records Created - {0},فیس سوابق ايجاد - {0}
 DocType: Asset Category Account,Asset Category Account,د شتمنیو د حساب کټه ګورۍ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +117,Cannot produce more Item {0} than Sales Order quantity {1},آیا د پلورنې نظم کمیت څخه زیات د قالب {0} د توليد نه {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,دحمل {0} د ننوتلو نه سپارل
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},آیا د پلورنې نظم کمیت څخه زیات د قالب {0} د توليد نه {1}
+apps/erpnext/erpnext/stock/doctype/item/item.js +360,Select Attribute Values,د ځانګړتیا ارزښتونه غوره کړئ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +537,Stock Entry {0} is not submitted,دحمل {0} د ننوتلو نه سپارل
 DocType: Payment Reconciliation,Bank / Cash Account,بانک / د نقدو پیسو حساب
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,بل تماس By نه شي کولای په غاړه دبرېښنا ليک پته په توګه ورته وي
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +45,Next Contact By cannot be same as the Lead Email Address,بل تماس By نه شي کولای په غاړه دبرېښنا ليک پته په توګه ورته وي
 DocType: Tax Rule,Billing City,د بیلونو په ښار
 DocType: Asset,Manual,لارښود
 DocType: Salary Component Account,Salary Component Account,معاش برخه اکانټ
 DocType: Global Defaults,Hide Currency Symbol,پټول د اسعارو سمبول
-apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card",د بيلګې په توګه بانک، د نقدو پیسو، کریډیټ کارټ
+apps/erpnext/erpnext/config/non_profit.py +58,Donor information.,د ډونر معلومات.
+apps/erpnext/erpnext/config/accounts.py +330,"e.g. Bank, Cash, Credit Card",د بيلګې په توګه بانک، د نقدو پیسو، کریډیټ کارټ
 DocType: Lead Source,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""",په بالغ کې د عادي آرام فشار فشار تقریبا 120 ملی ګرامه هګسټولیک دی، او 80 mmHg ډیسولیک، لنډیز &quot;120/80 mmHg&quot;
 DocType: Journal Entry,Credit Note,اعتبار يادونه
 DocType: Warranty Claim,Service Address,خدمتونو پته
+DocType: Asset Maintenance Task,Calibration,تجاوز
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +49,Furnitures and Fixtures,Furnitures او لامپ
 DocType: Item,Manufacture,د جوړون
 apps/erpnext/erpnext/utilities/user_progress.py +24,Setup Company,د سایټ اپ کمپنۍ
@@ -2745,8 +2932,9 @@
 DocType: Opportunity,Customer / Lead Name,پيرودونکو / سوق نوم
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,بېلوګډو چاڼېزو نېټه نه ذکر
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,تولید
-DocType: Patient,Occupation,وظيفه
+DocType: Guardian,Occupation,وظيفه
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,د کتارونو تر {0}: بیا نېټه دمخه بايد د پای نیټه وي
+DocType: Crop,Planting Area,د کښت کولو ساحه
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Qty)
 DocType: Installation Note Item,Installed Qty,نصب Qty
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +4,This could be because of some invalid Email Addresses in the,دا کېدی شي د ځینو ناسمو بریښنالیک پته په دې کې وي
@@ -2756,26 +2944,26 @@
 DocType: Purchase Invoice,Is Paid,ده ورکړل شوې
 DocType: Salary Structure,Total Earning,Total وټې
 DocType: Purchase Receipt,Time at which materials were received,د وخت په کوم توکي ترلاسه کړ
+DocType: Products Settings,Products per Page,محصول په هر مخ
 DocType: Stock Ledger Entry,Outgoing Rate,د تېرې Rate
-apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,سازمان د څانګې د بادار.
-apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,او یا
+apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,سازمان د څانګې د بادار.
+apps/erpnext/erpnext/controllers/accounts_controller.py +303, or ,او یا
 DocType: Sales Order,Billing Status,د بیلونو په حالت
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,یو Issue راپور
-apps/erpnext/erpnext/public/js/setup_wizard.js +28,Education (beta),ښوونه (بيټا)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,ټولګټې داخراجاتو
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-پورته
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,د کتارونو تر # {0}: ژورنال انفاذ {1} نه ګڼون لری {2} يا لا نه خوری بل کوپون پر وړاندې د
 DocType: Supplier Scorecard Criteria,Criteria Weight,معیارونه وزن
 DocType: Buying Settings,Default Buying Price List,Default د خريداري د بیې په لېست
-DocType: Process Payroll,Salary Slip Based on Timesheet,معاش ټوټه پر بنسټ Timesheet
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +113,No employee for the above selected criteria OR salary slip already created,د پورته انتخاب معیارونه یا معاش ټوټه هیڅ یو کارمند د مخه جوړ
+DocType: Payroll Entry,Salary Slip Based on Timesheet,معاش ټوټه پر بنسټ Timesheet
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +19,Buying Rate,د پیرودلو کچه
 DocType: Notification Control,Sales Order Message,خرڅلاو نظم پيغام
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",د ټاکلو په تلواله ارزښتونو شرکت، د اسعارو، روان مالي کال، او داسې نور په شان
 DocType: Payment Entry,Payment Type,د پیسو ډول
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,لطفا لپاره توکي داځکه غوره {0}. ته د یو واحد داځکه چې دا اړتیا پوره کوي د موندلو توان نلري
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,لطفا لپاره توکي داځکه غوره {0}. ته د یو واحد داځکه چې دا اړتیا پوره کوي د موندلو توان نلري
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +140,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,لطفا لپاره توکي داځکه غوره {0}. ته د یو واحد داځکه چې دا اړتیا پوره کوي د موندلو توان نلري
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +140,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,لطفا لپاره توکي داځکه غوره {0}. ته د یو واحد داځکه چې دا اړتیا پوره کوي د موندلو توان نلري
 DocType: Hub Category,Parent Category,د والدین کټګوري
-DocType: Process Payroll,Select Employees,انتخاب مامورین
+DocType: Payroll Entry,Select Employees,انتخاب مامورین
 DocType: Opportunity,Potential Sales Deal,احتمالي خرڅلاو تړون
 DocType: Complaint,Complaints,شکایتونه
 DocType: Payment Entry,Cheque/Reference Date,آرډر / ماخذ نېټه
@@ -2784,7 +2972,7 @@
 DocType: Bank Reconciliation Detail,Payment Entry,د پیسو د داخلولو
 DocType: Item,Quality Parameters,د پارامترونو د کيفيت
 ,sales-browser,د پلورنې-کتنمل
-apps/erpnext/erpnext/accounts/doctype/account/account.js +73,Ledger,د پنډو
+apps/erpnext/erpnext/accounts/doctype/account/account.js +79,Ledger,د پنډو
 DocType: Patient Medical Record,PMR-,PMR-
 DocType: Drug Prescription,Drug Code,د نشه یي توکو کود
 DocType: Target Detail,Target  Amount,هدف مقدار
@@ -2792,12 +2980,12 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,خرید په ګاډۍ امستنې
 DocType: Journal Entry,Accounting Entries,د محاسبې توکي
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},انفاذ ړنګ کړئ. مهرباني وکړئ وګورئ د واک د حاکمیت د {0}
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +29,Global POS Profile {0} already created for company {1},Global POS پيژند {0} لا د شرکت جوړ {1}
+DocType: Journal Entry Account,Reference Due Date,د ماخذ حواله نیټه
 DocType: Purchase Order,Ref SQ,دسرچینی یادونه مربع
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Receipt document must be submitted,د رسيد سند بايد وسپارل شي
 DocType: Purchase Invoice Item,Received Qty,ترلاسه Qty
 DocType: Stock Entry Detail,Serial No / Batch,شعبه / دسته
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +320,Not Paid and Not Delivered,نه ورکړل او نه تحویلوونکی
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +340,Not Paid and Not Delivered,نه ورکړل او نه تحویلوونکی
 DocType: Product Bundle,Parent Item,د موروپلار د قالب
 DocType: Account,Account Type,د حساب ډول
 DocType: Delivery Note,DN-RET-,DN-RET-
@@ -2806,33 +2994,36 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',د ساتنې او ویش لپاره د ټول سامان د تولید نه. مهرباني وکړی د &#39;تولید مهال ویش&#39; کیکاږۍ
 ,To Produce,توليدول
 apps/erpnext/erpnext/config/hr.py +93,Payroll,د معاشاتو
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",لپاره چي په کتارونو {0} د {1}. په قالب کچه {2} شامل دي، د قطارونو په {3} هم باید شامل شي
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",لپاره چي په کتارونو {0} د {1}. په قالب کچه {2} شامل دي، د قطارونو په {3} هم باید شامل شي
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,د کارن د کمکیانو لپاره د
 DocType: Packing Slip,Identification of the package for the delivery (for print),لپاره د وړاندې کولو د ټولګې د پيژندنې (د چاپي)
 DocType: Bin,Reserved Quantity,خوندي دي مقدار
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,لطفا د اعتبار وړ ایمیل ادرس ولیکۍ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,لطفا د اعتبار وړ ایمیل ادرس ولیکۍ
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,مهرباني وکړئ په موټر کې یو توکي غوره کړئ
+DocType: Volunteer Skill,Volunteer Skill,رضاکارانه مهارتونه
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +713,Please select an item in the cart,مهرباني وکړئ په موټر کې یو توکي غوره کړئ
 DocType: Landed Cost Voucher,Purchase Receipt Items,رانيول رسيد سامان
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Customizing فورمې
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,Arrear
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,په دغه موده کې د استهالک مقدار
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +74,Arrear,Arrear
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +158,Depreciation Amount during the period,په دغه موده کې د استهالک مقدار
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,معلولینو کېنډۍ باید default کېنډۍ نه وي
 DocType: Account,Income Account,پر عايداتو باندې حساب
 DocType: Payment Request,Amount in customer's currency,په مشتري د پيسو اندازه
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,د سپارنې پرمهال
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +823,Delivery,د سپارنې پرمهال
+DocType: Volunteer,Weekdays,اونۍ
 DocType: Stock Reconciliation Item,Current Qty,اوسني Qty
 DocType: Restaurant Menu,Restaurant Menu,د رستورانت ماین
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,قبلی
 DocType: Appraisal Goal,Key Responsibility Area,مهم مسوولیت په سیمه
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students",د زده کوونکو دستو مرسته وکړي چې تاسو د زده کوونکو لپاره د حاضرۍ، د ارزونو او د فيس تعقیب کړي
 DocType: Payment Entry,Total Allocated Amount,ټولې پیسې د
-apps/erpnext/erpnext/setup/doctype/company/company.py +143,Set default inventory account for perpetual inventory,جوړ تلوالیزه لپاره د دايمي انبار انبار حساب
+apps/erpnext/erpnext/setup/doctype/company/company.py +140,Set default inventory account for perpetual inventory,جوړ تلوالیزه لپاره د دايمي انبار انبار حساب
 DocType: Item Reorder,Material Request Type,د موادو غوښتنه ډول
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},څخه د {0} ته د معاشونو Accural ژورنال دکانکورازموينه {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save",LocalStorage دی پوره، خو د ژغورلو نه
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,د کتارونو تر {0}: UOM د تغیر فکتور الزامی دی
-apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,د خونې ظرفیت
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accural Journal Entry for salaries from {0} to {1},څخه د {0} ته د معاشونو Accural ژورنال دکانکورازموينه {1}
+apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,د وړیا بیاکتنې بریښنالیک واستوئ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +839,"LocalStorage is full, did not save",LocalStorage دی پوره، خو د ژغورلو نه
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,Row {0}: UOM Conversion Factor is mandatory,د کتارونو تر {0}: UOM د تغیر فکتور الزامی دی
+apps/erpnext/erpnext/utilities/user_progress.py +232,Room Capacity,د خونې ظرفیت
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,دسرچینی یادونه
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,د نوم ليکنې فیس
@@ -2846,16 +3037,17 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",د بیې د حاکمیت دی ځاېناستول د بیې په لېست / تعريف تخفیف سلنه، پر بنسټ د ځینو معیارونو.
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,ګدام يوازې دحمل د ننوتلو لارې بدليدای شي / د سپارنې پرمهال یادونه / رانيول رسيد
 DocType: Employee Education,Class / Percentage,ټولګی / سلنه
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +130,Head of Marketing and Sales,د بازار موندنې او خرڅلاو مشر
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Income Tax,عايداتو باندې د مالياتو
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,د بازار موندنې او خرڅلاو مشر
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,عايداتو باندې د مالياتو
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.",که ټاکل د بیې د حاکمیت لپاره &#39;د بیو د&#39; کړې، نو دا به د بیې په لېست ليکلی. د بیې د حاکمیت بيه وروستۍ بيه، له دې امله د لا تخفیف نه بايد پلی شي. نو له دې کبله، لکه د خرڅلاو د ترتیب پر اساس، د اخستلو امر او نور معاملو، نو دا به په کچه د ساحوي پايلي شي، پر ځای &#39;د بیې په لېست Rate&#39; ډګر.
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Track له خوا د صنعت ډول ځای شوی.
+apps/erpnext/erpnext/utilities/user_progress.py +98,Go to Letterheads,ليټر هير ته لاړ شه
 DocType: Item Supplier,Item Supplier,د قالب عرضه
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1107,Please enter Item Code to get batch no,لطفا د قالب کوډ داخل ته داځکه تر لاسه نه
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +827,Please select a value for {0} quotation_to {1},لورينه وکړئ د {0} quotation_to د ارزښت ټاکلو {1}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1187,Please enter Item Code to get batch no,لطفا د قالب کوډ داخل ته داځکه تر لاسه نه
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +874,Please select a value for {0} quotation_to {1},لورينه وکړئ د {0} quotation_to د ارزښت ټاکلو {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,ټول Addresses.
 DocType: Company,Stock Settings,دحمل امستنې
-apps/erpnext/erpnext/accounts/doctype/account/account.py +199,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",آژانسونو هغه مهال ممکنه ده که لاندې شتمنۍ په دواړو اسنادو يو شان دي. دی ګروپ، د ریښی ډول، د شرکت
+apps/erpnext/erpnext/accounts/doctype/account/account.py +185,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",آژانسونو هغه مهال ممکنه ده که لاندې شتمنۍ په دواړو اسنادو يو شان دي. دی ګروپ، د ریښی ډول، د شرکت
 DocType: Vehicle,Electric,Electric
 DocType: Task,% Progress,٪ پرمختګ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,ګټې / له لاسه ورکول د شتمنيو د برطرف
@@ -2868,10 +3060,11 @@
 DocType: Leave Control Panel,Leave Control Panel,پريږدئ Control Panel
 DocType: Project,Task Completion,کاري پوره کول
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,نه په سټاک
+DocType: Volunteer,Volunteer Skills,رضاکار مهارتونه
 DocType: Appraisal,HR User,د بشري حقونو څانګې د کارن
-apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,POS؟
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +36,POS?,POS؟
 DocType: Purchase Invoice,Taxes and Charges Deducted,مالیه او په تور مجرايي
-apps/erpnext/erpnext/hooks.py +138,Issues,مسایل
+apps/erpnext/erpnext/hooks.py +142,Issues,مسایل
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},وضعیت باید د یو وي {0}
 DocType: Sales Invoice,Debit To,د ډیبیټ
 DocType: Restaurant Menu Item,Restaurant Menu Item,د رستورانت د مینځلو توکي
@@ -2879,60 +3072,62 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,واقعي Qty د راکړې ورکړې وروسته
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},نه معاش ټوټه تر منځ موندل {0} او {1}
 ,Pending SO Items For Purchase Request,SO سامان د اخستلو غوښتنه په تمه
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,د زده کوونکو د شمولیت
-apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} د {1} معلول دی
+apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +35,Student Admissions,د زده کوونکو د شمولیت
+apps/erpnext/erpnext/accounts/party.py +376,{0} {1} is disabled,{0} د {1} معلول دی
 DocType: Supplier,Billing Currency,د بیلونو د اسعارو
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,ډېر لوی
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,ډېر لوی
+DocType: Crop,Scientific Name,سائنسي نوم
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,ټولې پاڼې
 DocType: Consultation,In print,په چاپ کې
 ,Profit and Loss Statement,ګټه او زیان اعلامیه
 DocType: Bank Reconciliation Detail,Cheque Number,آرډر شمېر
 ,Sales Browser,خرڅلاو د لټووني
 DocType: Journal Entry,Total Credit,Total اعتبار
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},خبرداری: بل {0} # {1} سټاک د ننوتلو پر وړاندې د شته {2}
-apps/erpnext/erpnext/utilities/user_progress_utils.py +51,Local,د محلي
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Warning: Another {0} # {1} exists against stock entry {2},خبرداری: بل {0} # {1} سټاک د ننوتلو پر وړاندې د شته {2}
+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/install_fixtures.py +195,Large,لوی
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,لوی
 DocType: Homepage Featured Product,Homepage Featured Product,کورپاڼه د ځانګړي محصول
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +236,All Assessment Groups,ټول د ارزونې ډلې
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +246,All Assessment Groups,ټول د ارزونې ډلې
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,نوي ګدام نوم
 apps/erpnext/erpnext/accounts/report/financial_statements.py +233,Total {0} ({1}),Total {0} ({1})
 DocType: C-Form Invoice Detail,Territory,خاوره
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,لورينه وکړئ د اړتيا کتنو نه یادونه
 DocType: Stock Settings,Default Valuation Method,تلواله ارزښت Method
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,فیس
-apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,اوسمهال په پرمختګ کې دی. دا ممکن یو څه وخت ونیسي.
+apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +26,Fee,فیس
+apps/erpnext/erpnext/setup/doctype/company/company.js +125,Update in progress. It might take a while.,اوسمهال په پرمختګ کې دی. دا ممکن یو څه وخت ونیسي.
 DocType: Vehicle Log,Fuel Qty,د تیلو د Qty
 DocType: Production Order Operation,Planned Start Time,پلان د پیل وخت
 DocType: Course,Assessment,ارزونه
 DocType: Payment Entry Reference,Allocated,تخصيص
-apps/erpnext/erpnext/config/accounts.py +275,Close Balance Sheet and book Profit or Loss.,نږدې بیلانس پاڼه او کتاب ګټه یا تاوان.
+apps/erpnext/erpnext/config/accounts.py +267,Close Balance Sheet and book Profit or Loss.,نږدې بیلانس پاڼه او کتاب ګټه یا تاوان.
 DocType: Student Applicant,Application Status,کاریال حالت
 DocType: Sensitivity Test Items,Sensitivity Test Items,د حساسیت ازموینې
 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 +158,Quotation {0} is cancelled,د داوطلبۍ {0} دی لغوه
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,د داوطلبۍ {0} دی لغوه
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Outstanding Amount,Total وتلي مقدار
 DocType: Sales Partner,Targets,موخې
 DocType: Price List,Price List Master,د بیې په لېست ماسټر
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,ټول خرڅلاو معاملې کولی شی څو ** خرڅلاو اشخاص ** په وړاندې د سکس شي تر څو چې تاسو کولای شي او د اهدافو څخه څارنه وکړي.
 ,S.O. No.,SO شمیره
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},لطفآ د سرب د پيرودونکو رامنځته {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +241,Please create Customer from Lead {0},لطفآ د سرب د پيرودونکو رامنځته {0}
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,ناروغ
 DocType: Price List,Applicable for Countries,لپاره هیوادونه د تطبيق وړ
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,د پیرس نوم
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,يوازې سره حالت غوښتنلیکونه پرېږدئ &#39;تصویب&#39; او &#39;رد&#39; کولای وسپارل شي
-apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},د زده کونکو د ډلې نوم په قطار الزامی دی {0}
+apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},د زده کونکو د ډلې نوم په قطار الزامی دی {0}
 DocType: Homepage,Products to be shown on website homepage,توليدات په ويب پاڼه کې ښودل شي
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,دا یو د ريښي د مشتريانو د ډلې او نه تصحيح شي.
-DocType: Employee,AB-,عبداالله
+DocType: Student,AB-,عبداالله
 DocType: POS Profile,Ignore Pricing Rule,د بیې د حاکمیت له پامه
 DocType: Employee Education,Graduate,فارغ
 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,وسیله انفاذ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +64,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},خبرداری: د پلورنې نظم {0} لا د پيرودونکو د اخستلو امر په وړاندې شتون لري {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +65,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:
@@ -2946,55 +3141,57 @@
 1. Terms of shipping, if applicable.
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.",معياري اصطلاحات او شرايط، چې کولی شي د پلورنې او پېرودلو زياته شي. مثالونه: 1. د وړاندیز د اعتبار. 1. د ورکړې شرایط (په پرمختللی، د پور، برخه مخکې داسې نور). 1. څه شی دی اضافي (يا د پيرودونکو له خوا اخیستل کیږی). 1. د خوندیتوب / بېلګې خبرداری. 1. ګرنټی که کوم. 1. د راستنیدنې د پالیسۍ. 1. د انتقال اصطلاحات، که د تطبيق وړ. 1. د شخړو د حل، د دنغدي، مسؤليت لارې، او داسې نور 1. پته او د خپل شرکت سره اړیکه.
+DocType: Issue,Issue Type,د سند ډول
 DocType: Attendance,Leave Type,رخصت ډول
 DocType: Purchase Invoice,Supplier Invoice Details,عرضه صورتحساب نورولوله
+DocType: Agriculture Task,Ignore holidays,د رخصتیو توضیحات
 apps/erpnext/erpnext/controllers/stock_controller.py +233,Expense / Difference account ({0}) must be a 'Profit or Loss' account,اخراجاتو / بدلون حساب ({0}) باید یو &#39;ګټه یا زیان&#39; حساب وي
 DocType: Project,Copied From,کاپي له
 DocType: Project,Copied From,کاپي له
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},نوم تېروتنه: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,په کمښت کې
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} د {1} سره تړاو نه {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,د {0} کارمند په ګډون لا د مخه په نښه
 DocType: Packing Slip,If more than one package of the same type (for print),که د همدې ډول له يوه څخه زيات بسته (د چاپي)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,مهرباني وکړئ د رستورانت ترتیباتو کې ډیزاین پیرود کړئ
 ,Salary Register,معاش د نوم ثبتول
 DocType: Warehouse,Parent Warehouse,Parent ګدام
 DocType: C-Form Invoice Detail,Net Total,خالص Total
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},Default هیښ لپاره توکی ونه موندل {0} او د پروژې د {1}
-apps/erpnext/erpnext/config/hr.py +163,Define various loan types,د پور د مختلفو ډولونو تعریف
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +526,Default BOM not found for Item {0} and Project {1},Default هیښ لپاره توکی ونه موندل {0} او د پروژې د {1}
+apps/erpnext/erpnext/config/hr.py +168,Define various loan types,د پور د مختلفو ډولونو تعریف
 DocType: Bin,FCFS Rate,FCFS Rate
-DocType: Payment Reconciliation Invoice,Outstanding Amount,بيالنس مقدار
+DocType: Opening Invoice Creation Tool Item,Outstanding Amount,بيالنس مقدار
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),د وخت (په دقیقه)
 DocType: Project Task,Working,کاري
 DocType: Stock Ledger Entry,Stock Queue (FIFO),دحمل د کتار (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,مالي کال
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} کوي چې د دې شرکت سره تړاو نه لري {1}
+apps/erpnext/erpnext/public/js/setup_wizard.js +127,Financial Year,مالي کال
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,{0} does not belong to Company {1},{0} کوي چې د دې شرکت سره تړاو نه لري {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,د معیارونو د سکور فعالیتونه د {0} لپاره ندی حل کولی. ډاډ ترلاسه کړئ چې فارمول اعتبار لري.
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,په توګه د لګښت
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +122,Cost as on,په توګه د لګښت
 DocType: Healthcare Settings,Out Patient Settings,د ناروغۍ ترتیبات
 DocType: Account,Round Off,پړاو
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,مقدار باید مثبت وي
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +252,Quantity must be positive,مقدار باید مثبت وي
 ,Requested Qty,غوښتنه Qty
 DocType: Tax Rule,Use for Shopping Cart,کولر په ګاډۍ استفاده
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},ارزښت {0} د خاصې لپاره {1} نه د اعتبار د قالب په لست کې شته لپاره د قالب ارزښتونه ځانتیا {2}
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Serial Numbers,پرلپسې ه وټاکئ
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +79,Select Serial Numbers,پرلپسې ه وټاکئ
 DocType: BOM Item,Scrap %,د اوسپنې٪
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection",په تور به د خپرولو په متناسب ډول پر توکی qty يا اندازه وي، ستاسو د انتخاب په هر توګه
 DocType: Maintenance Visit,Purposes,په موخه
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,تيروخت د یوه جنس بايد په بدل کې سند سره منفي کمیت ته داخل شي
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",د عملياتو {0} په پرتله په workstation هر موجود کار ساعتونو نور {1}، په څو عملیاتو کې د عملياتو تجزيه
+DocType: Membership,Membership Status,د غړیتوب حالت
 ,Requested,غوښتنه
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,نه څرګندونې
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,No Remarks,نه څرګندونې
+DocType: Asset,In Maintenance,په ساتنه کې
 DocType: Purchase Invoice,Overdue,ورځباندې
 DocType: Account,Stock Received But Not Billed,دحمل رارسيدلي خو نه محاسبې ته
-apps/erpnext/erpnext/accounts/doctype/account/account.py +87,Root Account must be a group,د ريښي د حساب بايد د يوې ډلې وي
+apps/erpnext/erpnext/accounts/doctype/account/account.py +86,Root Account must be a group,د ريښي د حساب بايد د يوې ډلې وي
 DocType: Consultation,Drug Prescription,د مخدره موادو نسخه
 DocType: Fees,FEE.,فیس.
 DocType: Employee Loan,Repaid/Closed,بیرته / تړل
 DocType: Item,Total Projected Qty,ټول پيشبيني Qty
 DocType: Monthly Distribution,Distribution Name,ویش نوم
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,عرضه کوونکي&gt; د عرضه کوونکي ډول
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"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",د تادیاتو کچه د {0} لپاره نده موندل شوې، کوم چې د {1} {2} لپاره د حساب ورکونې اندیښنو ته اړتیا لري. که چیرې توکي په {1} کې د صفر ارزښت د اندازې په توګه لیږدول کیږي، لطفا دا د {1} توکي میز کې یادونه وکړئ. که نه نو، مهرباني وکړئ د توکو لپاره د زیرمې راتلونکی لیږد رامنځته کړئ یا د توکو ریکارډ کې د ارزښت اندازه وشمیرئ، او بیا د دې داخلي ثبت کولو / فسخ کولو هڅه وکړئ
+apps/erpnext/erpnext/stock/stock_ledger.py +471,"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",د تادیاتو کچه د {0} لپاره نده موندل شوې، کوم چې د {1} {2} لپاره د حساب ورکونې اندیښنو ته اړتیا لري. که چیرې توکي په {1} کې د صفر ارزښت د اندازې په توګه لیږدول کیږي، لطفا دا د {1} توکي میز کې یادونه وکړئ. که نه نو، مهرباني وکړئ د توکو لپاره د زیرمې راتلونکی لیږد رامنځته کړئ یا د توکو ریکارډ کې د ارزښت اندازه وشمیرئ، او بیا د دې داخلي ثبت کولو / فسخ کولو هڅه وکړئ
 DocType: Course,Course Code,کورس کوډ
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},د کیفیت د تفتیش لپاره د قالب اړتیا {0}
 DocType: POS Settings,Use POS in Offline Mode,د پی ایس کارول په نالیکي اکر کې
@@ -3005,20 +3202,20 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Manage خاوره د ونو.
 DocType: Journal Entry Account,Sales Invoice,خرڅلاو صورتحساب
 DocType: Journal Entry Account,Party Balance,ګوند بیلانس
-apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,مهرباني غوره Apply کمښت د
+apps/erpnext/erpnext/accounts/page/pos/pos.js +497,Please select Apply Discount On,مهرباني غوره Apply کمښت د
+DocType: Stock Settings,Sample Retention Warehouse,د نمونې ساتنه ګودام
 DocType: Company,Default Receivable Account,Default ترلاسه اکانټ
-DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,مجموعي معاش لپاره د پورته انتخاب معیارونه ورکول د بانک د انفاذ جوړول
 DocType: Physician,Physician Schedule,د ډاکټرانو مهال ویش
 DocType: Purchase Invoice,Deemed Export,د صادراتو وضعیت
 DocType: Stock Entry,Material Transfer for Manufacture,د جوړون د توکو لېږدونه د
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,تخفیف سلنه يا په وړاندې د بیې په لېست کې او یا د ټولو د بیې په لېست کارول کيداي شي.
 DocType: Subscription,Half-yearly,Half-کلنی
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,لپاره دحمل محاسبې انفاذ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +406,Accounting Entry for Stock,لپاره دحمل محاسبې انفاذ
 DocType: Lab Test,LabTest Approver,د لابراتوار تګلاره
-apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,تاسو مخکې د ارزونې معیارونه ارزول {}.
+apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,تاسو مخکې د ارزونې معیارونه ارزول {}.
 DocType: Vehicle Service,Engine Oil,د انجن د تیلو
 DocType: Sales Invoice,Sales Team1,خرڅلاو Team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,د قالب {0} نه شته
+apps/erpnext/erpnext/stock/doctype/item/item.py +521,Item {0} does not exist,د قالب {0} نه شته
 DocType: Sales Invoice,Customer Address,پيرودونکو پته
 DocType: Employee Loan,Loan Details,د پور نورولوله
 DocType: Company,Default Inventory Account,Default موجودي حساب
@@ -3026,6 +3223,7 @@
 DocType: Antibiotic,Antibiotic Name,د انټي بيوټي نوم
 DocType: Purchase Invoice,Apply Additional Discount On,Apply اضافي کمښت د
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +69,Select Type...,ډول وټاکئ ...
+DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,د ټولو ځمکو واحدونو لپاره چې پکښې کرهنه وده کوي
 DocType: Account,Root Type,د ريښي ډول
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +132,Row # {0}: Cannot return more than {1} for Item {2},د کتارونو تر # {0}: بېرته نشي څخه زيات {1} لپاره د قالب {2}
@@ -3033,21 +3231,23 @@
 DocType: Item Group,Show this slideshow at the top of the page,د پاڼې په سر کې د دې سلاید وښایاست
 DocType: BOM,Item UOM,د قالب UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),د مالیې د مقدار کمښت مقدار وروسته (شرکت د اسعارو)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},هدف ګودام لپاره چي په کتارونو الزامی دی {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +155,Target warehouse is mandatory for row {0},هدف ګودام لپاره چي په کتارونو الزامی دی {0}
 DocType: Cheque Print Template,Primary Settings,لومړنۍ امستنې
 DocType: Purchase Invoice,Select Supplier Address,انتخاب عرضه پته
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +380,Add Employees,مامورین ورزیات کړئ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Add Employees,مامورین ورزیات کړئ
 DocType: Purchase Invoice Item,Quality Inspection,د کیفیت د تفتیش
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,اضافي واړه
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,اضافي واړه
 DocType: Company,Standard Template,معياري کينډۍ
 DocType: Training Event,Theory,تیوری
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,خبرداری: مادي غوښتل Qty دی لږ تر لږه نظم Qty څخه کم
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +805,Warning: Material Requested Qty is less than Minimum Order Qty,خبرداری: مادي غوښتل Qty دی لږ تر لږه نظم Qty څخه کم
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,ګڼون {0} ده کنګل
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,قانوني نهاد / مستقلې سره د حسابونه د يو جلا چارت د سازمان پورې.
 DocType: Payment Request,Mute Email,ګونګ دبرېښنا ليک
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco",د خوړو، او نوشابه &amp; تنباکو
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},يوازې په وړاندې پیسې unbilled {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,کمیسیون کچه نه شي کولای په پرتله 100 وي
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +29,"Food, Beverage & Tobacco",د خوړو، او نوشابه &amp; تنباکو
+DocType: Account,Account Number,ګڼون شمېره
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +714,Can only make payment against unbilled {0},يوازې په وړاندې پیسې unbilled {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +98,Commission rate cannot be greater than 100,کمیسیون کچه نه شي کولای په پرتله 100 وي
+DocType: Volunteer,Volunteer,رضاکار
 DocType: Stock Entry,Subcontract,فرعي
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,لطفا {0} په لومړي
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,څخه د نه ځواب
@@ -3056,60 +3256,67 @@
 DocType: Item,Manufacturer Part Number,جوړونکي برخه شمېر
 DocType: Production Order Operation,Estimated Time and Cost,د اټکل له وخت او لګښت
 DocType: Bin,Bin,بن
+DocType: Crop,Crop Name,د کرهن نوم
 DocType: SMS Log,No of Sent SMS,نه د ته وليږدول شوه پیغامونه
 DocType: Antibiotic,Healthcare Administrator,د روغتیا پاملرنې اداره
 apps/erpnext/erpnext/utilities/user_progress.py +44,Set a Target,هدف ټاکئ
 DocType: Dosage Strength,Dosage Strength,د غصب ځواک
 DocType: Account,Expense Account,اخراجاتو اکانټ
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,ساوتري
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,رنګ
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,ساوتري
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,رنګ
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,د ارزونې معیارونه پلان
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,د پیرودونکو مخنیوی مخه ونیسئ
-apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,د منلو وړ
+apps/erpnext/erpnext/healthcare/setup.py +258,Susceptible,د منلو وړ
 DocType: Patient Appointment,Scheduled,ټاکل شوې
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,لپاره د آفرونو غوښتنه وکړي.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",لطفا د قالب غوره هلته &quot;د دې لپاره دحمل د قالب&quot; ده &quot;نه&quot; او &quot;آیا د پلورنې د قالب&quot; د &quot;هو&quot; او نورو د محصول د بنډل نه شته
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,پیرودونکی انتخاب کړئ
 DocType: Student Log,Academic,علمي
 DocType: Patient,Personal and Social History,شخصي او ټولنیز تاریخ
+apps/erpnext/erpnext/education/doctype/guardian/guardian.py +52,User {0} created,کارن {0} جوړ شوی
 DocType: Fee Schedule,Fee Breakup for each student,د هر زده کوونکی لپاره د فیس ماتونکی
-apps/erpnext/erpnext/controllers/accounts_controller.py +476,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Total دمخه ({0}) د ترتیب پر وړاندې د {1} نه شي کولای د Grand ټولو څخه ډيره وي ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +520,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Total دمخه ({0}) د ترتیب پر وړاندې د {1} نه شي کولای د Grand ټولو څخه ډيره وي ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,میاشتنی ویش وټاکئ نا متوازنه توګه په ټول مياشتو هدفونو وویشي.
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +78,Change Code,د بدلولو کوډ
 DocType: Purchase Invoice Item,Valuation Rate,سنجي Rate
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,دیزل
-apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,د اسعارو بیې په لېست کې نه ټاکل
+apps/erpnext/erpnext/stock/get_item_details.py +381,Price List Currency not selected,د اسعارو بیې په لېست کې نه ټاکل
 apps/erpnext/erpnext/config/healthcare.py +46,Results,پایلې
 ,Student Monthly Attendance Sheet,د زده کوونکو میاشتنی حاضرۍ پاڼه
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,د پلور کولو لپاره یوازې د لیږد حاکمیت
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},د کارګر {0} لا د پلي {1} تر منځ د {2} او {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,د پروژې د پیل نیټه
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +5,Until,تر
 DocType: Rename Tool,Rename Log,د رښتو يادښت
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,د زده کوونکو د ډلې يا کورس ويش الزامی دی
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,د زده کوونکو د ډلې يا کورس ويش الزامی دی
+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,د زده کوونکو د ډلې يا کورس ويش الزامی دی
 DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,رسیدپاڼې ساعتونه او کاري ساعتونه په Timesheet ورته ساتل
 DocType: Maintenance Visit Purpose,Against Document No,لاسوند نه وړاندې د
 DocType: BOM,Scrap,د اوسپنې
-apps/erpnext/erpnext/utilities/user_progress.py +196,Go to Instructors,ښوونکو ته لاړ شئ
+apps/erpnext/erpnext/utilities/user_progress.py +214,Go to Instructors,ښوونکو ته لاړ شئ
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Manage خرڅلاو همکاران.
 DocType: Quality Inspection,Inspection Type,تفتیش ډول
 DocType: Fee Validity,Visited yet,لا تر اوسه لیدل شوی
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +135,Warehouses with existing transaction can not be converted to group.,د موجوده د راکړې ورکړې د ګدامونو د ډلې بدل نه شي.
 DocType: Assessment Result Tool,Result HTML,د پایلو د HTML
+apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +6,Memeber Activity,د یادونې فعالیت
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,په ختمېږي
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,زده کوونکي ورزیات کړئ
+apps/erpnext/erpnext/public/js/utils.js +264,Please select {0},مهرباني غوره {0}
 DocType: C-Form,C-Form No,C-فورمه نشته
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/utilities/user_progress.py +118,List your products or services that you buy or sell.,خپل محصولات یا خدمات لیست کړئ کوم چې تاسو یې اخلئ یا پلورئ.
+apps/erpnext/erpnext/utilities/user_progress.py +136,List your products or services that you buy or sell.,خپل محصولات یا خدمات لیست کړئ کوم چې تاسو یې اخلئ یا پلورئ.
+DocType: Water Analysis,Storage Temperature,د ذخیرې درجه
 DocType: Employee Attendance Tool,Unmarked Attendance,بې نښې حاضريدل
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Researcher,څیړونکې
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,څیړونکې
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,پروګرام شمولیت وسیله د زده کوونکو
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,نوم يا ليک الزامی دی
-apps/erpnext/erpnext/config/stock.py +168,Incoming quality inspection.,راتلونکي کیفیت د تفتیش.
 DocType: Purchase Order Item,Returned Qty,راستون Qty
-DocType: Employee,Exit,وتون
-apps/erpnext/erpnext/accounts/doctype/account/account.py +159,Root Type is mandatory,د ريښي ډول فرض ده
+DocType: Student,Exit,وتون
+apps/erpnext/erpnext/accounts/doctype/account/account.py +158,Root Type is mandatory,د ريښي ډول فرض ده
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +29,Failed to install presets,د کوټونو لګولو کې ناکام شو
+DocType: Chapter,Non Profit Manager,د غیر ګټې مدیر
 DocType: BOM,Total Cost(Company Currency),ټولیز لګښت (شرکت د اسعارو)
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +315,Serial No {0} created,شعبه {0} جوړ
 DocType: Homepage,Company Description for website homepage,د ویب پاڼه Company Description
@@ -3120,41 +3327,42 @@
 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/install_fixtures.py +221,Probationary Period,امتحاني دوره
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +231,Probationary Period,امتحاني دوره
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},وګورئ {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,يوازې د پاڼی غوټو کې د راکړې ورکړې اجازه لري
-DocType: Expense Claim,Expense Approver,اخراجاتو Approver
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,د کتارونو تر {0}: پيرودونکو په وړاندې پرمختللی بايد پور وي
-apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,غیر ګروپ ته ګروپ
-apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +58,Batch is mandatory in row {0},batch په قطار الزامی دی {0}
-apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +58,Batch is mandatory in row {0},batch په قطار الزامی دی {0}
+DocType: Project,Total Costing Amount (via Timesheets),د ټول لګښت لګښت (د ټایټ شیټونو له لارې)
+DocType: Employee Advance,Expense Approver,اخراجاتو Approver
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,Row {0}: Advance against Customer must be credit,د کتارونو تر {0}: پيرودونکو په وړاندې پرمختللی بايد پور وي
+apps/erpnext/erpnext/accounts/doctype/account/account.js +89,Non-Group to Group,غیر ګروپ ته ګروپ
+apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +58,Batch is mandatory in row {0},batch په قطار الزامی دی {0}
+apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +58,Batch is mandatory in row {0},batch په قطار الزامی دی {0}
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,رانيول رسيد د قالب برابر شوي
 DocType: Payment Entry,Pay,د تنخاوو
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,ته Datetime
-apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,کورس ویش ړنګ:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,د SMS د وړاندې کولو او مقام د ساتلو يادښتونه
 DocType: Accounts Settings,Make Payment via Journal Entry,ژورنال انفاذ له لارې د پیسو د کمکیانو لپاره
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,چاپ شوی
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +97,Printed On,چاپ شوی
 DocType: Item,Inspection Required before Delivery,د سپارنې مخکې د تفتیش د غوښتل شوي
 DocType: Item,Inspection Required before Purchase,رانيول مخکې د تفتیش د غوښتل شوي
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,انتظار فعالیتونه
 DocType: Patient Appointment,Reminded,یادونه
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,ستاسو د سازمان
+DocType: Chapter Member,Chapter Member,د فصل غړي
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,ستاسو د سازمان
 DocType: Fee Component,Fees Category,فیس کټه ګورۍ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,لطفا کرارولو نیټه.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,لطفا کرارولو نیټه.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,نننیو
 DocType: Supplier Scorecard,Notify Employee,کارمندان خبرتیا
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,د کمپاین د نوم ورکړه که د معلوماتو سرچينه ده کمپاین
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,ورځپاڼې اخیستونکي
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +38,Newspaper Publishers,ورځپاڼې اخیستونکي
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,مالي کال وټاکئ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +114,Expected Delivery Date should be after Sales Order Date,د تمویل شوي اټکل باید د پلور امر نیټه وروسته وي
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +115,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,د حاضرۍ نېټه
-apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},د قالب د بیې د {0} په بیې په لېست کې تازه {1}
+apps/erpnext/erpnext/stock/get_item_details.py +345,Item Price updated for {0} in Price List {1},د قالب د بیې د {0} په بیې په لېست کې تازه {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,معاش سترواکې بنسټ د ګټې وټې او Deduction.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,سره د ماشومانو د غوټو حساب بدل نه شي چې د پنډو
+apps/erpnext/erpnext/accounts/doctype/account/account.py +130,Account with child nodes cannot be converted to ledger,سره د ماشومانو د غوټو حساب بدل نه شي چې د پنډو
 DocType: Purchase Invoice Item,Accepted Warehouse,منل ګدام
 DocType: Bank Reconciliation Detail,Posting Date,نوکرې نېټه
 DocType: Item,Valuation Method,سنجي Method
@@ -3163,15 +3371,15 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,دوه ګونو ننوتلو
 DocType: Program Enrollment Tool,Get Students,زده کوونکي ترلاسه کړئ
 DocType: Serial No,Under Warranty,لاندې ګرنټی
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +491,[Error],[تېروتنه]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +515,[Error],[تېروتنه]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,په کلیمو کې به د ليدو وړ وي. هر کله چې تاسو د خرڅلاو نظم وژغوري.
 ,Employee Birthday,د کارګر کالیزې
+apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,مهرباني وکړئ د بشپړ شوي ترمیم لپاره د بشپړولو نیټه وټاکئ
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,د زده کوونکو د حاضرۍ دسته اوزار
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,حد اوښتي
-apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,ټاکل شوی
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,تصدي پلازمیینه
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,سره د دې د تعليمي کال د &#39;يوه علمي اصطلاح {0} او مهاله نوم&#39; {1} مخکې نه شتون لري. لطفا د دې زياتونې کې بدلون او بیا کوښښ وکړه.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}",لکه {0} توکی په وړاندې د موجودو معاملو شته دي، تاسو نه شي کولای د ارزښت د بدلون {1}
+apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,ټاکل شوی
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +55,Venture Capital,تصدي پلازمیینه
+apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,سره د دې د تعليمي کال د &#39;يوه علمي اصطلاح {0} او مهاله نوم&#39; {1} مخکې نه شتون لري. لطفا د دې زياتونې کې بدلون او بیا کوښښ وکړه.
 DocType: UOM,Must be Whole Number,باید ټول شمېر وي
 DocType: Leave Control Panel,New Leaves Allocated (In Days),نوې پاڼې د تخصيص (په ورځې)
 DocType: Purchase Invoice,Invoice Copy,صورتحساب کاپي
@@ -3181,7 +3389,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,صورتحساب شمېر
 DocType: Shopping Cart Settings,Orders,امر کړی
 DocType: Employee Leave Approver,Leave Approver,Approver ووځي
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,مهرباني وکړئ داځکه انتخاب
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +285,Please select a batch,مهرباني وکړئ داځکه انتخاب
 DocType: Assessment Group,Assessment Group Name,د ارزونې ډلې نوم
 DocType: Manufacturing Settings,Material Transferred for Manufacture,د جوړون مواد سپارل
 DocType: Expense Claim,"A user with ""Expense Approver"" role",A د &quot;اخراجاتو Approver&quot; رول د کارونکي عکس
@@ -3190,21 +3398,23 @@
 ,Issued Items Against Production Order,پر وړاندې د تولید نظم خپور شوی توکی
 DocType: Antibiotic,Healthcare,روغتیایی پاملرنه
 DocType: Target Detail,Target Detail,هدف تفصیلي
+apps/erpnext/erpnext/stock/doctype/item/item.js +65,Single Variant,یو واحد بڼه
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,All Jobs,ټول
 DocType: Sales Order,% of materials billed against this Sales Order,٪ د توکو د خرڅلاو د دې نظم په وړاندې د بلونو د
 DocType: Program Enrollment,Mode of Transportation,د ترانسپورت اکر
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,د دورې په تړلو انفاذ
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,څانګه غوره کړئ ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,د موجوده معاملو لګښت مرکز ته ډلې بدل نه شي
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},مقدار د {0} د {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +361,Amount {0} {1} {2} {3},مقدار د {0} د {1} {2} {3}
 DocType: Account,Depreciation,د استهالک
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),عرضه (s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,د کارګر د حاضرۍ اوزار
 DocType: Guardian Student,Guardian Student,ګارډین د زده کوونکو
 DocType: Supplier,Credit Limit,پورونو د حد
+apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Selling Price List Rate,اوسط. د نرخ لیست نرخ
 DocType: Production Plan Sales Order,Salse Order Date,Salse نظم نېټه
 DocType: Salary Component,Salary Component,معاش برخه
-apps/erpnext/erpnext/accounts/utils.py +490,Payment Entries {0} are un-linked,د پیسو توکي {0} دي un-سره تړاو لري
+apps/erpnext/erpnext/accounts/utils.py +492,Payment Entries {0} are un-linked,د پیسو توکي {0} دي un-سره تړاو لري
 DocType: GL Entry,Voucher No,کوپون نه
 ,Lead Owner Efficiency,مشري خاوند موثريت
 ,Lead Owner Efficiency,مشري خاوند موثريت
@@ -3218,12 +3428,12 @@
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,د شرایطو یا د قرارداد په کينډۍ.
 DocType: Purchase Invoice,Address and Contact,پته او تماس
 DocType: Cheque Print Template,Is Account Payable,آیا د حساب د راتلوونکې
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Stock cannot be updated against Purchase Receipt {0},دحمل رانيول رسيد وړاندې تازه نه شي {0}
-DocType: Supplier,Last Day of the Next Month,د د راتلونکې میاشتې په وروستۍ ورځ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +276,Stock cannot be updated against Purchase Receipt {0},دحمل رانيول رسيد وړاندې تازه نه شي {0}
+DocType: Company,Last Day of the Next Month,د د راتلونکې میاشتې په وروستۍ ورځ
 DocType: Support Settings,Auto close Issue after 7 days,د موټرونو 7 ورځې وروسته له نږدې Issue
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",تر وتلو وړاندې نه شي کولای ځانګړي شي {0} په توګه رخصت انډول لا شوي دي انتقال-استولې چې په راتلونکي کې رخصت تخصيص ریکارډ {1}
-apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),نوټ: له کبله / ماخذ نېټه له خوا د {0} په ورځ اجازه مشتريانو د پورونو ورځو څخه زيات (s)
-apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,د زده کوونکو د غوښتنليک
+apps/erpnext/erpnext/accounts/party.py +320,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),نوټ: له کبله / ماخذ نېټه له خوا د {0} په ورځ اجازه مشتريانو د پورونو ورځو څخه زيات (s)
+apps/erpnext/erpnext/education/doctype/program/program.js +8,Student Applicant,د زده کوونکو د غوښتنليک
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,اصلي لپاره د دترلاسه
 DocType: Asset Category Account,Accumulated Depreciation Account,د استهلاک د حساب
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,دا بریښنالیک تایید شوی
@@ -3234,40 +3444,43 @@
 DocType: Activity Cost,Billing Rate,د بیلونو په کچه
 ,Qty to Deliver,Qty ته تحویل
 ,Stock Analytics,دحمل Analytics
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,عملیاتو په خالي نه شي پاتې کېدای
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Operations cannot be left blank,عملیاتو په خالي نه شي پاتې کېدای
 DocType: Maintenance Visit Purpose,Against Document Detail No,په وړاندې د سند جزییات نشته
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,ګوند ډول فرض ده
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party Type is mandatory,ګوند ډول فرض ده
 DocType: Quality Inspection,Outgoing,د تېرې
 DocType: Material Request,Requested For,غوښتنه د
 DocType: Quotation Item,Against Doctype,په وړاندې د Doctype
-apps/erpnext/erpnext/controllers/buying_controller.py +395,{0} {1} is cancelled or closed,{0} د {1} ده لغوه یا تړل
+apps/erpnext/erpnext/controllers/buying_controller.py +396,{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 +30,Net Cash from Investing,له پانګه اچونه خالص د نغدو
 DocType: Production Order,Work-in-Progress Warehouse,کار-in-پرمختګ ګدام
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +111,Asset {0} must be submitted,د شتمنیو د {0} بايد وسپارل شي
+apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +111,Asset {0} must be submitted,د شتمنیو د {0} بايد وسپارل شي
 DocType: Fee Schedule Program,Total Students,ټول زده کونکي
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},د حاضرۍ دثبت {0} شتون د زده کوونکو پر وړاندې د {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},ماخذ # {0} د میاشتې په {1}
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,د استهالک له امله د شتمنيو د شنډولو څخه ویستل کیږي
+apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},د حاضرۍ دثبت {0} شتون د زده کوونکو پر وړاندې د {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +352,Reference #{0} dated {1},ماخذ # {0} د میاشتې په {1}
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,د استهالک له امله د شتمنيو د شنډولو څخه ویستل کیږي
+DocType: Member,Member,غړی
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Manage Addresses
-DocType: Asset,Item Code,د قالب کوډ
+DocType: Pricing Rule,Item Code,د قالب کوډ
 DocType: Production Planning Tool,Create Production Orders,تولید امر جوړول
 DocType: Serial No,Warranty / AMC Details,ګرنټی / AMC نورولوله
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,د فعالیت پر بنسټ د ګروپ لپاره د انتخاب کوونکو لاسي
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,د فعالیت پر بنسټ د ګروپ لپاره د انتخاب کوونکو لاسي
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,د فعالیت پر بنسټ د ګروپ لپاره د انتخاب کوونکو لاسي
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,د فعالیت پر بنسټ د ګروپ لپاره د انتخاب کوونکو لاسي
 DocType: Journal Entry,User Remark,کارن تبصره
 DocType: Lead,Market Segment,بازار برخه
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},ورکړل مقدار نه شي کولای ټولو منفي بيالنس مقدار څخه ډيره وي {0}
+DocType: Crop,Agriculture Manager,د کرنې مدیر
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +950,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 +239,Closing (Dr),تړل د (ډاکټر)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Dr),تړل د (ډاکټر)
 DocType: Cheque Print Template,Cheque Size,آرډر اندازه
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +232,Serial No {0} not in stock,شعبه {0} په ګدام کې نه
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,د معاملو د پلورلو د مالياتو کېنډۍ.
 DocType: Sales Invoice,Write Off Outstanding Amount,ولیکئ پړاو وتلي مقدار
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},حساب {0} سره شرکت سره سمون نه خوري {1}
-DocType: School Settings,Current Academic Year,د روان تعليمي کال د
-DocType: School Settings,Current Academic Year,د روان تعليمي کال د
+DocType: Education Settings,Current Academic Year,د روان تعليمي کال د
+DocType: Education Settings,Current Academic Year,د روان تعليمي کال د
 DocType: Stock Settings,Default Stock UOM,Default دحمل UOM
 DocType: Asset,Number of Depreciations Booked,بک د Depreciations شمېر
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},د کارګر د پور په وړاندې: {0}
@@ -3275,49 +3488,54 @@
 DocType: Production Planning Tool,Create Material Requests,د موادو غوښتنه جوړول
 DocType: Employee Education,School/University,ښوونځی / پوهنتون
 DocType: Payment Request,Reference Details,ماخذ په بشپړه توګه کتل
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,د تمی وړ ارزښت ګټور ژوند وروسته باید Gross رانيول مقدار څخه لږ وي
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,د تمی وړ ارزښت ګټور ژوند وروسته باید Gross رانيول مقدار څخه لږ وي
 DocType: Sales Invoice Item,Available Qty at Warehouse,موجود Qty په ګدام
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,د بلونو د مقدار
 DocType: Asset,Double Declining Balance,Double کموالی بیلانس
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +179,Closed order cannot be cancelled. Unclose to cancel.,د تړلو امر لغوه نه شي. Unclose لغوه.
-DocType: Patient Relation,Father,پلار
-apps/erpnext/erpnext/controllers/accounts_controller.py +562,'Update Stock' cannot be checked for fixed asset sale,&#39;تازه سټاک لپاره ثابته شتمني خرڅلاو نه وکتل شي
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,د تړلو امر لغوه نه شي. Unclose لغوه.
+DocType: Student Guardian,Father,پلار
+apps/erpnext/erpnext/controllers/accounts_controller.py +606,'Update Stock' cannot be checked for fixed asset sale,&#39;تازه سټاک لپاره ثابته شتمني خرڅلاو نه وکتل شي
 DocType: Bank Reconciliation,Bank Reconciliation,بانک پخلاينې
 DocType: Attendance,On Leave,په اړه چې رخصت
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,ترلاسه تازه خبرونه
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} د {1}: Account {2} کوي چې د دې شرکت سره تړاو نه لري {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,د موادو غوښتنه {0} دی لغوه یا ودرول
-apps/erpnext/erpnext/config/hr.py +305,Leave Management,د مدیریت څخه ووځي
+apps/erpnext/erpnext/stock/doctype/item/item.js +366,Select at least one value from each of the attributes.,لږ تر لږه یو ځانګړتیاوې د هر صفتونو څخه غوره کړئ.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,د موادو غوښتنه {0} دی لغوه یا ودرول
+apps/erpnext/erpnext/config/hr.py +310,Leave Management,د مدیریت څخه ووځي
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,له خوا د حساب ګروپ
 DocType: Sales Order,Fully Delivered,په بشپړه توګه وسپارل شول
 DocType: Lead,Lower Income,ولسي عايداتو
 DocType: Restaurant Order Entry,Current Order,اوسنۍ امر
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},سرچینه او هدف ګودام نه شي لپاره چي په کتارونو ورته وي {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Source and target warehouse cannot be same for row {0},سرچینه او هدف ګودام نه شي لپاره چي په کتارونو ورته وي {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",توپير حساب باید یو د شتمنیو / Liability ډول په پام کې وي، ځکه په دې کې دحمل پخلاينې يو پرانیستل انفاذ دی
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},ورکړل شوي مقدار نه شي کولای د پور مقدار زیات وي {0}
-apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,پروګرامونو ته لاړ شئ
+apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,پروګرامونو ته لاړ شئ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},Row {0} تخصیص شوی رقم {1} د ناپیژندل شوی مقدار څخه ډیر نه وی. {2}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},نظم لپاره د قالب اړتیا پیري {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,تولید نظم نه جوړ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,تولید نظم نه جوړ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;له نېټه باید وروسته&#39; ته د نېټه وي
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},آیا په توګه د زده کوونکو حالت بدل نه {0} کې د زده کوونکو د غوښتنلیک سره تړاو دی {1}
+apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},آیا په توګه د زده کوونکو حالت بدل نه {0} کې د زده کوونکو د غوښتنلیک سره تړاو دی {1}
 DocType: Asset,Fully Depreciated,په بشپړه توګه راکم شو
 ,Stock Projected Qty,دحمل وړاندوینی Qty
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},پيرودونکو {0} نه تړاو نه لري د پروژې د {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},پيرودونکو {0} نه تړاو نه لري د پروژې د {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,د پام وړ د حاضرۍ د HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers",د داوطلبۍ دي وړانديزونه، د داوطلبۍ د خپل مشتريان تاسو ته ليږلي دي
 DocType: Sales Order,Customer's Purchase Order,پيرودونکو د اخستلو امر
 DocType: Consultation,Patient,ناروغ
-apps/erpnext/erpnext/config/stock.py +117,Serial No and Batch,شعبه او دسته
+apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +47,Bypass credit check at Sales Order ,د پلور په امر کې د کریډیټ چک چیک کړئ
+DocType: Land Unit,Check if it is a hydroponic unit,وګورئ که دا د هیدرروپو واحد وي
+apps/erpnext/erpnext/config/stock.py +109,Serial No and Batch,شعبه او دسته
 DocType: Warranty Claim,From Company,له شرکت
-apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,د ارزونې معیارونه په لسګونو Sum ته اړتيا لري د {0} وي.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,مهرباني وکړئ ټاکل د Depreciations شمېر بک
+apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,د ارزونې معیارونه په لسګونو Sum ته اړتيا لري د {0} وي.
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,مهرباني وکړئ ټاکل د Depreciations شمېر بک
 DocType: Supplier Scorecard Period,Calculations,حسابونه
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,ارزښت او يا د Qty
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,Productions امر لپاره نه شي مطرح شي:
-apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,دقیقه
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,مهرباني وکړئ د سایټ نوم نومول د Setup&gt; ترتیباتو له لارې {0} لپاره د نومونې لړۍ وټاکئ
+DocType: Payment Terms Template,Payment Terms,د تادیاتو شرایط
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +426,Productions Orders cannot be raised for:,Productions امر لپاره نه شي مطرح شي:
+apps/erpnext/erpnext/utilities/user_progress.py +144,Minute,دقیقه
 DocType: Purchase Invoice,Purchase Taxes and Charges,مالیات او په تور پیري
-apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,سپلائر ته لاړ شئ
+DocType: Chapter,Meetup Embed HTML,ملګری ایمیل ایچ ایچ ایل
+apps/erpnext/erpnext/utilities/user_progress.py +118,Go to Suppliers,سپلائر ته لاړ شئ
 ,Qty to Receive,Qty له لاسه
 DocType: Leave Block List,Leave Block List Allowed,پريږدئ بالک بشپړفهرست اجازه
 DocType: Grading Scale Interval,Grading Scale Interval,د رتبو او مقياس وقفه
@@ -3326,33 +3544,34 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,تخفیف (٪) د بیې په لېست کې و ارزوئ سره څنډی
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,ټول Warehouses
 DocType: Sales Partner,Retailer,پرچون
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,د حساب د پور باید د موازنې د پاڼه په پام کې وي
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Balance Sheet account,د حساب د پور باید د موازنې د پاڼه په پام کې وي
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,ټول عرضه ډولونه
+DocType: Donor,Donor,بسپنه ورکوونکی
 DocType: Global Defaults,Disable In Words,نافعال په وييکي
-apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,د قالب کوډ لازمي ده، ځکه د قالب په اتوماتيک ډول شمېر نه
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},د داوطلبۍ {0} نه د ډول {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Item Code is mandatory because Item is not automatically numbered,د قالب کوډ لازمي ده، ځکه د قالب په اتوماتيک ډول شمېر نه
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},د داوطلبۍ {0} نه د ډول {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,د ساتنې او مهال ویش د قالب
 DocType: Sales Order,%  Delivered,٪ تحویلوونکی
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,مهرباني وکړئ د زده کونکي لپاره د بریښناليک ID مقرر کړئ ترڅو د تادیاتو غوښتنه واستوي
+apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,مهرباني وکړئ د زده کونکي لپاره د بریښناليک ID مقرر کړئ ترڅو د تادیاتو غوښتنه واستوي
 DocType: Production Order,PRO-,پلوه
 DocType: Patient,Medical History,طبی تاریخ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,بانک قرضې اکانټ
 DocType: Patient,Patient ID,د ناروغ پېژندنه
 DocType: Physician Schedule,Schedule Name,د مهال ویش نوم
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,معاش ټوټه د کمکیانو لپاره
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +813,Add All Suppliers,ټول سپلولونه زیات کړئ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +81,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,د کتارونو تر # {0}: ځانګړې شوې مقدار نه بيالنس اندازه په پرتله زیات وي.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +838,Add All Suppliers,ټول سپلولونه زیات کړئ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +83,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,د کتارونو تر # {0}: ځانګړې شوې مقدار نه بيالنس اندازه په پرتله زیات وي.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,کتنه د هیښ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,خوندي پور
 DocType: Purchase Invoice,Edit Posting Date and Time,سمول نوکرې نېټه او وخت
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},لطفا په شتمنیو کټه ګورۍ {0} یا د شرکت د استهالک اړوند حسابونه جوړ {1}
+apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},لطفا په شتمنیو کټه ګورۍ {0} یا د شرکت د استهالک اړوند حسابونه جوړ {1}
 DocType: Lab Test Groups,Normal Range,عمومی رینج
 DocType: Academic Term,Academic Year,تعلیمي کال
+apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +72,Available Selling,موجود پلورل
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,د پرانستلو په انډول مساوات
 DocType: Lead,CRM,دمراسمو
 DocType: Purchase Invoice,N,ن
-apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,پخلاینه
-apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,پاتې
+apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,پاتې
 DocType: Appraisal,Appraisal,قيمت
 DocType: Purchase Invoice,GST Details,د GST تفصیلات
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},ليک ته د عرضه کوونکي ته استول {0}
@@ -3361,22 +3580,23 @@
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,نېټه تکرار
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,اجازه لاسليک
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},approver ووځي باید د یو وي {0}
-apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,فیسونه جوړ کړئ
+apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +67,Create Fees,فیسونه جوړ کړئ
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Total رانيول لګښت (له لارې رانيول صورتحساب)
 DocType: Training Event,Start Time,د پيل وخت
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,انتخاب مقدار
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +399,Select Quantity,انتخاب مقدار
 DocType: Customs Tariff Number,Customs Tariff Number,د ګمرکي تعرفې شمیره
 DocType: Patient Appointment,Patient Appointment,د ناروغ ټاکنه
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,رول تصویب نه شي کولای ورته په توګه رول د واکمنۍ ته د تطبیق وړ وي
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,له دې ليک Digest وباسو
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,عرضه کونکي ترلاسه کړئ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +828,Get Suppliers By,عرضه کونکي ترلاسه کړئ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{1} د توکي {1} لپاره ندی موندلی
-apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,کورسونو ته لاړ شئ
+apps/erpnext/erpnext/utilities/user_progress.py +194,Go to Courses,کورسونو ته لاړ شئ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,پيغام ته وليږدول شوه
-apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,سره د ماشومانو د غوټو حساب نه په توګه د پنډو جوړ شي
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Account with child nodes cannot be set as ledger,سره د ماشومانو د غوټو حساب نه په توګه د پنډو جوړ شي
 DocType: C-Form,II,II
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,په ميزان کي د بیو د لست د اسعارو ده چې د مشتريانو د اډې اسعارو بدل
 DocType: Purchase Invoice Item,Net Amount (Company Currency),خالص مقدار (شرکت د اسعارو)
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +229,Total advance amount cannot be greater than total sanctioned amount,ټول وړاندیز شوی رقم کیدای شي د ټولو منظور شوي مقدار څخه ډیر نه وي
 DocType: Salary Slip,Hour Rate,ساعت Rate
 DocType: Stock Settings,Item Naming By,د قالب نوم By
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},وروسته يو بل د دورې په تړلو انفاذ {0} شوی دی {1}
@@ -3392,12 +3612,14 @@
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +155,Source and target warehouse must be different,سرچینه او هدف ګدام بايد توپير ولري
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},اجازه نه سټاک معاملو د اوسمهالولو په پرتله د زړو {0}
 DocType: Purchase Invoice Item,PR Detail,PR تفصیلي
+DocType: Driving License Category,Class,ټولګي
 DocType: Sales Order,Fully Billed,په بشپړ ډول محاسبې ته
+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 +136,Delivery warehouse required for stock item {0},د سپارنې پرمهال ګودام لپاره سټاک توکی اړتیا {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +137,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),د بنډل خالص وزن. معمولا د خالص وزن + د بسته بندۍ مواد وزن. (د چاپي)
-apps/erpnext/erpnext/schools/doctype/course/course.js +3,Program,پروګرام
+apps/erpnext/erpnext/education/doctype/course/course.js +3,Program,پروګرام
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,سره د دغه رول د کاروونکو دي چې کنګل شوي حسابونه کنګل شوي حسابونه په وړاندې د محاسبې زياتونې جوړ او رامنځته / تعديلوي اجازه
 DocType: Serial No,Is Cancelled,ده ردشوي
 DocType: Student Group,Group Based On,ګروپ پر بنسټ
@@ -3406,15 +3628,15 @@
 DocType: Healthcare Settings,Laboratory SMS Alerts,د لابراتواري ایس ایم ایل خبرتیاوې
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required",د خدمتونو د قالب، ډول، د فریکونسي او لګښتونو اندازه اړ دي
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",حتی که د لوړ لومړیتوب څو د بیو اصول شته دي، نو لاندې داخلي لومړیتوبونو دي استعمال:
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +128,Do you really want to Submit all Salary Slip from {0} to {1},تاسو په رښتيا غواړئ چې د {0} چې په معاش د ټولو ټوټه سپارل {1}
+DocType: Plant Analysis Criteria,Plant Analysis Criteria,د پلان تحلیل معیار
 DocType: Cheque Print Template,Cheque Height,آرډر لوړوالی
 DocType: Supplier,Supplier Details,عرضه نورولوله
 DocType: Setup Progress,Setup Progress,پرمختللی پرمختګ
 DocType: Expense Claim,Approval Status,تصویب حالت
 DocType: Hub Settings,Publish Items to Hub,تر مرکزي توکی د خپرېدو
-apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +43,From value must be less than to value in row {0},له ارزښت باید په پرتله د ارزښت په قطار کمه وي {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,تار بدلول
-apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,ټول وګوره
+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 +182,Wire Transfer,تار بدلول
+apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,ټول وګوره
 DocType: Vehicle Log,Invoice Ref,صورتحساب ګروف
 DocType: Company,Default Income Account,Default د عوايدو د حساب
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,پيرودونکو ډله / پيرودونکو
@@ -3423,19 +3645,18 @@
 DocType: Lab Test Template,Change In Item,په توکو کې بدلون
 DocType: Payment Gateway Account,Default Payment Request Message,Default د پیسو غوښتنه پيغام
 DocType: Item Group,Check this if you want to show in website,وګورئ دا که تاسو غواړئ چې په ویب پاڼه وښيي
-apps/erpnext/erpnext/config/accounts.py +142,Banking and Payments,بانکداري او د پیسو ورکړه
+apps/erpnext/erpnext/config/accounts.py +134,Banking and Payments,بانکداري او د پیسو ورکړه
 ,Welcome to ERPNext,ته ERPNext ته ښه راغلاست
 apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,ته د داوطلبۍ سوق
 DocType: Patient,A Negative,منفي
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,هیڅ مطلب ته وښيي.
 DocType: Lead,From Customer,له پيرودونکو
 apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,غږ
-apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,یو محصول
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,دستو
-DocType: Project,Total Costing Amount (via Time Logs),Total لګښت مقدار (له لارې د وخت کندي)
-apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,د فیس مهال ویش جوړ کړئ
+apps/erpnext/erpnext/utilities/user_progress.py +140,A Product,یو محصول
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +207,Batches,دستو
+apps/erpnext/erpnext/education/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,د فیس مهال ویش جوړ کړئ
 DocType: Purchase Order Item Supplied,Stock UOM,دحمل UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +230,Purchase Order {0} is not submitted,پیري نظم {0} نه سپارل
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +233,Purchase Order {0} is not submitted,پیري نظم {0} نه سپارل
 DocType: Vital Signs,Normal reference range for an adult is 16–20 breaths/minute (RCP 2012),د بالغ لپاره معمول حواله لرونکی حد 16-20 تنفس / دقیقې (RCP 2012)
 DocType: Customs Tariff Number,Tariff Number,د تعرفې شمیره
 DocType: Production Order Item,Available Qty at WIP Warehouse,موجود Qty په WIP ګدام
@@ -3445,70 +3666,77 @@
 DocType: Notification Control,Quotation Message,د داوطلبۍ پيغام
 DocType: Employee Loan,Employee Loan Application,د کارګر د پور کاریال
 DocType: Issue,Opening Date,د پرانستلو نېټه
-apps/erpnext/erpnext/schools/api.py +80,Attendance has been marked successfully.,د حاضرۍ په بریالیتوب سره په نښه شوي دي.
+apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,د حاضرۍ په بریالیتوب سره په نښه شوي دي.
 DocType: Program Enrollment,Public Transport,د عامه ترانسپورت
+DocType: Soil Texture,Silt Composition (%),د Silt جوړښت (٪)
 DocType: Journal Entry,Remark,تبصره
 DocType: Healthcare Settings,Avoid Confirmation,تایید څخه ډډه وکړئ
 DocType: Purchase Receipt Item,Rate and Amount,اندازه او مقدار
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +165,Account Type for {0} must be {1},ګڼون په ډول د {0} بايد د {1}
 DocType: Healthcare Settings,Default income accounts to be used if not set in Physician to book Consultation charges.,د عوایدو اصلي حسابونه باید وکارول شي که چیرې د طبي مشورې فیس ونه پیژني.
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,پاڼو او رخصتي
-DocType: School Settings,Current Academic Term,اوسنۍ علمي مهاله
-DocType: School Settings,Current Academic Term,اوسنۍ علمي مهاله
+DocType: Education Settings,Current Academic Term,اوسنۍ علمي مهاله
+DocType: Education Settings,Current Academic Term,اوسنۍ علمي مهاله
 DocType: Sales Order,Not Billed,نه محاسبې ته
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,دواړه ګدام بايد د همدې شرکت پورې اړه لري
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,نه تماسونه زياته کړه تر اوسه.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,تيرماښام لګښت ګټمنو مقدار
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,بلونه له خوا عرضه راپورته کړې.
 DocType: POS Profile,Write Off Account,حساب ولیکئ پړاو
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +78,Debit Note Amt,ډیبیټ یادونه نننیو
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +89,Debit Note Amt,ډیبیټ یادونه نننیو
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,تخفیف مقدار
 DocType: Purchase Invoice,Return Against Purchase Invoice,بېرته پر وړاندې رانيول صورتحساب
 DocType: Item,Warranty Period (in days),ګرنټی د دورې (په ورځو)
-apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,سره د اړیکو Guardian1
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +61,Failed to set defaults,د غلا کولو لپاره ناکام شو
+apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,سره د اړیکو Guardian1
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +797,Please select BOM against item {0},مهرباني وکړئ BOM د توکو په وړاندې وټاکئ {0}
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js +18,Make Invoices,انوائسونه جوړ کړئ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,له عملیاتو خالص د نغدو
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,د قالب 4
 DocType: Student Admission,Admission End Date,د شاملیدو د پای نیټه
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +30,Sub-contracting,فرعي قرارداد
 DocType: Journal Entry Account,Journal Entry Account,ژورنال انفاذ اکانټ
-apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,د زده کونکو د ګروپ
+apps/erpnext/erpnext/education/doctype/academic_year/academic_year.js +3,Student Group,د زده کونکو د ګروپ
 DocType: Shopping Cart Settings,Quotation Series,د داوطلبۍ لړۍ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item",توکی سره د ورته نوم شتون لري ({0})، لطفا د توکي ډلې نوم بدل کړي او يا د جنس نوم بدلولی شی
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,لطفا د مشتريانو د ټاکلو
+DocType: Soil Analysis Criteria,Soil Analysis Criteria,د خاورې تحلیل معیار
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2020,Please select customer,لطفا د مشتريانو د ټاکلو
 DocType: C-Form,I,زه
 DocType: Company,Asset Depreciation Cost Center,د شتمنيو د استهالک لګښت مرکز
 DocType: Sales Order Item,Sales Order Date,خرڅلاو نظم نېټه
 DocType: Sales Invoice Item,Delivered Qty,تحویلوونکی Qty
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.",که وکتل، د هر تولید توکي د ټولو ماشومانو به په مادي غوښتنې شامل شي.
 DocType: Assessment Plan,Assessment Plan,د ارزونې پلان
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,پیرودونکی {0} جوړ شوی.
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,پیرودونکی {0} جوړ شوی.
 DocType: Stock Settings,Limit Percent,حد سلنه
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,اوس مهال په کوم ګودام کې هیڅ ذخیره شتون نلري
 ,Payment Period Based On Invoice Date,د پیسو د دورې پر بنسټ د صورتحساب نېټه
 DocType: Sample Collection,No. of print,د چاپ شمیره
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},د ورکو پیسو د بدلولو د نرخونو او {0}
 DocType: Assessment Plan,Examiner,Examiner
-DocType: Patient Relation,Siblings,ورور
+DocType: Student,Siblings,ورور
 DocType: Journal Entry,Stock Entry,دحمل انفاذ
 DocType: Payment Entry,Payment References,د پیسو ماخذونه
 DocType: C-Form,C-FORM-,C-جوړښت
 DocType: Vehicle,Insurance Details,د بیمې په بشپړه توګه کتل
 DocType: Account,Payable,د تادیې وړ
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,لطفا د پور بيرته پړاوونه داخل
-apps/erpnext/erpnext/shopping_cart/cart.py +365,Debtors ({0}),پوروړو ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +376,Debtors ({0}),پوروړو ({0})
 DocType: Pricing Rule,Margin,څنډی
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,نوي پېرېدونکي
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,ټولټال ګټه ٪
 DocType: Appraisal Goal,Weightage (%),Weightage)٪ (
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +489,Change POS Profile,د POS پېژندل بدل کړئ
 DocType: Bank Reconciliation Detail,Clearance Date,بېلوګډو چاڼېزو نېټه
-apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,د ارزونې راپور
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Gross رانيول مقدار الزامی دی
+apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,د ارزونې راپور
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Gross رانيول مقدار الزامی دی
 DocType: Lead,Address Desc,د حل نزولی
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +101,Party is mandatory,ګوند الزامی دی
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,ګوند الزامی دی
 DocType: Journal Entry,JV-,JV-
+apps/erpnext/erpnext/controllers/accounts_controller.py +687,Rows with duplicate due dates in other rows were found: {list},په نورو قطارونو کې د دوه ځله ټاکل شوي نیټې سره قطعونه وموندل شول: {لیست}
 DocType: Topic,Topic Name,موضوع نوم
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,تيروخت د خرڅالو او يا د خريداري يو باید وټاکل شي
-apps/erpnext/erpnext/public/js/setup_wizard.js +33,Select the nature of your business.,د خپلې سوداګرۍ د ماهیت وټاکئ.
+apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,د خپلې سوداګرۍ د ماهیت وټاکئ.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
 <br>
 Compound for results which require multiple input fields with corresponding event names, result UOMs and normal values
@@ -3518,19 +3746,21 @@
 Grouped for test templates which are a group of other test templates.
 <br>
 No Result for tests with no results. Also, no Lab Test is created. e.g.. Sub Tests for Grouped results.",د پايلو لپاره يوازينۍ واحد چې يواځې يو واحد ته اړتيا لري، د UOM پايلې او عادي ارزښت <br> د پایلو لپاره مرکب چې د ورته پیښو د نومونو سره ډیری انډول ساحو ته اړتیا لري، د UOMs او عادي ارزښتونو پایله <br> د ازموینو لپاره تشریحات چې د ډیری پايلو برخې لري او د اړوندو پایلو داخلي ساحې لري. <br> د ټسټ ټکي لپاره ګروپ شوي کوم چې د نورو ازموینې چوکاټونه دي. <br> د هیڅ پایلو سره د ازموینې لپاره هیڅ نتیجه نه ده. همدارنګه، د لیب هیڅ آزموینه نده جوړه شوې. د مثال په توګه. د ګروپی پایلو لپاره فرعي ازموینه.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +73,Row #{0}: Duplicate entry in References {1} {2},د کتارونو تر # {0}: دوه ځلي په ماخذونه د ننوتلو {1} {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +75,Row #{0}: Duplicate entry in References {1} {2},د کتارونو تر # {0}: دوه ځلي په ماخذونه د ننوتلو {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,هلته عملیاتو په جوړولو سره کيږي.
 DocType: Asset Movement,Source Warehouse,سرچینه ګدام
 DocType: Installation Note,Installation Date,نصب او نېټه
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Row #{0}: Asset {1} does not belong to company {2},د کتارونو تر # {0}: د شتمنیو د {1} نه شرکت سره تړاو نه لري {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +585,Row #{0}: Asset {1} does not belong to company {2},د کتارونو تر # {0}: د شتمنیو د {1} نه شرکت سره تړاو نه لري {2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,د پلور انوائس {0} جوړ شوی
 DocType: Employee,Confirmation Date,باوريينه نېټه
 DocType: C-Form,Total Invoiced Amount,Total رسیدونو د مقدار
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +49,Min Qty can not be greater than Max Qty,Min Qty نه شي کولای Max Qty څخه ډيره وي
+DocType: Soil Texture,Silty Clay,د سپیټۍ کلی
 DocType: Account,Accumulated Depreciation,جمع د استهالک
 DocType: Supplier Scorecard Scoring Standing,Standing Name,تړل نوم
 DocType: Stock Entry,Customer or Supplier Details,پیرودونکي یا عرضه نورولوله
 DocType: Employee Loan Application,Required by Date,د اړتیا له خوا نېټه
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +222,Closing Balance (Dr - Cr),د تړلو بیلانس (ډاکټر - کر)
 DocType: Lead,Lead Owner,سرب د خاوند
 DocType: Bin,Requested Quantity,غوښتل شوي مقدار
 DocType: Patient,Marital Status,مدني حالت
@@ -3540,33 +3770,36 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,ناخالص معاشونو - ټول Deduction - پور بيرته ورکول
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,اوسني هیښ او نوي هیښ نه شي کولای ورته وي
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,معاش ټوټه ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,نېټه د تقاعد باید په پرتله د داخلیدل نېټه ډيره وي
-apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,غلطيو پر پلانونه جوړوي په داسې حال کې د کورس موجود وو:
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,نېټه د تقاعد باید په پرتله د داخلیدل نېټه ډيره وي
+apps/erpnext/erpnext/stock/doctype/item/item.js +68,Multiple Variants,ګڼ شمیر متغیرات
 DocType: Sales Invoice,Against Income Account,په وړاندې پر عايداتو باندې حساب
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}٪ تحویلوونکی
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,د قالب {0}: د سپارښتنې qty {1} نه نظم لږ تر لږه qty {2} (په قالب تعریف) په پرتله کمه وي.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +96,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,د قالب {0}: د سپارښتنې qty {1} نه نظم لږ تر لږه qty {2} (په قالب تعریف) په پرتله کمه وي.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,میاشتنی ویش سلنه
 apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,لطفا د بل کاروونکي په توګه ننوتل
 DocType: Territory,Territory Targets,خاوره موخې
+DocType: Soil Analysis,Ca/Mg,Ca / Mg
 DocType: Delivery Note,Transporter Info,لېږدول پيژندنه
-apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},لطفا په شرکت default {0} جوړ {1}
+apps/erpnext/erpnext/accounts/utils.py +499,Please set default {0} in Company {1},لطفا په شرکت default {0} جوړ {1}
 DocType: Cheque Print Template,Starting position from top edge,د پیل څخه د پورتنی څنډې مقام
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,ورته عرضه کړې څو ځلې داخل شوي دي
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,د ناخالصه ګټه / له لاسه ورکول
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,پیري نظم قالب برابر شوي
-apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,د شرکت نوم نه شي کولای د شرکت وي
+apps/erpnext/erpnext/public/js/setup_wizard.js +94,Company Name cannot be Company,د شرکت نوم نه شي کولای د شرکت وي
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,د چاپي کينډۍ لیک مشرانو.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,د چاپي کينډۍ عنوانونه لکه فورمه صورتحساب.
 DocType: Program Enrollment,Walking,ګرځي
 DocType: Student Guardian,Student Guardian,د زده کونکو د ګارډین
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,سنجي ډول تورونه نه په توګه د ټوليزې په نښه کولای شي
+DocType: Member,Member Name,د غړو نوم
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,سنجي ډول تورونه نه په توګه د ټوليزې په نښه کولای شي
 DocType: POS Profile,Update Stock,تازه دحمل
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,په ګډون کې
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,لپاره شیان ډول UOM به د ناسم (Total) خالص وزن ارزښت لامل شي. ډاډه کړئ چې د هر توکی خالص وزن په همدې UOM ده.
+DocType: Membership,Payment Details,د تاديې جزئيات
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,هیښ Rate
 DocType: Asset,Journal Entry for Scrap,د Scrap ژورنال انفاذ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,لطفآ د سپارنې پرمهال يادونه توکي وباسي
-apps/erpnext/erpnext/accounts/utils.py +467,Journal Entries {0} are un-linked,ژورنال توکي {0} دي un-سره تړاو لري
+apps/erpnext/erpnext/accounts/utils.py +469,Journal Entries {0} are un-linked,ژورنال توکي {0} دي un-سره تړاو لري
 apps/erpnext/erpnext/config/crm.py +92,"Record of all communications of type email, phone, chat, visit, etc.",د ډول ایمیل، فون، چت، سفر، او داسې نور د ټولو مخابراتي ریکارډ
 DocType: Supplier Scorecard Scoring Standing,Supplier Scorecard Scoring Standing,د سپرایورډ شمېره د سایډنګ سټینګنګ
 DocType: Manufacturer,Manufacturers used in Items,جوړونکو په توکي کارول
@@ -3576,9 +3809,10 @@
 DocType: Buying Settings,Purchase Order Required,پیري نظم مطلوب
 ,Item-wise Sales History,د قالب-هوښيار خرڅلاو تاریخ
 DocType: Expense Claim,Total Sanctioned Amount,Total تحریم مقدار
+DocType: Land Unit,Land Unit,د ځمکې واحد
 ,Purchase Analytics,رانيول Analytics
 DocType: Sales Invoice Item,Delivery Note Item,د سپارنې پرمهال يادونه د قالب
-DocType: Expense Claim,Task,کاري
+DocType: Asset Maintenance Log,Task,کاري
 DocType: Purchase Taxes and Charges,Reference Row #,ماخذ د کتارونو تر #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},د بستې شمېره لپاره د قالب الزامی دی {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,دا یو د ريښو د پلورنې د شخص او نه تصحيح شي.
@@ -3588,8 +3822,8 @@
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},Rate: {0}
 DocType: Company,Exchange Gain / Loss Account,په بدل کې لاسته راغلې ګټه / زیان اکانټ
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,د کارګر او د حاضرۍ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},هدف باید د یو وي {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Fill the form and save it,د فورمې په ډکولو او بيا يې خوندي
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Purpose must be one of {0},هدف باید د یو وي {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +116,Fill the form and save it,د فورمې په ډکولو او بيا يې خوندي
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,دانلود يو راپور پکې د ټولو خامو موادو سره د خپلو وروستيو انبار حالت
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,د ټولنې د بحث فورم
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,په سټاک واقعي qty
@@ -3603,7 +3837,7 @@
 DocType: Purchase Order,Get Items from Open Material Requests,له پرانیستې مادي غوښتنې لپاره توکي ترلاسه کړئ
 DocType: Lab Test Template,Standard Selling Rate,معياري پلورل Rate
 DocType: Account,Rate at which this tax is applied,په ميزان کي دغه ماليه د اجرا وړ ده
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +65,Reorder Qty,ترمیمي Qty
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +75,Reorder Qty,ترمیمي Qty
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,اوسنۍ دنده په پرانیستولو
 DocType: Company,Stock Adjustment Account,دحمل اصلاحاتو اکانټ
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,ولیکئ پړاو
@@ -3614,37 +3848,41 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +49,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,د ټولو موادو په وروستیو کې د وروستي قیمت نوي کولو لپاره قطع شوي. دا کیدای شي څو دقیقو وخت ونیسي.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,د نوو حساب نوم. یادونه: لطفا لپاره پېرودونکي او عرضه کوونکي حسابونو نه رامنځته کوي
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,د هیواد په تلواله پته نمونې
+DocType: Water Analysis,Appearance,بڼه
+apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +70,Avg. Buying Price List Rate,اوسط. د نرخ لیست نرخ
 DocType: Sales Order Item,Supplier delivers to Customer,عرضه کوونکي ته پيرودونکو برابروی
+apps/erpnext/erpnext/config/non_profit.py +23,Member information.,د غړو معلومات.
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# فورمه / د قالب / {0}) د ونډې څخه ده
+apps/erpnext/erpnext/assets/doctype/asset/asset.js +58,Asset Maintenance,د شتمنیو ساتنه
 ,Sales Payment Summary,د پلور تادیات لنډیز
 DocType: Restaurant,Restaurant,رستورانت
-apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},له امله / ماخذ نېټه وروسته نه شي {0}
+apps/erpnext/erpnext/accounts/party.py +323,Due / Reference Date cannot be after {0},له امله / ماخذ نېټه وروسته نه شي {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,په معلوماتو کې د وارداتو او صادراتو د
 DocType: Patient,Account Details,د حساب توضیحات
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,نه زده کوونکي موندل
+DocType: Crop,Materials Required,توکي اړین دي
+apps/erpnext/erpnext/education/doctype/student_group/student_group.py +76,No students Found,نه زده کوونکي موندل
 DocType: Medical Department,Medical Department,طبی څانګه
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,د سپرایټ شمیره د کرایه کولو معیارونه
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,صورتحساب نوکرې نېټه
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,وپلوري
-DocType: Sales Invoice,Rounded Total,غونډ مونډ Total
+DocType: Purchase Invoice,Rounded Total,غونډ مونډ Total
 DocType: Product Bundle,List items that form the package.,لست کې د اقلامو چې د بنډل جوړوي.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,سلنه تخصيص بايد مساوي له 100٪ وي
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,لطفا د ګوند په ټاکلو مخکې نوکرې نېټه وټاکئ
+DocType: Crop Cycle,Linked Land Unit,لینک شوی ځمکه
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,لطفا د ګوند په ټاکلو مخکې نوکرې نېټه وټاکئ
 DocType: Program Enrollment,School House,د ښوونځي ماڼۍ
 DocType: Serial No,Out of AMC,د AMC له جملې څخه
-apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,لطفا د داوطلبۍ انتخاب
-apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,لطفا د داوطلبۍ انتخاب
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,د Depreciations بک شمېر نه شي کولای ټول د Depreciations شمېر څخه ډيره وي
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,د Depreciations بک شمېر نه شي کولای ټول د Depreciations شمېر څخه ډيره وي
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,د کمکیانو لپاره د ساتنې او سفر
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,لطفا د کارونکي چې د خرڅلاو ماسټر مدير {0} رول سره اړیکه
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,لطفا د کارونکي چې د خرڅلاو ماسټر مدير {0} رول سره اړیکه
 DocType: Company,Default Cash Account,Default د نقدو پیسو حساب
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,شرکت (نه پيرودونکو يا عرضه) بادار.
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,دا د دې د زده کوونکو د ګډون پر بنسټ
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,په هيڅ ډول زده کوونکي
+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 +178,No Students in,په هيڅ ډول زده کوونکي
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,نور توکي یا علني بشپړه فورمه ورزیات کړئ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,د سپارنې پرمهال یاداښتونه {0} بايد بندول د دې خرڅلاو نظم مخکې لغوه شي
-apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,کاروونکو ته لاړ شه
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,ورکړل اندازه + ولیکئ پړاو مقدار نه شي کولای په پرتله Grand Total ډيره وي
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +212,Delivery Notes {0} must be cancelled before cancelling this Sales Order,د سپارنې پرمهال یاداښتونه {0} بايد بندول د دې خرڅلاو نظم مخکې لغوه شي
+apps/erpnext/erpnext/utilities/user_progress.py +256,Go to Users,کاروونکو ته لاړ شه
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,ورکړل اندازه + ولیکئ پړاو مقدار نه شي کولای په پرتله Grand Total ډيره وي
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} لپاره د قالب یو باوري دسته شمېر نه دی {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Note: There is not enough leave balance for Leave Type {0},نوټ: د اجازه ډول کافي رخصت توازن نه شته {0}
 apps/erpnext/erpnext/regional/india/utils.py +15,Invalid GSTIN or Enter NA for Unregistered,ناسم GSTIN يا د ناثبت شویو NA وليکئ
@@ -3662,30 +3900,34 @@
 DocType: Hub Settings,Publish Availability,پیدايښت د خپرېدو
 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 +107,Date of Birth cannot be greater than today.,د زېږېدو نېټه نه شي نن څخه ډيره وي.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,د زېږېدو نېټه نه شي نن څخه ډيره وي.
 ,Stock Ageing,دحمل Ageing
-apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},د زده کونکو د {0} زده کوونکو د درخواست په وړاندې د شته {1}
+apps/erpnext/erpnext/education/doctype/student/student.py +38,Student {0} exist against student applicant {1},د زده کونکو د {0} زده کوونکو د درخواست په وړاندې د شته {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),د سمبالولو رژیم (د شرکت پیسو)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Timesheet
-apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} &#39;{1}&#39; معلول دی
+DocType: Volunteer,Afternoon,ماسپښین
+apps/erpnext/erpnext/controllers/accounts_controller.py +256,{0} '{1}' is disabled,{0} &#39;{1}&#39; معلول دی
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,د ټاکل شويو Open
 DocType: Cheque Print Template,Scanned Cheque,سکن آرډر
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,اتومات بریښنالیکونو ته سپارل معاملو د اړيکې وليږئ.
 DocType: Timesheet,Total Billable Amount,Total Billable مقدار
+DocType: Customer,Credit Limit and Payment Terms,د کریډیټ محدودیت او د تادیاتو شرایط
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,د قالب 3
 apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,د امان داخله
 DocType: Purchase Order,Customer Contact Email,پيرودونکو سره اړيکي دبرېښنا ليک
 DocType: Warranty Claim,Item and Warranty Details,د قالب او ګرنټی نورولوله
+DocType: Chapter,Chapter Members,د فصل غړي
 DocType: Sales Team,Contribution (%),بسپنه)٪ (
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,يادونه: د پیسو د داخلولو به راهیسې جوړ نه شي &#39;د نغدي او يا بانک حساب ته&#39; نه مشخص
+apps/erpnext/erpnext/controllers/accounts_controller.py +100,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,يادونه: د پیسو د داخلولو به راهیسې جوړ نه شي &#39;د نغدي او يا بانک حساب ته&#39; نه مشخص
 DocType: Medical Department,Nursing User,د نرس کولو کارن
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,مسؤليتونه
+DocType: Plant Analysis,Plant Analysis Criterias,د پلان تحلیل کونکيري
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,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: Accounts Settings,Allow Stale Exchange Rates,د سټلایټ تبادلې نرخونو ته اجازه ورکړئ
 DocType: Sales Person,Sales Person Name,خرڅلاو شخص نوم
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,مهرباني وکړی په جدول تيروخت 1 صورتحساب ته ننوځي
-apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,کارنان ورزیات کړئ
+apps/erpnext/erpnext/utilities/user_progress.py +244,Add Users,کارنان ورزیات کړئ
 DocType: POS Item Group,Item Group,د قالب ګروپ
 DocType: Item,Safety Stock,د خونديتوب دحمل
 DocType: Healthcare Settings,Healthcare Settings,د روغتیا پاملرنې ترتیبونه
@@ -3693,75 +3935,79 @@
 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 +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,د قالب د مالياتو د کتارونو تر {0} بايد د ډول د مالياتو او يا د عايداتو او يا اخراجاتو یا Chargeable ګڼون لری
+apps/erpnext/erpnext/stock/doctype/item/item.py +461,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,د قالب د مالياتو د کتارونو تر {0} بايد د ډول د مالياتو او يا د عايداتو او يا اخراجاتو یا Chargeable ګڼون لری
 DocType: Sales Order,Partly Billed,خفيف د محاسبې
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,د قالب {0} بايد يوه ثابته شتمني د قالب وي
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,د قالب {0} بايد يوه ثابته شتمني د قالب وي
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Make Variants,ډولونه جوړ کړئ
 DocType: Item,Default BOM,default هیښ
+DocType: Project,Total Billed Amount (via Sales Invoices),د بشپړې شوې پیسې (د پلور انوګانو له لارې)
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Debit Note Amount,ډیبیټ يادونه مقدار
 apps/erpnext/erpnext/setup/doctype/company/company.js +60,Please re-type company name to confirm,مهرباني وکړئ د بيا ډول شرکت نوم د تایید
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +79,Total Outstanding Amt,Total وتلي نننیو
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Total Outstanding Amt,Total وتلي نننیو
 DocType: Journal Entry,Printing Settings,د چاپونې امستنې
+DocType: Employee Advance,Advance Account,د پرمختګ حساب
 DocType: Sales Invoice,Include Payment (POS),شامل دي تاديه (دفرت)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,Total Debit must be equal to Total Credit. The difference is {0},Total ګزارې بايد مساوي Total پور وي. د توپير دی {0}
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,مشين
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +290,Total Debit must be equal to Total Credit. The difference is {0},Total ګزارې بايد مساوي Total پور وي. د توپير دی {0}
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,مشين
 DocType: Vehicle,Insurance Company,د بیمې کمپنۍ
 DocType: Asset Category Account,Fixed Asset Account,د ثابت د شتمنیو د حساب
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,variable
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +414,Variable,variable
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,څخه د سپارنې يادونه
+DocType: Chapter,Members,غړي
 DocType: Student,Student Email Address,د زده کوونکو دبرېښنا ليک پته:
 DocType: Item,Hub Warehouse,هب ګودام
-DocType: Physician Schedule Time Slot,From Time,له وخت
+DocType: Assessment Plan,From Time,له وخت
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,په ګدام کښي:
 DocType: Notification Control,Custom Message,د ګمرکونو پيغام
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,د پانګونې د بانکداري
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +78,Cash or Bank Account is mandatory for making payment entry,د نغدي او يا بانک حساب د تادیاتو لپاره د ننوتلو کولو الزامی دی
-apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,د زده کوونکو پته
-apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,د زده کوونکو پته
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +33,Investment Banking,د پانګونې د بانکداري
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +79,Cash or Bank Account is mandatory for making payment entry,د نغدي او يا بانک حساب د تادیاتو لپاره د ننوتلو کولو الزامی دی
+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/accounts/doctype/account/account.py +253,Account Number {0} already used in account {1},د حساب شمیره {0} د مخه په حساب کې کارول شوې {1}
 DocType: POS Profile,POS Profile Name,د پی ایس پی ایل نوم
 DocType: Purchase Invoice Item,Rate,Rate
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,intern
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,پته نوم
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,intern
+DocType: Delivery Stop,Address Name,پته نوم
 DocType: Stock Entry,From BOM,له هیښ
 DocType: Assessment Code,Assessment Code,ارزونه کوډ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,د اساسي
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,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',مهرباني وکړی د &#39;تولید مهال ویش&#39; کیکاږۍ
-apps/erpnext/erpnext/config/stock.py +195,"e.g. Kg, Unit, Nos, m",د بيلګې په توګه کيلوګرامه، واحد، وځيري، متر
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,ماخذ نه فرض ده که تاسو ماخذ نېټه ته ننوتل
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,Reference No is mandatory if you entered Reference Date,ماخذ نه فرض ده که تاسو ماخذ نېټه ته ننوتل
 DocType: Bank Reconciliation Detail,Payment Document,د پیسو د سند
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,د معیار فارمول ارزونه کې تېروتنه
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date of Joining must be greater than Date of Birth,د داخلیدل نېټه بايد په پرتله د زېږېدو نېټه ډيره وي
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,د داخلیدل نېټه بايد په پرتله د زېږېدو نېټه ډيره وي
 DocType: Salary Slip,Salary Structure,معاش جوړښت
 DocType: Account,Bank,بانک د
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,هوايي شرکت
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,Issue مواد
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,هوايي شرکت
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +852,Issue Material,Issue مواد
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,د بیا ځلې کولو په وخت کې یوه تېروتنه رامنځته شوه
 DocType: Material Request Item,For Warehouse,د ګدام
 DocType: Employee,Offer Date,وړاندیز نېټه
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Quotations
-apps/erpnext/erpnext/accounts/page/pos/pos.js +711,You are in offline mode. You will not be able to reload until you have network.,تاسو په نالیکي اکر کې دي. تاسو به ونه کړای شي تر هغه وخته چې د شبکې لري بيا راولېښئ.
-apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,نه د زده کوونکو ډلو جوړ.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +726,You are in offline mode. You will not be able to reload until you have network.,تاسو په نالیکي اکر کې دي. تاسو به ونه کړای شي تر هغه وخته چې د شبکې لري بيا راولېښئ.
+apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,نه د زده کوونکو ډلو جوړ.
 DocType: Purchase Invoice Item,Serial No,پر له پسې ګڼه
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,میاشتنی پور بيرته مقدار نه شي کولای د پور مقدار زیات شي
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,مهرباني وکړئ لومړی داخل Maintaince نورولوله
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,Row # {0}: د تمویل شوي نیټه نیټه د اخیستلو د نیټې نه مخکې نشي کیدی
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,Row # {0}: د تمویل شوي نیټه نیټه د اخیستلو د نیټې نه مخکې نشي کیدی
 DocType: Purchase Invoice,Print Language,چاپ ژبه
 DocType: Salary Slip,Total Working Hours,Total کاري ساعتونه
 DocType: Subscription,Next Schedule Date,د بل شیدو نیټه
 DocType: Stock Entry,Including items for sub assemblies,په شمول د فرعي شوراګانو لپاره شیان
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,وليکئ ارزښت باید مثبتې وي
+DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,د لنډ وخت پرانيستلو حساب
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1943,Enter value must be positive,وليکئ ارزښت باید مثبتې وي
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,ټول سیمې
 DocType: Purchase Invoice,Items,توکي
-apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,د زده کوونکو د مخکې شامل.
+apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +28,Student is already enrolled.,د زده کوونکو د مخکې شامل.
 DocType: Fiscal Year,Year Name,کال نوم
-DocType: Process Payroll,Process Payroll,د بهیر د معاشاتو
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,په دې مياشت کاري ورځو څخه زيات د رخصتيو په شتون لري.
 DocType: Product Bundle Item,Product Bundle Item,د محصول د بنډل په قالب
 DocType: Sales Partner,Sales Partner Name,خرڅلاو همکار نوم
-apps/erpnext/erpnext/hooks.py +132,Request for Quotations,د داوطلبۍ غوښتنه
+apps/erpnext/erpnext/hooks.py +136,Request for Quotations,د داوطلبۍ غوښتنه
 DocType: Payment Reconciliation,Maximum Invoice Amount,اعظمي صورتحساب مقدار
-apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,هانټولوژی
+apps/erpnext/erpnext/healthcare/setup.py +210,Haematology,هانټولوژی
 DocType: Normal Test Items,Normal Test Items,د عادي ازموینې توکي
 DocType: Student Language,Student Language,د زده کوونکو ژبه
 apps/erpnext/erpnext/config/selling.py +23,Customers,پېرودونکي
@@ -3772,11 +4018,12 @@
 DocType: Asset,Partially Depreciated,تر یوه بریده راکم شو
 DocType: Issue,Opening Time,د پرانستلو په وخت
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,څخه او د خرما اړتیا
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,امنيت &amp; Commodity exchanges
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',د variant اندازه Default واحد &#39;{0}&#39; باید په کينډۍ ورته وي &#39;{1}&#39;
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,امنيت &amp; Commodity exchanges
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',د variant اندازه Default واحد &#39;{0}&#39; باید په کينډۍ ورته وي &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,محاسبه په اساس
 DocType: Delivery Note Item,From Warehouse,له ګدام
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,سره د توکو بیل نه توکي تولید
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +59,No employees for the mentioned criteria,د ذکر شویو معیارونو لپاره هیڅ کارمندان نشته
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,سره د توکو بیل نه توکي تولید
 DocType: Restaurant,Default Customer,اصلي پیرودونکی
 DocType: Assessment Plan,Supervisor Name,څارونکي نوم
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,دا تایید نه کړئ که چیرې د ورته ورځې لپاره ټاکنې جوړې شي
@@ -3787,41 +4034,42 @@
 DocType: Tax Rule,Shipping City,انتقال ښار
 DocType: Notification Control,Customize the Notification,د خبرتیا دتنظيمولو
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,له عملیاتو په نقدو پیسو د جریان
-DocType: Sales Invoice,Shipping Rule,انتقال حاکمیت
+DocType: Purchase Invoice,Shipping Rule,انتقال حاکمیت
 DocType: Patient Relation,Spouse,ښځه
 DocType: Lab Test Groups,Add Test,ازموينه زياته کړئ
 DocType: Manufacturer,Limited to 12 characters,محدود تر 12 تورو
 DocType: Journal Entry,Print Heading,چاپ Heading
+apps/erpnext/erpnext/config/stock.py +146,Delivery Trip service tours to customers.,پیرودونکو ته د خدمتونو لیږد سفر.
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +57,Total cannot be zero,Total نه شي کولای صفر وي
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,&#39;ورځو راهیسې تېر نظم&#39; باید په پرتله لویه یا د صفر سره مساوي وي
-DocType: Process Payroll,Payroll Frequency,د معاشونو د فریکونسۍ
+DocType: Plant Analysis Criteria,Maximum Permissible Value,د زیاتو اجازه ورکونکو ارزښت
+DocType: Journal Entry Account,Employee Advance,د کارموندنې پرمختیا
+DocType: Payroll Entry,Payroll Frequency,د معاشونو د فریکونسۍ
 DocType: Lab Test Template,Sensitivity,حساسیت
-DocType: Asset,Amended From,تعدیل له
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Raw Material,خام توکي
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +62,Raw Material,خام توکي
 DocType: Leave Application,Follow via Email,ایمیل له لارې تعقيب
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,د نباتاتو او ماشینونو
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,د مالیې د مقدار کمښت مقدار وروسته
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,هره ورځ د کار لنډیز امستنې
 DocType: Payment Entry,Internal Transfer,کورني انتقال
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,د دې په پام کې د ماشومانو د حساب موجود دی. تاسو نه شي کولای دغه بانکی حساب د ړنګولو.
+DocType: Asset Maintenance,Maintenance Tasks,د ترمیم دندې
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,يا هدف qty يا هدف اندازه فرض ده
-apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},نه default هیښ لپاره د قالب موجود {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,مهرباني وکړئ لومړی انتخاب نوکرې نېټه
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +367,Please select Posting Date first,مهرباني وکړئ لومړی انتخاب نوکرې نېټه
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,پرانيستل نېټه بايد تړل د نیټې څخه مخکې وي
 DocType: Leave Control Panel,Carry Forward,مخ په وړاندې ترسره کړي
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,د موجوده معاملو لګښت مرکز بدل نه شي چې د پنډو
 DocType: Department,Days for which Holidays are blocked for this department.,ورځو لپاره چې د رخصتۍ لپاره د دې ادارې تړل شوي دي.
+DocType: Crop Cycle,Detected Disease,ناروغی معلوم شوی
 ,Produced,تولید
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +118,Created Salary Slips,ايجاد معاش رسید
 DocType: Item,Item Code for Suppliers,د عرضه کوونکي د قالب کوډ
 DocType: Issue,Raised By (Email),راپورته By (Email)
 DocType: Training Event,Trainer Name,د روزونکي نوم
 DocType: Mode of Payment,General,جنرال
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,تېر مخابراتو
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,تېر مخابراتو
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +355,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',وضع نه شي کله چې وېشنيزه کې د &#39;ارزښت&#39; یا د &#39;ارزښت او Total&#39; دی
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',وضع نه شي کله چې وېشنيزه کې د &#39;ارزښت&#39; یا د &#39;ارزښت او Total&#39; دی
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +234,Serial Nos Required for Serialized Item {0},د Serialized د قالب سریال ترانسفارمرونو د مطلوب {0}
-apps/erpnext/erpnext/config/accounts.py +152,Match Payments with Invoices,سره صورتحساب لوبه د پیسو ورکړه
+apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,سره صورتحساب لوبه د پیسو ورکړه
 DocType: Journal Entry,Bank Entry,بانک د داخلولو
 DocType: Authorization Rule,Applicable To (Designation),د تطبیق وړ د (دنده)
 ,Profitability Analysis,دګټي تحلیل
@@ -3831,17 +4079,19 @@
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,کارټ ته یی اضافه کړه
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,ډله په
 DocType: Guardian,Interests,د ګټو
-apps/erpnext/erpnext/config/accounts.py +306,Enable / disable currencies.,فعال / معلول اسعارو.
+apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,فعال / معلول اسعارو.
 DocType: Production Planning Tool,Get Material Request,د موادو غوښتنه ترلاسه کړئ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,د پستي داخراجاتو
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (نننیو)
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,ساعتېري &amp; تفريح
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,ساعتېري &amp; تفريح
+,Item Variant Details,د توکي ډول توکی
 DocType: Quality Inspection,Item Serial No,د قالب شعبه
 apps/erpnext/erpnext/utilities/activation.py +135,Create Employee Records,کارکوونکی سوابق جوړول
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,Total حاضر
-apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,د محاسبې څرګندونې
+apps/erpnext/erpnext/config/accounts.py +105,Accounting Statements,د محاسبې څرګندونې
 DocType: Drug Prescription,Hour,ساعت
 DocType: Restaurant Order Entry,Last Sales Invoice,د پلورنې وروستنی تیلیفون
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +799,Please select Qty against item {0},مهرباني وکړئ د مقدار په مقابل کښی مقدار انتخاب کړئ {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,نوی شعبه نه شي ګدام لري. ګدام باید د سټاک انفاذ يا رانيول رسيد جوړ شي
 DocType: Lead,Lead Type,سرب د ډول
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,تاسو اختيار نه لري چې پر بالک نیټی پاڼو تصویب
@@ -3853,6 +4103,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,نامعلوم
 DocType: Shipping Rule,Shipping Rule Conditions,انتقال حاکمیت شرايط
 DocType: Purchase Invoice,Export Type,د صادرولو ډول
+DocType: Salary Slip Loan,Salary Slip Loan,د معاش لپ ټاپ
 DocType: BOM Update Tool,The new BOM after replacement,د ځای ناستی وروسته د نوي هیښ
 ,Point of Sale,د دخرسون ټکی
 DocType: Payment Entry,Received Amount,د مبلغ
@@ -3860,80 +4111,89 @@
 DocType: GST Settings,GSTIN Email Sent On,GSTIN برېښناليک لېږلو د
 DocType: Program Enrollment,Pick/Drop by Guardian,دپاک / خوا ګارډین &#39;خه
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order",د بشپړ مقدار جوړول، لا له وړاندي په موخه سترګې پټې کمیت
+DocType: Crop,Planting UOM,د UOM کښت کول
 DocType: Account,Tax,د مالياتو
-apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,نه ولمانځل شوه
+apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,نه ولمانځل شوه
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,د انوګانو لنډیز
+DocType: Education Settings,Education Manager,د ښوونکي مدیر
 DocType: Production Planning Tool,Production Planning Tool,تولید پلان جوړونې وسيله:
+DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,د مطلوبه ودې لپاره په ساحه کې د هر نبات تر مینځ لږترلږه اوږدوالی
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",يووړل شمیره {0} سټاک پخلاينې په کارولو نه تازه شي، پر ځای سټاک دکانکورازموينه وکاروي
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",يووړل شمیره {0} سټاک پخلاينې په کارولو نه تازه شي، پر ځای سټاک دکانکورازموينه وکاروي
 DocType: Quality Inspection,Report Date,د راپور تاریخ
 DocType: Student,Middle Name,منځنی نوم
 DocType: C-Form,Invoices,رسیدونه
+DocType: Water Analysis,Type of Sample,د نمونې ډول
 DocType: Batch,Source Document Name,سرچینه د سند نوم
 DocType: Batch,Source Document Name,سرچینه د سند نوم
 DocType: Job Opening,Job Title,د دندې سرلیک
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py +84,"{0} indicates that {1} will not provide a quotation, but all items \
 					have been quoted. Updating the RFQ quote status.",{1} اشاره کوي چې {1} به یو کوډ چمتو نکړي، مګر ټول توکي \ نقل شوي دي. د آر ایف پی د اقتباس حالت وضع کول
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +971,Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}.,ډیری نمونې - {1} د مخه د بچ لپاره {1} او Item {2} په بچ {3} کې ساتل شوي دي.
 DocType: Manufacturing Settings,Update BOM Cost Automatically,د بوم لګښت په اوتوماتیک ډول خپور کړئ
 DocType: Lab Test,Test Name,د ازموینې نوم
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,کارنان جوړول
-apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,ګرام
+apps/erpnext/erpnext/utilities/user_progress.py +144,Gram,ګرام
 DocType: Supplier Scorecard,Per Month,په میاشت کې
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,مقدار تولید باید په پرتله 0 ډيره وي.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +414,Quantity to Manufacture must be greater than 0.,مقدار تولید باید په پرتله 0 ډيره وي.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,د ساتنې غوښتنې ته راپور ته سفر وکړي.
 DocType: Stock Entry,Update Rate and Availability,تازه Rate او پیدايښت
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,سلنه تاسو اجازه لري چې د تر لاسه او یا د کمیت امر په وړاندې د زيات ورسوي. د مثال په توګه: که تاسو د 100 واحدونو ته امر وکړ. او ستاسو امتياز٪ 10 نو بيا تاسو ته اجازه لري چې 110 واحدونه ترلاسه ده.
 DocType: POS Customer Group,Customer Group,پيرودونکو ګروپ
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),نوي دسته تذکرو (اختیاري)
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),نوي دسته تذکرو (اختیاري)
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},اخراجاتو حساب لپاره توکی الزامی دی {0}
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +120,New Batch ID (Optional),نوي دسته تذکرو (اختیاري)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +120,New Batch ID (Optional),نوي دسته تذکرو (اختیاري)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,Expense account is mandatory for item {0},اخراجاتو حساب لپاره توکی الزامی دی {0}
 DocType: BOM,Website Description,وېب پاڼه Description
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,په مساوات خالص د بدلون
 apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,نوي
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,لطفا لغوه رانيول صورتحساب {0} په لومړي
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,لطفا لغوه رانيول صورتحساب {0} په لومړي
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",دبرېښنا ليک پته بايد د بې سارې وي، له مخکې د شتون {0}
 DocType: Serial No,AMC Expiry Date,AMC د پای نېټه
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,رسيد
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +865,Receipt,رسيد
 ,Sales Register,خرڅلاو د نوم ثبتول
 DocType: Daily Work Summary Settings Company,Send Emails At,برېښناليک وليږئ کې
 DocType: Quotation,Quotation Lost Reason,د داوطلبۍ ورک دلیل
-apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,ستاسو د Domain وټاکئ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},د راکړې ورکړې اشاره نه {0} د میاشتې په {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Transaction reference no {0} dated {1},د راکړې ورکړې اشاره نه {0} د میاشتې په {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,هيڅ د سمولو لپاره شتون لري.
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,د فارم لید
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +476,Form View,د فارم لید
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,لنډيز لپاره د دې مياشتې او په تمه فعالیتونو
-apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.",کاروونکي د خپل ځان پرته بل سازمان ته اضافه کړئ.
+apps/erpnext/erpnext/utilities/user_progress.py +245,"Add users to your organization, other than yourself.",کاروونکي د خپل ځان پرته بل سازمان ته اضافه کړئ.
 DocType: Customer Group,Customer Group Name,پيرودونکو ډلې نوم
 apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,نه پېرېدونکي تر اوسه!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,نقدو پیسو د جریان اعلامیه
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},د پور مقدار نه شي کولای د اعظمي پور مقدار زیات {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,منښتليک
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},لطفا لرې دې صورتحساب {0} څخه C-فورمه {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},لطفا لرې دې صورتحساب {0} څخه C-فورمه {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,مهرباني غوره مخ په وړاندې ترسره کړي که تاسو هم غواړي چې عبارت دي د تېر مالي کال د توازن د دې مالي کال ته روان شو
 DocType: GL Entry,Against Voucher Type,په وړاندې د ګټمنو ډول
 DocType: Physician,Phone (R),تلیفون (R)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,د وخت وختونه شامل دي
 DocType: Item,Attributes,صفات
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,کينډۍ فعالول
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,لطفا حساب ولیکئ پړاو
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +226,Please enter Write Off Account,لطفا حساب ولیکئ پړاو
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,تېره نظم نېټه
 DocType: Patient,B Negative,B منفي
+apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +25,Maintenance Status has to be Cancelled or Completed to Submit,د ساتنې حالت باید فسخ شي یا بشپړ شي
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},ګڼون {0} کوي شرکت ته نه پورې {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,Serial Numbers in row {0} does not match with Delivery Note,په قطار {0} سریال شمیرې سره د سپارلو يادونه سره سمون نه خوري
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +878,Serial Numbers in row {0} does not match with Delivery Note,په قطار {0} سریال شمیرې سره د سپارلو يادونه سره سمون نه خوري
 DocType: Student,Guardian Details,د ګارډین په بشپړه توګه کتل
 DocType: C-Form,C-Form,C-فورمه
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,د څو کارکوونکي مارک حاضريدل
+DocType: Agriculture Task,Start Day,د پیل ورځ
 DocType: Vehicle,Chassis No,Chassis نه
 DocType: Payment Request,Initiated,پیل
 DocType: Production Order,Planned Start Date,پلان د پیل نیټه
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,مهرباني وکړئ BOM غوره کړئ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +596,Please select a BOM,مهرباني وکړئ BOM غوره کړئ
 DocType: Serial No,Creation Document Type,د خلقت د سند ډول
+DocType: Project Task,View Timesheet,ټايمز پاڼه وګورئ
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,د پای نیټه باید د پیل نیټې څخه ډیره وي
 DocType: Leave Type,Is Encash,ده Encash
 DocType: Leave Allocation,New Leaves Allocated,نوې پاڼې د تخصيص
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,د پروژې-هوښيار معلوماتو لپاره د داوطلبۍ شتون نه لري
-apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,په پای کې
+apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +30,End on,په پای کې
 DocType: Project,Expected End Date,د تمی د پای نیټه
 DocType: Budget Account,Budget Amount,د بودجې د مقدار
+DocType: Donor,Donor Name,د ډونر نوم
 DocType: Appraisal Template,Appraisal Template Title,ارزونې کينډۍ عنوان
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +39,From Date {0} for Employee {1} cannot be before employee's joining Date {2},له نېټه {0} د کارکوونکی د {1} مخکې د کارکوونکي د یوځای نېټه نه وي {2}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,سوداګریز
@@ -3945,32 +4205,34 @@
 DocType: Expense Claim,More Details,نورولوله
 DocType: Supplier Quotation,Supplier Address,عرضه پته
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} لپاره د حساب د بودجې د {1} په وړاندې د {2} {3} دی {4}. دا به د زیات {5}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',د کتارونو تر {0} # حساب بايد د ډول وي شتمن &#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +689,Row {0}# Account must be of type 'Fixed Asset',د کتارونو تر {0} # حساب بايد د ډول وي شتمن &#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,له جملې څخه Qty
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,او په معلول معلولیت لرونکی
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,لړۍ الزامی دی
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,مالي خدمتونه
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,مالي خدمتونه
 DocType: Student Sibling,Student ID,زده کوونکي د پیژندنې
 apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,د پیرودونکي برېښلیک
 apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,لپاره د وخت کندي د فعالیتونو ډولونه
-DocType: Tax Rule,Sales,خرڅلاو
+DocType: Opening Invoice Creation Tool,Sales,خرڅلاو
 DocType: Stock Entry Detail,Basic Amount,اساسي مقدار
 DocType: Training Event,Exam,ازموينه
 DocType: Complaint,Complaint,شکایت
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},ګدام لپاره سټاک د قالب اړتیا {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},ګدام لپاره سټاک د قالب اړتیا {0}
 DocType: Leave Allocation,Unused leaves,ناکارېدلې پاڼي
 DocType: Patient,Alcohol Past Use,الکولي پخوانی کارول
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,CR
+DocType: Fertilizer Content,Fertilizer Content,د سرې وړ منځپانګه
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +188,Cr,CR
 DocType: Tax Rule,Billing State,د بیلونو د بهرنیو چارو
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,د انتقال د
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),چاودنه هیښ (فرعي شوراګانو په ګډون) د راوړلو
+apps/erpnext/erpnext/assets/doctype/asset/asset.js +296,Transfer,د انتقال د
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +916,Fetch exploded BOM (including sub-assemblies),چاودنه هیښ (فرعي شوراګانو په ګډون) د راوړلو
 DocType: Authorization Rule,Applicable To (Employee),د تطبیق وړ د (کارکوونکی)
-apps/erpnext/erpnext/controllers/accounts_controller.py +113,Due Date is mandatory,له امله نېټه الزامی دی
+apps/erpnext/erpnext/controllers/accounts_controller.py +135,Due Date is mandatory,له امله نېټه الزامی دی
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,د خاصې لپاره بهرمن {0} 0 نه شي
 DocType: Journal Entry,Pay To / Recd From,د / Recd له ورکړي
 DocType: Naming Series,Setup Series,Setup لړۍ
 DocType: Payment Reconciliation,To Invoice Date,ته صورتحساب نېټه
 DocType: Supplier,Contact HTML,د تماس د HTML
+DocType: Disease,Treatment Period,د درملنې موده
 ,Inactive Customers,ناچارنده پېرودونکي
 DocType: Student Admission Program,Maximum Age,لوړ عمر
 DocType: Landed Cost Voucher,LCV,LCV
@@ -3979,13 +4241,13 @@
 DocType: Stock Entry,Delivery Note No,د سپارنې پرمهال يادونه نه
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created",که وکتل، يوازې پیري وروستۍ خامو موادو د مادي غوښتنې به په مادي غوښتنې شامل شي. که نه نو، د مور او پلار په پېژندتورو مادي غوښتنې به رامنځته شي
 DocType: Cheque Print Template,Message to show,پيغام تر څو وښيي
-DocType: Company,Retail,پرچون
-DocType: Attendance,Absent,غیرحاضر
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,د محصول د بنډل
+apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,پرچون
+DocType: Student Attendance,Absent,غیرحاضر
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,د محصول د بنډل
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,په {0} پېل کې د پېسو د موندلو توان نلري. تاسو اړتیا لرئ چې د 0 څخه تر 100 پورې پوښلو ته ولاړ شئ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},د کتارونو تر {0}: ناسم مرجع {1}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +206,No submitted Delivery Notes found,د سپارلو سپارښتنې نښې موندل شوي ندي
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,Row {0}: Invalid reference {1},د کتارونو تر {0}: ناسم مرجع {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,پیري مالیات او په تور کينډۍ
-DocType: Upload Attendance,Download Template,دانلود کينډۍ
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} د {1}: یا ډیبیټ یا د پور اندازه د اړتيا {2}
 DocType: GL Entry,Remarks,څرګندونې
@@ -3996,31 +4258,35 @@
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,د کمکیانو لپاره د مشرتابه
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,چاپ او قرطاسيه
 DocType: Stock Settings,Show Barcode Field,انکړپټه ښودل Barcode ساحوي
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,Send Supplier Emails,عرضه برېښناليک وليږئ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +807,Send Supplier Emails,عرضه برېښناليک وليږئ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",معاش لا د تر منځ د {0} او {1}، پريږدئ درخواست موده دې نېټې لړ تر منځ نه وي موده پروسس.
-apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,لپاره د سریال شمیره نصب ریکارډ
 DocType: Guardian Interest,Guardian Interest,د ګارډین په زړه پوري
-apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,د پیسو د انوز لپاره د بیالبیلو ارزښتونو ترتیبول
-apps/erpnext/erpnext/config/hr.py +177,Training,د روزنې
+DocType: Volunteer,Availability,شتون
+apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,د پیسو د انوز لپاره د بیالبیلو ارزښتونو ترتیبول
+apps/erpnext/erpnext/config/hr.py +182,Training,د روزنې
 DocType: Timesheet,Employee Detail,د کارګر تفصیلي
-apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 بريښناليک ID
-apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 بريښناليک ID
+apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 بريښناليک ID
+apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 بريښناليک ID
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,بل نېټه د ورځې او د مياشتې په ورځ تکرار بايد مساوي وي
 DocType: Lab Prescription,Test Code,د ازموینې کود
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,د ویب پاڼه امستنې
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},RFJs د {1} لپاره د سکډورډ کارډ له امله اجازه نه لري {1}
+DocType: Delivery Stop,Select/Unselect Delivery Notes,د سپارلو یادښتونه غوره او غوره کړئ
 DocType: Offer Letter,Awaiting Response,په تمه غبرګون
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,پورته
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},ټوله شمیره {0}
-apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},ناباوره ځانتیا د {0} د {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1375,Total Amount {0},ټوله شمیره {0}
+apps/erpnext/erpnext/controllers/item_variant.py +301,Invalid attribute {0} {1},ناباوره ځانتیا د {0} د {1}
 DocType: Supplier,Mention if non-standard payable account,یادونه که غیر معیاري د تادیې وړ حساب
-apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',لطفا د ارزونې په پرتله &#39;ټول ارزونه ډلو د نورو ګروپ غوره
+apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',لطفا د ارزونې په پرتله &#39;ټول ارزونه ډلو د نورو ګروپ غوره
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Row {0}: د توکو لپاره د لګښت مرکز ته اړتیا ده {1}
 DocType: Training Event Employee,Optional,اختیاري
 DocType: Salary Slip,Earning & Deduction,وټې &amp; Deduction
-apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,اختیاري. دا امستنې به په بېلا بېلو معاملو چاڼ وکارول شي.
+DocType: Agriculture Analysis Criteria,Water Analysis,د اوبو تحلیل
+DocType: Chapter,Region,Region
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,اختیاري. دا امستنې به په بېلا بېلو معاملو چاڼ وکارول شي.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,منفي ارزښت Rate اجازه نه وي
 DocType: Holiday List,Weekly Off,د اونۍ پړاو
+apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,لینک شوي تجزیه بیاکتنه
 DocType: Fiscal Year,"For e.g. 2012, 2012-13",د بيلګې په توګه د 2012 کال، 2012-13
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +96,Provisional Profit / Loss (Credit),مؤقت ګټه / زیان (اعتبار)
 DocType: Sales Invoice,Return Against Sales Invoice,بېرته پر وړاندې د خرڅلاو صورتحساب
@@ -4032,10 +4298,10 @@
 ,Monthly Attendance Sheet,میاشتنی حاضرۍ پاڼه
 DocType: Production Order Item,Production Order Item,تولید نظم قالب
 apps/erpnext/erpnext/healthcare/report/lab_test_report/lab_test_report.py +15,No record found,څه شی پيدا نشول
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,د پرزه د شتمنیو د لګښت
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,د پرزه د شتمنیو د لګښت
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} د {1}: لګښت لپاره مرکز د قالب الزامی دی {2}
 DocType: Vehicle,Policy No,د پالیسۍ نه
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,څخه د محصول د بنډل توکي ترلاسه کړئ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +684,Get Items from Product Bundle,څخه د محصول د بنډل توکي ترلاسه کړئ
 DocType: Asset,Straight Line,سیده کرښه
 DocType: Project User,Project User,د پروژې د کارن
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,وېشل شوى
@@ -4048,6 +4314,8 @@
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,تېر مخابراتو نېټه
 DocType: Sales Team,Contact No.,د تماس شمیره
 DocType: Bank Reconciliation,Payment Entries,د پیسو توکي
+DocType: Land Unit,Land Unit Details,د ځمکې څانګې تفصیلات
+DocType: Land Unit,Latitude,عرضه
 DocType: Production Order,Scrap Warehouse,د اوسپنې ګدام
 DocType: Production Order,Check if material transfer entry is not required,وګورئ که د موادو د ليږدونې د ننوتلو ته اړتيا نه ده
 DocType: Production Order,Check if material transfer entry is not required,وګورئ که د موادو د ليږدونې د ننوتلو ته اړتيا نه ده
@@ -4061,77 +4329,83 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,خرڅلاو مالیات او په تور کينډۍ
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),Total (اعتبار)
 DocType: Repayment Schedule,Payment Date,د تادیاتو نېټه
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,نوي دسته Qty
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,نوي دسته Qty
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,پوښاک تلسکوپی
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +114,New Batch Qty,نوي دسته Qty
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +114,New Batch Qty,نوي دسته Qty
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +10,Apparel & Accessories,پوښاک تلسکوپی
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,نشي کولی د وزن شوي سکور فعالیتونه حل کړي. ډاډ ترلاسه کړئ چې فارمول اعتبار لري.
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,د نظم شمېر
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / بنر چې به د محصول د لست په سر وښيي.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,شرایطو ته انتقال اندازه محاسبه ليکئ
+DocType: Program Enrollment,Institute's Bus,د انسټیټوټ بس
 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 +28,Cannot convert Cost Center to ledger as it has child nodes,ته د پنډو لګښت مرکز بدلوي نشي کولای، ځکه دا د ماشوم غوټو لري
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +56,Opening Value,د پرانستلو په ارزښت
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +66,Opening Value,د پرانستلو په ارزښت
 DocType: Salary Detail,Formula,فورمول
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,سریال #
 DocType: Lab Test Template,Lab Test Template,د لابراتوار ازموینه
+DocType: Purchase Invoice Item,Total Weight,ټول وزن
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,د کمیسیون په خرڅلاو
 DocType: Offer Letter Term,Value / Description,د ارزښت / Description
-apps/erpnext/erpnext/controllers/accounts_controller.py +565,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",د کتارونو تر # {0}: د شتمنیو د {1} نه شي وړاندې شي، دا لا دی {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +609,"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,د رستورانت امر
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ډیبیټ او اعتبار د {0} # مساوي نه {1}. توپير دی {2}.
+DocType: Asset Maintenance Task,Assign To Name,نوم ته مراجعه وکړئ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,ساعتېري داخراجاتو
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,د موادو غوښتنه د کمکیانو لپاره د
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +63,Make Material Request,د موادو غوښتنه د کمکیانو لپاره د
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},د پرانیستې شمیره {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Sales Invoice {0} must be cancelled before cancelling this Sales Order,خرڅلاو صورتحساب {0} بايد لغوه شي بندول د دې خرڅلاو نظم مخکې
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +222,Sales Invoice {0} must be cancelled before cancelling this Sales Order,خرڅلاو صورتحساب {0} بايد لغوه شي بندول د دې خرڅلاو نظم مخکې
 DocType: Consultation,Age,عمر
 DocType: Sales Invoice Timesheet,Billing Amount,د بیلونو په مقدار
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,باطلې کمیت لپاره توکی مشخص {0}. مقدار باید په پرتله 0 ډيره وي.
+DocType: Company,Default Employee Advance Account,د اصلي کارمندانو پرمختیا حساب
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,لپاره رخصت غوښتنلیکونه.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,سره د موجوده د راکړې ورکړې حساب نه ړنګ شي
+apps/erpnext/erpnext/accounts/doctype/account/account.py +166,Account with existing transaction can not be deleted,سره د موجوده د راکړې ورکړې حساب نه ړنګ شي
 DocType: Vehicle,Last Carbon Check,تېره کاربن Check
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,قانوني داخراجاتو
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,لطفا د قطار په کمیت وټاکي
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +140,Please select quantity on row ,لطفا د قطار په کمیت وټاکي
+apps/erpnext/erpnext/config/accounts.py +277,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 +118,Telephone Expenses,Telephone داخراجاتو
 DocType: Sales Partner,Logo,logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,وګورئ دا که تاسو غواړئ چې د کارونکي زور راوړي ترڅو د سپما لپاره مخکې له یو لړ ټاکي. هلته به نه default وي که چېرې تاسو د دې وګورئ.
-apps/erpnext/erpnext/stock/get_item_details.py +135,No Item with Serial No {0},سره سریال نه نه د قالب {0}
+apps/erpnext/erpnext/stock/get_item_details.py +129,No Item with Serial No {0},سره سریال نه نه د قالب {0}
 DocType: Email Digest,Open Notifications,د پرانستې د خبرتیا
 DocType: Payment Entry,Difference Amount (Company Currency),توپیر رقم (شرکت د اسعارو)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,مستقیم لګښتونه
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,مهرباني وکړئ په تعلیم کې د ښوونکي د نومونې سیسټم جوړ کړئ&gt; د زده کړې ترتیبات
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,نوي پېرېدونکي د عوایدو
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,د سفر لګښت
 DocType: Maintenance Visit,Breakdown,د ماشین یا د ګاډي ناڅاپه خرابېدل
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},په doctype کې د ګمرک ساحه ګډون کړئ {0}
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Account: {0} with currency: {1} can not be selected,ګڼون: {0} سره اسعارو: {1} غوره نه شي
+apps/erpnext/erpnext/controllers/accounts_controller.py +789,Account: {0} with currency: {1} can not be selected,ګڼون: {0} سره اسعارو: {1} غوره نه شي
+DocType: Purchase Receipt Item,Sample Quantity,نمونې مقدار
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",د BOM تازه معلومات د مهال ویش له لارې لګښت کوي، د قیمت د قیمت د نرخ / د نرخونو نرخ / د خامو موادو اخیستل شوي نرخ پر اساس.
 DocType: Bank Reconciliation Detail,Cheque Date,آرډر نېټه
-apps/erpnext/erpnext/accounts/doctype/account/account.py +54,Account {0}: Parent account {1} does not belong to company: {2},ګڼون {0}: Parent حساب {1} نه پورې شرکت نه لري چې: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},ګڼون {0}: Parent حساب {1} نه پورې شرکت نه لري چې: {2}
 DocType: Program Enrollment Tool,Student Applicants,د زده کونکو د درخواست
 apps/erpnext/erpnext/setup/doctype/company/company.js +77,Successfully deleted all transactions related to this company!,په بریالیتوب سره د دې شرکت ته اړوند ټولو معاملو ړنګ!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,په توګه د تاريخ
 DocType: Appraisal,HR,د بشري حقونو څانګه
 DocType: Program Enrollment,Enrollment Date,د شموليت نېټه
 DocType: Healthcare Settings,Out Patient SMS Alerts,د ناروغۍ ایس ایم ایل خبرتیاوې
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Probation,تعليقي
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,تعليقي
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,معاش د اجزاو
 DocType: Program Enrollment Tool,New Academic Year,د نوي تعليمي کال د
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +762,Return / Credit Note,بیرته / اعتبار يادونه
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +809,Return / Credit Note,بیرته / اعتبار يادونه
 DocType: Stock Settings,Auto insert Price List rate if missing,کړکېو کې درج د بیې په لېست کچه که ورک
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +23,Total Paid Amount,ټولې ورکړل شوې پیسې د
 DocType: Production Order Item,Transferred Qty,انتقال Qty
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigating
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Planning,د پلان
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,د پلان
 DocType: Material Request,Issued,صادر شوی
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +14,Student Activity,د زده کونکو د فعالیت
-DocType: Project,Total Billing Amount (via Time Logs),Total اولګښت مقدار (له لارې د وخت کندي)
+apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,د زده کونکو د فعالیت
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,عرضه Id
 DocType: Payment Request,Payment Gateway Details,د پیسو ليدونکی نورولوله
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,مقدار باید په پرتله ډيره وي 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +267,Quantity should be greater than 0,مقدار باید په پرتله ډيره وي 0
 DocType: Journal Entry,Cash Entry,د نغدو پیسو د داخلولو
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,د ماشومانو د غوټو يوازې ډله &#39;ډول غوټو لاندې جوړ شي
 DocType: Leave Application,Half Day Date,نيمه ورځ نېټه
@@ -4140,22 +4414,25 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.",د پاڼو په شان واله ډول، ناروغ او داسې نور
 DocType: Email Digest,Send regular summary reports via Email.,منظم لنډیز راپورونه ليک له لارې واستوئ.
 DocType: Payment Entry,PE-,پيشبيني شوي
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +254,Please set default account in Expense Claim Type {0},لطفا په اخراجاتو ادعا ډول default ګڼون جوړ {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +305,Please set default account in Expense Claim Type {0},لطفا په اخراجاتو ادعا ډول default ګڼون جوړ {0}
 DocType: Assessment Result,Student Name,د زده کوونکو نوم
 DocType: Brand,Item Manager,د قالب مدير
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,د معاشونو د راتلوونکې
 DocType: Buying Settings,Default Supplier Type,Default عرضه ډول
+DocType: Plant Analysis,Collection Datetime,د وخت وخت راټولول
 DocType: Production Order,Total Operating Cost,Total عملياتي لګښت
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,يادونه: د قالب {0} څو ځلې ننوتل
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,ټول د اړيکې.
-apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,شرکت Abbreviation
+apps/erpnext/erpnext/public/js/setup_wizard.js +71,Company Abbreviation,شرکت Abbreviation
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,کارن {0} نه شته
+DocType: Payment Term,Day(s) after invoice date,د رسید نیټې وروسته ورځ (ورځې)
+DocType: Payment Schedule,Payment Schedule,د تادیاتو مهال ویش
 DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,لنډیزونه
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,د پیسو د داخلولو د مخکې نه شتون
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,نه authroized راهیسې {0} حدودو څخه تجاوز
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,معاش کېنډۍ د بادار.
-apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,پیژندولو
+apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,پیژندولو
 DocType: Restaurant Order Entry,Restaurant Table,د رستورانت میز
 DocType: Leave Type,Max Days Leave Allowed,Max ورځې د وتلو اجازه ورکړي
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,د سودا کراچۍ جوړ د مالياتو د حاکمیت
@@ -4168,68 +4445,72 @@
 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/install_fixtures.py +139,All Customer Groups,ټول پيرودونکو ډلې
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,ټول پيرودونکو ډلې
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,جمع میاشتنی
-apps/erpnext/erpnext/controllers/accounts_controller.py +638,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} الزامی دی. ښايي د پیسو د بدلولو ریکارډ نه د {1} د {2} جوړ.
+apps/erpnext/erpnext/controllers/accounts_controller.py +750,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} الزامی دی. ښايي د پیسو د بدلولو ریکارډ نه د {1} د {2} جوړ.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,Tax Template is mandatory.,د مالياتو د کينډۍ الزامی دی.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,ګڼون {0}: Parent حساب {1} نه شته
+apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,ګڼون {0}: Parent حساب {1} نه شته
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),د بیې په لېست کچه (د شرکت د اسعارو)
 DocType: Products Settings,Products Settings,محصوالت امستنې
+,Item Price Stock,د محصول قیمت
 DocType: Lab Prescription,Test Created,ازموینه جوړه شوه
 DocType: Healthcare Settings,Custom Signature in Print,په چاپ کې د ګمرک لاسلیک
 DocType: Account,Temporary,لنډمهاله
 DocType: Program,Courses,کورسونه
 DocType: Monthly Distribution Percentage,Percentage Allocation,سلنه تخصيص
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +124,Secretary,منشي
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,منشي
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction",که ناتوان، &#39;په لفظ&#39; ډګر به په هيڅ معامله د لیدو وړ وي
 DocType: Serial No,Distinct unit of an Item,د يو قالب توپیر واحد
 DocType: Supplier Scorecard Criteria,Criteria Name,معیارونه نوم
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1213,Please set Company,لطفا جوړ شرکت
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1289,Please set Company,لطفا جوړ شرکت
 DocType: Pricing Rule,Buying,د خريداري
+apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,ناروغي او سرې
 DocType: HR Settings,Employee Records to be created by,د کارګر سوابق له خوا جوړ شي
 DocType: Patient,AB Negative,AB منفی
 DocType: Sample Collection,SMPL-,SMPL-
 DocType: POS Profile,Apply Discount On,Apply کمښت د
+DocType: Member,Membership Type,د غړیتوب ډول
 ,Reqd By Date,Reqd By نېټه
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +140,Creditors,پور
 DocType: Assessment Plan,Assessment Name,ارزونه نوم
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No is mandatory,د کتارونو تر # {0}: شعبه الزامی دی
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,د قالب تدبيراومصلحت سره د مالياتو د تفصیلي
-apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,انستیتوت Abbreviation
+apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,انستیتوت Abbreviation
 ,Item-wise Price List Rate,د قالب-هوښيار بیې په لېست کې و ارزوئ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,عرضه کوونکي د داوطلبۍ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +966,Supplier Quotation,عرضه کوونکي د داوطلبۍ
 DocType: Quotation,In Words will be visible once you save the Quotation.,په کلیمو کې به د ليدو وړ وي. هر کله چې تاسو د داوطلبۍ وژغوري.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},مقدار ({0}) نه په قطار یوه برخه وي {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},مقدار ({0}) نه په قطار یوه برخه وي {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},Barcode {0} د مخه په قالب کارول {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +473,Barcode {0} already used in Item {1},Barcode {0} د مخه په قالب کارول {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,د زياته کړه لېږد لګښتونه اصول.
 DocType: Item,Opening Stock,پرانيستل دحمل
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,پيرودونکو ته اړتيا ده
 DocType: Lab Test,Result Date,د پایلو نیټه
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} د بیرته ستنیدلو لپاره جبري دی
 DocType: Purchase Order,To Receive,تر لاسه
-apps/erpnext/erpnext/utilities/user_progress.py +231,user@example.com,user@example.com
+apps/erpnext/erpnext/utilities/user_progress.py +249,user@example.com,user@example.com
+DocType: Asset,Asset Owner,د شتمنی مالک
 DocType: Employee,Personal Email,د شخصي ليک
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Total توپیر
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",که چېرې توانول شوی، دا سيستم به د محاسبې زياتونې لپاره د انبار په اتوماتيک ډول وروسته.
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,صرافي
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,صرافي
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +232,Attendance for employee {0} is already marked for this day,د {0} کارمند په ګډون لا د مخه د دې ورځې لپاره په نښه
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",په دقيقه يي روز &#39;د وخت څېره&#39; له لارې
 DocType: Customer,From Lead,له کوونکۍ
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,امر د تولید لپاره د خوشې شول.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,مالي کال لپاره وټاکه ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,POS د پېژندنې اړتيا ته POS انفاذ لپاره
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,POS د پېژندنې اړتيا ته POS انفاذ لپاره
 DocType: Program Enrollment Tool,Enroll Students,زده کوونکي شامل کړي
 DocType: Lab Test,Approved Date,منظور شوی نیټه
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,معياري پلورل
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,تيروخت يو ګودام الزامی دی
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Atleast one warehouse is mandatory,تيروخت يو ګودام الزامی دی
 DocType: Serial No,Out of Warranty,د ګرنټی له جملې څخه
 DocType: BOM Update Tool,Replace,ځاېناستول
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,نه محصولات وموندل.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} خرڅلاو صورتحساب په وړاندې د {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +358,{0} against Sales Invoice {1},{0} خرڅلاو صورتحساب په وړاندې د {1}
 DocType: Antibiotic,Laboratory User,د لابراتوار کارن
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,د پروژې نوم
@@ -4239,44 +4520,48 @@
 DocType: Stock Ledger Entry,Stock Value Difference,دحمل ارزښت بدلون
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,د بشري منابعو
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,قطعا د پخلاينې د پیسو
+DocType: Disease,Treatment Task,د درملنې ټیم
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,د مالياتو د جايدادونو د
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},د تولید د ترتیب شوی دی {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +630,Production Order has been {0},د تولید د ترتیب شوی دی {0}
 DocType: BOM Item,BOM No,هیښ نه
 DocType: Instructor,INS/,ISP د /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,ژورنال انفاذ {0} نه په پام کې نه لري د {1} يا لا نه خوری نورو کوپون پر وړاندې د
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +158,Journal Entry {0} does not have account {1} or already matched against other voucher,ژورنال انفاذ {0} نه په پام کې نه لري د {1} يا لا نه خوری نورو کوپون پر وړاندې د
 DocType: Item,Moving Average,حرکت اوسط
 DocType: BOM Update Tool,The BOM which will be replaced,د هیښ چې به بدل شي
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,الکترونیکي وسایلو
+DocType: Asset,Maintenance Required,ساتنه اړینه ده
 DocType: Account,Debit,ډیبیټ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,پاڼي باید د 0.5 ګونی ځانګړي شي
 DocType: Production Order,Operation Cost,د عملياتو لګښت
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,له .csv د دوتنې پورته کول د حاضرۍ
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,بيالنس نننیو
+apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,بيالنس نننیو
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,ټولګې اهدافو د قالب ګروپ-هوښيار د دې خرڅلاو شخص.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],د يخبندان په ډیپو کې د زړو څخه [ورځې]
-apps/erpnext/erpnext/controllers/accounts_controller.py +535,Row #{0}: Asset is mandatory for fixed asset purchase/sale,د کتارونو تر # {0}: د شتمنیو لپاره ثابته شتمني د اخیستلو / خرڅلاو الزامی دی
+apps/erpnext/erpnext/controllers/accounts_controller.py +579,Row #{0}: Asset is mandatory for fixed asset purchase/sale,د کتارونو تر # {0}: د شتمنیو لپاره ثابته شتمني د اخیستلو / خرڅلاو الزامی دی
+DocType: Asset Maintenance Team,Maintenance Team Name,د ساتنې ټیم نوم
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.",که دوه يا زيات د بیې اصول دي د پورته شرايطو پر بنسټ وموندل شول، د لومړيتوب په توګه استعماليږي. د لومړیتوب دا دی چې 20 0 تر منځ د یو شمیر داسې حال کې تلواله ارزښت صفر ده (تش). د لوړو شمېر معنی چې که له هماغه حالت ته څو د بیو اصول شته دي دا به د لمړيتوب حق واخلي.
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,مالي کال: {0} نه شتون
 DocType: Currency Exchange,To Currency,د پیسو د
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,اجازه لاندې کاروونکو لپاره د بنديز ورځو اجازه غوښتنلیکونه تصویب کړي.
-apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,د اخراجاتو ادعا ډولونه.
-apps/erpnext/erpnext/controllers/selling_controller.py +176,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 +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},د پلورلو لپاره د توکی کچه {0} کمه ده چې د خپلو {1}. خرڅول کچه باید تيروخت {2}
+apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,د اخراجاتو ادعا ډولونه.
+apps/erpnext/erpnext/controllers/selling_controller.py +144,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 +144,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},د پلورلو لپاره د توکی کچه {0} کمه ده چې د خپلو {1}. خرڅول کچه باید تيروخت {2}
 DocType: Item,Taxes,مالیات
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,ورکړل او نه تحویلوونکی
+DocType: Purchase Invoice Item,Weight Per Unit,د فی واحد وزن
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,ورکړل او نه تحویلوونکی
 DocType: Project,Default Cost Center,Default لګښت مرکز
 DocType: Bank Guarantee,End Date,د پای نیټه
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,دحمل معاملې
 DocType: Budget,Budget Accounts,د بودجې د حسابونه
 DocType: Employee,Internal Work History,کورني کار تاریخ
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,د استهلاک د مقدار
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,د خصوصي مساوات
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,د خصوصي مساوات
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,د سپریرو څراغونو کارت variable
 DocType: Employee Loan,Fully Disbursed,په بشپړه توګه مصرف
 DocType: Maintenance Visit,Customer Feedback,پيرودونکو Feedback
 DocType: Account,Expense,اخراجاتو
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,نمره نه شي کولای اعظمې نمره په پرتله زیات وي
-apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,پیرودونکي او سپلونکي
+apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,نمره نه شي کولای اعظمې نمره په پرتله زیات وي
+apps/erpnext/erpnext/utilities/user_progress.py +126,Customers and Suppliers,پیرودونکي او سپلونکي
 DocType: Item Attribute,From Range,له Range
 DocType: BOM,Set rate of sub-assembly item based on BOM,د BOM پر بنسټ د فرعي شورا توکي ټاکئ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},په فورمول يا حالت العروض تېروتنه: {0}
@@ -4285,6 +4570,7 @@
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +109,Submit this Production Order for further processing.,د نور د پروسس د دې تولید نظم ته وړاندې کړي.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",ته په یوه ځانګړی د راکړې ورکړې د بیو د حاکمیت د پلي کېدو وړ نه، ټولو تطبيقېدونکو د بیې اصول بايد نافعال شي.
+DocType: Payment Term,Day(s) after the end of the invoice month,د رسیدنې میاشتې پای ته ورسیدو ورځې
 DocType: Assessment Group,Parent Assessment Group,د موروپلار د ارزونې ګروپ
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,دندې
 ,Sales Order Trends,خرڅلاو نظم رجحانات
@@ -4293,21 +4579,23 @@
 ,Employee Information,د کارګر معلومات
 DocType: Stock Entry Detail,Additional Cost,اضافي لګښت
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher",نه ګټمنو نه پر بنسټ کولای شي Filter، که ګروپ له خوا د ګټمنو
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +891,Make Supplier Quotation,عرضه د داوطلبۍ د کمکیانو لپاره
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,عرضه د داوطلبۍ د کمکیانو لپاره
 DocType: Quality Inspection,Incoming,راتلونکي
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.py +47,Assessment Result record {0} already exists.,د ارزونې پایلې ریکارډ {0} لا د مخه وجود لري.
+apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +47,Assessment Result record {0} already exists.,د ارزونې پایلې ریکارډ {0} لا د مخه وجود لري.
 DocType: BOM,Materials Required (Exploded),د توکو ته اړتیا ده (چاودنه)
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',لطفا جوړ شرکت چاڼ خالي که ډله په دی شرکت
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,نوکرې نېټه نه شي کولای راتلونکې نیټه وي.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},د کتارونو تر # {0}: شعبه {1} سره سمون نه خوري {2} {3}
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,د بیا تکرارولو لپاره
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,واله ته لاړل
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,واله ته لاړل
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,د لابراتوار ازموینه.
+DocType: Agriculture Task,End Day,د پای پای
 DocType: Batch,Batch ID,دسته ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},یادونه: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},یادونه: {0}
 ,Delivery Note Trends,د سپارنې پرمهال يادونه رجحانات
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,دا اونۍ د لنډيز
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,په سټاک Qty
+DocType: Delivery Trip,Calculate Estimated Arrival Times,اټکل شوي را رسید ټایمز محاسبه کړئ
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,ګڼون: {0} يوازې دحمل معاملې له لارې تازه شي
 DocType: Student Group Creation Tool,Get Courses,کورسونه ترلاسه کړئ
 DocType: GL Entry,Party,ګوند
@@ -4316,59 +4604,68 @@
 DocType: Sales Order,Delivery Date,د سپارنې نېټه
 DocType: Opportunity,Opportunity Date,فرصت نېټه
 DocType: Purchase Receipt,Return Against Purchase Receipt,پر وړاندې د رانيول د رسيد Return
+DocType: Water Analysis,Person Responsible,شخص مسؤلیت لري
 DocType: Request for Quotation Item,Request for Quotation Item,لپاره د داوطلبۍ د قالب غوښتنه
 DocType: Purchase Order,To Bill,ته بیل
 DocType: Material Request,% Ordered,٪ د سپارښتنې
-DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",د کورس پر بنسټ د زده کوونکو د ډلې، د کورس لپاره به په پروګرام شموليت شامل کورسونه هر زده کوونکو اعتبار ورکړ شي.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,Piecework
+DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",د کورس پر بنسټ د زده کوونکو د ډلې، د کورس لپاره به په پروګرام شموليت شامل کورسونه هر زده کوونکو اعتبار ورکړ شي.
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Piecework
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Avg. د خريداري Rate
 DocType: Task,Actual Time (in Hours),واقعي وخت (په ساعتونه)
 DocType: Employee,History In Company,تاریخ په شرکت
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,خبرپا
 DocType: Drug Prescription,Description/Strength,تفصیل / ځواک
 DocType: Stock Ledger Entry,Stock Ledger Entry,دحمل د پنډو انفاذ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +82,Same item has been entered multiple times,ورته توکی دی څو ځله داخل شوي دي
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,ورته توکی دی څو ځله داخل شوي دي
 DocType: Department,Leave Block List,پريږدئ بالک بشپړفهرست
-DocType: Sales Invoice,Tax ID,د مالياتو د تذکرو
+DocType: Purchase Invoice,Tax ID,د مالياتو د تذکرو
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,{0} د قالب د سریال ترانسفارمرونو د تشکیلاتو نه ده. کالم بايد خالي وي
 DocType: Accounts Settings,Accounts Settings,جوړوي امستنې
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,منظور کړل
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,د سپارلو لپاره هیڅ نتیجه نشته
+apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,منظور کړل
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +51,"Malformatted address for {0}, please fix to continue.",د {0} لپاره د خرابې بڼې پتې، مهرباني وکړئ دوام ومومي.
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Number of new Account, it will be included in the account name as a prefix",د نوي حساب شمېره، دا به د حساب په نوم کې د مخفف په توګه وکارول شي
+DocType: Maintenance Team Member,Team Member,د ډلې غړی
+apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,د سپارلو لپاره هیڅ نتیجه نشته
 DocType: Customer,Sales Partner and Commission,خرڅلاو همکار او کميسيون
 DocType: Employee Loan,Rate of Interest (%) / Year,د په زړه پوری (٪) / کال کچه
 ,Project Quantity,د پروژې د مقدار
 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'",Total {0} لپاره ټول توکي صفر دی، کېدی شي چې تاسو باید بدلون &#39;په تور ویشي پر بنسټ&#39;
 DocType: Opportunity,To Discuss,د خبرو اترو
-apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} د واحدونو {1} د {2} د دې معاملې د بشپړولو لپاره اړتيا لري.
+apps/erpnext/erpnext/stock/stock_ledger.py +375,{0} units of {1} needed in {2} to complete this transaction.,{0} د واحدونو {1} د {2} د دې معاملې د بشپړولو لپاره اړتيا لري.
 DocType: Loan Type,Rate of Interest (%) Yearly,د ګټې کچه)٪ (کلنی
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,لنډمهاله حسابونه
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,تور
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,تور
 DocType: BOM Explosion Item,BOM Explosion Item,هیښ چاودنه د قالب
 DocType: Account,Auditor,پلټونکي
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} توکو توليد
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,نور زده کړئ
 DocType: Cheque Print Template,Distance from top edge,له پورتنی څنډې فاصله
-apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,د بیې په لېست {0} معلول دی او یا موجود ندی
+apps/erpnext/erpnext/stock/get_item_details.py +360,Price List {0} is disabled or does not exist,د بیې په لېست {0} معلول دی او یا موجود ندی
 DocType: Purchase Invoice,Return,بیرته راتګ
 DocType: Production Order Operation,Production Order Operation,تولید نظم عمليات
 DocType: Pricing Rule,Disable,نافعال
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,د پیسو اکر ته اړتيا ده چې د پیسو لپاره
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Mode of payment is required to make a payment,د پیسو اکر ته اړتيا ده چې د پیسو لپاره
 DocType: Project Task,Pending Review,انتظار کتنه
+apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.",په نورو مخونو کې د نورو انتخابونو لکه شتمنۍ، سیریل نکس، بسته او نور لپاره سم کړئ.
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,ټاکنې او مشورې
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} په دسته کې د ده شامل نه {2}
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}",د شتمنیو د {0} نه پرزه شي، لکه څنګه چې د مخه د {1}
+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 +113,"Asset {0} cannot be scrapped, as it is already {1}",د شتمنیو د {0} نه پرزه شي، لکه څنګه چې د مخه د {1}
 DocType: Task,Total Expense Claim (via Expense Claim),Total اخراجاتو ادعا (اخراجاتو ادعا له لارې)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,مارک حاضر
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,د شرکت جوړولو لپاره ناکام شو
+DocType: Asset Repair,Asset Repair,د شتمنیو ترمیم
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},د کتارونو تر {0}: د هیښ # د اسعارو د {1} بايد مساوي د ټاکل اسعارو وي {2}
 DocType: Journal Entry Account,Exchange Rate,د بدلولو نرخ
 DocType: Patient,Additional information regarding the patient,د ناروغ په اړه اضافي معلومات
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,خرڅلاو نظم {0} نه سپارل
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,خرڅلاو نظم {0} نه سپارل
 DocType: Homepage,Tag Line,Tag کرښې
 DocType: Fee Component,Fee Component,فیس برخه
-apps/erpnext/erpnext/config/hr.py +199,Fleet Management,د بیړیو د مدیریت
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,Add له توکي
+apps/erpnext/erpnext/config/hr.py +204,Fleet Management,د بیړیو د مدیریت
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +964,Add items from,Add له توکي
+apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,فصلونه او ځمکې
 DocType: Cheque Print Template,Regular,منظم
-apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,د ټولو د ارزونې معیارونه ټول Weightage باید 100٪ شي
+DocType: Fertilizer,Density (if liquid),کثافت (که چیری مائع)
+apps/erpnext/erpnext/education/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,د ټولو د ارزونې معیارونه ټول Weightage باید 100٪ شي
 DocType: Purchase Order Item,Last Purchase Rate,تېره رانيول Rate
 DocType: Account,Asset,د شتمنیو
 DocType: Project Task,Task ID,کاري ID
@@ -4378,29 +4675,33 @@
 DocType: Training Event,Contact Number,د اړیکې شمیره
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,ګدام {0} نه شته
 DocType: Monthly Distribution,Monthly Distribution Percentages,میاشتنی ویش فيصدۍ
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,د ټاکل شوي توکي نه شي کولای دسته لري
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +38,The selected item cannot have Batch,د ټاکل شوي توکي نه شي کولای دسته لري
 DocType: Delivery Note,% of materials delivered against this Delivery Note,٪ د توکو د دې سپارنې يادونه وړاندې کولو
-DocType: Training Event,Has Certificate,سند لري
+DocType: Asset Maintenance Log,Has Certificate,سند لري
 DocType: Project,Customer Details,پيرودونکو په بشپړه توګه کتل
+DocType: Asset,Check if Asset requires Preventive Maintenance or Calibration,وګورئ که چیرې شتمنۍ د مخنیوي ساتنه یا تعقیب ته اړتیا ولري
 DocType: Employee,Reports to,د راپورونو له
 ,Unpaid Expense Claim,معاش اخراجاتو ادعا
 DocType: Payment Entry,Paid Amount,ورکړل مقدار
-apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,د پلور سایټ وپلټئ
+apps/erpnext/erpnext/utilities/user_progress.py +155,Explore Sales Cycle,د پلور سایټ وپلټئ
 DocType: Assessment Plan,Supervisor,څارونکي
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,په آنلاین توګه
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +70,Online,په آنلاین توګه
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +867,Retention Stock Entry,د ساتلو ذخیره کول
 ,Available Stock for Packing Items,د ت توکي موجود دحمل
 DocType: Item Variant,Item Variant,د قالب variant
 DocType: Assessment Result Tool,Assessment Result Tool,د ارزونې د پایلو د اوزار
 DocType: BOM Scrap Item,BOM Scrap Item,هیښ Scrap د قالب
-apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,ته وسپارل امر نه ړنګ شي
-apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",ګڼون بیلانس د مخه په ګزارې، تاسو ته د ټاکل &#39;بیلانس باید&#39; په توګه اعتبار &#39;اجازه نه
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,د کیفیت د مدیریت
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,{0} د قالب نافعال شوی دی
+apps/erpnext/erpnext/accounts/page/pos/pos.js +886,Submitted orders can not be deleted,ته وسپارل امر نه ړنګ شي
+apps/erpnext/erpnext/accounts/doctype/account/account.py +116,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",ګڼون بیلانس د مخه په ګزارې، تاسو ته د ټاکل &#39;بیلانس باید&#39; په توګه اعتبار &#39;اجازه نه
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,د کیفیت د مدیریت
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,{0} د قالب نافعال شوی دی
+DocType: Project,Total Billable Amount (via Timesheets),د ټول وړ وړ مقدار (د ټایټ شیټونو له لارې)
+DocType: Agriculture Task,Previous Business Day,مخکینی کاروباری ورځ
 DocType: Employee Loan,Repay Fixed Amount per Period,هر دوره ثابته مقدار ورکول
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},لورينه وکړئ د قالب اندازه داخل {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +78,Credit Note Amt,اعتبار يادونه نننیو
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +89,Credit Note Amt,اعتبار يادونه نننیو
 DocType: Employee External Work History,Employee External Work History,د کارګر د بهرنيو کار تاریخ
-DocType: Tax Rule,Purchase,رانيول
+DocType: Opening Invoice Creation Tool,Purchase,رانيول
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,توازن Qty
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +20,Goals cannot be empty,موخې نه شي تش وي
 DocType: Item Group,Parent Item Group,د موروپلار د قالب ګروپ
@@ -4408,24 +4709,26 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} د {1}
 DocType: Healthcare Settings,Valid number of days,دقیق وخت
 apps/erpnext/erpnext/setup/doctype/company/company.js +35,Cost Centers,لګښت د مرکزونو
+DocType: Land Unit,Linked Plant Analysis,تړل شوي پلان شننه
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,چې د عرضه کوونکي د پيسو کچه چې د شرکت د اډې اسعارو بدل
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},د کتارونو تر # {0}: د قطار تیارولو شخړو د {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,اجازه صفر ارزښت Rate
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,اجازه صفر ارزښت Rate
 DocType: Training Event Employee,Invited,بلنه
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,څو فعال معاش جوړښت لپاره د ورکړل شوي خرما د {0} کارمند وموندل شول
-apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,Setup ليدونکی حسابونو.
+apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,Setup ليدونکی حسابونو.
 DocType: Employee,Employment Type,وظيفي نوع
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,ثابته شتمني
 DocType: Payment Entry,Set Exchange Gain / Loss,د ټاکلو په موخه د بدل لازمې / له لاسه ورکول
 ,GST Purchase Register,GST رانيول د نوم ثبتول
 ,Cash Flow,نقدو پیسو د جریان
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,Application period cannot be across two alocation records,کاریال موده نه شي کولای په ټول دوه alocation اسناد وي
+apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +25,Combined invoice portion must equal 100%,د تادیې مشترکه برخه باید 100٪ مساوي وي
 DocType: Item Group,Default Expense Account,Default اخراجاتو اکانټ
-apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,د زده کونکو د ليک ID
+apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,د زده کونکو د ليک ID
 DocType: Employee,Notice (days),خبرتیا (ورځې)
 DocType: Tax Rule,Sales Tax Template,خرڅلاو د مالياتو د کينډۍ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,توکي چې د صورتحساب د ژغورلو وټاکئ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2467,Select items to save the invoice,توکي چې د صورتحساب د ژغورلو وټاکئ
 DocType: Employee,Encashment Date,د ورکړې نېټه
 DocType: Training Event,Internet,د انټرنېټ
 DocType: Special Test Template,Special Test Template,د ځانګړې ځانګړې ټکي
@@ -4436,6 +4739,7 @@
 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 +242,Please find attached {0} #{1},لطفا پیدا ضميمه {0} # {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +701,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,د تادیاتو مهال ویش کې د مجموعي تادیاتو اندازه باید د ګردي / ګردي ګرد مجموعي سره مساوي وي
 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,متقاضي نوم
 DocType: Authorization Rule,Customer / Item Name,پيرودونکو / د قالب نوم
@@ -4460,53 +4764,57 @@
 apps/erpnext/erpnext/config/support.py +22,Warranty,ګرنټی
 DocType: Purchase Invoice,Debit Note Issued,ډیبیټ يادونه خپور شوی
 DocType: Production Order,Warehouses,Warehouses
-apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} د شتمنیو نه انتقال شي
-apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,د دې توکي د {0} (کينډۍ) يو variant ده.
+apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} د شتمنیو نه انتقال شي
+apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,د دې توکي د {0} (کينډۍ) يو variant ده.
 DocType: Workstation,per hour,په يوه ګړۍ کې
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,د خريدارۍ د
 DocType: Announcement,Announcement,اعلانونه
-DocType: School Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.",د دسته پر بنسټ د زده کوونکو د ډلې، د زده کوونکو د سته به د پروګرام څخه د هر زده کوونکو اعتبار ورکړ شي.
+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.,ګدام په توګه د دې ګودام سټاک د پنډو ننوتلو شتون نه ړنګ شي.
-DocType: Company,Distribution,ویش
+apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,ویش
+DocType: Expense Claim Advance,Expense Claim Advance,د ادعا ادعا غوښتنه
 DocType: Lab Test,Report Preference,راپور غوره کول
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +129,Project Manager,پروژې سمبالګر
+apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,رضاکار معلومات.
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,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/install_fixtures.py +110,Dispatch,چلاونه د
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,چلاونه د
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +73,Max discount allowed for item: {0} is {1}%,Max تخفیف لپاره توکی اجازه: {0} دی {1}٪
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,خالص د شتمنیو ارزښت په توګه د
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,خالص د شتمنیو ارزښت په توګه د
+DocType: Crop,Produce,توليدول، جوړول
 DocType: Account,Receivable,ترلاسه
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,د کتارونو تر # {0}: نه، اجازه لري چې عرضه بدلون په توګه د اخستلو د امر د مخکې نه شتون
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +308,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,د کتارونو تر # {0}: نه، اجازه لري چې عرضه بدلون په توګه د اخستلو د امر د مخکې نه شتون
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,رول چې اجازه راکړه ورکړه چې د پور د حدودو ټاکل تجاوز ته وړاندې کړي.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,وړانديزونه وټاکئ جوړون
-apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time",د بادار د معلوماتو syncing، دا به يو څه وخت ونيسي
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +978,Select Items to Manufacture,وړانديزونه وټاکئ جوړون
+DocType: Delivery Stop,Delivery Stop,د سپارلو بند
+apps/erpnext/erpnext/accounts/page/pos/pos.js +954,"Master data syncing, it might take some time",د بادار د معلوماتو syncing، دا به يو څه وخت ونيسي
 DocType: Item,Material Issue,مادي Issue
 DocType: Employee Education,Qualification,وړتوب
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +40,View Salary Slips,د معاش سلپس وګورئ
 DocType: Item Price,Item Price,د قالب بیه
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Soap &amp; پاکونکو
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Soap &amp; پاکونکو
 DocType: BOM,Show Items,خپرونه توکی
-apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,له وخت نه شي کولای د وخت څخه ډيره وي.
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,حرکت انځوريز &amp; ویډیو
+apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,له وخت نه شي کولای د وخت څخه ډيره وي.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +74,Do you want to notify all the customers by email?,ایا تاسو غواړئ ټول پیرودونکي د بریښنالیک له لارې خبر کړئ؟
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,حرکت انځوريز &amp; ویډیو
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,امر وکړ
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,بیا پیل کول
-DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,که چیرې فعال شي نو سیسټم به د بېلابېلو برخو بیلابیل ټیمونه نوي نه کړي خو د لاندې ذکر شویو ساحو معلومات به کله چې نوې بڼه جوړوي
 DocType: Salary Detail,Component,برخه
 DocType: Assessment Criteria,Assessment Criteria Group,د ارزونې معیارونه ګروپ
 DocType: Healthcare Settings,Patient Name By,د ناروغ نوم
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},د استهلاک د پرانيستلو باید په پرتله مساوي کمه وي {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},د استهلاک د پرانيستلو باید په پرتله مساوي کمه وي {0}
 DocType: Warehouse,Warehouse Name,ګدام نوم
 DocType: Naming Series,Select Transaction,انتخاب معامالتو
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,لطفا رول تصويب يا تصويب کارن
 DocType: Journal Entry,Write Off Entry,ولیکئ پړاو په انفاذ
 DocType: BOM,Rate Of Materials Based On,کچه د موادو پر بنسټ
-DocType: Item Variant Settings,Do not Update Variants,متغیرات نه تازه کړئ
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,د ملاتړ Analtyics
-apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,څلورڅنډی په ټولو
+apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +102,Uncheck all,څلورڅنډی په ټولو
 DocType: POS Profile,Terms and Conditions,د قرارداد شرايط
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},ته نېټه بايد د مالي کال په چوکاټ کې وي. د نېټه فرض = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc",دلته تاسو د قد، وزن، الرجی، طبي اندېښنې او نور وساتي
 DocType: Leave Block List,Applies to Company,د دې شرکت د تطبيق وړ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,لغوه نه شي کولای، ځکه وړاندې دحمل انفاذ {0} شتون لري
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +222,Cannot cancel because submitted Stock Entry {0} exists,لغوه نه شي کولای، ځکه وړاندې دحمل انفاذ {0} شتون لري
 DocType: Employee Loan,Disbursement Date,دویشلو نېټه
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,&#39;اخیستونکي&#39; مشخص شوي ندي
 DocType: BOM Update Tool,Update latest price in all BOMs,په ټولو بومونو کې وروستي قیمت تازه کړئ
@@ -4514,44 +4822,53 @@
 DocType: Vehicle,Vehicle,موټر
 DocType: Purchase Invoice,In Words,په وييکي
 DocType: POS Profile,Item Groups,د قالب ډلې
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,نن د {0} د زوکړې ورځ!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Today is {0}'s birthday!,نن د {0} د زوکړې ورځ!
 DocType: Production Planning Tool,Material Request For Warehouse,د موادو غوښتنه د ګدام
 DocType: Sales Order Item,For Production,د تولید
 DocType: Payment Request,payment_url,payment_url
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +163,Please add a Temporary Opening account in Chart of Accounts,مهرباني وکړئ د حسابونو په چارټ کې د عارضي پرانیستلو حساب اضافه کړئ
+DocType: Customer,Customer Primary Contact,پیرودونکي لومړني اړیکه
 DocType: Project Task,View Task,محتویات کاري
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,د کارموندنۍ / مشري٪
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,د کارموندنۍ / مشري٪
 DocType: Material Request,MREQ-,MREQ-
+DocType: Payment Schedule,Invoice Portion,د انوائس پوسشن
 ,Asset Depreciations and Balances,د شتمنیو Depreciations او انډول.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},مقدار د {0} د {1} څخه انتقال {2} د {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Amount {0} {1} transferred from {2} to {3},مقدار د {0} د {1} څخه انتقال {2} د {3}
 DocType: Sales Invoice,Get Advances Received,ترلاسه کړئ پرمختګونه تر لاسه کړي
 DocType: Email Digest,Add/Remove Recipients,Add / اخیستونکو کړئ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},د راکړې ورکړې ودرول تولید په وړاندې د نه اجازه نظم {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +486,Transaction not allowed against stopped Production Order {0},د راکړې ورکړې ودرول تولید په وړاندې د نه اجازه نظم {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",د دې مالي کال په توګه (Default) جوړ، په &#39;د ټاکلو په توګه Default&#39; کیکاږۍ
-apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,سره یو ځای شول
+apps/erpnext/erpnext/projects/doctype/project/project.py +216,Join,سره یو ځای شول
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,په کمښت کې Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,د قالب variant {0} سره ورته صفاتو شتون
+apps/erpnext/erpnext/stock/doctype/item/item.py +645,Cannot change Variant properties after stock transction. You will have to make a new Item to do this.,د ذخیره کولو وروسته مختلف توپیرونه نشي راوولی. تاسو باید دا کار کولو لپاره نوي توکي جوړ کړئ.
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Item variant {0} exists with same attributes,د قالب variant {0} سره ورته صفاتو شتون
 DocType: Employee Loan,Repay from Salary,له معاش ورکول
 DocType: Leave Application,LAP/,دورو /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},د غوښتنې په وړاندې د پیسو {0} د {1} لپاره د اندازه {2}
 DocType: Salary Slip,Salary Slip,معاش ټوټه
 DocType: Lead,Lost Quotation,د داوطلبۍ له لاسه
-apps/erpnext/erpnext/utilities/user_progress.py +200,Student Batches,د زده کوونکو بسته
+apps/erpnext/erpnext/utilities/user_progress.py +218,Student Batches,د زده کوونکو بسته
 DocType: Pricing Rule,Margin Rate or Amount,څنډی Rate يا مقدار
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,&#39;د نېټه&#39; ته اړتيا ده
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",بسته بنديو ټوټه تولید لپاره د بستې ته تحویلیږي. لپاره کارول کيږي چې بسته شمېر، بسته کړی او د هغې د وزن خبر ورکړي.
 DocType: Sales Invoice Item,Sales Order Item,خرڅلاو نظم قالب
 DocType: Salary Slip,Payment Days,د پیسو ورځې
+DocType: Stock Settings,Convert Item Description to Clean HTML,د HTML پاکولو لپاره د توکو تفصیل بدل کړئ
 DocType: Patient,Dormant,د استراحت په
+DocType: Salary Slip,Total Interest Amount,د ګټو مجموعه
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +125,Warehouses with child nodes cannot be converted to ledger,سره د ماشومانو د غوټو ګودامونه بدل نه شي چې د پنډو
 DocType: BOM,Manage cost of operations,اداره د عملیاتو لګښت
 DocType: Accounts Settings,Stale Days,ستوري ورځ
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.",کله چې د چک معاملو کوم &quot;ته وسپارل&quot;، يو بريښناليک Pop-up په اتوماتيک ډول پرانستل شو تر څو چې د راکړې ورکړې د تړاو &quot;تماس&quot; په بريښنالیک کې واستوي، سره د مل په توګه د راکړې ورکړې. د کارونکي وی ممکن د برېښليک نه واستوي.
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Global امستنې
+DocType: Crop,Row Spacing UOM,د قطار فاصله UOM
 DocType: Assessment Result Detail,Assessment Result Detail,د ارزونې د پایلو د تفصیلي
 DocType: Employee Education,Employee Education,د کارګر ښوونه
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +48,Duplicate item group found in the item group table,دوه ګونو توکی ډلې په توکی ډلې جدول کې وموندل
-apps/erpnext/erpnext/public/js/controllers/transaction.js +965,It is needed to fetch Item Details.,دا ته اړتيا ده، د قالب نورولوله راوړي.
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,دوه ګونو توکی ډلې په توکی ډلې جدول کې وموندل
+DocType: Land Unit,Parent Land Unit,د مور د ځمکې څانګه
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1045,It is needed to fetch Item Details.,دا ته اړتيا ده، د قالب نورولوله راوړي.
+DocType: Fertilizer,Fertilizer Name,د سرې نوم
 DocType: Salary Slip,Net Pay,خالص د معاشونو
 DocType: Account,Account,ګڼون
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,شعبه {0} لا ترلاسه شوي دي
@@ -4559,39 +4876,44 @@
 DocType: Expense Claim,Vehicle Log,موټر ننوتنه
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),د تبه شتون (temp&gt; 38.5 ° C / 101.3 ° F یا دوام لرونکی طنز&gt; 38 ° C / 100.4 ° F)
 DocType: Customer,Sales Team Details,خرڅلاو ټيم په بشپړه توګه کتل
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,د تل لپاره ړنګ کړئ؟
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1341,Delete permanently?,د تل لپاره ړنګ کړئ؟
 DocType: Expense Claim,Total Claimed Amount,Total ادعا مقدار
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,د پلورلو د بالقوه فرصتونو.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},باطلې {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Sick Leave,ناروغ ته لاړل
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +90,Sick Leave,ناروغ ته لاړل
 DocType: Email Digest,Email Digest,Email Digest
 DocType: Delivery Note,Billing Address Name,د بیلونو په پته نوم
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,مغازو
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +22,Department Stores,مغازو
 ,Item Delivery Date,د توکي سپارلو نیټه
 DocType: Warehouse,PIN,PIN
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,Setup په ERPNext ستاسو په ښوونځي
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +125,Error '{0}' occured. Arguments {1}.,تېروتنه &#39;{0}&#39; رامنځته شوه. دلیلونه {1}.
 DocType: Sales Invoice,Base Change Amount (Company Currency),اډه د بدلون مقدار (شرکت د اسعارو)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,د لاندې زېرمتونونه د محاسبې نه زياتونې
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,لومړی سند وژغورۍ.
+apps/erpnext/erpnext/shopping_cart/cart.py +71,Only {0} in stock for item {1},یواځې {0} د توکو لپاره زیرمه {1}
 DocType: Account,Chargeable,Chargeable
 DocType: Company,Change Abbreviation,د بدلون Abbreviation
 DocType: Expense Claim Detail,Expense Date,اخراجاتو نېټه
 DocType: Item,Max Discount (%),Max کمښت)٪ (
+apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +30,Credit Days cannot be a negative number,کریډیټ ورځ نشي کولی منفي شمیره وي
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,تېره نظم مقدار
+apps/erpnext/erpnext/stock/doctype/item/item.py +264," {0} Retain Sample is based on batch, please check Has Batch No to retain sample of item",{0} نمونه ساتل د بستې پر بنسټ دي، مهرباني وکړئ د ترلاسه کولو نمونه وګورئ د بستې بسته نه وګورئ
 DocType: Task,Is Milestone,آیا د معیار
-DocType: Daily Work Summary,Email Sent To,د برېښناليک لېږلو
+DocType: Delivery Stop,Email Sent To,د برېښناليک لېږلو
 DocType: Budget,Warn,خبرداری
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,ایا ته باوري یې چې غیر راجستر کول غواړئ؟
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",کوم بل څرګندونې، د یادولو وړ هڅې چې بايد په اسنادو ته ولاړ شي.
-DocType: BOM,Manufacturing User,دفابريکي کارن
+DocType: Asset Maintenance,Manufacturing User,دفابريکي کارن
 DocType: Purchase Invoice,Raw Materials Supplied,خام مواد
 DocType: C-Form,Series,لړۍ
 DocType: Appraisal,Appraisal Template,ارزونې کينډۍ
+DocType: Soil Texture,Ternary Plot,Ternary Plot
 DocType: Item Group,Item Classification,د قالب طبقه
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,کاروبار انکشاف مدير
+DocType: Driver,License Number,د جواز نمبر
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,کاروبار انکشاف مدير
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,د ساتنې سفر هدف
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,د رسیدګۍ ناروغۍ راجستر
-DocType: Drug Prescription,Period,د دورې
+DocType: Crop,Period,د دورې
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +18,General Ledger,له بلونو
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},کارکوونکی د {0} په اړه چې رخصت پر {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,محتویات ياه
@@ -4599,9 +4921,9 @@
 DocType: Item Attribute Value,Attribute Value,منسوب ارزښت
 ,Itemwise Recommended Reorder Level,نورتسهیالت وړانديز شوي ترمیمي د ليول
 DocType: Salary Detail,Salary Detail,معاش تفصیلي
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,مهرباني غوره {0} په لومړي
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1043,Please select {0} first,مهرباني غوره {0} په لومړي
 DocType: Appointment Type,Physician,ډاکټر
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,دسته {0} د قالب {1} تېر شوی دی.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +833,Batch {0} of Item {1} has expired.,دسته {0} د قالب {1} تېر شوی دی.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,مشورې
 DocType: Sales Invoice,Commission,کمیسیون
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,د تولید د وخت پاڼه.
@@ -4612,7 +4934,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,ګدام په سيستم کې ونه موندل شو
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,دا مياشت د لنډيز
 DocType: Quality Inspection Reading,Quality Inspection Reading,د کیفیت د تفتیش د لوستلو
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`د يخبندان په ډیپو کې د زړو Than` بايد٪ d ورځو په پرتله کوچنی وي.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,`د يخبندان په ډیپو کې د زړو Than` بايد٪ d ورځو په پرتله کوچنی وي.
 DocType: Tax Rule,Purchase Tax Template,پیري د مالياتو د کينډۍ
 apps/erpnext/erpnext/utilities/user_progress.py +45,Set a sales goal you'd like to achieve for your company.,د پلور موخې وټاکئ چې تاسو غواړئ د خپل شرکت لپاره ترلاسه کړئ.
 ,Project wise Stock Tracking,د پروژې هوښيار دحمل څارلو
@@ -4620,42 +4942,50 @@
 apps/erpnext/erpnext/config/healthcare.py +40,Laboratory,لابراتوار
 DocType: Stock Entry Detail,Actual Qty (at source/target),واقعي Qty (په سرچينه / هدف)
 DocType: Item Customer Detail,Ref Code,دسرچینی یادونه کوډ
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +66,Customer Group is Required in POS Profile,د پیرودونکي ګروپ د POS پروفیور ته اړتیا لري
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +71,Customer Group is Required in POS Profile,د پیرودونکي ګروپ د POS پروفیور ته اړتیا لري
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,د کارګر اسناد.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,مهرباني وکړئ ټاکل بل د استهالک نېټه
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,مهرباني وکړئ ټاکل بل د استهالک نېټه
 DocType: HR Settings,Payroll Settings,د معاشاتو په امستنې
-apps/erpnext/erpnext/config/accounts.py +154,Match non-linked Invoices and Payments.,غیر تړاو بلونه او د تادياتو لوبه.
+apps/erpnext/erpnext/config/accounts.py +146,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,نوي رانيول امر
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,د ريښو نه شي کولای د يو مور او لګښت مرکز لری
 apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,انتخاب دتوليد ...
+apps/erpnext/erpnext/public/js/setup_wizard.js +32,Non Profit (beta),غیر ګټې (بیټا)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,د روزنې فعاليتونه / پایلې
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,جمع د استهالک په توګه د
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +152,Accumulated Depreciation as on,جمع د استهالک په توګه د
 DocType: Sales Invoice,C-Form Applicable,C-فورمه د تطبیق وړ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},د وخت عمليات بايد د عملياتو 0 څخه ډيره وي {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +419,Operation Time must be greater than 0 for Operation {0},د وخت عمليات بايد د عملياتو 0 څخه ډيره وي {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,ګدام الزامی دی
 DocType: Supplier,Address and Contacts,پته او اړیکې
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +67,Failed to create website,د وېب پاڼه جوړولو کې پاتې راغله
+DocType: Soil Analysis,Mg/K,MG / K
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM اړونه تفصیلي
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +922,Retention Stock Entry already created or Sample Quantity not provided,د ساتلو د ذخیره ننوتنې مخکې له مخکې رامینځته شوې یا نمونې مقدار ندی برابر شوی
 DocType: Program,Program Abbreviation,پروګرام Abbreviation
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,يو قالب کينډۍ پر وړاندې د تولید نظم نه راپورته شي
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +407,Production Order cannot be raised against a Item Template,يو قالب کينډۍ پر وړاندې د تولید نظم نه راپورته شي
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,په تور د هري برخي په وړاندې په رانيول رسيد تازه دي
 DocType: Warranty Claim,Resolved By,حل د
 DocType: Bank Guarantee,Start Date,پیل نېټه
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,د يوې مودې لپاره پاڼي تخصيص.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Cheques او سپما په ناسم ډول پاکه
-apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: You can not assign itself as parent account,ګڼون {0}: تاسو نه شي کولاي ځان د مور او پلار په پام کې وګماری
+apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,ګڼون {0}: تاسو نه شي کولاي ځان د مور او پلار په پام کې وګماری
 DocType: Purchase Invoice Item,Price List Rate,د بیې په لېست Rate
 apps/erpnext/erpnext/utilities/activation.py +72,Create customer quotes,د پېرېدونکو يادي جوړول
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",وښیه &quot;په سټاک&quot; يا &quot;نه په سټاک&quot; پر بنسټ د ونډې په دې ګودام لپاره چمتو کېږي.
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),د توکو Bill (هیښ)
 DocType: Item,Average time taken by the supplier to deliver,د وخت اوسط د عرضه کوونکي له خوا اخيستل ته ورسوي
 DocType: Sample Collection,Collected By,لخوا راټول شوی
-apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +22,Assessment Result,د ارزونې د پايلو
+apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.js +22,Assessment Result,د ارزونې د پايلو
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,ساعتونه
 DocType: Project,Expected Start Date,د تمی د پیل نیټه
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant Details Report,د توپیر تفصیلات
 DocType: Setup Progress Action,Setup Progress Action,د پرمختګ پرمختګ
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +18,Buying Price List,د نرخ لیست
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,توکی لرې که په تور د تطبیق وړ نه دی چې توکی
+apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,مهرباني وکړئ د بشپړولو په حال کې د ساتنې وضعیت غوره کړئ یا د ختم نیټه نیټه
+DocType: Supplier,Default Payment Terms Template,د اصلي تادیاتو شرایط سانچہ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,د راکړې ورکړې د اسعارو په توګه باید د پیسو ليدونکی اسعارو ورته وي
 DocType: Payment Entry,Receive,تر لاسه
 apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,Quotations:
@@ -4665,20 +4995,20 @@
 DocType: Workstation,Operating Costs,د عملیاتي لګښتونو
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,که کړنه جمع میاشتنی بودجې زیات شو
 DocType: Subscription,Submit on creation,پر رامنځته سپارل
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},د اسعارو د {0} بايد د {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +470,Currency for {0} must be {1},د اسعارو د {0} بايد د {1}
 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,د کارګر اجازه Approver
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},د کتارونو تر {0}: د نورو ترمیمي د ننوتلو مخکې د دې ګودام شتون {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +485,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/hr/doctype/training_event/training_event.js +16,Training Feedback,د زده کړې Feedback
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,تولید نظم {0} بايد وسپارل شي
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +483,Production Order {0} must be submitted,تولید نظم {0} بايد وسپارل شي
 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}
-apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},د کورس په قطار الزامی دی {0}
+apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},د کورس په قطار الزامی دی {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,تر اوسه پورې ونه شي کولای له نېټې څخه مخکې وي
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,Add / سمول نرخونه
+apps/erpnext/erpnext/stock/doctype/item/item.js +268,Add / Edit Prices,Add / سمول نرخونه
 DocType: Batch,Parent Batch,د موروپلار دسته
 DocType: Batch,Parent Batch,د موروپلار دسته
 DocType: Cheque Print Template,Cheque Print Template,آرډر چاپ کينډۍ
@@ -4688,7 +5018,6 @@
 apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,زما امرونه
 DocType: Price List,Price List Name,د بیې په لېست نوم
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},هره ورځ د کار لنډیز د {0}
-DocType: Employee Loan,Totals,مجموعه
 DocType: BOM,Manufacturing,دفابريکي
 ,Ordered Items To Be Delivered,امر سامان ته تحویلیږي
 DocType: Account,Income,پر عايداتو
@@ -4698,129 +5027,142 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Sales Invoice {0} has already been submitted,خرڅلاو صورتحساب {0} د مخکې نه سپارل
 DocType: Supplier Scorecard Scoring Criteria,Score,نمره
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,مالي کال د {0} نه شته
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,د بشپړیدلو نیټه
+DocType: Asset Maintenance Log,Completion Date,د بشپړیدلو نیټه
 DocType: Purchase Invoice Item,Amount (Company Currency),اندازه (شرکت د اسعارو)
+DocType: Crop,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 +372,{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 +379,{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/config/hr.py +233,Organization unit (department) master.,اداره واحد (رياست) بادار.
-apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,خونو ته لاړ شه
+apps/erpnext/erpnext/config/hr.py +238,Organization unit (department) master.,اداره واحد (رياست) بادار.
+DocType: Shipping Rule,Shipping Rule Type,د تدارکاتو ډول ډول
+apps/erpnext/erpnext/utilities/user_progress.py +236,Go to Rooms,خونو ته لاړ شه
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,لطفا د استولو مخکې پیغام ته ننوځي
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,دوه ګونو لپاره د عرضه
 DocType: Email Digest,Pending Quotations,انتظار Quotations
-apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,Point-of-خرڅول پېژندنه
+apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,Point-of-خرڅول پېژندنه
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,د لابراتوټ ازموینې ترتیب.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,ضمانته پور
 DocType: Cost Center,Cost Center Name,لګښت مرکز نوم
-DocType: Employee,B+,B +
+DocType: Student,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Max کار ساعتونو Timesheet پر وړاندې د
 DocType: Maintenance Schedule Detail,Scheduled Date,ټاکل شوې نېټه
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,ټولې ورکړل نننیو
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +88,Total Paid Amt,ټولې ورکړل نننیو
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Messages په پرتله 160 تورو هماغه اندازه به په څو پېغامونه ویشل شي
 DocType: Purchase Receipt Item,Received and Accepted,تر لاسه کړي او منل
 DocType: Hub Settings,Company and Seller Profile,د شرکت او پلورونکي پیژندنه
 ,GST Itemised Sales Register,GST مشخص کړل خرڅلاو د نوم ثبتول
+DocType: Soil Texture,Silt Loam,سټل لوام
 ,Serial No Service Contract Expiry,شعبه خدمتونو د قرارداد د پای
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,تاسې کولای شی نه اعتبار او په ورته وخت کې په همدې حساب ډیبیټ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,You cannot credit and debit same account at the same time,تاسې کولای شی نه اعتبار او په ورته وخت کې په همدې حساب ډیبیټ
 DocType: Vital Signs,Adults' pulse rate is anywhere between 50 and 80 beats per minute.,د پلسانو لویانو هر یو له 50 څخه تر 80 دقیقو په منځ کې وي.
 DocType: Naming Series,Help HTML,مرسته د HTML
 DocType: Student Group Creation Tool,Student Group Creation Tool,د زده کونکو د ګروپ خلقت اسباب
 DocType: Item,Variant Based On,variant پر بنسټ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Total weightage ګمارل باید 100٪ شي. دا د {0}
-apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,ستاسو د عرضه کوونکي
+apps/erpnext/erpnext/utilities/user_progress.py +106,Your Suppliers,ستاسو د عرضه کوونکي
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,مهرباني وکړئ سم کړئ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,نه شي په توګه له السه په توګه خرڅلاو نظم جوړ شوی دی.
 DocType: Request for Quotation Item,Supplier Part No,عرضه برخه نه
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',وضع نه شي کله چې وېشنيزه کې د &#39;ارزښت&#39; یا د &#39;Vaulation او Total&#39; دی
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,ترلاسه له
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',وضع نه شي کله چې وېشنيزه کې د &#39;ارزښت&#39; یا د &#39;Vaulation او Total&#39; دی
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +364,Received From,ترلاسه له
 DocType: Lead,Converted,بدلوی
 DocType: Item,Has Serial No,لري شعبه
 DocType: Employee,Date of Issue,د صدور نېټه
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +24,{0}: From {0} for {1},{0}: د {0} د {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"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}",لکه څنګه چې هر د خريداري امستنې که رانيول Reciept مطلوب ==: هو، بیا د رانيول صورتحساب د رامنځته کولو، د کارونکي باید رانيول رسيد لومړي لپاره توکی جوړ {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Row #{0}: Set Supplier for item {1},د کتارونو تر # {0}: د جنس د ټاکلو په عرضه {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +222,"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}",لکه څنګه چې هر د خريداري امستنې که رانيول Reciept مطلوب ==: هو، بیا د رانيول صورتحساب د رامنځته کولو، د کارونکي باید رانيول رسيد لومړي لپاره توکی جوړ {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +167,Row #{0}: Set Supplier for item {1},د کتارونو تر # {0}: د جنس د ټاکلو په عرضه {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,د کتارونو تر {0}: ساعتونه ارزښت باید له صفر څخه زیات وي.
-apps/erpnext/erpnext/stock/doctype/item/item.py +183,Website Image {0} attached to Item {1} cannot be found,وېب پاڼه Image {0} چې په قالب {1} وصل ونه موندل شي
+apps/erpnext/erpnext/stock/doctype/item/item.py +185,Website Image {0} attached to Item {1} cannot be found,وېب پاڼه Image {0} چې په قالب {1} وصل ونه موندل شي
 DocType: Issue,Content Type,منځپانګه ډول
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,کمپيوټر
+DocType: Asset,Assets,شتمنۍ
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,کمپيوټر
 DocType: Item,List this Item in multiple groups on the website.,په د ويب پاڼې د څو ډلو د دې توکي لست کړئ.
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,مهرباني وکړئ د پلورونکو ترتیباتو کې د ډیزاین کونکي ګروپ او ساحه وټاکئ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +323,Please check Multi Currency option to allow accounts with other currency,لطفا د اسعارو انتخاب څو له نورو اسعارو حسابونو اجازه وګورئ
+DocType: Payment Term,Due Date Based On,د ټاکل شوي نیټې پر بنسټ
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +85,Please set default customer group and territory in Selling Settings,مهرباني وکړئ د پلورونکو ترتیباتو کې د ډیزاین کونکي ګروپ او ساحه وټاکئ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +203,{0} {1} does not exist,{0} د {1} نه شته
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,Please check Multi Currency option to allow accounts with other currency,لطفا د اسعارو انتخاب څو له نورو اسعارو حسابونو اجازه وګورئ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +85,Item: {0} does not exist in the system,شمیره: {0} په سيستم کې نه شته
-apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,تاسو د ګنګل ارزښت جوړ واک نه دي
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,You are not authorized to set Frozen value,تاسو د ګنګل ارزښت جوړ واک نه دي
 DocType: Payment Reconciliation,Get Unreconciled Entries,تطبیق توکي ترلاسه کړئ
 DocType: Payment Reconciliation,From Invoice Date,له صورتحساب نېټه
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,تاسو ته د سپارلو اجازه نلرئ
-apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,د بلونو د اسعارو بايد مساوي يا default comapany د پيسو او يا د ګوند حساب اسعارو وي
 DocType: Healthcare Settings,Laboratory Settings,د لابراتواري امستنې
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,په نقطو څخه ووځي
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,دا څه کوي؟
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,ته ګدام
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,ټول د زده کوونکو د شمولیت
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +75,Leave Encashment,په نقطو څخه ووځي
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,What does it do?,دا څه کوي؟
+DocType: Crop,Byproducts,بپروټونه
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +76,To Warehouse,ته ګدام
+apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +26,All Student Admissions,ټول د زده کوونکو د شمولیت
 ,Average Commission Rate,په اوسط ډول د کمیسیون Rate
-apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,&#39;لري شعبه&#39; د غیر سټاک توکی نه وي &#39;هو&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +434,'Has Serial No' can not be 'Yes' for non-stock item,&#39;لري شعبه&#39; د غیر سټاک توکی نه وي &#39;هو&#39;
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,حالت وټاکئ
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,د حاضرۍ د راتلونکي لپاره د خرما نه په نښه شي
 DocType: Pricing Rule,Pricing Rule Help,د بیې د حاکمیت مرسته
 DocType: School House,House Name,ماڼۍ نوم
 DocType: Fee Schedule,Total Amount per Student,د هر زده کونکي ټوله اندازه
 DocType: Purchase Taxes and Charges,Account Head,ګڼون مشر
-apps/erpnext/erpnext/config/stock.py +173,Update additional costs to calculate landed cost of items,اضافي لګښتونه د اوسمهالولو لپاره د توکو لګیدلي لګښت محاسبه
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,Electrical,برق
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,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),Total ارزښت بدلون (له جملې څخه - په)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,د کتارونو تر {0}: د بدلولو نرخ الزامی دی
+DocType: Grant Application,Requested Amount,غوښتل شوي مقدار
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Row {0}: Exchange Rate is mandatory,د کتارونو تر {0}: د بدلولو نرخ الزامی دی
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},کارن تذکرو لپاره د کارکونکو نه {0}
 DocType: Vehicle,Vehicle Value,موټر ارزښت
+DocType: Crop Cycle,Detected Diseases,درملو ناروغي
 DocType: Stock Entry,Default Source Warehouse,Default سرچینه ګدام
 DocType: Item,Customer Code,پيرودونکو کوډ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},د کالیزې په ياد راولي {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},د کالیزې په ياد راولي {0}
+DocType: Asset Maintenance Task,Last Completion Date,د پای بشپړولو نیټه
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ورځو راهیسې تېر نظم
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,د حساب ډیبیټ باید د موازنې د پاڼه په پام کې وي
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,د حساب ډیبیټ باید د موازنې د پاڼه په پام کې وي
 DocType: Buying Settings,Naming Series,نوم لړۍ
 DocType: Leave Block List,Leave Block List Name,پريږدئ بالک بشپړفهرست نوم
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,د بيمې د پیل نیټه بايد د بيمې د پای نیټه په پرتله کمه وي
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,مهرباني وکړئ په ښوونځي کې د ښوونکي د نومونې سیسټم جوړ کړئ&gt; د ښوونځي ترتیبات
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,دحمل شتمني
 DocType: Timesheet,Production Detail,تولید تفصیلي
 DocType: Restaurant,Active Menu,فعالې غورنۍ
 DocType: Target Detail,Target Qty,هدف Qty
 DocType: Shopping Cart Settings,Checkout Settings,رایستل امستنې
-DocType: Attendance,Present,اوسنی
+DocType: Student Attendance,Present,اوسنی
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,د سپارنې پرمهال يادونه {0} بايد وړاندې نه شي
 DocType: Notification Control,Sales Invoice Message,خرڅلاو صورتحساب پيغام
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,تړل د حساب {0} بايد د ډول Liability / مساوات وي
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},د کارکوونکي معاش ټوټه {0} د مخه د وخت په پاڼه کې جوړ {1}
 DocType: Vehicle Log,Odometer,Odometer
 DocType: Sales Order Item,Ordered Qty,امر Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,د قالب {0} معلول دی
+apps/erpnext/erpnext/stock/doctype/item/item.py +713,Item {0} is disabled,د قالب {0} معلول دی
 DocType: Stock Settings,Stock Frozen Upto,دحمل ګنګل ترمړوندونو پورې
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,هیښ کوم سټاک توکی نه لري
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +929,BOM does not contain any stock item,هیښ کوم سټاک توکی نه لري
+DocType: Chapter,Chapter Head,د فصل سر
+DocType: Payment Term,Month(s) after the end of the invoice month,د رسیدنې میاشتې پای پورې میاشت میاشتې
 apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,د پروژې د فعاليت / دنده.
 DocType: Vehicle Log,Refuelling Details,Refuelling نورولوله
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,معاش ټوټه تولید
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}",د خريداري باید وکتل شي، که د تطبیق لپاره د ده په توګه وټاکل {0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,تخفیف باید څخه کم 100 وي
+DocType: Shipping Rule,Restrict to Countries,هیوادونو ته محدودیت
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +171,Select Delivery Notes,د سپارلو یادښتونه غوره کړئ
 DocType: Purchase Invoice,Write Off Amount (Company Currency),مقدار ولیکئ پړاو (د شرکت د اسعارو)
 DocType: Sales Invoice Timesheet,Billing Hours,بلونو ساعتونه
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,د {0} ونه موندل Default هیښ
-apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,د کتارونو تر # {0}: مهرباني وکړئ ټاکل ترمیمي کمیت
+DocType: Project,Total Sales Amount (via Sales Order),د پلور مجموعي مقدار (د پلور امر له الرې)
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +528,Default BOM for {0} not found,د {0} ونه موندل Default هیښ
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Row #{0}: Please set reorder quantity,د کتارونو تر # {0}: مهرباني وکړئ ټاکل ترمیمي کمیت
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,دلته يې اضافه توکي tap
 DocType: Fees,Program Enrollment,پروګرام شمولیت
 DocType: Landed Cost Voucher,Landed Cost Voucher,تيرماښام لګښت ګټمنو
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},لطفا جوړ {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} دی فعال محصل
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} دی فعال محصل
+apps/erpnext/erpnext/education/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} دی فعال محصل
+apps/erpnext/erpnext/education/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} دی فعال محصل
 DocType: Employee,Health Details,د روغتیا په بشپړه توګه کتل
 DocType: Offer Letter,Offer Letter Terms,لیک شرطونه وړاندې کوي
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,د پیسو غوښتنه مرجع سند ته اړتيا ده پيدا
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,د پیسو غوښتنه مرجع سند ته اړتيا ده پيدا
+DocType: Soil Texture,Sandy Clay,د سینڈی کلی
+DocType: Grant Application,Assessment  Manager,د ارزونې مدیر
 DocType: Payment Entry,Allocate Payment Amount,د پیسو مقدار د تخصيص
 DocType: Employee External Work History,Salary,معاش
 DocType: Serial No,Delivery Document Type,د سپارنې پرمهال د سند ډول
-DocType: Process Payroll,Submit all salary slips for the above selected criteria,د پورته انتخاب معیارونه ټول معاش ټوټه سپارل
 DocType: Sales Order,Partly Delivered,خفيف د تحویلوونکی
+DocType: Item Variant Settings,Do not update variants on save,په خوندي کولو کې توپیرونه ندی تازه کړئ
 DocType: Email Digest,Receivables,پورونه
 DocType: Lead Source,Lead Source,سرب د سرچینه
 DocType: Customer,Additional information regarding the customer.,د مشتريانو په اړه اضافي معلومات.
@@ -4831,24 +5173,27 @@
 DocType: Maintenance Visit,Maintenance Date,د ساتنې او نېټه
 DocType: Purchase Invoice Item,Rejected Serial No,رد شعبه
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,کال د پيل نيټه او يا پای نیټه سره {0} تداخل. د مخنيوي لطفا شرکت جوړ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +94,Please mention the Lead Name in Lead {0},مهرباني وکړئ په لیډ {0} کې د لیډ نوم یاد کړئ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,Please mention the Lead Name in Lead {0},مهرباني وکړئ په لیډ {0} کې د لیډ نوم یاد کړئ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,Start date should be less than end date for Item {0},د پیل نیټه باید د قالب پای د نېټې په پرتله کمه وي {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.",بېلګه: د ABCD ##### که لړ ټاکل شوې ده او شعبه په معاملو ذکر نه دی، نو اتومات سریال به پر بنسټ دې لړ کې جوړ شي. که غواړئ چې تل په صراحت سریال وځيري لپاره د دې توکي ذکر. دا تش ووځي.
 DocType: Upload Attendance,Upload Attendance,upload حاضريدل
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +319,BOM and Manufacturing Quantity are required,هیښ او توليد مقدار ته اړتیا ده
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +535,BOM and Manufacturing Quantity are required,هیښ او توليد مقدار ته اړتیا ده
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Ageing Range 2
 DocType: SG Creation Tool Course,Max Strength,Max پياوړتيا
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,لګول شوي سایټونه
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +67,No Delivery Note selected for Customer {},د سپارښتنې یادښت د پیرودونکو لپاره غوره شوی {}
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,هیښ بدل
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,د سپارلو نیټه پر بنسټ د توکو توکي وټاکئ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1041,Select Items based on Delivery Date,د سپارلو نیټه پر بنسټ د توکو توکي وټاکئ
+DocType: Grant Application,Has any past Grant Record,د تیر وړیا مرستې ریکارډ لري
 ,Sales Analytics,خرڅلاو Analytics
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},موجود {0}
 ,Prospects Engaged But Not Converted,د پانګې لپاره ليوالتيا کوژدن خو نه، ډمتوب
 ,Prospects Engaged But Not Converted,د پانګې لپاره ليوالتيا کوژدن خو نه، ډمتوب
 DocType: Manufacturing Settings,Manufacturing Settings,دفابريکي امستنې
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Email ترتیبول
-apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 د موبايل په هيڅ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,لطفا په شرکت ماسټر default اسعارو ته ننوځي
+apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1 د موبايل په هيڅ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +106,Please enter default currency in Company Master,لطفا په شرکت ماسټر default اسعارو ته ننوځي
 DocType: Stock Entry Detail,Stock Entry Detail,دحمل انفاذ تفصیلي
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,هره ورځ په دوراني ډول
 DocType: Products Settings,Home Page is Products,لمړی مخ ده محصوالت
@@ -4857,17 +5202,17 @@
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,نوی ګڼون نوم
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,خام مواد لګښت
 DocType: Selling Settings,Settings for Selling Module,لپاره خرڅول ماډل امستنې
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Customer Service,د پیرودونکو خدمت
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,د پیرودونکو خدمت
 DocType: BOM,Thumbnail,بټنوک
 DocType: Item Customer Detail,Item Customer Detail,د قالب پيرودونکو تفصیلي
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,وړاندیز کانديد په دنده.
 DocType: Notification Control,Prompt for Email on Submission of,د ليک د وړاندې کول دې ته وهڅول
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves are more than days in the period,ټولې پاڼي په دې موده کې د ورځو څخه زیات دي
+DocType: Land Unit,Linked Soil Analysis,د خاورې سره د خاورې شننه
 DocType: Pricing Rule,Percentage,سلنه
 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,Default د کار په پرمختګ ګدام
-apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,د محاسبې معاملو تلواله امستنو.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,مهرباني وکړئ د بشري منابعو&gt; بشري سیسټمونو کې د کارمندانو نومونې سیستم ترتیب کړئ
+apps/erpnext/erpnext/config/accounts.py +288,Default settings for accounting transactions.,د محاسبې معاملو تلواله امستنو.
 DocType: Maintenance Visit,MV,ترځمکې
 DocType: Restaurant,Default Tax Template,اصلي مالی ټکي
 DocType: Fees,Student Details,د زده کونکو توضیحات
@@ -4880,11 +5225,11 @@
 DocType: Sales Order,Printing Details,د چاپونې نورولوله
 DocType: Task,Closing Date,بنديدو نېټه
 DocType: Sales Order Item,Produced Quantity,توليد مقدار
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +122,Engineer,انجنير
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,انجنير
 DocType: Journal Entry,Total Amount Currency,Total مقدار د اسعارو
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,د لټون فرعي شورا
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Item Code required at Row No {0},د قالب کوډ په کتارونو هیڅ اړتیا {0}
-apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,توکي ته لاړ شه
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},د قالب کوډ په کتارونو هیڅ اړتیا {0}
+apps/erpnext/erpnext/utilities/user_progress.py +151,Go to Items,توکي ته لاړ شه
 DocType: Sales Partner,Partner Type,همکار ډول
 DocType: Purchase Taxes and Charges,Actual,واقعي
 DocType: Restaurant Menu,Restaurant Manager,د رستورانت مدیر
@@ -4901,36 +5246,38 @@
 DocType: Item Reorder,Re-Order Level,Re-نظم د ليول
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,توکي او پالن qty د کوم لپاره چې تاسو غواړئ چې د توليد امر کړي او يا يې د تحليل او د خامو موادو د نیولو لپاره وليکئ.
 apps/erpnext/erpnext/projects/doctype/project/project.js +64,Gantt Chart,Gantt چارت
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Part-time,بعد له وخته
+DocType: Crop Cycle,Cycle Type,د سائیکل ډول
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +99,Part-time,بعد له وخته
 DocType: Employee,Applicable Holiday List,د تطبيق وړ رخصتي بشپړفهرست
 DocType: Employee,Cheque,آرډر
 DocType: Training Event,Employee Emails,د کارموندنې برېښناليکونه
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +59,Series Updated,لړۍ Updated
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,راپور ډول فرض ده
+apps/erpnext/erpnext/accounts/doctype/account/account.py +161,Report Type is mandatory,راپور ډول فرض ده
 DocType: Item,Serial Number Series,پرلپسې لړۍ
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},ګدام لپاره سټاک د قالب {0} په قطار الزامی دی {1}
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,د پرچون او عمده
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +45,Retail & Wholesale,د پرچون او عمده
 DocType: Issue,First Responded On,لومړی ځواب د
 DocType: Website Item Group,Cross Listing of Item in multiple groups,په څو ډلو د قالب صلیب داعلاناتو
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},مالي کال د پیل نیټه او د مالي کال د پای نیټه لا پخوا د مالي کال کې جوړ {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,تازه چاڼېزو نېټه
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,ویش په دسته
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,ویش په دسته
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +138,Split Batch,ویش په دسته
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +138,Split Batch,ویش په دسته
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,په بریالیتوب سره راوړې
 DocType: Request for Quotation Supplier,Download PDF,دانلود PDF
 DocType: Production Order,Planned End Date,پلان د پای نیټه
-apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,مهرباني وکړئ د مهال ویش نیټه درج کړئ
-apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,هلته توکو زیرمه شوي دي.
+apps/erpnext/erpnext/controllers/buying_controller.py +424,Please enter Schedule Date,مهرباني وکړئ د مهال ویش نیټه درج کړئ
+apps/erpnext/erpnext/config/non_profit.py +63,Donor Type information.,د ډونر ډول ډول.
 DocType: Request for Quotation,Supplier Detail,عرضه تفصیلي
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},په فورمول يا حالت تېروتنه: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,رسیدونو د مقدار
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,د معیارونو وزن باید 100٪ ته ورسیږي
-DocType: Attendance,Attendance,د حاضرۍ
+apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,د حاضرۍ
 apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,سټاک توکی
 DocType: BOM,Materials,د توکو
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",که چک، په لست کې به ته د هر ریاست چې دا لري چې کارول کيږي زياته شي.
-apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,سرچینه او د هدف ګدام نه شي کولای ورته وي
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +535,Posting date and posting time is mandatory,پست کوي وخت او نېټه امخ د الزامی دی
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +103,Creating {0},جوړول {0}
+apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,سرچینه او د هدف ګدام نه شي کولای ورته وي
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +561,Posting date and posting time is mandatory,پست کوي وخت او نېټه امخ د الزامی دی
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,د معاملو اخلي د مالياتو کېنډۍ.
 ,Item Prices,د قالب نرخونه
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,په کلیمو کې به د ليدو وړ وي. هر کله چې تاسو د اخستلو امر وژغوري.
@@ -4940,40 +5287,43 @@
 apps/erpnext/erpnext/config/selling.py +67,Price List master.,د بیې په لېست بادار.
 DocType: Task,Review Date,کتنه نېټه
 DocType: Company,Series for Asset Depreciation Entry (Journal Entry),د استملاک د استحکام داخلي (جریان داخلي) لړۍ
+DocType: Membership,Member Since,غړی
 DocType: Purchase Invoice,Advance Payments,پرمختللی د پیسو ورکړه
 DocType: Purchase Taxes and Charges,On Net Total,د افغان بېسیم ټول
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},د خاصې لپاره {0} ارزښت باید د لړ کې وي {1} د {2} د زیاتوالی {3} لپاره د قالب {4}
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,په قطار {0} د هدف ګدام بايد په توګه تولید نظم ورته وي
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,Target warehouse in row {0} must be same as Production Order,په قطار {0} د هدف ګدام بايد په توګه تولید نظم ورته وي
 DocType: Restaurant Reservation,Waitlisted,انتظار شوی
-apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,د اسعارو نه شي د ارقامو د يو شمېر نورو اسعارو په کارولو وروسته بدل شي
+apps/erpnext/erpnext/accounts/doctype/account/account.py +126,Currency can not be changed after making entries using some other currency,د اسعارو نه شي د ارقامو د يو شمېر نورو اسعارو په کارولو وروسته بدل شي
+DocType: Shipping Rule,Fixed,ثابت شوی
 DocType: Vehicle Service,Clutch Plate,د کلچ ذريعه
 DocType: Company,Round Off Account,حساب پړاو
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,اداري لګښتونه
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consulting
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Parent پيرودونکو ګروپ
 DocType: Journal Entry,Subscription,ګډون
 DocType: Purchase Invoice,Contact Email,تماس دبرېښنا ليک
-apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,د فیس جوړونې تادیه کول
+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/install_fixtures.py +229,Notice Period,دمهلت دوره
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,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,نوي خرڅلاو شخص نوم
 DocType: Packing Slip,Gross Weight UOM,Gross وزن UOM
+DocType: Asset Maintenance Task,Preventive Maintenance,مخنیوی ساتنه
 DocType: Delivery Note Item,Against Sales Invoice,په وړاندې د خرڅلاو صورتحساب
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,لطفا د serialized توکی سريال عدد وليکئ
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +151,Please enter serial numbers for serialized item ,لطفا د serialized توکی سريال عدد وليکئ
 DocType: Bin,Reserved Qty for Production,د تولید خوندي دي Qty
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,وناکتل پريږدئ که تاسو نه غواړي چې په داسې حال کې د کورس پر بنسټ ډلو جوړولو داځکه پام کې ونیسي.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,وناکتل پريږدئ که تاسو نه غواړي چې په داسې حال کې د کورس پر بنسټ ډلو جوړولو داځکه پام کې ونیسي.
 DocType: Asset,Frequency of Depreciation (Months),د استهالک د فريکوينسي (مياشتې)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +493,Credit Account,اعتبار اکانټ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +501,Credit Account,اعتبار اکانټ
 DocType: Landed Cost Item,Landed Cost Item,تيرماښام لګښت د قالب
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,صفر ارزښتونو وښایاست
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,د توکي مقدار توليدي وروسته ترلاسه / څخه د خامو موادو ورکول اندازه ګیلاسو
 DocType: Lab Test,Test Group,ټسټ ګروپ
 DocType: Payment Reconciliation,Receivable / Payable Account,ترلاسه / د راتلوونکې اکانټ
 DocType: Delivery Note Item,Against Sales Order Item,په وړاندې د خرڅلاو نظم قالب
-apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},مهرباني وکړئ مشخص د خاصې لپاره ارزښت ځانتیا {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +680,Please specify Attribute Value for attribute {0},مهرباني وکړئ مشخص د خاصې لپاره ارزښت ځانتیا {0}
 DocType: Item,Default Warehouse,default ګدام
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},د بودجې د ګروپ د حساب په وړاندې نه شي کولای {0}
 DocType: Healthcare Settings,Patient Registration,د ناروغۍ ثبت
@@ -4985,24 +5335,28 @@
 DocType: Appraisal,Total Score (Out of 5),ټولې نمرې (د 5 څخه)
 DocType: Fee Structure,FS.,په مطالعه کې.
 DocType: Student Attendance Tool,Batch,دسته
+DocType: Donor,Donor Type,د ډونر ډول
 apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,توازن
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +66,Please select the Company,مهرباني وکړئ شرکت غوره کړئ
 DocType: Room,Seating Capacity,ناستل او د ظرفیت
 DocType: Issue,ISS-,ISS-
 DocType: Lab Test Groups,Lab Test Groups,د لابراتوار ټسټ ګروپونه
 DocType: Project,Total Expense Claim (via Expense Claims),Total اخراجاتو ادعا (اخراجاتو د ادعا له لارې)
 DocType: GST Settings,GST Summary,GST لنډيز
 DocType: Assessment Result,Total Score,ټولې نمرې
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +116,Please set the Default Cost Center in {0} company,مهرباني وکړئ د شرکت په {0} کمپنۍ کې د اصلي لګښت مرکز ولیکئ
 DocType: Journal Entry,Debit Note,ډیبیټ يادونه
 DocType: Stock Entry,As per Stock UOM,لکه څنګه چې د هر دحمل UOM
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,نه ختم دی
 DocType: Student Log,Achievement,لاسته راوړنه
 DocType: Batch,Source Document Type,سرچینه لاسوند ډول
 DocType: Batch,Source Document Type,سرچینه لاسوند ډول
+apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,د کورس کورسونه جوړ شول
 DocType: Journal Entry,Total Debit,Total ګزارې
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Default توکو د ګدام
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,خرڅلاو شخص
-apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,د بودجې او لګښتونو مرکز
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,د پیسو ډیری ډیزاین موډل اجازه نه لري
+apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,د بودجې او لګښتونو مرکز
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,د پیسو ډیری ډیزاین موډل اجازه نه لري
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,لپاره
 ,Appointment Analytics,د استوګنې انټرنېټونه
 DocType: Vehicle Service,Half Yearly,نيمايي د اکتوبر
@@ -5011,19 +5365,20 @@
 DocType: Healthcare Settings,Consultations in valid days,په صحيح ورځو کې مشورې
 DocType: Assessment Plan Criteria,Maximum Score,اعظمي نمره
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,قواعد معاملو پر بنسټ د ارزښتونو د محدودولو جوړول.
-apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +49, Group Roll No,ګروپ رول نه
-apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +9,Fee Creation Failed,د فیس جوړول ناکام شول
+apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +49, Group Roll No,ګروپ رول نه
+apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +9,Fee Creation Failed,د فیس جوړول ناکام شول
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,خالي پريږدئ که تاسو په هر کال کې زده کوونکو ډلو لپاره
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,خالي پريږدئ که تاسو په هر کال کې زده کوونکو ډلو لپاره
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",که وکتل، ټول نه. د کاري ورځې به رخصتي شامل دي او دا کار به د معاش د ورځې د ارزښت د کمولو
 DocType: Purchase Invoice,Total Advance,Total پرمختللی
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,د کود کوډ بدل کړئ
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,د دورې د پای نیټه نه شي کولای د دورې د پیل نیټه د وخت نه مخکې وي. لطفا د خرما د اصلاح او بیا کوښښ وکړه.
+apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,د دورې د پای نیټه نه شي کولای د دورې د پیل نیټه د وخت نه مخکې وي. لطفا د خرما د اصلاح او بیا کوښښ وکړه.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Quot شمېرنې
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Quot شمېرنې
 ,BOM Stock Report,هیښ سټاک راپور
 DocType: Stock Reconciliation Item,Quantity Difference,مقدار بدلون
-apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,د پروسس د معاشاتو
+DocType: Employee Advance,EA-,EA-
+apps/erpnext/erpnext/config/hr.py +320,Processing Payroll,د پروسس د معاشاتو
 DocType: Opportunity Item,Basic Rate,اساسي Rate
 DocType: GL Entry,Credit Amount,اعتبار مقدار
 DocType: Cheque Print Template,Signatory Position,لاسليک مقام
@@ -5031,73 +5386,80 @@
 DocType: Timesheet,Total Billable Hours,Total Billable ساعتونه
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,د پيسو د رسيد يادونه
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,دا په دې پيرودونکو پر وړاندې د معاملو پر بنسټ. د تفصیلاتو لپاره په لاندی مهال ویش وګورئ
-DocType: Supplier,Credit Days Based On,پورونو د ورځې پر بنسټ
+DocType: Company,Credit Days Based On,پورونو د ورځې پر بنسټ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +161,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},د کتارونو تر {0}: ځانګړې اندازه {1} بايد په پرتله کمه وي او یا د پیسو د داخلولو اندازه مساوي {2}
 ,Course wise Assessment Report,کورس هوښيار د ارزونې رپورټ
 DocType: Tax Rule,Tax Rule,د مالياتو د حاکمیت
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,د خرڅلاو دوره ورته کچه وساتي
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Workstation کاري ساعتونه بهر وخت يادښتونه پلان جوړ کړي.
 apps/erpnext/erpnext/public/js/pos/pos.html +87,Customers in Queue,په کتار پېرېدونکي
+DocType: Driver,Issuing Date,د جاري کولو نیټه
 DocType: Student,Nationality,تابعیت
 ,Items To Be Requested,د ليکنو ته غوښتنه وشي
 DocType: Company,Company Info,پيژندنه
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,وټاکئ او يا د نوي مشتريانو د اضافه
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,لګښت مرکز ته اړتيا ده چې د لګښت ادعا کتاب
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Select or add new customer,وټاکئ او يا د نوي مشتريانو د اضافه
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Cost center is required to book an expense claim,لګښت مرکز ته اړتيا ده چې د لګښت ادعا کتاب
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),د بسپنو (شتمني) کاریال
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,دا د دې د کارکونکو د راتګ پر بنسټ
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,نښه نښه
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,ډیبیټ اکانټ
+apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,نښه نښه
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +495,Debit Account,ډیبیټ اکانټ
 DocType: Fiscal Year,Year Start Date,کال د پیل نیټه
 DocType: Attendance,Employee Name,د کارګر نوم
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,د رستورانت امر د ننوت توکي
-DocType: Sales Invoice,Rounded Total (Company Currency),غونډ مونډ Total (شرکت د اسعارو)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,آيا له ګروپ د پټو نه ځکه حساب ډول انتخاب.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +240,{0} {1} has been modified. Please refresh.,{0} د {1} بدل شوی دی. لطفا تازه.
+DocType: Purchase Invoice,Rounded Total (Company Currency),غونډ مونډ Total (شرکت د اسعارو)
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Cannot covert to Group because Account Type is selected.,آيا له ګروپ د پټو نه ځکه حساب ډول انتخاب.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +260,{0} {1} has been modified. Please refresh.,{0} د {1} بدل شوی دی. لطفا تازه.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,څخه په لاندې ورځو کولو اجازه غوښتنلیکونه کاروونکو ودروي.
+DocType: Asset Maintenance Team,Maintenance Team Members,د ساتنې د ټیم غړي
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,رانيول مقدار
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +259,Supplier Quotation {0} created,عرضه کوونکي د داوطلبۍ {0} جوړ
 apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,د پای کال د پیل کال مخکې نه شي
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,د کارګر ګټې
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Employee Benefits,د کارګر ګټې
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packed quantity must equal quantity for Item {0} in row {1},ډک اندازه بايد په قطار د {0} د قالب اندازه برابر {1}
 DocType: Production Order,Manufactured Qty,جوړيږي Qty
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,انوائس جوړ شو
+DocType: Asset,Out of Order,له کاره وتلی
 DocType: Purchase Receipt Item,Accepted Quantity,منل مقدار
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},لطفا یو default رخصتي بشپړفهرست لپاره د کارګر جوړ {0} یا د شرکت د {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +242,Please set a default Holiday List for Employee {0} or Company {1},لطفا یو default رخصتي بشپړفهرست لپاره د کارګر جوړ {0} یا د شرکت د {1}
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} نه شتون
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +75,Select Batch Numbers,انتخاب دسته شمیرې
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,انتخاب دسته شمیرې
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,بلونه د پېرېدونکي راپورته کړې.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,د پروژې Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},د قطار نه {0}: مقدار نه شي اخراجاتو ادعا {1} په وړاندې د مقدار د انتظار څخه ډيره وي. انتظار مقدار دی {2}
-DocType: Maintenance Schedule,Schedule,مهال ويش
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +532,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},د قطار نه {0}: مقدار نه شي اخراجاتو ادعا {1} په وړاندې د مقدار د انتظار څخه ډيره وي. انتظار مقدار دی {2}
+DocType: Assessment Plan,Schedule,مهال ويش
 DocType: Account,Parent Account,Parent اکانټ
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,شته
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +266,Available,شته
 DocType: Quality Inspection Reading,Reading 3,لوستلو 3
 ,Hub,مرکز
 DocType: GL Entry,Voucher Type,ګټمنو ډول
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,بیې په لېست کې ونه موندل او يا معيوب
-DocType: Lab Test,Approved,تصویب شوې
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1706,Price List not found or disabled,بیې په لېست کې ونه موندل او يا معيوب
+DocType: Student Applicant,Approved,تصویب شوې
 DocType: Pricing Rule,Price,د بیې
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',د کارګر د کرارۍ د {0} بايد جوړ شي د &quot;کيڼ &#39;
 DocType: Hub Settings,Last Sync On,وروستنۍ هممهال
 DocType: Guardian,Guardian,ګارډین
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,ارزونې {0} په ټاکلې نیټه لړ {1} لپاره د کارګر جوړ
-DocType: Employee,Education,ښوونه
+DocType: Academic Term,Education,ښوونه
 apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,دل
 DocType: Selling Settings,Campaign Naming By,د کمپاین نوم By
 DocType: Employee,Current Address Is,اوسني پته ده
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,د میاشتنۍ پلورنې هدف)
 apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,بدلون موندلی
-apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +41,"Optional. Sets company's default currency, if not specified.",اختیاري. ټاکي شرکت د تلواله اسعارو، که مشخصه نه ده.
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +43,"Optional. Sets company's default currency, if not specified.",اختیاري. ټاکي شرکت د تلواله اسعارو، که مشخصه نه ده.
 DocType: Sales Invoice,Customer GSTIN,پيرودونکو GSTIN
+DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,په ساحه کې د ناروغیو لیست. کله چې دا غوره کړه نو په اتومات ډول به د دندو لیست اضافه کړئ چې د ناروغۍ سره معامله وکړي
+DocType: Asset Repair,Repair Status,د ترمیم حالت
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,د محاسبې ژورنال زياتونې.
 DocType: Delivery Note Item,Available Qty at From Warehouse,موجود Qty په له ګدام
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,مهرباني وکړئ لومړی غوره کارکوونکی دثبت.
 DocType: POS Profile,Account for Change Amount,د بدلون لپاره د مقدار حساب
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},د کتارونو تر {0}: ګوند / حساب سره سمون نه خوري {1} / {2} د {3} {4}
-apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,د کورس کود:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +215,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},د کتارونو تر {0}: ګوند / حساب سره سمون نه خوري {1} / {2} د {3} {4}
+DocType: Maintenance Team Member,Maintenance Team Member,د ساتنې د ټیم غړی
+DocType: Agriculture Analysis Criteria,Soil Analysis,د خاورې شننه
+apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,د کورس کود:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,لطفا اخراجاتو حساب ته ننوځي
 DocType: Account,Stock,سټاک
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",د کتارونو تر # {0}: ماخذ لاسوند ډول باید د اخستلو امر يو، رانيول صورتحساب یا ژورنال انفاذ وي
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1068,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",د کتارونو تر # {0}: ماخذ لاسوند ډول باید د اخستلو امر يو، رانيول صورتحساب یا ژورنال انفاذ وي
 DocType: Employee,Current Address,اوسني پته
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",که جنس د بل جنس بيا توضيحات، انځور، د قيمتونو، ماليه او نور به د کېنډۍ څخه جوړ شي يو variant دی، مګر په واضح ډول مشخص
 DocType: Serial No,Purchase / Manufacture Details,رانيول / جوړون نورولوله
@@ -5108,54 +5470,53 @@
 DocType: Sales Invoice Item,Discount and Margin,کمښت او څنډی
 DocType: Lab Test,Prescription,نسخه
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,کشش د پلورنې د حکم (په تمه ته وړاندې) پر بنسټ د پورته معيارونو
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +90,Not Available,نشته
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +98,Not Available,نشته
 DocType: Pricing Rule,Min Qty,Min Qty
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +36,Disable Template,کينډۍ ناباوره کول
-DocType: Asset Movement,Transaction Date,د راکړې ورکړې نېټه
+DocType: GL Entry,Transaction Date,د راکړې ورکړې نېټه
 DocType: Production Plan Item,Planned Qty,پلان Qty
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +121,Total Tax,Total د مالياتو
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,د مقدار (تولید Qty) فرض ده
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +182,For Quantity (Manufactured Qty) is mandatory,د مقدار (تولید Qty) فرض ده
 DocType: Stock Entry,Default Target Warehouse,Default د هدف ګدام
 DocType: Purchase Invoice,Net Total (Company Currency),خالص Total (شرکت د اسعارو)
-apps/erpnext/erpnext/schools/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.,د کال د پای نیټه نه شي کولای د کال د پیل نیټه د وخت نه مخکې وي. لطفا د خرما د اصلاح او بیا کوښښ وکړه.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,د کتارونو تر {0}: ګوند ډول او ګوند یوازې ترلاسه / د راتلوونکې ګڼون په وړاندې د تطبيق وړ
+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: Notification Control,Purchase Receipt Message,رانيول رسيد پيغام
 DocType: BOM,Scrap Items,د اوسپنې توکی
 DocType: Production Order,Actual Start Date,واقعي د پیل نیټه
 DocType: Sales Order,% of materials delivered against this Sales Order,٪ د توکو د خرڅلاو د دې نظم په وړاندې کولو
-apps/erpnext/erpnext/config/stock.py +12,Record item movement.,ریکارډ توکی غورځنګ.
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +57,Set default mode of payment,د پیسو د بدلولو موډل ټاکئ
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +62,Set default mode of payment,د پیسو د بدلولو موډل ټاکئ
+DocType: Grant Application,Withdrawn,ایستل
 DocType: Hub Settings,Hub Settings,مرکزي امستنې
 DocType: Project,Gross Margin %,د ناخالصه عايد٪
 DocType: BOM,With Operations,سره د عملیاتو په
-apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,په اسعارو د محاسبې زياتونې لا شوي دي {0} د شرکت {1}. لطفا د کرنسۍ ته د ترلاسه يا د ورکړې وړ حساب غوره {0}.
+apps/erpnext/erpnext/accounts/party.py +262,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,په اسعارو د محاسبې زياتونې لا شوي دي {0} د شرکت {1}. لطفا د کرنسۍ ته د ترلاسه يا د ورکړې وړ حساب غوره {0}.
 DocType: Asset,Is Existing Asset,آیا موجوده د شتمنیو
 DocType: Salary Detail,Statistical Component,د احصایې برخه
 DocType: Salary Detail,Statistical Component,د احصایې برخه
 DocType: Warranty Claim,If different than customer address,که د پېرېدونکو پته په پرتله بیلو
 DocType: Purchase Invoice,Without Payment of Tax,د مالیې ورکړې پرته
 DocType: BOM Operation,BOM Operation,هیښ عمليات
+apps/erpnext/erpnext/config/stock.py +141,Fulfilment,بشپړ
 DocType: Purchase Taxes and Charges,On Previous Row Amount,په تیره د کتارونو تر مقدار
-DocType: Student,Home Address,کور پته
 DocType: Item,Has Expiry Date,د پای نیټه نیټه لري
-apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,د توکو ډول ډولونه.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,د انتقال د شتمنیو
+apps/erpnext/erpnext/assets/doctype/asset/asset.js +269,Transfer Asset,د انتقال د شتمنیو
 DocType: POS Profile,POS Profile,POS پېژندنه
 DocType: Training Event,Event Name,دکمپاینونو نوم
 DocType: Physician,Phone (Office),تلیفون (دفتر)
-apps/erpnext/erpnext/hooks.py +147,Admission,د شاملیدو
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},لپاره د شمولیت {0}
-apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.",د ټاکلو لپاره د بودجې، نښې او نور موسمي
+apps/erpnext/erpnext/hooks.py +151,Admission,د شاملیدو
+apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},لپاره د شمولیت {0}
+apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.",د ټاکلو لپاره د بودجې، نښې او نور موسمي
 DocType: Supplier Scorecard Scoring Variable,Variable Name,متغیر نوم
-apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants",{0} د قالب دی کېنډۍ، لطفا د خپلو بېرغونو وټاکئ
+apps/erpnext/erpnext/stock/get_item_details.py +142,"Item {0} is a template, please select one of its variants",{0} د قالب دی کېنډۍ، لطفا د خپلو بېرغونو وټاکئ
 DocType: Asset,Asset Category,د شتمنیو کټه ګورۍ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,خالص د معاشونو نه کېدای شي منفي وي
 DocType: Assessment Plan,Room,کوټه
 DocType: Purchase Order,Advance Paid,پرمختللی ورکړل
 DocType: Item,Item Tax,د قالب د مالياتو
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,ته عرضه مواد
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,وسیله صورتحساب
-apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}٪ ښکاري څخه یو ځل بیا
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Material to Supplier,ته عرضه مواد
+DocType: Soil Texture,Loamy Sand,لامین ریت
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +594,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,د کارکوونکو دبرېښنا ليک Id
 DocType: Employee Attendance Tool,Marked Attendance,د پام وړ د حاضرۍ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,اوسني مسؤلیتونه
@@ -5163,16 +5524,17 @@
 DocType: Patient,A Positive,A مثبت
 DocType: Program,Program Name,د پروګرام نوم
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,لپاره د مالياتو او يا چارج په پام کې
+DocType: Driver,Driving License Category,د موټر چلولو د جواز کټګوري
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,واقعي Qty الزامی دی
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} په اوسني وخت کې {1} د سپارل شوي کارت کارت لري، او د دې عرضه کوونکي لپاره د پیرودونکي سپارښتنې باید احتیاط سره خپور شي.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +81,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0} په اوسني وخت کې {1} د سپارل شوي کارت کارت لري، او د دې عرضه کوونکي لپاره د پیرودونکي سپارښتنې باید احتیاط سره خپور شي.
+DocType: Asset Maintenance Team,Asset Maintenance Team,د شتمنیو د ساتنې ټیم
 DocType: Employee Loan,Loan Type,د پور ډول
 DocType: Scheduling Tool,Scheduling Tool,مهال ويش له اوزار
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,باور كارت
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,باور كارت
 DocType: BOM,Item to be manufactured or repacked,د قالب توليد شي او يا repacked
-apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,د سټاک معاملو تلواله امستنو.
 DocType: Employee Education,Major/Optional Subjects,جګړن / اختیاري مضمونونه
 DocType: Sales Invoice Item,Drop Ship,څاڅکی کښتۍ
-DocType: Hub Settings,Suspended,معطل شوی
+DocType: Driver,Suspended,معطل شوی
 DocType: Training Event,Attendees,دې سمینار کې
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",دلته تاسو په شان د نوم او د مور او پلار، ښځه او ماشومان اشغال کورنۍ جزئيات وساتي
 DocType: Academic Term,Term End Date,اصطلاح د پای نیټه
@@ -5181,12 +5543,12 @@
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,څخه د اسعارو او د پیسو د نه شي کولای ورته وي
 DocType: Stock Entry,Repack,Repack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,تاسو باید د محاکمې د مخه فورمه Save
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,مهرباني وکړئ لومړی شرکت غوره کړئ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +113,Please select the Company first,مهرباني وکړئ لومړی شرکت غوره کړئ
 DocType: Item Attribute,Numeric Values,شمېريزو ارزښتونه
-apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,Logo ضمیمه
+apps/erpnext/erpnext/public/js/setup_wizard.js +56,Attach Logo,Logo ضمیمه
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,سټاک کچه
 DocType: Customer,Commission Rate,کمیسیون Rate
-apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,د کمکیانو لپاره د variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +472,Make Variant,د کمکیانو لپاره د variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,له خوا د رياست د بنديز رخصت غوښتنلیکونه.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer",د پیسو ډول بايد د تر لاسه شي، د تنخاوو او کورني انتقال
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics
@@ -5194,7 +5556,8 @@
 DocType: Vehicle,Model,د نمونوي
 DocType: Production Order,Actual Operating Cost,واقعي عملياتي لګښت
 DocType: Payment Entry,Cheque/Reference No,آرډر / ماخذ نه
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,د ريښي د تصحيح نه شي.
+DocType: Soil Texture,Clay Loam,مټ لوام
+apps/erpnext/erpnext/accounts/doctype/account/account.py +83,Root cannot be edited.,د ريښي د تصحيح نه شي.
 DocType: Item,Units of Measure,د اندازه کولو واحدونه
 DocType: Manufacturing Settings,Allow Production on Holidays,په رخصتۍ تولید اجازه
 DocType: Sales Order,Customer's Purchase Order Date,پيرودونکو د اخستلو امر نېټه
@@ -5207,39 +5570,37 @@
 DocType: Company,Existing Company,موجوده شرکت
 DocType: Healthcare Settings,Result Emailed,پایلې ای میل شوي
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items",د مالياتو د کټه دی چې د &quot;ټول&quot; ته بدل شوي ځکه چې ټول سامان د غیر سټاک توکي دي
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,د توکو کود&gt; توکي ګروپ&gt; برنامه
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,لطفا یو csv دوتنه انتخاب
 DocType: Student Leave Application,Mark as Present,مارک په توګه د وړاندې
 DocType: Supplier Scorecard,Indicator Color,د شاخص رنګ
 DocType: Purchase Order,To Receive and Bill,تر لاسه کول او د بیل
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,مستند محصوالت
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Designer,په سکښتګر کې
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,Designer,په سکښتګر کې
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,د قرارداد شرايط کينډۍ
 DocType: Serial No,Delivery Details,د وړاندې کولو په بشپړه توګه کتل
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +487,Cost Center is required in row {0} in Taxes table for type {1},لګښت په مرکز کې قطار ته اړتیا لیدل کیږي {0} په مالیات لپاره ډول جدول {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +491,Cost Center is required in row {0} in Taxes table for type {1},لګښت په مرکز کې قطار ته اړتیا لیدل کیږي {0} په مالیات لپاره ډول جدول {1}
 DocType: Program,Program Code,پروګرام کوډ
 DocType: Terms and Conditions,Terms and Conditions Help,د قرارداد شرايط مرسته
 ,Item-wise Purchase Register,د قالب-هوښيار رانيول د نوم ثبتول
-DocType: Batch,Expiry Date,د ختم نیټه
+DocType: Driver,Expiry Date,د ختم نیټه
 DocType: Healthcare Settings,Employee name and designation in print,د کارمند نوم او چاپ په چاپ کې
 ,accounts-browser,حسابونو-کتنمل
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +351,Please select Category first,مهرباني وکړئ لومړی ټولۍ وټاکئ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,مهرباني وکړئ لومړی ټولۍ وټاکئ
 apps/erpnext/erpnext/config/projects.py +13,Project master.,د پروژې د بادار.
 apps/erpnext/erpnext/controllers/status_updater.py +209,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.",ته-بلونو او یا د فرمایشاتو لپاره اجازه ورکړي، په سټاک امستنې او يا د قالب &quot;امتياز&quot; د اوسمهالولو.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,مه $ نور په څېر د هر سمبول تر څنګ اسعارو نه ښيي.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(نیمه ورځ)
-DocType: Supplier,Credit Days,اعتبار ورځې
+DocType: Payment Term,Credit Days,اعتبار ورځې
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,د کمکیانو لپاره د زده کونکو د دسته
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,مخ په وړاندې د دې لپاره ترسره کړي
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,له هیښ توکي ترلاسه کړئ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +840,Get Items from BOM,له هیښ توکي ترلاسه کړئ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,د وخت ورځې سوق
-apps/erpnext/erpnext/controllers/accounts_controller.py +556,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},د کتارونو تر # {0}: پست کوي نېټه بايد په توګه د اخیستلو نېټې ورته وي {1} د شتمنیو د {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +600,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,مهرباني وکړی په پورته جدول خرڅلاو امر ته ننوځي
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,معاش رسید ونه لېږل
 ,Stock Summary,دحمل لنډيز
-apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,له يوه ګودام څخه بل د شتمنیو ته سپاري
+apps/erpnext/erpnext/config/assets.py +50,Transfer an asset from one warehouse to another,له يوه ګودام څخه بل د شتمنیو ته سپاري
 DocType: Vehicle,Petrol,پطرول
 apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,د توکو بیل
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Party Type and Party is required for Receivable / Payable account {1},د کتارونو تر {0}: ګوند ډول او د ګوند د ترلاسه / د راتلوونکې حساب ته اړتیا لیدل کیږي {1}
@@ -5249,9 +5610,9 @@
 DocType: Employee Loan Application,Rate of Interest,د سود اندازه
 DocType: Expense Claim Detail,Sanctioned Amount,تحریم مقدار
 DocType: GL Entry,Is Opening,ده پرانيستل
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},د کتارونو تر {0}: ډیبیټ د ننوتلو سره د نه تړاو شي کولای {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +194,Row {0}: Debit entry can not be linked with a {1},د کتارونو تر {0}: ډیبیټ د ننوتلو سره د نه تړاو شي کولای {1}
 DocType: Journal Entry,Subscription Section,د ګډون برخې
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,ګڼون {0} نه شته
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account {0} does not exist,ګڼون {0} نه شته
 DocType: Training Event,Training Program,د روزنې پروګرام
 DocType: Account,Cash,د نغدو پيسو
 DocType: Employee,Short biography for website and other publications.,د ويب سايټ او نورو خپرونو لنډ ژوندلیک.