fix: conflicts
diff --git a/erpnext/translations/uz.csv b/erpnext/translations/uz.csv
index a89e2c7..e7fdd01 100644
--- a/erpnext/translations/uz.csv
+++ b/erpnext/translations/uz.csv
@@ -44,7 +44,6 @@
DocType: Exchange Rate Revaluation Account,New Exchange Rate,Yangi almashinuv kursi
apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py,Currency is required for Price List {0},Narxlar ro'yxati uchun valyuta talab qilinadi {0}
DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Jurnalda hisoblab chiqiladi.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource > HR Settings,"Iltimos, xodimlarni nomlash tizimini inson resurslari> Kadrlar sozlamalarida o'rnating"
DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
DocType: Purchase Order,Customer Contact,Mijozlar bilan aloqa
DocType: Shift Type,Enable Auto Attendance,Avtomatik qatnashishni yoqish
@@ -96,6 +95,7 @@
DocType: Support Settings,Support Settings,Yordam sozlamalari
apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0} is added in the child company {1},{1} bolalar kompaniyasiga {0} hisobi qo'shildi
apps/erpnext/erpnext/erpnext_integrations/doctype/exotel_settings/exotel_settings.py,Invalid credentials,Noto‘g‘ri hisob ma’lumotlari
+apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js,Mark Work From Home,Uydan ishlarni belgilash
apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,ITC Available (whether in full op part),ITC mavjud (to'liq holatda bo'lsin)
DocType: Amazon MWS Settings,Amazon MWS Settings,Amazon MWS sozlamalari
apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Processing Vouchers,Voucherlarni qayta ishlash
@@ -389,6 +389,7 @@
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,Belgilangan protseduralar
apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,Faqat qalinni ko'rsatish
DocType: Supplier Group,Supplier Group Name,Yetkazib beruvchining guruh nomi
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Davomi sifatida belgilang <b></b>
DocType: Driver,Driving License Categories,Haydovchilik guvohnomasi kategoriyalari
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,"Iltimos, etkazib berish sanasi kiriting"
DocType: Depreciation Schedule,Make Depreciation Entry,Amortizatsiyani kiritish
@@ -408,7 +409,6 @@
apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py,Membership Details,Registratsiya tafsilotlari
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Yetkazib beruvchi to'lash kerak hisobiga {2}
apps/erpnext/erpnext/config/buying.py,Items and Pricing,Mahsulotlar va narxlanish
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer > Customer Group > Territory,Xaridor> Mijozlar guruhi> Hudud
apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html,Total hours: {0},Umumiy soatlar: {0}
apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py,From Date should be within the Fiscal Year. Assuming From Date = {0},Sana boshlab Moliya yilida bo'lishi kerak. Sana = {0}
DocType: Patient Medical Record,HLC-PMR-.YYYY.-,HLC-PMR-YYYYY.-
@@ -455,7 +455,6 @@
DocType: Quiz Result,Selected Option,Tanlangan variant
DocType: SG Creation Tool Course,SG Creation Tool Course,SG yaratish vositasi kursi
DocType: Bank Statement Transaction Invoice Item,Payment Description,To'lov ta'rifi
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Iltimos, sozlash> Sozlamalar> Nomlash seriyalari orqali {0} uchun nomlash seriyasini o'rnating"
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Insufficient Stock,Qimmatli qog'ozlar yetarli emas
DocType: Email Digest,New Sales Orders,Yangi Sotuvdagi Buyurtma
DocType: Bank Account,Bank Account,Bank hisob raqami
@@ -773,6 +772,7 @@
DocType: Healthcare Settings,Require Lab Test Approval,Laboratoriya tekshiruvini tasdiqlashni talab qiling
DocType: Attendance,Working Hours,Ish vaqti
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html,Total Outstanding,Umumiy natija
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -> {1}) not found for item: {2},UOM konversiya koeffitsienti ({0} -> {1}) quyidagi element uchun topilmadi: {2}
DocType: Naming Series,Change the starting / current sequence number of an existing series.,Mavjud ketma-ketlikning boshlang'ich / to`g`ri qatorini o`zgartirish.
DocType: Accounts Settings,Percentage you are allowed to bill more against the amount ordered. For example: If the order value is $100 for an item and tolerance is set as 10% then you are allowed to bill for $110.,"Siz buyurtma qilingan miqdordan ko'proq hisob-kitob qilishingiz mumkin bo'lgan foiz. Masalan: Agar buyurtma qiymati bir mahsulot uchun 100 dollarni tashkil etsa va sabr-toqat 10% bo'lsa, sizga 110 dollarga to'lashingiz mumkin."
DocType: Dosage Strength,Strength,Kuch-quvvat
@@ -999,6 +999,7 @@
DocType: Company,Delete Company Transactions,Kompaniya jarayonini o'chirish
DocType: Production Plan Item,Quantity and Description,Miqdori va tavsifi
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,Bank bo'yicha bitim uchun Yo'naltiruvchi Yo'naltiruvchi va Yo'nalish sanasi majburiy hisoblanadi
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Iltimos, sozlash> Sozlamalar> Nomlash seriyalari orqali {0} uchun nomlash seriyasini o'rnating"
DocType: Purchase Receipt,Add / Edit Taxes and Charges,Soliqlarni va to'lovlarni qo'shish / tahrirlash
DocType: Payment Entry Reference,Supplier Invoice No,Yetkazib beruvchi hisob raqami №
DocType: Territory,For reference,Malumot uchun
@@ -1259,7 +1260,6 @@
DocType: Pricing Rule Item Group,Pricing Rule Item Group,Narxlarni boshqarish qoidalari guruhi
DocType: Travel Itinerary,Travel To,Sayohat qilish
apps/erpnext/erpnext/config/accounts.py,Exchange Rate Revaluation master.,Valyuta kursini qayta baholash ustasi.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup > Numbering Series,Iltimos Setup> Raqamlash seriyalari orqali qatnashish uchun raqamlash seriyasini sozlang
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Write Off Amount,Miqdorni yozing
DocType: Leave Block List Allow,Allow User,Foydalanuvchiga ruxsat berish
DocType: Journal Entry,Bill No,Bill №
@@ -1612,6 +1612,7 @@
DocType: Sales Team,Incentives,Rag'batlantirish
apps/erpnext/erpnext/accounts/general_ledger.py,Values Out Of Sync,Sinxron bo'lmagan qiymatlar
apps/erpnext/erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py,Difference Value,Farq qiymati
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup > Numbering Series,Iltimos Setup> Raqamlash seriyalari orqali qatnashish uchun raqamlash seriyasini sozlang
DocType: SMS Log,Requested Numbers,Talab qilingan raqamlar
DocType: Volunteer,Evening,Oqshom
DocType: Quiz,Quiz Configuration,Viktorina sozlamalari
@@ -1779,6 +1780,7 @@
DocType: Student Admission,Publish on website,Saytda e'lon qiling
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Supplier Invoice Date cannot be greater than Posting Date,Yetkazib beruvchi hisob-fakturasi sanasi yuborish kunidan kattaroq bo'lishi mumkin emas
DocType: Installation Note,MAT-INS-.YYYY.-,MAT-INS-YYYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code > Item Group > Brand,Element kodi> Tovar guruhi> Tovar
DocType: Subscription,Cancelation Date,Bekor qilish sanasi
DocType: Purchase Invoice Item,Purchase Order Item,Buyurtma Buyurtma Buyurtma
DocType: Agriculture Task,Agriculture Task,Qishloq xo'jaligi masalalari
@@ -2379,7 +2381,6 @@
DocType: Target Detail,Target Distribution,Nishon tarqatish
DocType: Purchase Invoice,06-Finalization of Provisional assessment,06 - Vaqtinchalik baholashni yakunlash
apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Parties and Addresses,Tomonlar va manzillarni import qilish
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -> {1}) not found for item: {2},UOM konversiyalash koeffitsienti ({0} -> {1}) quyidagi element uchun topilmadi: {2}
DocType: Salary Slip,Bank Account No.,Bank hisob raqami
DocType: Naming Series,This is the number of the last created transaction with this prefix,"Bu, bu old qo'shimchadagi oxirgi yaratilgan bitimning sonidir"
DocType: Supplier Scorecard,"Scorecard variables can be used, as well as:
@@ -2769,6 +2770,9 @@
DocType: Pricing Rule,Supplier Group,Yetkazib beruvchilar guruhi
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py,{0} Digest,{0} Digest
apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0}: From Time and To Time of {1} is overlapping with {2},Row {0}: {1} dan vaqt va vaqtdan {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,"A BOM with name {0} already exists for item {1}.
+ <br> Did you rename the item? Please contact Administrator / Tech support
+ ",{1} element uchun {0} nomli BOM allaqachon mavjud. <br> Siz mahsulot nomini o'zgartirdingizmi? Iltimos Administrator / Tech qo'llab-quvvatlash xizmatiga murojaat qiling
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Stock Liabilities,Qarz majburiyatlari
DocType: Purchase Invoice,Supplier Warehouse,Yetkazib beruvchi ombori
DocType: Opportunity,Contact Mobile No,Mobil raqami bilan bog'laning
@@ -3209,6 +3213,7 @@
DocType: Quality Inspection,MAT-QA-.YYYY.-,MAT-QA-.YYYY.-
DocType: Quality Meeting Table,Quality Meeting Table,Sifatli uchrashuv jadvali
apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,Forumlarga tashrif buyuring
+apps/erpnext/erpnext/projects/doctype/task/task.py,Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,"{0} vazifasini bajarib bo'lmadi, chunki unga bog'liq bo'lgan {1} vazifasi tugallanmagan / bekor qilinmagan."
DocType: Student,Student Mobile Number,Isoning shogirdi mobil raqami
DocType: Item,Has Variants,Varyantlar mavjud
DocType: Employee Benefit Claim,Claim Benefit For,Shikoyat uchun manfaat
@@ -3367,7 +3372,6 @@
apps/erpnext/erpnext/education/doctype/fee_structure/fee_structure.js,Create Fee Schedule,Ish haqi jadvalini yarating
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py,Repeat Customer Revenue,Xaridor daromadini takrorlang
DocType: Soil Texture,Silty Clay Loam,Silty Clay Loam
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education > Education Settings,"Iltimos, Ta'lim beruvchiga nom berish tizimini Ta'lim sozlamalarida o'rnating"
DocType: Quiz,Enter 0 to waive limit,Cheklovni rad etish uchun 0 raqamini kiriting
DocType: Bank Statement Settings,Mapped Items,Eşlenmiş ma'lumotlar
DocType: Amazon MWS Settings,IT,IT
@@ -3401,7 +3405,6 @@
Please create or link {1} Assets with respective document.","Yaratilgan yoki {0} ga bog‘langan obyekt yetarli emas. \ Iltimos, {1} obyektlarni tegishli hujjat bilan yarating yoki bog'lang."
DocType: Pricing Rule,Apply Rule On Brand,Qoidalarni brendga qo'llang
DocType: Task,Actual End Date (via Time Sheet),Haqiqiy tugash sanasi (vaqt jadvalidan orqali)
-apps/erpnext/erpnext/projects/doctype/task/task.py,Cannot close task {0} as its dependant task {1} is not closed.,"{0} vazifasini yopib bo'lmaydi, chunki unga bog'liq bo'lgan vazifa {1} yopilmagan."
DocType: Soil Texture,Soil Type,Tuproq turi
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Amount {0} {1} against {2} {3},{0} {1} miqdori {2} {3} ga qarshi
,Quotation Trends,Iqtiboslar tendentsiyalari
@@ -3431,6 +3434,7 @@
DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Yetkazib beruvchi Koreya kartasi
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,Row {0}: Bill of Materials not found for the Item {1},Row {0}: Mahsulot {1} uchun topilmadi.
DocType: Contract Fulfilment Checklist,Requirement,Talab
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource > HR Settings,"Iltimos, xodimlarni nomlash tizimini inson resurslari> Kadrlar sozlamalarida o'rnating"
DocType: Journal Entry,Accounts Receivable,Kutilgan tushim
DocType: Quality Goal,Objectives,Maqsadlar
DocType: HR Settings,Role Allowed to Create Backdated Leave Application,Kechiktirilgan ta'til arizasini yaratishga ruxsat berilgan rol
@@ -3572,6 +3576,7 @@
DocType: Student Applicant,Applied,Amalga oshirildi
apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Details of Outward Supplies and inward supplies liable to reverse charge,Orqaga zaryadlanishi kerak bo'lgan tashqi ta'minot va ichki ta'minot tafsilotlari
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Re-open,Qayta oching
+apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py,Not permitted. Please disable the Lab Test Template,"Ruxsat berilmagan Iltimos, laboratoriya shablonini o'chirib qo'ying"
DocType: Sales Invoice Item,Qty as per Stock UOM,Qimmatli qog'ozlar aktsiyadorlik jamiyati bo'yicha
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Name,Guardian2 Ismi
apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,Root Company,Ildiz kompaniyasi
@@ -3630,6 +3635,7 @@
apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js,Type of Business,Biznes turi
DocType: Sales Invoice,Consumer,Iste'molchi
apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Iltimos, atigi bir qatorda ajratilgan miqdori, hisob-faktura turi va hisob-faktura raqami-ni tanlang"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Iltimos, sozlash> Sozlamalar> Nomlash seriyalari orqali {0} uchun nomlash seriyasini o'rnating"
apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py,Cost of New Purchase,Yangi xarid qiymati
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,Sales Order required for Item {0},{0} band uchun zarur Sotuvdagi Buyurtma
DocType: Grant Application,Grant Description,Grantlar tavsifi
@@ -3655,7 +3661,6 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please click on 'Generate Schedule' to get schedule,Jadvalni olish uchun "Jadvalni yarat" tugmasini bosing
DocType: Item,"Purchase, Replenishment Details","Sotib olish, to'ldirish tafsilotlari"
DocType: Products Settings,Enable Field Filters,Maydon filtrlarini yoqish
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code > Item Group > Brand,Element kodi> Mahsulotlar guruhi> Tovar
apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot be Purchase Item also",""Xaridor tomonidan taqdim etilgan narsa" shuningdek, xarid qilish obyekti bo'lolmaydi"
DocType: Blanket Order Item,Ordered Quantity,Buyurtma miqdori
apps/erpnext/erpnext/public/js/setup_wizard.js,"e.g. ""Build tools for builders""","Masalan, "Quruvchilar uchun asboblarni yaratish""
@@ -4125,7 +4130,7 @@
DocType: Authorization Rule,Applicable To (Role),Qo'llanishi mumkin (rol)
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html,Pending Leaves,Kutilayotgan barglar
DocType: BOM Update Tool,Replace BOM,BOMni almashtiring
-apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py,Code {0} already exist,{0} kodi allaqachon mavjud
+apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py,Code {0} already exist,{0} kodi allaqachon mavjud
DocType: Patient Encounter,Procedures,Jarayonlar
apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Sales orders are not available for production,Savdo buyurtmalari ishlab chiqarish uchun mavjud emas
DocType: Asset Movement,Purpose,Maqsad
@@ -4189,6 +4194,8 @@
DocType: Grant Application,Grant Application Details ,Dastur haqida batafsil ma'lumot
DocType: Employee Separation,Employee Separation,Xodimlarni ajratish
DocType: BOM Item,Original Item,Asl modda
+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","Ushbu hujjatni bekor qilish uchun <a href=""#Form/Employee/{0}"">{0}</a> \ xodimini o'chiring"
apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Doc tarixi
apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},Yaratilgan yozuvlar - {0}
DocType: Asset Category Account,Asset Category Account,Aktiv turkumidagi hisob
@@ -4221,6 +4228,7 @@
DocType: Warranty Claim,Service Address,Xizmat manzili
apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.js,Import Master Data,Magistr ma'lumotlarini import qilish
DocType: Asset Maintenance Task,Calibration,Kalibrlash
+apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py,Lab Test Item {0} already exist,{0} laboratoriya sinov elementi allaqachon mavjud
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,{0} is a company holiday,{0} kompaniya bayramidir
apps/erpnext/erpnext/projects/report/billing_summary.py,Billable Hours,To‘lov vaqti
apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py,Leave Status Notification,Vaziyat bayonnomasini qoldiring
@@ -4569,7 +4577,7 @@
,Salary Register,Ish haqi registrati
DocType: Company,Default warehouse for Sales Return,Sotishni qaytarish uchun odatiy ombor
DocType: Pick List,Parent Warehouse,Ota-onalar
-DocType: Subscription,Net Total,Net Jami
+DocType: C-Form Invoice Detail,Net Total,Net Jami
apps/erpnext/erpnext/stock/doctype/batch/batch.py,"Set item's shelf life in days, to set expiry based on manufacturing date plus shelf-life.",Mahsulotning yaroqlilik muddatini kunlar bilan belgilang.
apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Default BOM not found for Item {0} and Project {1},{0} va Project {1} uchun standart BOM topilmadi
apps/erpnext/erpnext/regional/italy/utils.py,Row {0}: Please set the Mode of Payment in Payment Schedule,"{0} qatori: Iltimos, to'lov jadvalida to'lov usulini o'rnating"
@@ -4684,7 +4692,7 @@
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Target warehouse is mandatory for row {0},Nishon ombor {0} satr uchun majburiydir.
apps/erpnext/erpnext/config/retail.py,Retail Operations,Chakana operatsiyalar
DocType: Cheque Print Template,Primary Settings,Asosiy sozlamalar
-DocType: Attendance Request,Work From Home,Uydan ish
+DocType: Attendance,Work From Home,Uydan ish
DocType: Purchase Invoice,Select Supplier Address,Ta'minlovchining manzilini tanlang
apps/erpnext/erpnext/public/js/event.js,Add Employees,Ishchilarni qo'shish
DocType: Purchase Invoice Item,Quality Inspection,Sifatni tekshirish
@@ -4926,8 +4934,6 @@
DocType: QuickBooks Migrator,Authorization URL,Avtorizatsiya URL manzili
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Amount {0} {1} {2} {3},Miqdor {0} {1} {2} {3}
DocType: Account,Depreciation,Amortizatsiya
-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","Ushbu hujjatni bekor qilish uchun <a href=""#Form/Employee/{0}"">{0}</a> \ xodimini o'chiring"
apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py,The number of shares and the share numbers are inconsistent,Aktsiyalar soni va aktsiyalarning soni nomuvofiqdir
apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Supplier(s),Yetkazib beruvchilar (lar)
DocType: Employee Attendance Tool,Employee Attendance Tool,Xodimlarga qatnashish vositasi
@@ -5205,6 +5211,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Tadbirlarni {0} ga sozlash, chunki quyida ko'rsatilgan Sotish Sotuviga qo'yilgan xodimlar uchun foydalanuvchi identifikatori yo'q {1}"
DocType: Timesheet,Billing Details,To'lov ma'lumoti
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,Resurslar va maqsadli omborlar boshqacha bo'lishi kerak
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource > HR Settings,"Iltimos, xodimlarni nomlash tizimini inson resurslari> Kadrlar sozlamalarida o'rnating"
apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,"To'lov amalga oshmadi. Iltimos, batafsil ma'lumot uchun GoCardsiz hisobingizni tekshiring"
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},{0} dan katta aktsiyalarini yangilash uchun ruxsat berilmadi
DocType: Stock Entry,Inspection Required,Tekshirish kerak
@@ -5232,7 +5239,6 @@
DocType: Cheque Print Template,Cheque Height,Balandligini tekshiring
DocType: Supplier,Supplier Details,Yetkazib beruvchi ma'lumotlari
DocType: Setup Progress,Setup Progress,O'rnatish jarayoni
-DocType: Expense Claim,Approval Status,Tasdiqlash maqomi
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,From value must be less than to value in row {0},Qiymatdan {0} qatorda qiymatdan kam bo'lishi kerak
DocType: Program,Intro Video,Kirish video
DocType: Manufacturing Settings,Default Warehouses for Production,Ishlab chiqarish uchun odatiy omborlar
@@ -5439,6 +5445,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,Joriy BOM va yangi BOM bir xil bo'lishi mumkin emas
apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,Ish haqi miqdori
apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,Pensiya tarixi sanasi qo'shilish sanasidan katta bo'lishi kerak
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier > Supplier Type,Ta'minotchi> Ta'minotchi turi
apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,Bir nechta varianti
DocType: Sales Invoice,Against Income Account,Daromad hisobiga qarshi
apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% taslim etildi
@@ -5573,7 +5580,6 @@
apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,Slots for {0} are not added to the schedule,{0} uchun joylar jadvalga qo'shilmaydi
DocType: Product Bundle,List items that form the package.,Paketni tashkil etadigan elementlarni ro'yxatlang.
apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py,Target Location is required while transferring Asset {0},Obyektni topshirishda mo'ljal manzili talab qilinadi {0}
-apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py,Not permitted. Please disable the Test Template,Ruxsat berilmaydi. Viktorina jadvalini o'chirib qo'ying
DocType: Sales Invoice,Distance (in km),Masofa (km)
apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,Foizlarni taqsimlash 100%
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,Tomonni tanlashdan oldin sanasi sanasini tanlang
@@ -5703,7 +5709,6 @@
DocType: Purchase Invoice,Price List Exchange Rate,Narxlar ro'yxati almashuv kursi
apps/erpnext/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py,All Supplier Groups,Barcha yetkazib beruvchi guruhlari
DocType: Employee Boarding Activity,Required for Employee Creation,Xodimlarni yaratish uchun talab qilinadi
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier > Supplier Type,Ta'minotchi> Ta'minotchi turi
apps/erpnext/erpnext/accounts/doctype/account/account.py,Account Number {0} already used in account {1},Hisob raqami {0} allaqachon {1} hisobida ishlatilgan
DocType: GoCardless Mandate,Mandate,Majburiyat
DocType: Hotel Room Reservation,Booked,Qayd qilingan
@@ -5769,7 +5774,6 @@
DocType: Sales Partner,Sales Partner Name,Savdo hamkorining nomi
apps/erpnext/erpnext/hooks.py,Request for Quotations,Takliflar uchun so'rov
DocType: Payment Reconciliation,Maximum Invoice Amount,Maksimal Billing miqdori
-apps/erpnext/erpnext/accounts/doctype/bank_account/test_bank_account.py,BankAccount.validate_iban() failed for empty IBAN,Bo'sh IBAN uchun BankAccount.validate_iban () muvaffaqiyatsiz tugadi
DocType: Normal Test Items,Normal Test Items,Oddiy test buyumlari
DocType: QuickBooks Migrator,Company Settings,Kompaniya sozlamalari
DocType: Additional Salary,Overwrite Salary Structure Amount,Ish haqi tuzilishi miqdori haqida yozing
@@ -5920,6 +5924,7 @@
DocType: Leave Allocation,Leave Period,Davrni qoldiring
DocType: Item,Default Material Request Type,Standart material talabi turi
DocType: Supplier Scorecard,Evaluation Period,Baholash davri
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer > Customer Group > Territory,Xaridor> Mijozlar guruhi> Hudud
apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js,Unknown,Noma'lum
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Work Order not created,Ish tartibi yaratilmadi
apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
@@ -6269,6 +6274,7 @@
DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Muzlatilgan hisoblarni sozlash va muzlatilgan yozuvlarni tahrir qilish uchun roli mumkin
DocType: Supplier Scorecard Scoring Variable,Path,Yo'l
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,"Xarajatli markazni kitob nusxa ko'chirish qurilmasiga aylantira olmaysiz, chunki u tugmachalarga ega"
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -> {1}) not found for item: {2},UOM konversiya koeffitsienti ({0} -> {1}) quyidagi element uchun topilmadi: {2}
DocType: Production Plan,Total Planned Qty,Jami rejalashtirilgan miqdori
apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,Bitimlar allaqachon bayonotdan uzoqlashgan
apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Ochilish qiymati
@@ -6277,8 +6283,11 @@
DocType: Material Request Plan Item,Required Quantity,Kerakli miqdori
DocType: Lab Test Template,Lab Test Template,Laboratoriya viktorina namunasi
apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Hisob-kitob davri {0} bilan mos keladi
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier > Supplier Type,Ta'minotchi> Ta'minotchi turi
apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,Savdo hisobi
DocType: Purchase Invoice Item,Total Weight,Jami Og'irligi
+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","Ushbu hujjatni bekor qilish uchun <a href=""#Form/Employee/{0}"">{0}</a> \ xodimini o'chiring"
DocType: Pick List Item,Pick List Item,Ro‘yxat bandini tanlang
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Commission on Sales,Savdo bo'yicha komissiya
DocType: Job Offer Term,Value / Description,Qiymati / ta'rifi
@@ -6393,6 +6402,7 @@
DocType: Contract,Signed On,Imzolangan
DocType: Bank Account,Party Type,Partiya turi
DocType: Discounted Invoice,Discounted Invoice,Chegirilgan hisob-faktura
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Davomi sifatida belgilang <b></b>
DocType: Payment Schedule,Payment Schedule,To'lov jadvali
apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,No Employee found for the given employee field value. '{}': {},Berilgan xodimning maydon qiymati uchun xodim topilmadi. '{}': {}
DocType: Item Attribute Value,Abbreviation,Qisqartirish
@@ -6487,6 +6497,7 @@
DocType: Purchase Order,To Receive,Qabul qilmoq
DocType: Leave Period,Holiday List for Optional Leave,Majburiy bo'lmagan yo'l uchun dam olish ro'yxati
DocType: Item Tax Template,Tax Rates,Soliq stavkalari
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code > Item Group > Brand,Element kodi> Tovar guruhi> Tovar
DocType: Asset,Asset Owner,Shaxs egasi
DocType: Item,Website Content,Veb-sayt tarkibi
DocType: Bank Account,Integration ID,Integratsiya identifikatori
@@ -6494,7 +6505,6 @@
DocType: Employee,Personal Email,Shaxsiy Email
apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py,Total Variance,Jami o'zgarish
DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Agar yoqilgan bo'lsa, tizim avtomatik ravishda inventarizatsiyadan o'tkazish uchun buxgalteriya yozuvlarini yuboradi."
-apps/erpnext/erpnext/accounts/doctype/bank_account/test_bank_account.py,BankAccount.validate_iban() accepted invalid IBAN {},BankAccount.validate_iban () noto'g'ri IBAN qabul qildi {}
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Brokerage,Brokerlik
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Attendance for employee {0} is already marked for this day,Xodimga {0} davomi bu kun uchun belgilandi
DocType: Work Order Operation,"in Minutes
@@ -6613,6 +6623,7 @@
DocType: Stock Entry Detail,Additional Cost,Qo'shimcha xarajatlar
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher","Voucher tomonidan guruhlangan bo'lsa, Voucher No ga asoslangan holda filtrlay olmaydi"
DocType: Quality Inspection,Incoming,Kiruvchi
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup > Numbering Series,Iltimos Setup> Raqamlash seriyalari orqali qatnashish uchun raqamlash seriyasini sozlang
apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Savdo va xarid uchun odatiy soliq namunalari yaratilgan.
apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,Baholash natijasi {0} allaqachon mavjud.
DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Misol: ABCD. #####. Jarayonlarda seriya o'rnatilgan bo'lsa va Batch No ko'rsatilgan bo'lsa, bu ketma-ketlik asosida avtomatik partiya raqami yaratiladi. Agar siz doimo bu element uchun "Partiya No" ni aniq ko'rsatishni istasangiz, bo'sh qoldiring. Eslatma: Ushbu sozlama Stok Sozlamalarida Nominal Seriya Prefiksidan ustunlik qiladi."
@@ -6764,6 +6775,7 @@
apps/erpnext/erpnext/regional/report/irs_1099/irs_1099.js,Print IRS 1099 Forms,IRS 1099 shakllarini chop eting
DocType: Asset,Check if Asset requires Preventive Maintenance or Calibration,Assotsiatsiya profilaktik xizmat yoki kalibrlashni talab qiladimi-yo'qligini tekshiring
apps/erpnext/erpnext/public/js/setup_wizard.js,Company Abbreviation cannot have more than 5 characters,Kompaniya qisqartmasi 5 belgidan oshmasligi kerak
+apps/erpnext/erpnext/setup/doctype/company/company.py,Parent Company must be a group company,Asosiy kompaniya guruh kompaniyasi bo'lishi kerak
DocType: Employee,Reports to,Hisobotlar
,Unpaid Expense Claim,To'lanmagan to'lov xarajatlari
DocType: Payment Entry,Paid Amount,To'langan pul miqdori
@@ -6851,6 +6863,7 @@
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Opp Count,Opp Count
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Both Trial Period Start Date and Trial Period End Date must be set,Sinov muddati boshlanish sanasi va Sinov muddati tugashi kerak
apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,O'rtacha narx
+DocType: Appointment,Appointment With,Uchrashuv bilan
apps/erpnext/erpnext/controllers/accounts_controller.py,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,To'lov tarifidagi umumiy to'lov miqdori Grand / Rounded Totalga teng bo'lishi kerak
apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate","Buyurtmachiga taqdim etilgan mahsulot" baho qiymatiga ega bo'lolmaydi
DocType: Subscription Plan Detail,Plan,Reja
@@ -6952,6 +6965,7 @@
DocType: BOM,Rate Of Materials Based On,Materiallar asoslari
DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Agar yoqilsa, dasturni ro'yxatga olish vositasida Akademiyasi muddat majburiy bo'ladi."
apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","Ishlab chiqarilmaydigan, nolga teng va GST bo'lmagan ichki ta'minot qiymatlari"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer > Customer Group > Territory,Xaridor> Mijozlar guruhi> Hudud
apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>Kompaniya</b> majburiy filtrdir.
apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,Barchasini olib tashlang
DocType: Purchase Taxes and Charges,On Item Quantity,Miqdori miqdori bo'yicha
@@ -6983,7 +6997,6 @@
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Opp/Lead %,Opp / Lead%
DocType: Bank Guarantee,Bank Account Info,Bank hisobi ma'lumotlari
DocType: Bank Guarantee,Bank Guarantee Type,Bank kafolati turi
-apps/erpnext/erpnext/accounts/doctype/bank_account/test_bank_account.py,BankAccount.validate_iban() failed for valid IBAN {},BankAccount.validate_iban () IBAN uchun {} muvaffaqiyatsiz
DocType: Payment Schedule,Invoice Portion,Billing qismi
,Asset Depreciations and Balances,Assotsiatsiyalangan amortizatsiya va balans
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Amount {0} {1} transferred from {2} to {3},{0} {1} miqdori {2} dan {3}
@@ -6997,6 +7010,7 @@
apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,Miqdori miqdori
DocType: Purchase Invoice,Input Service Distributor,Kirish xizmati tarqatuvchisi
apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,{0} mahsulot varianti bir xil xususiyatlarga ega
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education > Education Settings,"Iltimos, Ta'lim beruvchiga nom berish tizimini Ta'lim sozlamalarida o'rnating"
DocType: Loan,Repay from Salary,Ish haqidan to'lash
DocType: Exotel Settings,API Token,API token
apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Requesting payment against {0} {1} for amount {2},{0} {1} dan {2}
@@ -7647,7 +7661,6 @@
apps/erpnext/erpnext/crm/doctype/email_campaign/email_campaign.py,Please set up the Campaign Schedule in the Campaign {0},"Iltimos, {0} Kampaniyada Kampaniya jadvalini o'rnating."
apps/erpnext/erpnext/config/buying.py,Price List master.,Narxlar ro'yxati ustasi.
DocType: Task,Review Date,Ko'rib chiqish sanasi
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Davomi sifatida belgilang <b></b>
DocType: BOM,Allow Alternative Item,Shu bilan bir qatorda narsalarga ruxsat berish
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,Xarid kvitansiyasida "Qidiruv namunasini yoqish" bandi mavjud emas.
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Invoice Grand Total,Hisob-fakturaning umumiy summasi
@@ -7875,7 +7888,6 @@
DocType: Amazon MWS Settings,Max Retry Limit,Maks. Qayta harakatlanish limiti
apps/erpnext/erpnext/accounts/page/pos/pos.js,Price List not found or disabled,Narxlar ro'yxati topilmadi yoki o'chirib qo'yilgan
DocType: Content Activity,Last Activity ,So'nggi faoliyat
-DocType: Student Applicant,Approved,Tasdiqlandi
DocType: Pricing Rule,Price,Narxlari
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Employee relieved on {0} must be set as 'Left',{0} da bo'shagan xodim "chapga"
DocType: Guardian,Guardian,Guardian
@@ -8046,6 +8058,7 @@
DocType: GL Entry,To Rename,Nomini o'zgartirish uchun
DocType: Stock Entry,Repack,Qaytarib oling
apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Select to add Serial Number.,Seriya raqamini qo'shish uchun tanlang.
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education > Education Settings,"Iltimos, Ta'lim beruvchiga nom berish tizimini Ta'lim sozlamalarida o'rnating"
apps/erpnext/erpnext/regional/italy/utils.py,Please set Fiscal Code for the customer '%s',"Iltimos, '% s' mijozi uchun soliq kodini o'rnating."
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select the Company first,Avval Kompaniya-ni tanlang
DocType: Item Attribute,Numeric Values,Raqamli qiymatlar
@@ -8062,6 +8075,7 @@
apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html,Cart is Empty,Savat bo'sh
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Item {0} has no Serial No. Only serilialized items \
can have delivery based on Serial No",{0} mahsulotida Seriya raqami yo'q. Faqat serilallangan elementlar \ seriya raqami asosida etkazib berishi mumkin
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Depreciated Amount,Eskirgan summa
DocType: Vehicle,Model,Model
DocType: Work Order,Actual Operating Cost,Haqiqiy Operatsion Narx
DocType: Payment Entry,Cheque/Reference No,Tekshirish / Yo'naltiruvchi No