diff --git a/erpnext/translations/ps.csv b/erpnext/translations/ps.csv
index 027a917..d2de258 100644
--- a/erpnext/translations/ps.csv
+++ b/erpnext/translations/ps.csv
@@ -164,12 +164,11 @@
 DocType: Work Order Operation,Work In Progress,کار په جریان کښی
 DocType: Leave Control Panel,Branch (optional),څانګه (اختیاري)
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py,Please select date,مهرباني غوره نیټه
-DocType: Item Price,Minimum Qty ,لږ تر لږه مقدار
+apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,Minimum Qty ,لږ تر لږه مقدار
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,BOM recursion: {0} cannot be child of {1},د BOM تکرار: {0} د {1} ماشوم نشی کیدی
 DocType: Finance Book,Finance Book,د مالیې کتاب
 DocType: Patient Encounter,HLC-ENC-.YYYY.-,HLC-ENC -YYYY-
 DocType: Appointment Booking Settings,Holiday List,رخصتي بشپړفهرست
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,The parent account {0} does not exists,د مور حساب {0} شتون نلري
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,بیا کتنه او عمل
 apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},دا کارمند لا دمخه د ورته مهال ویش سره لاګ لري. {0}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,محاسب
@@ -240,7 +239,6 @@
 DocType: Exchange Rate Revaluation Account,Gain/Loss,لاسته راوړنې / ضایع
 DocType: Crop,Perennial,پیړۍ
 DocType: Program,Is Published,خپور شوی
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show Delivery Notes,د تحویلو یادښتونه وښیه
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over billing, update ""Over Billing Allowance"" in Accounts Settings or the Item.",د بلینګ څخه اجازه ورکولو لپاره ، د حسابونو ترتیباتو یا توکي کې &quot;د اضافي بلینګ الاونس&quot; تازه کړئ.
 DocType: Patient Appointment,Procedure,کړنلاره
 DocType: Accounts Settings,Use Custom Cash Flow Format,د ګمرکي پیسو فلو فارم څخه کار واخلئ
@@ -968,7 +966,6 @@
 DocType: Patient,Risk Factors,د خطر فکتورونه
 DocType: Patient,Occupational Hazards and Environmental Factors,مسلکی خطرونه او چاپیریال عوامل
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,د استخراج اسنادونه د مخه د کار امر لپاره جوړ شوي
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,د توکي کوډ&gt; د توکي ګروپ&gt; نښه
 apps/erpnext/erpnext/templates/pages/cart.html,See past orders,تیرې سپارښتنې وګورئ
 DocType: Vital Signs,Respiratory rate,د تناسب کچه
 apps/erpnext/erpnext/config/help.py,Managing Subcontracting,د اداره کولو په ټیکه
@@ -1123,7 +1120,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,د اوسمهال د پروسې په ترڅ کې یوه تېروتنه رامنځته شوه
 DocType: Restaurant Reservation,Restaurant Reservation,د رستورانت ساتنه
 apps/erpnext/erpnext/public/js/hub/Sidebar.vue,Your Items,ستاسو توکي
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,عرضه کونکي&gt; عرضه کونکي ډول
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,د پروپوزل ليکلو
 DocType: Payment Entry Deduction,Payment Entry Deduction,د پیسو د داخلولو Deduction
 DocType: Service Level Priority,Service Level Priority,د خدمت کچې لومړیتوب
