fix: conflicts
diff --git a/erpnext/translations/ms.csv b/erpnext/translations/ms.csv
index ab7e932..45de81f 100644
--- a/erpnext/translations/ms.csv
+++ b/erpnext/translations/ms.csv
@@ -44,7 +44,6 @@
DocType: Exchange Rate Revaluation Account,New Exchange Rate,Kadar Pertukaran Baru
apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py,Currency is required for Price List {0},Mata wang diperlukan untuk Senarai Harga {0}
DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Akan dikira dalam urus niaga.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource > HR Settings,Sila persediaan Sistem Penamaan Pekerja dalam Sumber Manusia> Tetapan HR
DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
DocType: Purchase Order,Customer Contact,Pelanggan Hubungi
DocType: Shift Type,Enable Auto Attendance,Dayakan Auto Kehadiran
@@ -96,6 +95,7 @@
DocType: Support Settings,Support Settings,Tetapan sokongan
apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0} is added in the child company {1},Akaun {0} ditambahkan dalam syarikat anak {1}
apps/erpnext/erpnext/erpnext_integrations/doctype/exotel_settings/exotel_settings.py,Invalid credentials,Kelayakan tidak sah
+apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js,Mark Work From Home,Tandakan Kerja Dari Rumah
apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,ITC Available (whether in full op part),ITC Tersedia (sama ada dalam bahagian penuh)
DocType: Amazon MWS Settings,Amazon MWS Settings,Tetapan MWS Amazon
apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Processing Vouchers,Baucer Pemprosesan
@@ -390,6 +390,7 @@
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,Prosedur yang Ditetapkan
apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,Tunjukkan sahaja POS
DocType: Supplier Group,Supplier Group Name,Nama Kumpulan Pembekal
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Tandatangan kehadiran sebagai <b></b>
DocType: Driver,Driving License Categories,Kategori Lesen Memandu
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,Sila masukkan Tarikh Penghantaran
DocType: Depreciation Schedule,Make Depreciation Entry,Buat Entry Susutnilai
@@ -409,7 +410,6 @@
apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py,Membership Details,Butiran Keahlian
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Pembekal diperlukan terhadap akaun Dibayar {2}
apps/erpnext/erpnext/config/buying.py,Items and Pricing,Item dan Harga
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer > Customer Group > Territory,Pelanggan> Kumpulan Pelanggan> Wilayah
apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html,Total hours: {0},Jumlah jam: {0}
apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py,From Date should be within the Fiscal Year. Assuming From Date = {0},Dari Tarikh harus berada dalam Tahun Fiskal. Dengan mengandaikan Dari Tarikh = {0}
DocType: Patient Medical Record,HLC-PMR-.YYYY.-,HLC-PMR-.YYYY.-
@@ -456,7 +456,6 @@
DocType: Quiz Result,Selected Option,Pilihan Terpilih
DocType: SG Creation Tool Course,SG Creation Tool Course,Kursus Alat SG Creation
DocType: Bank Statement Transaction Invoice Item,Payment Description,Penerangan Bayaran
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup > Settings > Naming Series,Sila tetapkan Siri Penamaan untuk {0} melalui Persediaan> Tetapan> Penamaan Siri
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Insufficient Stock,Saham yang tidak mencukupi
DocType: Email Digest,New Sales Orders,New Jualan Pesanan
DocType: Bank Account,Bank Account,Akaun Bank
@@ -778,6 +777,7 @@
DocType: Healthcare Settings,Require Lab Test Approval,Memerlukan Kelulusan Ujian Lab
DocType: Attendance,Working Hours,Waktu Bekerja
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html,Total Outstanding,Jumlah yang belum dijelaskan
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -> {1}) not found for item: {2},Faktor penukaran UOM ({0} -> {1}) tidak ditemui untuk item: {2}
DocType: Naming Series,Change the starting / current sequence number of an existing series.,Menukar nombor yang bermula / semasa urutan siri yang sedia ada.
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.,Peratusan anda dibenarkan untuk membilkan lebih banyak daripada jumlah yang diperintahkan. Sebagai contoh: Jika nilai pesanan adalah $ 100 untuk item dan toleransi ditetapkan sebanyak 10% maka anda dibenarkan untuk membiayai $ 110.
DocType: Dosage Strength,Strength,Kekuatan
@@ -1008,6 +1008,7 @@
DocType: Company,Delete Company Transactions,Padam Transaksi Syarikat
DocType: Production Plan Item,Quantity and Description,Kuantiti dan Penerangan
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,Rujukan dan Tarikh Rujukan adalah wajib untuk transaksi Bank
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup > Settings > Naming Series,Sila tetapkan Siri Penamaan untuk {0} melalui Persediaan> Tetapan> Penamaan Siri
DocType: Purchase Receipt,Add / Edit Taxes and Charges,Tambah / Edit Cukai dan Caj
DocType: Payment Entry Reference,Supplier Invoice No,Pembekal Invois No
DocType: Territory,For reference,Untuk rujukan
@@ -1272,7 +1273,6 @@
DocType: Pricing Rule Item Group,Pricing Rule Item Group,Kumpulan Item Peraturan Harga
DocType: Travel Itinerary,Travel To,Mengembara ke
apps/erpnext/erpnext/config/accounts.py,Exchange Rate Revaluation master.,Tuan penilaian semula nilai tukar.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup > Numbering Series,Sila persediaan siri penomboran untuk Kehadiran melalui Persediaan> Penomboran Siri
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Write Off Amount,Tulis Off Jumlah
DocType: Leave Block List Allow,Allow User,Benarkan pengguna
DocType: Journal Entry,Bill No,Rang Undang-Undang No
@@ -1629,6 +1629,7 @@
DocType: Sales Team,Incentives,Insentif
apps/erpnext/erpnext/accounts/general_ledger.py,Values Out Of Sync,Nilai Out Of Sync
apps/erpnext/erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py,Difference Value,Nilai Perbezaan
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup > Numbering Series,Sila persediaan siri penomboran untuk Kehadiran melalui Persediaan> Penomboran Siri
DocType: SMS Log,Requested Numbers,Nombor diminta
DocType: Volunteer,Evening,Petang
DocType: Quiz,Quiz Configuration,Konfigurasi Kuiz
@@ -1796,6 +1797,7 @@
DocType: Student Admission,Publish on website,Menerbitkan di laman web
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Supplier Invoice Date cannot be greater than Posting Date,Pembekal Invois Tarikh tidak boleh lebih besar daripada Pos Tarikh
DocType: Installation Note,MAT-INS-.YYYY.-,MAT-INS-.YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code > Item Group > Brand,Kod Item> Kumpulan Item> Jenama
DocType: Subscription,Cancelation Date,Tarikh Pembatalan
DocType: Purchase Invoice Item,Purchase Order Item,Pesanan Pembelian Item
DocType: Agriculture Task,Agriculture Task,Petugas Pertanian
@@ -2404,7 +2406,6 @@
DocType: Target Detail,Target Distribution,Pengagihan Sasaran
DocType: Purchase Invoice,06-Finalization of Provisional assessment,06-Muktamadkan penilaian sementara
apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Parties and Addresses,Mengimport Pihak dan Alamat
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -> {1}) not found for item: {2},Faktor penukaran UOM ({0} -> {1}) tidak ditemui untuk item: {2}
DocType: Salary Slip,Bank Account No.,No. Akaun Bank
DocType: Naming Series,This is the number of the last created transaction with this prefix,Ini ialah bilangan transaksi terakhir yang dibuat dengan awalan ini
DocType: Supplier Scorecard,"Scorecard variables can be used, as well as:
@@ -2798,6 +2799,9 @@
DocType: Pricing Rule,Supplier Group,Kumpulan Pembekal
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}: Dari Masa dan Untuk Masa {1} adalah bertindih dengan {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
+ ",BOM dengan nama {0} sudah wujud untuk item {1}. <br> Adakah anda menamakan semula item itu? Sila hubungi sokongan Pentadbir / Teknikal
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Stock Liabilities,Liabiliti saham
DocType: Purchase Invoice,Supplier Warehouse,Gudang Pembekal
DocType: Opportunity,Contact Mobile No,Hubungi Mobile No
@@ -3246,6 +3250,7 @@
DocType: Quality Inspection,MAT-QA-.YYYY.-,MAT-QA-.YYYY.-
DocType: Quality Meeting Table,Quality Meeting Table,Jadual Mesyuarat Kualiti
apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,Lawati forum
+apps/erpnext/erpnext/projects/doctype/task/task.py,Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,Tidak dapat menyelesaikan tugas {0} sebagai tugasnya bergantung {1} tidak selesai / dibatalkan.
DocType: Student,Student Mobile Number,Pelajar Nombor Telefon
DocType: Item,Has Variants,Mempunyai Kelainan
DocType: Employee Benefit Claim,Claim Benefit For,Manfaat Tuntutan Untuk
@@ -3407,7 +3412,6 @@
apps/erpnext/erpnext/education/doctype/fee_structure/fee_structure.js,Create Fee Schedule,Buat Jadual Bayaran
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py,Repeat Customer Revenue,Ulang Hasil Pelanggan
DocType: Soil Texture,Silty Clay Loam,Loam Clay Loam
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education > Education Settings,Sila persediaan Sistem Penamaan Pengajar dalam Pendidikan> Tetapan Pendidikan
DocType: Quiz,Enter 0 to waive limit,Masukkan 0 untuk mengetepikan had
DocType: Bank Statement Settings,Mapped Items,Item yang dipadatkan
DocType: Amazon MWS Settings,IT,IT
@@ -3441,7 +3445,6 @@
Please create or link {1} Assets with respective document.",Tidak ada aset yang mencukupi atau dikaitkan dengan {0}. \ Sila buat atau hubungkan {1} Aset dengan dokumen masing-masing.
DocType: Pricing Rule,Apply Rule On Brand,Memohon Peraturan Mengenai Jenama
DocType: Task,Actual End Date (via Time Sheet),Sebenar Tarikh Akhir (melalui Lembaran Time)
-apps/erpnext/erpnext/projects/doctype/task/task.py,Cannot close task {0} as its dependant task {1} is not closed.,Tidak dapat menutup tugas {0} sebagai tugas bergantungnya {1} tidak ditutup.
DocType: Soil Texture,Soil Type,Jenis Tanah
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Amount {0} {1} against {2} {3},Jumlah {0} {1} daripada {2} {3}
,Quotation Trends,Trend Sebut Harga
@@ -3471,6 +3474,7 @@
DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Pembekal kad skor pembekal
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,Row {0}: Bill of Materials not found for the Item {1},Row {0}: Bill of Materials tidak dijumpai untuk Perkara {1}
DocType: Contract Fulfilment Checklist,Requirement,Keperluan
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource > HR Settings,Sila persediaan Sistem Penamaan Pekerja dalam Sumber Manusia> Tetapan HR
DocType: Journal Entry,Accounts Receivable,Akaun-akaun boleh terima
DocType: Quality Goal,Objectives,Objektif
DocType: HR Settings,Role Allowed to Create Backdated Leave Application,Peranan Dibenarkan Buat Permohonan Cuti Backdated
@@ -3612,6 +3616,7 @@
DocType: Student Applicant,Applied,Applied
apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Details of Outward Supplies and inward supplies liable to reverse charge,Butir-butir Bekalan Bekalan dan bekalan ke dalam boleh dikenakan caj balik
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Re-open,Buka semula
+apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py,Not permitted. Please disable the Lab Test Template,Tidak diizinkan. Sila nyahdayakan Template Test Lab
DocType: Sales Invoice Item,Qty as per Stock UOM,Qty seperti Saham UOM
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Name,Nama Guardian2
apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,Root Company,Syarikat Root
@@ -3671,6 +3676,7 @@
apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js,Type of Business,Jenis perniagaan
DocType: Sales Invoice,Consumer,Pengguna
apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Sila pilih Jumlah Diperuntukkan, Jenis Invois dan Nombor Invois dalam atleast satu baris"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup > Settings > Naming Series,Sila tetapkan Siri Penamaan untuk {0} melalui Persediaan> Tetapan> Penamaan Siri
apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py,Cost of New Purchase,Kos Pembelian New
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,Sales Order required for Item {0},Pesanan Jualan diperlukan untuk Perkara {0}
DocType: Grant Application,Grant Description,Pemberian Geran
@@ -3697,7 +3703,6 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please click on 'Generate Schedule' to get schedule,Sila klik pada 'Menjana Jadual' untuk mendapatkan jadual
DocType: Item,"Purchase, Replenishment Details","Pembelian, Butiran Penambahan"
DocType: Products Settings,Enable Field Filters,Dayakan Penapis Field
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code > Item Group > Brand,Kod Item> Kumpulan Item> Jenama
apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot be Purchase Item also","Item yang Dibekalkan Pelanggan" tidak boleh Dibeli Perkara juga
DocType: Blanket Order Item,Ordered Quantity,Mengarahkan Kuantiti
apps/erpnext/erpnext/public/js/setup_wizard.js,"e.g. ""Build tools for builders""",contohnya "Membina alat bagi pembina"
@@ -4170,7 +4175,7 @@
DocType: Authorization Rule,Applicable To (Role),Terpakai Untuk (Peranan)
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html,Pending Leaves,Meninggalkan Daun
DocType: BOM Update Tool,Replace BOM,Gantikan BOM
-apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py,Code {0} already exist,Kod {0} sudah wujud
+apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py,Code {0} already exist,Kod {0} sudah wujud
DocType: Patient Encounter,Procedures,Prosedur
apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Sales orders are not available for production,Pesanan jualan tidak tersedia untuk pengeluaran
DocType: Asset Movement,Purpose,Tujuan
@@ -4235,6 +4240,8 @@
DocType: Grant Application,Grant Application Details ,Butiran Permohonan Grant
DocType: Employee Separation,Employee Separation,Pemisahan Pekerja
DocType: BOM Item,Original Item,Item Asal
+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","Sila padamkan Pekerja <a href=""#Form/Employee/{0}"">{0}</a> \ untuk membatalkan dokumen ini"
apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Tarikh Dokumen
apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},Rekod Bayaran Dibuat - {0}
DocType: Asset Category Account,Asset Category Account,Akaun Kategori Asset
@@ -4267,6 +4274,7 @@
DocType: Warranty Claim,Service Address,Alamat Perkhidmatan
apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.js,Import Master Data,Import Master Data
DocType: Asset Maintenance Task,Calibration,Penentukuran
+apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py,Lab Test Item {0} already exist,Item Ujian Makmal {0} sudah wujud
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,{0} is a company holiday,{0} adalah percutian syarikat
apps/erpnext/erpnext/projects/report/billing_summary.py,Billable Hours,Waktu yang boleh ditanggung
apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py,Leave Status Notification,Tinggalkan Pemberitahuan Status
@@ -4620,7 +4628,7 @@
,Salary Register,gaji Daftar
DocType: Company,Default warehouse for Sales Return,Gudang lalai untuk Pulangan Jualan
DocType: Pick List,Parent Warehouse,Warehouse Ibu Bapa
-DocType: Subscription,Net Total,Jumlah bersih
+DocType: C-Form Invoice Detail,Net Total,Jumlah bersih
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.","Tetapkan hayat rak item pada hari-hari, untuk menetapkan tamat tempoh berdasarkan tarikh perkilangan ditambah jangka hayat."
apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Default BOM not found for Item {0} and Project {1},Lalai BOM tidak dijumpai untuk Perkara {0} dan Projek {1}
apps/erpnext/erpnext/regional/italy/utils.py,Row {0}: Please set the Mode of Payment in Payment Schedule,Baris {0}: Sila tetapkan Mod Pembayaran dalam Jadual Pembayaran
@@ -4735,7 +4743,7 @@
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Target warehouse is mandatory for row {0},Gudang sasaran adalah wajib untuk berturut-turut {0}
apps/erpnext/erpnext/config/retail.py,Retail Operations,Operasi Runcit
DocType: Cheque Print Template,Primary Settings,Tetapan utama
-DocType: Attendance Request,Work From Home,Bekerja dari rumah
+DocType: Attendance,Work From Home,Bekerja dari rumah
DocType: Purchase Invoice,Select Supplier Address,Pilih Alamat Pembekal
apps/erpnext/erpnext/public/js/event.js,Add Employees,Tambahkan Pekerja
DocType: Purchase Invoice Item,Quality Inspection,Pemeriksaan Kualiti
@@ -4979,8 +4987,6 @@
DocType: QuickBooks Migrator,Authorization URL,URL Kebenaran
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Amount {0} {1} {2} {3},Jumlah {0} {1} {2} {3}
DocType: Account,Depreciation,Susutnilai
-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","Sila padamkan Pekerja <a href=""#Form/Employee/{0}"">{0}</a> \ untuk membatalkan dokumen ini"
apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py,The number of shares and the share numbers are inconsistent,Bilangan saham dan bilangan saham tidak konsisten
apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Supplier(s),Pembekal (s)
DocType: Employee Attendance Tool,Employee Attendance Tool,Pekerja Tool Kehadiran
@@ -5262,6 +5268,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}","Menetapkan Peristiwa untuk {0}, kerana pekerja yang bertugas di bawah Persons Jualan tidak mempunyai ID Pengguna {1}"
DocType: Timesheet,Billing Details,Billing Details
apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,Sumber dan sasaran gudang mestilah berbeza
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource > HR Settings,Sila persediaan Sistem Penamaan Pekerja dalam Sumber Manusia> Tetapan HR
apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,Pembayaran gagal. Sila semak Akaun GoCardless anda untuk maklumat lanjut
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},Tidak dibenarkan untuk mengemaskini transaksi saham lebih tua daripada {0}
DocType: Stock Entry,Inspection Required,Pemeriksaan Diperlukan
@@ -5290,7 +5297,6 @@
DocType: Cheque Print Template,Cheque Height,Cek Tinggi
DocType: Supplier,Supplier Details,Butiran Pembekal
DocType: Setup Progress,Setup Progress,Kemajuan Persediaan
-DocType: Expense Claim,Approval Status,Kelulusan Status
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,From value must be less than to value in row {0},Dari nilai boleh kurang daripada nilai berturut-turut {0}
DocType: Program,Intro Video,Video Pengenalan
DocType: Manufacturing Settings,Default Warehouses for Production,Gudang Default untuk Pengeluaran
@@ -5498,6 +5504,7 @@
apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,BOM semasa dan New BOM tidak boleh sama
apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,Slip Gaji ID
apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,Tarikh Persaraan mesti lebih besar daripada Tarikh Menyertai
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier > Supplier Type,Pembekal> Jenis Pembekal
apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,Pelbagai variasi
DocType: Sales Invoice,Against Income Account,Terhadap Akaun Pendapatan
apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% Dihantar
@@ -5634,7 +5641,6 @@
apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,Slots for {0} are not added to the schedule,Slot untuk {0} tidak ditambah pada jadual
DocType: Product Bundle,List items that form the package.,Senarai item yang membentuk pakej.
apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py,Target Location is required while transferring Asset {0},Lokasi Sasaran diperlukan semasa memindahkan Asset {0}
-apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py,Not permitted. Please disable the Test Template,Tidak dibenarkan. Sila lumpuhkan Templat Ujian
DocType: Sales Invoice,Distance (in km),Jarak (dalam km)
apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,Peratus Peruntukan hendaklah sama dengan 100%
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,Sila pilih Tarikh Pengeposan sebelum memilih Parti
@@ -5765,7 +5771,6 @@
DocType: Purchase Invoice,Price List Exchange Rate,Senarai Harga Kadar Pertukaran
apps/erpnext/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py,All Supplier Groups,Semua Kumpulan Pembekal
DocType: Employee Boarding Activity,Required for Employee Creation,Diperlukan untuk Penciptaan Pekerja
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier > Supplier Type,Pembekal> Jenis Pembekal
apps/erpnext/erpnext/accounts/doctype/account/account.py,Account Number {0} already used in account {1},Nombor Akaun {0} yang telah digunakan dalam akaun {1}
DocType: GoCardless Mandate,Mandate,Mandat
DocType: Hotel Room Reservation,Booked,Telah dipetik
@@ -5831,7 +5836,6 @@
DocType: Sales Partner,Sales Partner Name,Nama Rakan Jualan
apps/erpnext/erpnext/hooks.py,Request for Quotations,Tawaran Sebut Harga
DocType: Payment Reconciliation,Maximum Invoice Amount,Amaun Invois maksimum
-apps/erpnext/erpnext/accounts/doctype/bank_account/test_bank_account.py,BankAccount.validate_iban() failed for empty IBAN,BankAccount.validate_iban () gagal untuk IBAN kosong
DocType: Normal Test Items,Normal Test Items,Item Ujian Normal
DocType: QuickBooks Migrator,Company Settings,Tetapan Syarikat
DocType: Additional Salary,Overwrite Salary Structure Amount,Timpa Jumlah Struktur Gaji
@@ -5985,6 +5989,7 @@
DocType: Leave Allocation,Leave Period,Tempoh Cuti
DocType: Item,Default Material Request Type,Lalai Bahan Jenis Permintaan
DocType: Supplier Scorecard,Evaluation Period,Tempoh Penilaian
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer > Customer Group > Territory,Pelanggan> Kumpulan Pelanggan> Wilayah
apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js,Unknown,tidak diketahui
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Work Order not created,Perintah Kerja tidak dibuat
apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
@@ -6342,6 +6347,7 @@
DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Peranan Dibenarkan untuk Set Akaun Frozen & Frozen Edit Entri
DocType: Supplier Scorecard Scoring Variable,Path,Jalan
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,Tidak boleh menukar PTJ ke lejar kerana ia mempunyai nod anak
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -> {1}) not found for item: {2},Faktor penukaran UOM ({0} -> {1}) tidak ditemui untuk item: {2}
DocType: Production Plan,Total Planned Qty,Jumlah Qty Yang Dirancang
apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,Urus niaga telah diambil dari kenyataan itu
apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Nilai pembukaan
@@ -6350,8 +6356,11 @@
DocType: Material Request Plan Item,Required Quantity,Kuantiti yang Diperlukan
DocType: Lab Test Template,Lab Test Template,Templat Ujian Lab
apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Tempoh Perakaunan bertindih dengan {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier > Supplier Type,Pembekal> Jenis Pembekal
apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,Akaun Jualan
DocType: Purchase Invoice Item,Total Weight,Berat keseluruhan
+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","Sila padamkan Pekerja <a href=""#Form/Employee/{0}"">{0}</a> \ untuk membatalkan dokumen ini"
DocType: Pick List Item,Pick List Item,Pilih Senarai Item
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Commission on Sales,Suruhanjaya Jualan
DocType: Job Offer Term,Value / Description,Nilai / Penerangan
@@ -6466,6 +6475,7 @@
DocType: Contract,Signed On,Ditandatangani
DocType: Bank Account,Party Type,Jenis Parti
DocType: Discounted Invoice,Discounted Invoice,Invois Diskaun
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Tandatangan kehadiran sebagai <b></b>
DocType: Payment Schedule,Payment Schedule,Jadual pembayaran
apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,No Employee found for the given employee field value. '{}': {},Tiada Pekerja yang didapati untuk nilai medan pekerja yang diberi. '{}': {}
DocType: Item Attribute Value,Abbreviation,Singkatan
@@ -6561,6 +6571,7 @@
DocType: Purchase Order,To Receive,Untuk Menerima
DocType: Leave Period,Holiday List for Optional Leave,Senarai Percutian untuk Cuti Opsional
DocType: Item Tax Template,Tax Rates,Kadar cukai
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code > Item Group > Brand,Kod Item> Kumpulan Item> Jenama
DocType: Asset,Asset Owner,Pemilik Aset
DocType: Item,Website Content,Kandungan Laman Web
DocType: Bank Account,Integration ID,ID Integrasi
@@ -6568,7 +6579,6 @@
DocType: Employee,Personal Email,E-mel peribadi
apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py,Total Variance,Jumlah Varian
DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Jika diaktifkan, sistem akan menghantar entri perakaunan untuk inventori secara automatik."
-apps/erpnext/erpnext/accounts/doctype/bank_account/test_bank_account.py,BankAccount.validate_iban() accepted invalid IBAN {},BankAccount.validate_iban () diterima tidak sah IBAN {}
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Brokerage,Brokerage
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Attendance for employee {0} is already marked for this day,Kehadiran pekerja {0} sudah ditanda pada hari ini
DocType: Work Order Operation,"in Minutes
@@ -6688,6 +6698,7 @@
DocType: Stock Entry Detail,Additional Cost,Kos tambahan
apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher","Tidak boleh menapis berdasarkan Baucer Tidak, jika dikumpulkan oleh Baucar"
DocType: Quality Inspection,Incoming,Masuk
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup > Numbering Series,Sila persediaan siri penomboran untuk Kehadiran melalui Persediaan> Penomboran Siri
apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Templat cukai lalai untuk jualan dan pembelian dicipta.
apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,Rekod Keputusan Penilaian {0} sudah wujud.
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.","Contoh: ABCD. #####. Jika siri ditetapkan dan No Batch tidak disebutkan dalam urus niaga, maka nombor batch automatik akan dibuat berdasarkan siri ini. Sekiranya anda sentiasa ingin menyatakan secara terperinci Batch No untuk item ini, biarkan kosong ini. Nota: tetapan ini akan diberi keutamaan di atas Prefix Prefix Prefix dalam Tetapan Stok."
@@ -6839,6 +6850,7 @@
apps/erpnext/erpnext/regional/report/irs_1099/irs_1099.js,Print IRS 1099 Forms,Cetak Borang IRS 1099
DocType: Asset,Check if Asset requires Preventive Maintenance or Calibration,Periksa sama ada Asset memerlukan Penyelenggaraan Pencegahan atau Penentukuran
apps/erpnext/erpnext/public/js/setup_wizard.js,Company Abbreviation cannot have more than 5 characters,Singkatan Syarikat tidak boleh mempunyai lebih daripada 5 aksara
+apps/erpnext/erpnext/setup/doctype/company/company.py,Parent Company must be a group company,Syarikat induk mestilah syarikat kumpulan
DocType: Employee,Reports to,Laporan kepada
,Unpaid Expense Claim,Tidak dibayar Perbelanjaan Tuntutan
DocType: Payment Entry,Paid Amount,Jumlah yang dibayar
@@ -6928,6 +6940,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,Tarikh Mulai Tempoh Percubaan dan Tarikh Akhir Tempoh Percubaan mesti ditetapkan
apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,Kadar purata
+DocType: Appointment,Appointment With,Pelantikan Dengan
apps/erpnext/erpnext/controllers/accounts_controller.py,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Jumlah Amaun Pembayaran dalam Jadual Pembayaran mestilah sama dengan Jumlah Besar / Bulat
apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate","Item yang Dibekalkan Pelanggan" tidak boleh mempunyai Kadar Penilaian
DocType: Subscription Plan Detail,Plan,Rancang
@@ -7029,6 +7042,7 @@
DocType: BOM,Rate Of Materials Based On,Kadar Bahan Based On
DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Sekiranya diaktifkan, Tempoh Akademik bidang akan Dikenakan dalam Alat Pendaftaran Program."
apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","Nilai-nilai yang dikecualikan, tidak diberi nilai dan bekalan masuk bukan CBP"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer > Customer Group > Territory,Pelanggan> Kumpulan Pelanggan> Wilayah
apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>Syarikat</b> adalah penapis mandatori.
apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,Nyahtanda semua
DocType: Purchase Taxes and Charges,On Item Quantity,Pada Kuantiti Item
@@ -7061,7 +7075,6 @@
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Opp/Lead %,RRJP / Lead%
DocType: Bank Guarantee,Bank Account Info,Maklumat Akaun Bank
DocType: Bank Guarantee,Bank Guarantee Type,Jenis Jaminan Bank
-apps/erpnext/erpnext/accounts/doctype/bank_account/test_bank_account.py,BankAccount.validate_iban() failed for valid IBAN {},BankAccount.validate_iban () gagal untuk sah IBAN {}
DocType: Payment Schedule,Invoice Portion,Bahagian Invois
,Asset Depreciations and Balances,Penurunan nilai aset dan Baki
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Amount {0} {1} transferred from {2} to {3},Jumlah {0} {1} dipindahkan dari {2} kepada {3}
@@ -7075,6 +7088,7 @@
apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,Kekurangan Qty
DocType: Purchase Invoice,Input Service Distributor,Pengedar Perkhidmatan Input
apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,Varian item {0} wujud dengan ciri yang sama
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education > Education Settings,Sila persediaan Sistem Penamaan Pengajar dalam Pendidikan> Tetapan Pendidikan
DocType: Loan,Repay from Salary,Membayar balik dari Gaji
DocType: Exotel Settings,API Token,Token API
apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Requesting payment against {0} {1} for amount {2},Meminta pembayaran daripada {0} {1} untuk jumlah {2}
@@ -7731,7 +7745,6 @@
apps/erpnext/erpnext/crm/doctype/email_campaign/email_campaign.py,Please set up the Campaign Schedule in the Campaign {0},Sila sediakan Jadual Kempen dalam Kempen {0}
apps/erpnext/erpnext/config/buying.py,Price List master.,Senarai Harga induk.
DocType: Task,Review Date,Tarikh Semakan
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Tandatangan kehadiran sebagai <b></b>
DocType: BOM,Allow Alternative Item,Benarkan Item Alternatif
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,Resit Pembelian tidak mempunyai sebarang item yang mengekalkan sampel adalah didayakan.
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Invoice Grand Total,Jumlah Besar Invois
@@ -7963,7 +7976,6 @@
DocType: Amazon MWS Settings,Max Retry Limit,Batas Semula Maksima
apps/erpnext/erpnext/accounts/page/pos/pos.js,Price List not found or disabled,Senarai Harga tidak dijumpai atau orang kurang upaya
DocType: Content Activity,Last Activity ,Aktiviti Terakhir
-DocType: Student Applicant,Approved,Diluluskan
DocType: Pricing Rule,Price,Harga
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Employee relieved on {0} must be set as 'Left',Pekerja lega pada {0} mesti ditetapkan sebagai 'kiri'
DocType: Guardian,Guardian,Guardian
@@ -8135,6 +8147,7 @@
DocType: GL Entry,To Rename,Untuk Namakan semula
DocType: Stock Entry,Repack,Membungkus semula
apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Select to add Serial Number.,Pilih untuk menambah Nombor Serial.
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education > Education Settings,Sila persediaan Sistem Penamaan Pengajar dalam Pendidikan> Tetapan Pendidikan
apps/erpnext/erpnext/regional/italy/utils.py,Please set Fiscal Code for the customer '%s',Sila tetapkan Kod Fiskal untuk '% s' pelanggan
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select the Company first,Sila pilih Syarikat terlebih dahulu
DocType: Item Attribute,Numeric Values,Nilai-nilai berangka
@@ -8151,6 +8164,7 @@
apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html,Cart is Empty,Troli kosong
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",Item {0} tidak mempunyai Siri Serial sahaja. Hanya serilialized item \ boleh mempunyai penghantaran berdasarkan Serial No
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Depreciated Amount,Jumlah Susut Nilai
DocType: Vehicle,Model,model
DocType: Work Order,Actual Operating Cost,Kos Sebenar Operasi
DocType: Payment Entry,Cheque/Reference No,Cek / Rujukan