@@ -1422,7 +1418,6 @@
 apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,Please select Company and Posting Date to getting entries,مهرباني وکړئ د شرکتونو او لیکنو نیټه وټاکئ تر څو ثبتات ترلاسه کړي
 DocType: Asset,Maintenance,د ساتنې او
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,Get from Patient Encounter,د ناروغۍ له لارې ترلاسه کړئ
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},د UOM د بدلون فاکتور ({0} -&gt; {1}) د توکي لپاره ونه موندل شو: {2}
 DocType: Subscriber,Subscriber,ګډون کوونکي
 DocType: Item Attribute Value,Item Attribute Value,د قالب ځانتیا ارزښت
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,Currency Exchange must be applicable for Buying or for Selling.,د پیسو تبادله باید د اخیستلو یا خرڅلاو لپاره تطبیق شي.
@@ -1917,7 +1912,6 @@
 DocType: Purchase Invoice,Is Return (Debit Note),بیرته راستنیدنه (د Debit Note)
 DocType: Workstation,Wages,د معاشونو
 DocType: Asset Maintenance,Maintenance Manager Name,د ترمیم مدیر نوم
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,Transactions against the company already exist! ,د شرکت پروړاندې معاملې دمخه شتون لري!
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,د غوښتنې ځای
 DocType: Agriculture Task,Urgent,Urgent
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Fetching records......,د ریکارډونو راوړل ......
@@ -2769,7 +2763,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py,Leaves Allocated Successfully for {0},د پاڼو په بریالیتوب سره ځانګړې {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,No Items to pack,نه سامان ته واچوئ
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Only .csv and .xlsx files are supported currently,اوس مهال یوازې .csv او .xlsx فایلونه ملاتړ کیږي
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,مهرباني وکړئ د بشري سرچینو&gt; HR ترتیبات کې د کارمند نوم ورکولو سیسټم تنظیم کړئ
 DocType: Shipping Rule Condition,From Value,له ارزښت
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,دفابريکي مقدار الزامی دی
 DocType: Loan,Repayment Method,دبيرته طريقه
@@ -4001,7 +3994,6 @@
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,اړتیا ده
 DocType: HR Settings,"If checked, hides and disables Rounded Total field in Salary Slips",که چک شوی وي ، نو په معاشونو کې ټوټې ټوټې په بشپړ ډول پټ پټ پټوي او معلولوي
 DocType: Woocommerce Settings,This is the default offset (days) for the Delivery Date in Sales Orders. The fallback offset is 7 days from the order placement date.,دا د پلور امرونو کې د تحویلي نیټې لپاره لومړنۍ آفسیټ (ورځې) دي. د فالباک آفسیټ د سپارلو له نیټې څخه days ورځې دی.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,مهرباني وکړئ د تنظیم کولو له لارې د شمیره ورکولو لړۍ له لارې د ګډون لپاره د شمېرنې لړۍ تنظیم کړئ
 DocType: Rename Tool,File to Rename,د نوم بدلول د دوتنې
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Please select BOM for Item in Row {0},لطفا په کتارونو لپاره د قالب هیښ غوره {0}
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,د ترلاسه کولو تازه راپورونه
@@ -4594,7 +4586,6 @@
 DocType: Cash Flow Mapping,Is Finance Cost,د مالي لګښت دی
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,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/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,مهرباني وکړئ د ښوونې او روزنې ترتیبات کې د ښوونکي نوم ورکولو سیسټم تنظیم کړئ
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Please set default customer in Restaurant Settings,مهرباني وکړئ د رستورانت ترتیباتو کې ډیزاین پیرود کړئ
 ,Salary Register,معاش د نوم ثبتول
 DocType: Company,Default warehouse for Sales Return,د پلور بیرته راتګ لپاره اصلي ګودام
@@ -4861,7 +4852,6 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Pending Activities,انتظار فعالیتونه
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test_list.js,Create Lab Test,لابراتوار ازموینه جوړه کړئ
 DocType: Patient Appointment,Reminded,یادونه
-DocType: Homepage Section,Cards,کارتونه
 apps/erpnext/erpnext/public/js/setup_wizard.js,View Chart of Accounts,د حساب چارټ وګورئ
 DocType: Chapter Member,Chapter Member,د فصل غړي
 DocType: Material Request Plan Item,Minimum Order Quantity,د کم تر لږه اندازه
@@ -4878,7 +4868,7 @@
 apps/erpnext/erpnext/hr/utils.py,Future dates not allowed,راتلونکی نیټه اجازه نه ده ورکړل شوې
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,د تمویل شوي اټکل باید د پلور امر نیټه وروسته وي
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,Reorder Level,ترمیمي د ليول
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Chart Of Accounts Template,د حسابونو کينډۍ چارت
+DocType: Company,Chart Of Accounts Template,د حسابونو کينډۍ چارت
 DocType: Attendance,Attendance Date,د حاضرۍ نېټه
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Update stock must be enable for the purchase invoice {0},د تازه معلوماتو ذخیره باید د پیرود انوائس لپاره وکارول شي {0}
 apps/erpnext/erpnext/stock/get_item_details.py,Item Price updated for {0} in Price List {1},د قالب د بیې د {0} په بیې په لېست کې تازه {1}
@@ -5438,8 +5428,6 @@
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,شریک لیجر
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Sales Invoice {0} created,د پلور انوائس {0} جوړ شوی
 DocType: Employee,Confirmation Date,باوريينه نېټه
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","مهرباني وکړئ د دې سند لغوه کولو لپاره کارمند <a href=""#Form/Employee/{0}"">{0}</a> delete حذف کړئ"
 DocType: Inpatient Occupancy,Check Out,بشپړ ی وګوره
 DocType: C-Form,Total Invoiced Amount,Total رسیدونو د مقدار
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,Min Qty نه شي کولای Max Qty څخه ډيره وي
@@ -5642,7 +5630,6 @@
 DocType: Cheque Print Template,Cheque Width,آرډر پلنوالي
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,د رانيول نرخ يا ارزښت Rate په وړاندې د قالب اعتبار د پلورنې بیه
 DocType: Fee Schedule,Fee Schedule,فیس مهال ويش
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Column Labels : ,کالم لیبلونه:
 DocType: Bank Transaction,Settled,آباد شوی
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Cess,سیس
 DocType: Quality Feedback,Parameters,پیرامیټرې
@@ -6318,6 +6305,7 @@
 DocType: Salary Component,Formula,فورمول
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,سریال #
 DocType: Material Request Plan Item,Required Quantity,اړین مقدار
+DocType: Cash Flow Mapping Template,Template Name,کينډۍ نوم
 DocType: Lab Test Template,Lab Test Template,د لابراتوار ازموینه
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,د پلور حساب
 DocType: Purchase Invoice Item,Total Weight,ټول وزن
@@ -6377,7 +6365,7 @@
 DocType: Bank Reconciliation Detail,Cheque Date,آرډر نېټه
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: Parent account {1} does not belong to company: {2},ګڼون {0}: Parent حساب {1} نه پورې شرکت نه لري چې: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js,Successfully deleted all transactions related to this company!,په بریالیتوب سره د دې شرکت ته اړوند ټولو معاملو ړنګ!
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,As on Date,په توګه د تاريخ
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,As on Date,په توګه د تاريخ
 DocType: Additional Salary,HR,د بشري حقونو څانګه
 DocType: Course Enrollment,Enrollment Date,د شموليت نېټه
 DocType: Healthcare Settings,Out Patient SMS Alerts,د ناروغۍ ایس ایم ایل خبرتیاوې
@@ -6442,7 +6430,6 @@
 DocType: Course Content,Quiz,پوښتنې
 DocType: Subscription,Trial Period End Date,د ازموینې موده پای نیټه
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py,Not authroized since {0} exceeds limits,نه authroized راهیسې {0} حدودو څخه تجاوز
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Start entering data from here : ,دلته د معلوماتو داخلول پیل کړئ:
 DocType: Serial No,Asset Status,د شتمنۍ حالت
 DocType: Sales Invoice,Over Dimensional Cargo (ODC),د Dimensional کارګو څخه زیات (ODC)
 DocType: Restaurant Order Entry,Restaurant Table,د رستورانت میز
@@ -6666,7 +6653,6 @@
 DocType: Contract,Party User,د ګوند کارن
 apps/erpnext/erpnext/controllers/buying_controller.py,Assets not created for <b>{0}</b>. You will have to create asset manually.,شتمني د <b>{0}</b> لپاره نده جوړه شوې. تاسو باید شتمني په لاسي ډول جوړه کړئ.
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',لطفا جوړ شرکت چاڼ خالي که ډله په دی شرکت
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,پیرودونکي&gt; د پیرودونکي ګروپ&gt; سیمه
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,نوکرې نېټه نه شي کولای راتلونکې نیټه وي.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},د کتارونو تر # {0}: شعبه {1} سره سمون نه خوري {2} {3}
 DocType: Loan Repayment,Interest Payable,سود ورکول
@@ -6900,7 +6886,6 @@
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,اوسط کچه
 DocType: Appointment,Appointment With,د سره ټاکل
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,د تادیاتو مهال ویش کې د مجموعي تادیاتو اندازه باید د ګردي / ګردي ګرد مجموعي سره مساوي وي
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,د حاضرۍ نښه په توګه <b></b>
 apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate",&quot;پیرودونکي چمتو شوي توکی&quot; نشي کولی د ارزښت نرخ ولري
 DocType: Subscription Plan Detail,Plan,پلان
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,بانک اعلامیه سلنه له بلونو په توګه انډول
@@ -7579,7 +7564,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},د کارمند اعظمي اعداد اندازه {0} د {1} څخه زیات
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total allocated leaves are more than days in the period,ټولې پاڼي په دې موده کې د ورځو څخه زیات دي
 DocType: Linked Soil Analysis,Linked Soil Analysis,د خاورې سره د خاورې شننه
-DocType: Pricing Rule,Percentage,سلنه
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Item {0} must be a stock Item,د قالب {0} باید یو سټاک د قالب وي
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Default د کار په پرمختګ ګدام
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Schedules for {0} overlaps, do you want to proceed after skiping overlaped slots ?",د {0} تاوان لپاره شیډولونه، ایا تاسو غواړئ چې د اوپلو شویو سلایډونو د سکپ کولو وروسته پرمخ ولاړ شئ؟