feat: Updated translation (#20490)

diff --git a/erpnext/translations/af.csv b/erpnext/translations/af.csv
index c2604ac..d31dda2 100644
--- a/erpnext/translations/af.csv
+++ b/erpnext/translations/af.csv
@@ -389,6 +389,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,Voorgeskrewe Prosedures
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,Wys net POS
 DocType: Supplier Group,Supplier Group Name,Verskaffer Groep Naam
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Merk bywoning as <b></b>
 DocType: Driver,Driving License Categories,Bestuurslisensie Kategorieë
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,Voer asseblief Verskaffingsdatum in
 DocType: Depreciation Schedule,Make Depreciation Entry,Maak waardeverminderinginskrywing
@@ -999,6 +1000,7 @@
 DocType: Company,Delete Company Transactions,Verwyder maatskappytransaksies
 DocType: Production Plan Item,Quantity and Description,Hoeveelheid en beskrywing
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,Verwysingsnommer en verwysingsdatum is verpligtend vir Banktransaksie
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Stel Naming Series in vir {0} via Setup&gt; Settings&gt; Naming Series
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Voeg / verander belasting en heffings
 DocType: Payment Entry Reference,Supplier Invoice No,Verskafferfaktuurnr
 DocType: Territory,For reference,Vir verwysing
@@ -4198,6 +4200,8 @@
 DocType: Grant Application,Grant Application Details ,Gee aansoek besonderhede
 DocType: Employee Separation,Employee Separation,Werknemersskeiding
 DocType: BOM Item,Original Item,Oorspronklike item
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Skrap die werknemer <a href=""#Form/Employee/{0}"">{0}</a> \ om hierdie dokument te kanselleer"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Doc Datum
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},Fooi Rekords Geskep - {0}
 DocType: Asset Category Account,Asset Category Account,Bate Kategorie Rekening
@@ -5215,6 +5219,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}","Stel gebeure in op {0}, aangesien die werknemer verbonde aan die onderstaande verkoopspersone nie &#39;n gebruikers-ID het nie {1}"
 DocType: Timesheet,Billing Details,Rekeningbesonderhede
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,Bron en teiken pakhuis moet anders wees
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Stel asseblief &#39;n naamstelsel vir werknemers in vir menslike hulpbronne&gt; HR-instellings
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,Betaling misluk. Gaan asseblief jou GoCardless rekening vir meer besonderhede
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},Nie toegelaat om voorraadtransaksies ouer as {0} by te werk nie.
 DocType: Stock Entry,Inspection Required,Inspeksie benodig
@@ -5448,6 +5453,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,Huidige BOM en Nuwe BOM kan nie dieselfde wees nie
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,Salaris Slip ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,Datum van aftrede moet groter wees as datum van aansluiting
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Verskaffer&gt; Verskaffer tipe
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,Veelvuldige Varianten
 DocType: Sales Invoice,Against Income Account,Teen Inkomsterekening
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% afgelewer
@@ -6277,6 +6283,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rol toegelaat om bevrore rekeninge in te stel en Bevrore Inskrywings te wysig
 DocType: Supplier Scorecard Scoring Variable,Path,pad
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,Kan nie Kostesentrum omskakel na grootboek nie aangesien dit nodusse het
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM-omskakelingsfaktor ({0} -&gt; {1}) nie vir item gevind nie: {2}
 DocType: Production Plan,Total Planned Qty,Totale Beplande Aantal
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,Transaksies het reeds weer uit die staat verskyn
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Openingswaarde
@@ -6499,6 +6506,7 @@
 DocType: Purchase Order,To Receive,Om te ontvang
 DocType: Leave Period,Holiday List for Optional Leave,Vakansie Lys vir Opsionele Verlof
 DocType: Item Tax Template,Tax Rates,Belastingkoerse
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Itemkode&gt; Itemgroep&gt; Merk
 DocType: Asset,Asset Owner,Bate-eienaar
 DocType: Item,Website Content,Inhoud van die webwerf
 DocType: Bank Account,Integration ID,Integrasie ID
@@ -6624,6 +6632,7 @@
 DocType: Stock Entry Detail,Additional Cost,Addisionele koste
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher","Kan nie filter gebaseer op Voucher No, indien gegroepeer deur Voucher"
 DocType: Quality Inspection,Incoming,inkomende
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Stel nommeringreekse op vir bywoning via Setup&gt; Numbering Series
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Standaard belasting sjablonen vir verkope en aankoop word gemaak.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,Assesseringsresultaat rekord {0} bestaan reeds.
 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.","Voorbeeld: ABCD. #####. As reeksreeks ingestel is en Batchnommer nie in transaksies genoem word nie, sal outomatiese joernaalnommer geskep word op grond van hierdie reeks. As jy dit altyd wil spesifiseer, moet jy dit loslaat. Let wel: hierdie instelling sal prioriteit geniet in die voorkeuraam van die naamreeks in voorraadinstellings."
@@ -6963,6 +6972,7 @@
 DocType: BOM,Rate Of Materials Based On,Mate van materiaal gebaseer op
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Indien geaktiveer, sal die vak Akademiese Termyn Verpligtend wees in die Programinskrywingsinstrument."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","Waardes van vrygestelde, nie-gegradeerde en nie-GST-voorrade"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kliënt&gt; Kliëntegroep&gt; Gebied
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>Die maatskappy</b> is &#39;n verpligte filter.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,Ontmerk alles
 DocType: Purchase Taxes and Charges,On Item Quantity,Op die hoeveelheid
@@ -7007,6 +7017,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,Tekort
 DocType: Purchase Invoice,Input Service Distributor,Insetdiensverspreider
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,Item variant {0} bestaan met dieselfde eienskappe
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Stel asb. Die instrukteur-naamstelsel op in onderwys&gt; Onderwysinstellings
 DocType: Loan,Repay from Salary,Terugbetaal van Salaris
 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},Versoek betaling teen {0} {1} vir bedrag {2}
diff --git a/erpnext/translations/am.csv b/erpnext/translations/am.csv
index c79c460..5794fd7 100644
--- a/erpnext/translations/am.csv
+++ b/erpnext/translations/am.csv
@@ -388,6 +388,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,የታዘዙ ሸቀጦች
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,POS ብቻ አሳይ
 DocType: Supplier Group,Supplier Group Name,የአቅራቢው የቡድን ስም
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,ተገኝነትን እንደ ምልክት ያድርጉ <b></b>
 DocType: Driver,Driving License Categories,የመንጃ ፍቃድ ምድቦች
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,እባክዎ የመላኪያ ቀን ያስገቡ
 DocType: Depreciation Schedule,Make Depreciation Entry,የእርጅና Entry አድርግ
@@ -4192,6 +4193,8 @@
 DocType: Grant Application,Grant Application Details ,የመተግበሪያ ዝርዝሮችን ይስጡ
 DocType: Employee Separation,Employee Separation,የሰራተኛ መለያ
 DocType: BOM Item,Original Item,የመጀመሪያው ንጥል
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","ይህንን ሰነድ ለመሰረዝ እባክዎ ሰራተኛውን <a href=""#Form/Employee/{0}"">{0}</a> \ ያጥፉ"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Doc Date
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},ክፍያ መዛግብት ፈጥሯል - {0}
 DocType: Asset Category Account,Asset Category Account,የንብረት ምድብ መለያ
@@ -5205,6 +5208,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","ወደ ክስተቶች በማቀናበር ላይ {0}, የሽያጭ አካላት ከታች ያለውን ጋር ተያይዞ ሠራተኛው የተጠቃሚ መታወቂያ የለውም ጀምሮ {1}"
 DocType: Timesheet,Billing Details,አከፋፈል ዝርዝሮች
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,የመነሻ እና የመድረሻ መጋዘን የተለየ መሆን አለበት
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,በሰብአዊ ሀብት&gt; የሰው ሠራሽ ቅንጅቶች ውስጥ የሰራተኛ መለያ ስም መስሪያ ስርዓት ያዋቅሩ
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,ክፍያ አልተሳካም. ለተጨማሪ ዝርዝሮች እባክዎ የ GoCardless መለያዎን ይመልከቱ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},አይደለም በላይ የቆዩ የአክሲዮን ግብይቶችን ለማዘመን አይፈቀድላቸውም {0}
 DocType: Stock Entry,Inspection Required,የምርመራ ያስፈልጋል
@@ -5437,6 +5441,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,የአሁኑ BOM ኒው BOM ተመሳሳይ መሆን አይችልም
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,የቀጣሪ መታወቂያ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,ጡረታ መካከል ቀን በመቀላቀል ቀን የበለጠ መሆን አለበት
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,አቅራቢ&gt; የአቅራቢ ዓይነት
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,በርካታ ስሪቶች
 DocType: Sales Invoice,Against Income Account,የገቢ መለያ ላይ
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% ደርሷል
@@ -6265,6 +6270,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,ሚና Frozen መለያዎች &amp; አርትዕ Frozen ግቤቶችን አዘጋጅ የሚፈቀድለት
 DocType: Supplier Scorecard Scoring Variable,Path,ዱካ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,ይህ ልጅ መገናኛ ነጥቦች አሉት እንደ የመቁጠር ወደ ወጪ ማዕከል መለወጥ አይቻልም
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM የልወጣ ሁኔታ ({0} -&gt; {1}) ለንጥል አልተገኘም {{2}
 DocType: Production Plan,Total Planned Qty,የታቀደ አጠቃላይ ቅደም ተከተል
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,ግብይቶቹ ቀደም ሲል ከ መግለጫው ተመልሰዋል።
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,በመክፈት ላይ እሴት
@@ -6487,6 +6493,7 @@
 DocType: Purchase Order,To Receive,መቀበል
 DocType: Leave Period,Holiday List for Optional Leave,የአማራጭ ፈቃድ የአፈፃጸም ዝርዝር
 DocType: Item Tax Template,Tax Rates,የግብር ተመኖች
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,የንጥል ኮድ&gt; የንጥል ቡድን&gt; የምርት ስም
 DocType: Asset,Asset Owner,የንብረት ባለቤት
 DocType: Item,Website Content,የድር ጣቢያ ይዘት።
 DocType: Bank Account,Integration ID,የተቀናጀ መታወቂያ።
@@ -6612,6 +6619,7 @@
 DocType: Stock Entry Detail,Additional Cost,ተጨማሪ ወጪ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher","ቫውቸር ምንም ላይ የተመሠረተ ማጣሪያ አይችሉም, ቫውቸር በ ተመድበው ከሆነ"
 DocType: Quality Inspection,Incoming,ገቢ
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,እባክዎን ለተማሪ ተገኝነት በማዋቀር&gt; በቁጥር ተከታታይ በኩል ያዘጋጁ
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,ለሽያጭ እና ለግዢ ነባሪ የግብር አብነቶች ተፈጥረዋል.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,የአመሳሾቹ ውጤት ዘገባ {0} አስቀድሞም ይገኛል.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","ምሳሌ ABCD. #####. ተከታታይነት ከተዘጋጀ እና የቡድን ቁጥር በግብይቶች ውስጥ ካልተጠቀሰ, በዚህ ተከታታይ ላይ ተመስርተው ራስ-ሰር ቁጥሩ ቁጥር ይፈጠራል. ለእዚህ ንጥል እቃ ዝርዝር በግልጽ ለመጥቀስ የሚፈልጉ ከሆነ, ይህንን ባዶ ይተውት. ማሳሰቢያ: ይህ ቅንብር በስምሪት ቅንጅቶች ውስጥ ከሚታወቀው Seriesing ቅድመ-ቅጥያ ቅድሚያ ይሰጠዋል."
@@ -6953,6 +6961,7 @@
 DocType: BOM,Rate Of Materials Based On,ደረጃ ይስጡ እቃዎች ላይ የተመረኮዘ ላይ
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","ከነቃ, የአካዳሚክ የትምህርት ጊዜ በፕሮግራም ምዝገባ ፕሮግራም ውስጥ አስገዳጅ ይሆናል."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies",የነፃ ፣ የ Nil ደረጃ እና GST ያልሆኑ ውስጣዊ አቅርቦቶች እሴቶች።
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ደንበኛ&gt; የደንበኛ ቡድን&gt; ግዛት
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>ኩባንያ</b> የግዴታ ማጣሪያ ነው።
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,ሁሉንም አታመልክት
 DocType: Purchase Taxes and Charges,On Item Quantity,በእቃ ቁጥር።
@@ -6997,6 +7006,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,እጥረት ብዛት
 DocType: Purchase Invoice,Input Service Distributor,የግቤት አገልግሎት አሰራጭ
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,ንጥል ተለዋጭ {0} ተመሳሳይ ባሕርያት ጋር አለ
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,እባክዎ በትምህርቱ&gt; የትምህርት ቅንብሮች ውስጥ የትምህርት አሰጣጥ / መለያ መመሪያን ያዋቅሩ
 DocType: Loan,Repay from Salary,ደመወዝ ከ ልከፍለው
 DocType: Exotel Settings,API Token,ኤ.ፒ.አይ. የምስክር ወረቀት
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Requesting payment against {0} {1} for amount {2},ላይ ክፍያ በመጠየቅ ላይ {0} {1} መጠን ለ {2}
diff --git a/erpnext/translations/ar.csv b/erpnext/translations/ar.csv
index 0b2dea4..45793e4 100644
--- a/erpnext/translations/ar.csv
+++ b/erpnext/translations/ar.csv
@@ -389,6 +389,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,الإجراءات المقررة
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,عرض نقاط البيع فقط
 DocType: Supplier Group,Supplier Group Name,اسم مجموعة الموردين
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,علامة الحضور كما <b></b>
 DocType: Driver,Driving License Categories,فئات رخصة القيادة
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,الرجاء إدخال تاريخ التسليم
 DocType: Depreciation Schedule,Make Depreciation Entry,انشئ قيد اهلاك
@@ -999,6 +1000,7 @@
 DocType: Company,Delete Company Transactions,حذف معاملات وحركات للشركة
 DocType: Production Plan Item,Quantity and Description,الكمية والوصف
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,رقم المرجع و تاريخ المرجع إلزامي للمعاملة المصرفية
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,يرجى تعيين سلسلة التسمية لـ {0} عبر الإعداد&gt; الإعدادات&gt; سلسلة التسمية
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,إضافة / تعديل الضرائب والرسوم
 DocType: Payment Entry Reference,Supplier Invoice No,رقم فاتورة المورد
 DocType: Territory,For reference,للرجوع إليها
@@ -4240,6 +4242,8 @@
 DocType: Grant Application,Grant Application Details ,تفاصيل طلب المنح
 DocType: Employee Separation,Employee Separation,فصل الموظف
 DocType: BOM Item,Original Item,البند الأصلي
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","يرجى حذف الموظف <a href=""#Form/Employee/{0}"">{0}</a> \ لإلغاء هذا المستند"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,وثيقة التاريخ
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},سجلات الرسوم  تم انشاؤها - {0}
 DocType: Asset Category Account,Asset Category Account,حساب فئة الأصول
@@ -5269,6 +5273,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}",وضع الأحداث إلى {0}، لأن الموظف المرفقة أدناه الأشخاص المبيعات لايوجد هوية المستخدم {1}
 DocType: Timesheet,Billing Details,تفاصيل الفاتورة
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,ويجب أن تكون مصدر ومستودع الهدف مختلفة
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,يرجى إعداد نظام تسمية الموظف في الموارد البشرية&gt; إعدادات الموارد البشرية
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,عملية الدفع فشلت. يرجى التحقق من حسابك في GoCardless لمزيد من التفاصيل
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},لا يسمح لتحديث المعاملات المخزنية أقدم من {0}
 DocType: Stock Entry,Inspection Required,التفتيش مطلوب
@@ -5502,6 +5507,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,قائمة المواد الحالية و قائمة المواد الجديد لا يمكن أن تكون نفس بعضهما
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,هوية كشف الراتب
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,تاريخ التقاعد يجب أن يكون بعد تاريخ الالتحاق بالعمل
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,مورد&gt; نوع المورد
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,متغيرات متعددة
 DocType: Sales Invoice,Against Income Account,مقابل حساب الدخل
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}٪ تم التسليم
@@ -6331,6 +6337,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,الدور الوظيفي يسمح له بتجميد الحسابات و تعديل القيود المجمدة
 DocType: Supplier Scorecard Scoring Variable,Path,مسار
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,لا يمكن تحويل مركز التكلفة إلى حساب دفتر الأستاذ لانه مرتبط بعقدة فرعية
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},معامل تحويل UOM ({0} -&gt; {1}) غير موجود للعنصر: {2}
 DocType: Production Plan,Total Planned Qty,مجموع الكمية المخطط لها
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,المعاملات استرجعت بالفعل من البيان
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,القيمة الافتتاحية
@@ -6553,6 +6560,7 @@
 DocType: Purchase Order,To Receive,للأستلام
 DocType: Leave Period,Holiday List for Optional Leave,قائمة العطلة للإجازة الاختيارية
 DocType: Item Tax Template,Tax Rates,معدلات الضريبة
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,كود الصنف&gt; مجموعة الصنف&gt; العلامة التجارية
 DocType: Asset,Asset Owner,مالك الأصول
 DocType: Item,Website Content,محتوى الموقع
 DocType: Bank Account,Integration ID,معرف التكامل
@@ -6679,6 +6687,7 @@
 DocType: Stock Entry Detail,Additional Cost,تكلفة إضافية
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher",لا يمكن الفلتره علي اساس (رقم الأيصال)، إذا تم وضعه في مجموعة على اساس (ايصال)
 DocType: Quality Inspection,Incoming,الوارد
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,يرجى إعداد سلسلة الترقيم للحضور عبر الإعداد&gt; سلسلة الترقيم
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,تم إنشاء قوالب الضرائب الافتراضية للمبيعات والمشتريات.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,سجل نتيجة التقييم {0} موجود بالفعل.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.",مثال: ABCD. #####. إذا تم ضبط المسلسل ولم يتم ذكر رقم الدفعة في المعاملات ، فسيتم إنشاء رقم الدفعة تلقائيًا استنادًا إلى هذه السلسلة. إذا كنت تريد دائمًا الإشارة صراحة إلى Batch No لهذا العنصر ، فاترك هذا فارغًا. ملاحظة: سيأخذ هذا الإعداد الأولوية على بادئة Naming Series في إعدادات المخزون.
@@ -7022,6 +7031,7 @@
 DocType: BOM,Rate Of Materials Based On,سعرالمواد استنادا على
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.",إذا تم تمكينه ، فسيكون الحقل الدراسي الأكاديمي إلزاميًا في أداة انتساب البرنامج.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies",قيم الإمدادات المعفاة وغير المصنفة وغير الداخلة في ضريبة السلع والخدمات
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,العملاء&gt; مجموعة العملاء&gt; الإقليم
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>الشركة</b> هي مرشح إلزامي.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,الغاء أختيار الكل
 DocType: Purchase Taxes and Charges,On Item Quantity,على كمية البند
@@ -7067,6 +7077,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,نقص الكمية
 DocType: Purchase Invoice,Input Service Distributor,موزع خدمة الإدخال
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,متغير الصنف {0} موجود بنفس الخاصية
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,يرجى إعداد نظام تسمية المدرب في التعليم&gt; إعدادات التعليم
 DocType: Loan,Repay from Salary,سداد من الراتب
 DocType: Exotel Settings,API Token,رمز واجهة برمجة التطبيقات
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Requesting payment against {0} {1} for amount {2},طلب الدفعة مقابل {0} {1} لقيمة {2}
diff --git a/erpnext/translations/bg.csv b/erpnext/translations/bg.csv
index ba1a9d0..860b6e4 100644
--- a/erpnext/translations/bg.csv
+++ b/erpnext/translations/bg.csv
@@ -389,6 +389,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,Предписани процедури
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,Показване само на POS
 DocType: Supplier Group,Supplier Group Name,Име на групата доставчици
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Отбележете присъствието като <b></b>
 DocType: Driver,Driving License Categories,Категории лицензионни шофьори
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,"Моля, въведете дата на доставка"
 DocType: Depreciation Schedule,Make Depreciation Entry,Направи запис за амортизация
@@ -999,6 +1000,7 @@
 DocType: Company,Delete Company Transactions,Изтриване на транзакциите на фирма
 DocType: Production Plan Item,Quantity and Description,Количество и описание
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,Референтен Не и Референтен Дата е задължително за Bank сделка
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Моля, задайте Именуване на серия за {0} чрез Настройка&gt; Настройки&gt; Наименуване на серия"
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Добавяне / Редактиране на данъци и такси
 DocType: Payment Entry Reference,Supplier Invoice No,Доставчик - Фактура номер
 DocType: Territory,For reference,За референция
@@ -4199,6 +4201,8 @@
 DocType: Grant Application,Grant Application Details ,Подробности за кандидатстването
 DocType: Employee Separation,Employee Separation,Отделяне на служители
 DocType: BOM Item,Original Item,Оригинален елемент
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Моля, изтрийте Служителя <a href=""#Form/Employee/{0}"">{0}</a> \, за да отмените този документ"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Дата на документа
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},Такса - записи създадени - {0}
 DocType: Asset Category Account,Asset Category Account,Дълготраен актив Категория сметка
@@ -5216,6 +5220,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Създаване на събитията в {0}, тъй като Работника прикрепен към по-долу, купува Лицата не разполага с потребителско име {1}"
 DocType: Timesheet,Billing Details,Детайли за фактура
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,Източник и целеви склад трябва да бъде различен
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Моля, настройте системата за именуване на служители в Човешки ресурси&gt; Настройки за човешки ресурси"
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,"Плащането не бе успешно. Моля, проверете профила си в GoCardless за повече подробности"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},Не е позволено да се актуализира борсови сделки по-стари от {0}
 DocType: Stock Entry,Inspection Required,"Инспекция, изискван"
@@ -5449,6 +5454,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,Текущ BOM и нов BOM не могат да бъдат едни и същи
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,Фиш за заплата ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,Дата на пенсиониране трябва да е по-голяма от Дата на Присъединяване
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Доставчик&gt; Тип доставчик
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,Няколко варианта
 DocType: Sales Invoice,Against Income Account,Срещу Приходна Сметка
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% Доставени
@@ -6278,6 +6284,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Роля позволено да определят замразени сметки &amp; Редактиране на замразени влизания
 DocType: Supplier Scorecard Scoring Variable,Path,път
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,"Не може да конвертирате Cost Center да Леджър, тъй като има дете възли"
+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: Production Plan,Total Planned Qty,Общ планиран брой
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,"Транзакции, които вече са изтеглени от извлечението"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Наличност - Стойност
@@ -6500,6 +6507,7 @@
 DocType: Purchase Order,To Receive,Да получавам
 DocType: Leave Period,Holiday List for Optional Leave,Почивен списък за незадължителен отпуск
 DocType: Item Tax Template,Tax Rates,Данъчни ставки
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Код на артикула&gt; Група артикули&gt; Марка
 DocType: Asset,Asset Owner,Собственик на актив
 DocType: Item,Website Content,Съдържание на уебсайтове
 DocType: Bank Account,Integration ID,Интеграционен идентификатор
@@ -6625,6 +6633,7 @@
 DocType: Stock Entry Detail,Additional Cost,Допълнителен разход
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher","Не може да се филтрира по Ваучер Не, ако е групирано по ваучер"
 DocType: Quality Inspection,Incoming,Входящ
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Моля, настройте номерацията на сериите за присъствие чрез настройка&gt; серия от номерация"
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Създават се стандартни данъчни шаблони за продажби и покупки.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,Отчет за резултата от оценката {0} вече съществува.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Пример: ABCD. #####. Ако е зададена серия и партида № не е посочена в транзакциите, тогава автоматично се създава номера на партидата въз основа на тази серия. Ако винаги искате да посочите изрично партида № за този елемент, оставете го празно. Забележка: тази настройка ще има приоритет пред Prefix на серията за наименоване в Настройки на запасите."
@@ -6966,6 +6975,7 @@
 DocType: BOM,Rate Of Materials Based On,Курсове на материали на основата на
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Ако е активирано, полето Академичен термин ще бъде задължително в програмата за записване на програми."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","Стойности на освободени, нулеви стойности и вътрешни доставки без GST"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Клиентска група&gt; Територия
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>Фирмата</b> е задължителен филтър.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,Махнете отметката от всичко
 DocType: Purchase Taxes and Charges,On Item Quantity,На брой
@@ -7010,6 +7020,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,Недостиг Количество
 DocType: Purchase Invoice,Input Service Distributor,Дистрибутор на входната услуга
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,Съществува т вариант {0} със същите атрибути
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,"Моля, настройте системата за именуване на инструктори в Образование&gt; Настройки за образование"
 DocType: Loan,Repay from Salary,Погасяване от Заплата
 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} за количество {2}
diff --git a/erpnext/translations/bn.csv b/erpnext/translations/bn.csv
index 37c0a28..4bb9c26 100644
--- a/erpnext/translations/bn.csv
+++ b/erpnext/translations/bn.csv
@@ -386,6 +386,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,নির্ধারিত পদ্ধতি
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,শুধুমাত্র পিওএস দেখান
 DocType: Supplier Group,Supplier Group Name,সরবরাহকারী গ্রুপ নাম
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,হিসাবে উপস্থিতি চিহ্নিত করুন <b></b>
 DocType: Driver,Driving License Categories,ড্রাইভিং লাইসেন্স বিভাগ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,ডেলিভারি তারিখ লিখুন দয়া করে
 DocType: Depreciation Schedule,Make Depreciation Entry,অবচয় এণ্ট্রি করুন
@@ -4126,6 +4127,8 @@
 DocType: Grant Application,Grant Application Details ,আবেদনপত্র জমা দিন
 DocType: Employee Separation,Employee Separation,কর্মচারী বিচ্ছেদ
 DocType: BOM Item,Original Item,মৌলিক আইটেম
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","এই নথিটি বাতিল করতে দয়া করে কর্মচারী <a href=""#Form/Employee/{0}"">{0}</a> delete মুছুন"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,ডক তারিখ
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},ফি রেকর্ডস নির্মিত - {0}
 DocType: Asset Category Account,Asset Category Account,অ্যাসেট শ্রেণী অ্যাকাউন্ট
@@ -5131,6 +5134,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","জন্য ইভেন্ট নির্ধারণ {0}, যেহেতু কর্মচারী সেলস ব্যক্তি নিচে সংযুক্ত একটি ইউজার আইডি নেই {1}"
 DocType: Timesheet,Billing Details,পূর্ণ রূপ প্রকাশ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,উত্স এবং লক্ষ্য গুদাম আলাদা হতে হবে
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,মানব সম্পদ&gt; এইচআর সেটিংসে কর্মচারী নামকরণ সিস্টেম সেটআপ করুন
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,পেমেন্ট ব্যর্থ হয়েছে. আরো তথ্যের জন্য আপনার GoCardless অ্যাকাউন্ট চেক করুন
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},বেশী না পুরোনো স্টক লেনদেন হালনাগাদ করার অনুমতি {0}
 DocType: Stock Entry,Inspection Required,ইন্সপেকশন প্রয়োজনীয়
@@ -5360,6 +5364,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,বর্তমান BOM এবং নতুন BOM একই হতে পারে না
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,বেতন স্লিপ আইডি
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,অবসর তারিখ যোগদান তারিখ থেকে বড় হওয়া উচিত
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,সরবরাহকারী&gt; সরবরাহকারী প্রকার
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,একাধিক বৈকল্পিক
 DocType: Sales Invoice,Against Income Account,আয় অ্যাকাউন্টের বিরুদ্ধে
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% বিতরণ করা হয়েছে
@@ -6178,6 +6183,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,ভূমিকা হিমায়িত একাউন্টস ও সম্পাদনা হিমায়িত সাজপোশাকটি সেট করার মঞ্জুরি
 DocType: Supplier Scorecard Scoring Variable,Path,পথ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,এটা সন্তানের নোড আছে খতিয়ান করার খরচ কেন্দ্র রূপান্তর করতে পারবেন না
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},ইউওএম রূপান্তর ফ্যাক্টর ({0} -&gt; {1}) আইটেমটির জন্য পাওয়া যায় নি: {2}
 DocType: Production Plan,Total Planned Qty,মোট পরিকল্পিত পরিমাণ
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,ইতিমধ্যে বিবৃতি থেকে লেনদেন প্রত্যাহার করা হয়েছে
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,খোলা মূল্য
@@ -6396,6 +6402,7 @@
 DocType: Purchase Order,To Receive,গ্রহণ করতে
 DocType: Leave Period,Holiday List for Optional Leave,ঐচ্ছিক তালিকার জন্য হলিডে তালিকা
 DocType: Item Tax Template,Tax Rates,করের হার
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,আইটেম কোড&gt; আইটেম গ্রুপ&gt; ব্র্যান্ড
 DocType: Asset,Asset Owner,সম্পদ মালিক
 DocType: Item,Website Content,ওয়েবসাইট সামগ্রী
 DocType: Bank Account,Integration ID,ইন্টিগ্রেশন আইডি
@@ -6518,6 +6525,7 @@
 DocType: Stock Entry Detail,Additional Cost,অতিরিক্ত খরচ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher","ভাউচার কোন উপর ভিত্তি করে ফিল্টার করতে পারবে না, ভাউচার দ্বারা গ্রুপকৃত যদি"
 DocType: Quality Inspection,Incoming,ইনকামিং
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,দয়া করে সেটআপ&gt; নম্বরিং সিরিজের মাধ্যমে উপস্থিতির জন্য সংখ্যায়ন সিরিজটি সেট করুন
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,বিক্রয় এবং ক্রয় জন্য ডিফল্ট ট্যাক্স টেমপ্লেট তৈরি করা হয়।
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,মূল্যায়ন ফলাফল রেকর্ড {0} ইতিমধ্যে বিদ্যমান।
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","উদাহরণ: ABCD। ##### যদি সিরিজ সেট করা থাকে এবং ব্যাচ নাম লেনদেনের ক্ষেত্রে উল্লেখ করা হয় না, তাহলে এই সিরিজের উপর ভিত্তি করে স্বয়ংক্রিয় ব্যাচ নম্বর তৈরি করা হবে। আপনি যদি সবসময় এই আইটেমটির জন্য ব্যাচ নংকে স্পষ্টভাবে উল্লেখ করতে চান, তবে এই ফাঁকা স্থানটি ছেড়ে দিন। দ্রষ্টব্য: এই সেটিং স্টক সেটিংসের নামকরণ সিরিজ প্রিফিক্সের উপর অগ্রাধিকার পাবে।"
@@ -6854,6 +6862,7 @@
 DocType: BOM,Rate Of Materials Based On,হার উপকরণ ভিত্তি করে
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","যদি সক্রিয় থাকে, তাহলে প্রোগ্রাম এনরোলমেন্ট টুল এ ক্ষেত্রটি একাডেমিক টার্ম বাধ্যতামূলক হবে।"
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","অব্যাহতি, শূন্য রেটযুক্ত এবং জিএসটি অ অভ্যন্তরীণ সরবরাহের মান supplies"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,গ্রাহক&gt; গ্রাহক গোষ্ঠী&gt; অঞ্চল
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>সংস্থা</b> একটি বাধ্যতামূলক ফিল্টার।
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,সব অচিহ্নিত
 DocType: Purchase Taxes and Charges,On Item Quantity,আইটেম পরিমাণে
@@ -6898,6 +6907,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,ঘাটতি Qty
 DocType: Purchase Invoice,Input Service Distributor,ইনপুট পরিষেবা বিতরণকারী
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,আইটেম বৈকল্পিক {0} একই বৈশিষ্ট্যাবলী সঙ্গে বিদ্যমান
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,অনুগ্রহ করে শিক্ষা&gt; শিক্ষা সেটিংসে প্রশিক্ষক নামকরণ সিস্টেম সেটআপ করুন
 DocType: Loan,Repay from Salary,বেতন থেকে শুধা
 DocType: Exotel Settings,API Token,এপিআই টোকেন
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Requesting payment against {0} {1} for amount {2},বিরুদ্ধে পেমেন্ট অনুরোধ {0} {1} পরিমাণ জন্য {2}
diff --git a/erpnext/translations/bs.csv b/erpnext/translations/bs.csv
index f1d080a..d25c785 100644
--- a/erpnext/translations/bs.csv
+++ b/erpnext/translations/bs.csv
@@ -389,6 +389,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,Propisane procedure
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,Prikaži samo POS
 DocType: Supplier Group,Supplier Group Name,Ime grupe dobavljača
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Označi prisustvo kao <b></b>
 DocType: Driver,Driving License Categories,Vozačke dozvole Kategorije
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,Molimo unesite datum isporuke
 DocType: Depreciation Schedule,Make Depreciation Entry,Make Amortizacija Entry
@@ -999,6 +1000,7 @@
 DocType: Company,Delete Company Transactions,Izbrišite Company Transakcije
 DocType: Production Plan Item,Quantity and Description,Količina i opis
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,Poziv na broj i referentni datum je obavezan za transakcije banke
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Molimo postavite Naming Series za {0} putem Podešavanje&gt; Podešavanja&gt; Imenovanje serije
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Dodaj / uredi poreze i troškove
 DocType: Payment Entry Reference,Supplier Invoice No,Dobavljač Račun br
 DocType: Territory,For reference,Za referencu
@@ -4238,6 +4240,8 @@
 DocType: Grant Application,Grant Application Details ,Grant Application Details
 DocType: Employee Separation,Employee Separation,Separacija zaposlenih
 DocType: BOM Item,Original Item,Original Item
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Izbrišite zaposlenika <a href=""#Form/Employee/{0}"">{0}</a> \ da biste otkazali ovaj dokument"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Doc Date
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},Naknada Records Kreirano - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Kategorija računa
@@ -5267,6 +5271,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}","Postavljanje Događanja u {0}, jer zaposleni u prilogu ispod prodaje osoba nema korisniku ID {1}"
 DocType: Timesheet,Billing Details,Billing Detalji
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,Izvor i meta skladište mora biti drugačiji
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Postavite sistem imenovanja zaposlenika u ljudskim resursima&gt; HR postavke
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,Plaćanje nije uspelo. Molimo provjerite svoj GoCardless račun za više detalja
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},Nije dopušteno osvježavanje burzovnih transakcija stariji od {0}
 DocType: Stock Entry,Inspection Required,Inspekcija Obvezno
@@ -5500,6 +5505,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,Trenutni troškovnik i novi troškovnik ne mogu biti isti
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,Plaća Slip ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,Datum umirovljenja mora biti veći od datuma pristupa
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Dobavljač&gt; vrsta dobavljača
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,Višestruke varijante
 DocType: Sales Invoice,Against Income Account,Protiv računu dohotka
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% Isporučeno
@@ -6329,6 +6335,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Uloga Dozvoljena Set Frozen Accounts & Frozen Edit unosi
 DocType: Supplier Scorecard Scoring Variable,Path,Put
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,"Ne može se pretvoriti troška za knjigu , kao da ima djece čvorova"
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Faktor konverzije UOM ({0} -&gt; {1}) nije pronađen za stavku: {2}
 DocType: Production Plan,Total Planned Qty,Ukupna planirana količina
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,Transakcije su već povučene iz izjave
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,otvaranje vrijednost
@@ -6551,6 +6558,7 @@
 DocType: Purchase Order,To Receive,Da Primite
 DocType: Leave Period,Holiday List for Optional Leave,List za odmor za opcioni odlazak
 DocType: Item Tax Template,Tax Rates,Porezne stope
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kod artikla&gt; Grupa artikala&gt; Marka
 DocType: Asset,Asset Owner,Vlasnik imovine
 DocType: Item,Website Content,Sadržaj web stranice
 DocType: Bank Account,Integration ID,ID integracije
@@ -6677,6 +6685,7 @@
 DocType: Stock Entry Detail,Additional Cost,Dodatni trošak
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher","Ne možete filtrirati na temelju vaučer No , ako grupirani po vaučer"
 DocType: Quality Inspection,Incoming,Dolazni
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Molimo podesite seriju brojeva za Attendance putem Podešavanje&gt; Serija numeriranja
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Osnovani porezni predlošci za prodaju i kupovinu su stvoreni.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,Evidencija Rezultat zapisa {0} već postoji.
 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.","Primer: ABCD. #####. Ako je serija postavljena i Batch No se ne pominje u transakcijama, na osnovu ove serije će se kreirati automatski broj serije. Ako uvek želite da eksplicitno navedete Batch No za ovu stavku, ostavite ovo praznim. Napomena: ovo podešavanje će imati prioritet nad Prefiksom naziva serije u postavkama zaliha."
@@ -7018,6 +7027,7 @@
 DocType: BOM,Rate Of Materials Based On,Stopa materijali na temelju
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Ako je omogućeno, polje Akademski termin će biti obavezno u alatu za upisivanje programa."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","Vrijednosti izuzetih, nulta ocjenjivanja i ulaznih zaliha koje nisu GST"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kupac&gt; grupa kupaca&gt; teritorija
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>Kompanija</b> je obavezan filter.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,Poništi sve
 DocType: Purchase Taxes and Charges,On Item Quantity,Na Količina predmeta
@@ -7062,6 +7072,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,Nedostatak Qty
 DocType: Purchase Invoice,Input Service Distributor,Distributer ulaznih usluga
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,Stavka varijanta {0} postoji sa istim atributima
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Postavite sistem imenovanja instruktora u Obrazovanje&gt; Postavke obrazovanja
 DocType: Loan,Repay from Salary,Otplatiti iz Plata
 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},Tražeći isplatu protiv {0} {1} za iznos {2}
diff --git a/erpnext/translations/ca.csv b/erpnext/translations/ca.csv
index f77d3ed..f9095d5 100644
--- a/erpnext/translations/ca.csv
+++ b/erpnext/translations/ca.csv
@@ -389,6 +389,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,Procediments prescrits
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,Mostra només TPV
 DocType: Supplier Group,Supplier Group Name,Nom del grup del proveïdor
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Marcar l&#39;assistència com <b></b>
 DocType: Driver,Driving License Categories,Categories de llicències de conducció
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,Introduïu la data de lliurament
 DocType: Depreciation Schedule,Make Depreciation Entry,Fer l&#39;entrada de Depreciació
@@ -999,6 +1000,7 @@
 DocType: Company,Delete Company Transactions,Eliminar Transaccions Empresa
 DocType: Production Plan Item,Quantity and Description,Quantitat i descripció
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,No de referència i data de referència és obligatòria per a les transaccions bancàries
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Configureu Naming Series per a {0} mitjançant Configuració&gt; Configuració&gt; Sèries de nom
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Afegeix / Edita les taxes i càrrecs
 DocType: Payment Entry Reference,Supplier Invoice No,Número de Factura de Proveïdor
 DocType: Territory,For reference,Per referència
@@ -4240,6 +4242,8 @@
 DocType: Grant Application,Grant Application Details ,Concediu els detalls de la sol·licitud
 DocType: Employee Separation,Employee Separation,Separació d&#39;empleats
 DocType: BOM Item,Original Item,Article original
+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","Elimineu l&#39;empleat <a href=""#Form/Employee/{0}"">{0}</a> \ per cancel·lar aquest document"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Data de doc
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},Els registres d&#39;honoraris creats - {0}
 DocType: Asset Category Account,Asset Category Account,Compte categoria d&#39;actius
@@ -5269,6 +5273,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}","Configura els esdeveniments a {0}, ja que l&#39;empleat que estigui connectat a la continuació venedors no té un ID d&#39;usuari {1}"
 DocType: Timesheet,Billing Details,Detalls de facturació
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,Origen i destí de dipòsit han de ser diferents
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configureu el sistema de nominació dels empleats a Recursos humans&gt; Configuració de recursos humans
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,"El pagament ha fallat. Si us plau, consulteu el vostre compte GoCardless per obtenir més detalls"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},No es permet actualitzar les transaccions de valors més grans de {0}
 DocType: Stock Entry,Inspection Required,Inspecció requerida
@@ -5502,6 +5507,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,El BOM actual i el nou no poden ser el mateix
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,Salari Slip ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,Data de la jubilació ha de ser major que la data del contracte
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Proveïdor&gt; Tipus de proveïdor
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,Variants múltiples
 DocType: Sales Invoice,Against Income Account,Contra el Compte d'Ingressos
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% Lliurat
@@ -6332,6 +6338,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Paper deixa forjar congelats Comptes i editar les entrades congelades
 DocType: Supplier Scorecard Scoring Variable,Path,Camí
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,"No es pot convertir de centres de cost per al llibre major, ja que té nodes secundaris"
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Factor de conversió UOM ({0} -&gt; {1}) no trobat per a l&#39;element: {2}
 DocType: Production Plan,Total Planned Qty,Total de quantitats planificades
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,Les transaccions ja s&#39;han recuperat de l&#39;estat
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Valor d&#39;obertura
@@ -6554,6 +6561,7 @@
 DocType: Purchase Order,To Receive,Rebre
 DocType: Leave Period,Holiday List for Optional Leave,Llista de vacances per a la licitació opcional
 DocType: Item Tax Template,Tax Rates,Tipus d’impostos
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Codi de l&#39;article&gt; Grup d&#39;elements&gt; Marca
 DocType: Asset,Asset Owner,Propietari d&#39;actius
 DocType: Item,Website Content,Contingut del lloc web
 DocType: Bank Account,Integration ID,ID d&#39;integració
@@ -6680,6 +6688,7 @@
 DocType: Stock Entry Detail,Additional Cost,Cost addicional
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher","Can not filter based on Voucher No, if grouped by Voucher"
 DocType: Quality Inspection,Incoming,Entrant
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Configureu les sèries de numeració per assistència mitjançant Configuració&gt; Sèries de numeració
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Es creen plantilles d&#39;impostos predeterminades per a vendes i compra.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,El registre del resultat de l&#39;avaluació {0} ja existeix.
 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.","Exemple: ABCD. #####. Si s&#39;estableix la sèrie i el lot no es menciona en les transaccions, es crearà un nombre automàtic de lot en funció d&#39;aquesta sèrie. Si sempre voleu esmentar explícitament No per a aquest element, deixeu-lo en blanc. Nota: aquesta configuració tindrà prioritat sobre el Prefix de la sèrie de noms a la configuració de valors."
@@ -7021,6 +7030,7 @@
 DocType: BOM,Rate Of Materials Based On,Tarifa de materials basats en
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Si està habilitat, el camp acadèmic de camp serà obligatori en l&#39;eina d&#39;inscripció del programa."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","Valors dels subministraments interns exempts, no classificats i no GST"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Client&gt; Grup de clients&gt; Territori
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>L’empresa</b> és un filtre obligatori.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,desactivar tot
 DocType: Purchase Taxes and Charges,On Item Quantity,Quantitat de l&#39;article
@@ -7065,6 +7075,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,Quantitat escassetat
 DocType: Purchase Invoice,Input Service Distributor,Distribuïdor de servei d’entrada
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,Hi ha la variant d&#39;article {0} amb mateixos atributs
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Configureu un sistema de nom de l’Instructor a Educació&gt; Configuració d’educació
 DocType: Loan,Repay from Salary,Pagar del seu sou
 DocType: Exotel Settings,API Token,Títol API
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Requesting payment against {0} {1} for amount {2},Sol·licitant el pagament contra {0} {1} per la quantitat {2}
diff --git a/erpnext/translations/cs.csv b/erpnext/translations/cs.csv
index cbd8bda..30f2b4c 100644
--- a/erpnext/translations/cs.csv
+++ b/erpnext/translations/cs.csv
@@ -389,6 +389,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,Předepsané postupy
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,Zobrazit pouze POS
 DocType: Supplier Group,Supplier Group Name,Název skupiny dodavatelů
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Označit účast jako <b></b>
 DocType: Driver,Driving License Categories,Kategorie řidičských oprávnění
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,Zadejte prosím datum doručení
 DocType: Depreciation Schedule,Make Depreciation Entry,Udělat Odpisy Entry
@@ -999,6 +1000,7 @@
 DocType: Company,Delete Company Transactions,Smazat transakcí Company
 DocType: Production Plan Item,Quantity and Description,Množství a popis
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,Referenční číslo a referenční datum je povinný pro bankovní transakce
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Nastavte Naming Series pro {0} prostřednictvím Setup&gt; Settings&gt; Naming Series
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Přidat / Upravit daní a poplatků
 DocType: Payment Entry Reference,Supplier Invoice No,Dodavatelské faktury č
 DocType: Territory,For reference,Pro srovnání
@@ -4240,6 +4242,8 @@
 DocType: Grant Application,Grant Application Details ,Podrobnosti o žádosti o grant
 DocType: Employee Separation,Employee Separation,Separace zaměstnanců
 DocType: BOM Item,Original Item,Původní položka
+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","Chcete-li tento dokument zrušit, prosím odstraňte zaměstnance <a href=""#Form/Employee/{0}"">{0}</a> \"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Datum dokumentu
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},Fee Records Vytvořil - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Kategorie Account
@@ -5269,6 +5273,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}","Nastavení událostí do {0}, protože zaměstnanec připojena k níže prodejcům nemá ID uživatele {1}"
 DocType: Timesheet,Billing Details,fakturační údaje
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,Zdrojové a cílové sklad se musí lišit
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Nastavte prosím systém názvů zaměstnanců v části Lidské zdroje&gt; Nastavení lidských zdrojů
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,Platba selhala. Zkontrolujte svůj účet GoCardless pro více informací
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},Není dovoleno měnit obchodů s akciemi starší než {0}
 DocType: Stock Entry,Inspection Required,Kontrola Povinné
@@ -5501,6 +5506,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,Aktuální BOM a nový BOM nemůže být stejný
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,Plat Slip ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,"Datum odchodu do důchodu, musí být větší než Datum spojování"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Dodavatel&gt; Typ dodavatele
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,Více variant
 DocType: Sales Invoice,Against Income Account,Proti účet příjmů
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% dodáno
@@ -6330,6 +6336,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Role povoleno nastavit zmrazené účty a upravit Mražené Příspěvky
 DocType: Supplier Scorecard Scoring Variable,Path,Cesta
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,"Nelze převést nákladového střediska na knihy, protože má podřízené uzly"
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM konverzní faktor ({0} -&gt; {1}) nebyl nalezen pro položku: {2}
 DocType: Production Plan,Total Planned Qty,Celkový plánovaný počet
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,Transakce již byly z výkazu odebrány
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,otevření Value
@@ -6552,6 +6559,7 @@
 DocType: Purchase Order,To Receive,Obdržet
 DocType: Leave Period,Holiday List for Optional Leave,Dovolená seznam pro nepovinné dovolené
 DocType: Item Tax Template,Tax Rates,Daňová sazba
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kód položky&gt; Skupina položek&gt; Značka
 DocType: Asset,Asset Owner,Majitel majetku
 DocType: Item,Website Content,Obsah webových stránek
 DocType: Bank Account,Integration ID,ID integrace
@@ -6678,6 +6686,7 @@
 DocType: Stock Entry Detail,Additional Cost,Dodatečné náklady
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher","Nelze filtrovat na základě poukazu ne, pokud seskupeny podle poukazu"
 DocType: Quality Inspection,Incoming,Přicházející
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Nastavte číslovací řady pro Docházku prostřednictvím Nastavení&gt; Číslovací řady
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Výchozí daňové šablony pro prodej a nákup jsou vytvořeny.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,Výsledky hodnocení {0} již existuje.
 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.","Příklad: ABCD. #####. Je-li nastavena řada a v transakcích není uvedena šarže, pak se na základě této série vytvoří automatické číslo šarže. Pokud chcete výslovně uvést číslo dávky pro tuto položku, ponechte prázdné místo. Poznámka: Toto nastavení bude mít přednost před předčíslí série Naming v nastavení akcí."
@@ -7019,6 +7028,7 @@
 DocType: BOM,Rate Of Materials Based On,Ocenění materiálů na bázi
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Je-li zapnuto, pole Akademický termín bude povinné v nástroji pro zápis programu."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","Hodnoty osvobozených, nulových a nemateriálních vstupních dodávek"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Zákazník&gt; Skupina zákazníků&gt; Území
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>Společnost</b> je povinný filtr.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,Zrušte všechny
 DocType: Purchase Taxes and Charges,On Item Quantity,Množství položky
@@ -7063,6 +7073,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,Nedostatek Množství
 DocType: Purchase Invoice,Input Service Distributor,Distributor vstupních služeb
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,Bod varianta {0} existuje s stejné atributy
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Nastavte prosím Pojmenovací systém instruktorů v sekci Vzdělávání&gt; Nastavení vzdělávání
 DocType: Loan,Repay from Salary,Splatit z platu
 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},Požadovala vyplacení proti {0} {1} na částku {2}
diff --git a/erpnext/translations/da.csv b/erpnext/translations/da.csv
index e50b98e..fa1902c 100644
--- a/erpnext/translations/da.csv
+++ b/erpnext/translations/da.csv
@@ -389,6 +389,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,Foreskrevne procedurer
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,Vis kun POS
 DocType: Supplier Group,Supplier Group Name,Leverandørgruppens navn
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Markér deltagelse som <b></b>
 DocType: Driver,Driving License Categories,Kørekortskategorier
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,Indtast venligst Leveringsdato
 DocType: Depreciation Schedule,Make Depreciation Entry,Foretag Afskrivninger indtastning
@@ -999,6 +1000,7 @@
 DocType: Company,Delete Company Transactions,Slet Company Transaktioner
 DocType: Production Plan Item,Quantity and Description,Mængde og beskrivelse
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,Referencenummer og reference Dato er obligatorisk for Bank transaktion
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Angiv Naming Series for {0} via Setup&gt; Settings&gt; Naming Series
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Tilføj / rediger Skatter og Afgifter
 DocType: Payment Entry Reference,Supplier Invoice No,Leverandør fakturanr.
 DocType: Territory,For reference,For reference
@@ -4199,6 +4201,8 @@
 DocType: Grant Application,Grant Application Details ,Giv ansøgningsoplysninger
 DocType: Employee Separation,Employee Separation,Medarbejder adskillelse
 DocType: BOM Item,Original Item,Originalelement
+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","Slet medarbejderen <a href=""#Form/Employee/{0}"">{0}</a> \ for at annullere dette dokument"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Dok Dato
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},Fee Records Oprettet - {0}
 DocType: Asset Category Account,Asset Category Account,Aktiver kategori konto
@@ -5216,6 +5220,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}","Sætter begivenheder til {0}, da den til medarbejderen tilknyttede salgsmedarbejder {1} ikke har et brugernavn"
 DocType: Timesheet,Billing Details,Faktureringsoplysninger
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,Kilde og mål lager skal være forskellige
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Indstil venligst medarbejdernavningssystem i menneskelig ressource&gt; HR-indstillinger
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,Betaling mislykkedes. Tjek venligst din GoCardless-konto for flere detaljer
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},Ikke tilladt at opdatere lagertransaktioner ældre end {0}
 DocType: Stock Entry,Inspection Required,Inspection Nødvendig
@@ -5449,6 +5454,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,Nuværende stykliste og ny stykliste må ikke være ens
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,Lønseddel id
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,Pensioneringsdato skal være større end ansættelsesdato
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Leverandør&gt; Leverandørtype
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,Flere varianter
 DocType: Sales Invoice,Against Income Account,Imod Indkomst konto
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% Leveret
@@ -6279,6 +6285,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rolle Tilladt til Indstil Frosne Konti og Rediger Frosne Entries
 DocType: Supplier Scorecard Scoring Variable,Path,Sti
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,"Kan ikke konvertere Cost Center til hovedbog, som det har barneknudepunkter"
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM-konverteringsfaktor ({0} -&gt; {1}) ikke fundet for varen: {2}
 DocType: Production Plan,Total Planned Qty,Samlet planlagt antal
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,Transaktioner er allerede gengivet tilbage fra erklæringen
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,åbning Value
@@ -6501,6 +6508,7 @@
 DocType: Purchase Order,To Receive,At Modtage
 DocType: Leave Period,Holiday List for Optional Leave,Ferieliste for valgfri ferie
 DocType: Item Tax Template,Tax Rates,Skattesatser
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Varekode&gt; Varegruppe&gt; Mærke
 DocType: Asset,Asset Owner,Aktiv ejer
 DocType: Item,Website Content,Indhold på webstedet
 DocType: Bank Account,Integration ID,Integrations-ID
@@ -6626,6 +6634,7 @@
 DocType: Stock Entry Detail,Additional Cost,Yderligere omkostning
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher",Kan ikke filtrere baseret på bilagsnr. hvis der sorteres efter Bilagstype
 DocType: Quality Inspection,Incoming,Indgående
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Indstil nummerserier til deltagelse via Opsætning&gt; Nummereringsserie
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Standard skat skabeloner til salg og køb oprettes.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,Vurdering resultatoptegnelsen {0} eksisterer allerede.
 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.","Eksempel: ABCD. #####. Hvis serier er indstillet og Batch nr ikke er nævnt i transaktioner, oprettes automatisk batchnummer baseret på denne serie. Hvis du altid vil udtrykkeligt nævne Batch nr for dette emne, skal du lade dette være tomt. Bemærk: Denne indstilling vil have prioritet i forhold til Naming Series Prefix i lagerindstillinger."
@@ -6967,6 +6976,7 @@
 DocType: BOM,Rate Of Materials Based On,Rate Of materialer baseret på
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Hvis aktiveret, vil feltet Akademisk Term være obligatorisk i Programindskrivningsværktøjet."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","Værdier for undtagne, ikke-klassificerede og ikke-GST-indgående leverancer"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundegruppe&gt; Territorium
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>Virksomheden</b> er et obligatorisk filter.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,Fravælg alle
 DocType: Purchase Taxes and Charges,On Item Quantity,Om varemængde
@@ -7011,6 +7021,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,Mangel Antal
 DocType: Purchase Invoice,Input Service Distributor,Distributør af inputtjenester
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,Vare variant {0} eksisterer med samme attributter
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Indstil instruktørens navngivningssystem i uddannelse&gt; Uddannelsesindstillinger
 DocType: Loan,Repay from Salary,Tilbagebetale fra Løn
 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},Anmodning betaling mod {0} {1} for beløb {2}
diff --git a/erpnext/translations/de.csv b/erpnext/translations/de.csv
index 52d3a29..302f443 100644
--- a/erpnext/translations/de.csv
+++ b/erpnext/translations/de.csv
@@ -389,6 +389,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,Vorgeschriebene Verfahren
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,Zeige nur POS
 DocType: Supplier Group,Supplier Group Name,Name der Lieferantengruppe
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Anwesenheit markieren als <b></b>
 DocType: Driver,Driving License Categories,Führerscheinklasse
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,Bitte geben Sie das Lieferdatum ein
 DocType: Depreciation Schedule,Make Depreciation Entry,Neuen Abschreibungseintrag erstellen
@@ -999,6 +1000,7 @@
 DocType: Company,Delete Company Transactions,Löschen der Transaktionen dieses Unternehmens
 DocType: Production Plan Item,Quantity and Description,Menge und Beschreibung
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,Referenznummer und Referenzdatum ist obligatorisch für Bankengeschäft
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Stellen Sie die Benennungsserie für {0} über Setup&gt; Einstellungen&gt; Benennungsserie ein
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Hinzufügen/Bearbeiten von Steuern und Abgaben
 DocType: Payment Entry Reference,Supplier Invoice No,Lieferantenrechnungsnr.
 DocType: Territory,For reference,Zu Referenzzwecken
@@ -4237,6 +4239,8 @@
 DocType: Grant Application,Grant Application Details ,Gewähren Sie Anwendungsdetails
 DocType: Employee Separation,Employee Separation,Mitarbeitertrennung
 DocType: BOM Item,Original Item,Originalartikel
+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","Bitte löschen Sie den Mitarbeiter <a href=""#Form/Employee/{0}"">{0}</a> \, um dieses Dokument zu stornieren"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Dokumenten Datum
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},Gebühren-Einträge erstellt - {0}
 DocType: Asset Category Account,Asset Category Account,Anlagekategorie Konto
@@ -5266,6 +5270,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}","Einstellen Events auf {0}, da die Mitarbeiter auf die beigefügten unter Verkaufs Personen keine Benutzer-ID {1}"
 DocType: Timesheet,Billing Details,Rechnungsdetails
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,Quell- und Ziel-Warehouse müssen unterschiedlich sein
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Richten Sie das Employee Naming System unter Human Resource&gt; HR Settings ein
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,Bezahlung fehlgeschlagen. Bitte überprüfen Sie Ihr GoCardless Konto für weitere Details
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},Aktualisierung von Transaktionen älter als {0} nicht erlaubt
 DocType: Stock Entry,Inspection Required,Prüfung erforderlich
@@ -5499,6 +5504,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,Aktuelle Stückliste und neue Stückliste können nicht identisch sein
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,Gehaltsabrechnung ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,Zeitpunkt der Pensionierung muss nach dem Eintrittsdatum liegen
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Lieferant&gt; Lieferantentyp
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,Mehrere Varianten
 DocType: Sales Invoice,Against Income Account,Zu Ertragskonto
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% geliefert
@@ -6328,6 +6334,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rolle darf Konten sperren und gesperrte Buchungen bearbeiten
 DocType: Supplier Scorecard Scoring Variable,Path,Pfad
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,"Kostenstelle kann nicht in ein Kontenblatt umgewandelt werden, da sie Unterknoten hat"
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM-Umrechnungsfaktor ({0} -&gt; {1}) für Artikel nicht gefunden: {2}
 DocType: Production Plan,Total Planned Qty,Geplante Gesamtmenge
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,"Transaktionen, die bereits von der Abrechnung erhalten wurden"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Öffnungswert
@@ -6550,6 +6557,7 @@
 DocType: Purchase Order,To Receive,Zu empfangen
 DocType: Leave Period,Holiday List for Optional Leave,Urlaubsliste für optionalen Urlaub
 DocType: Item Tax Template,Tax Rates,Steuersätze
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Artikelcode&gt; Artikelgruppe&gt; Marke
 DocType: Asset,Asset Owner,Eigentümer des Vermögenswertes
 DocType: Item,Website Content,Websiten Inhalt
 DocType: Bank Account,Integration ID,Integrations-ID
@@ -6675,6 +6683,7 @@
 DocType: Stock Entry Detail,Additional Cost,Zusätzliche Kosten
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher","Wenn nach Beleg gruppiert wurde, kann nicht auf Grundlage von Belegen gefiltert werden."
 DocType: Quality Inspection,Incoming,Eingehend
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Richten Sie die Nummerierungsserie für die Teilnahme über Setup&gt; Nummerierungsserie ein
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Standardsteuervorlagen für Verkauf und Einkauf werden erstellt.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,Beurteilungsergebnis {0} existiert bereits.
 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.","Beispiel: ABCD. #####. Wenn die Serie gesetzt ist und die Chargennummer in den Transaktionen nicht erwähnt wird, wird die automatische Chargennummer basierend auf dieser Serie erstellt. Wenn Sie die Chargennummer für diesen Artikel immer explizit angeben möchten, lassen Sie dieses Feld leer. Hinweis: Diese Einstellung hat Vorrang vor dem Naming Series Prefix in den Stock Settings."
@@ -7014,6 +7023,7 @@
 DocType: BOM,Rate Of Materials Based On,Anteil der zu Grunde liegenden Materialien
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Falls diese Option aktiviert ist, wird das Feld ""Akademisches Semester"" im Kurs-Registrierungs-Werkzeug obligatorisch sein."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","Werte für steuerbefreite, nicht bewertete und Nicht-GST-Lieferungen"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundengruppe&gt; Gebiet
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>Unternehmen</b> ist ein Pflichtfilter.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,Alle abwählen
 DocType: Purchase Taxes and Charges,On Item Quantity,Auf Artikelmenge
@@ -7058,6 +7068,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,Engpassmenge
 DocType: Purchase Invoice,Input Service Distributor,Input Service Distributor
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,Artikelvariante {0} mit denselben Attributen existiert
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Richten Sie das Instructor Naming System unter Education&gt; Education Settings ein
 DocType: Loan,Repay from Salary,Repay von Gehalts
 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},Anfordern Zahlung gegen {0} {1} für Menge {2}
diff --git a/erpnext/translations/el.csv b/erpnext/translations/el.csv
index 574a94f..dc5c37d 100644
--- a/erpnext/translations/el.csv
+++ b/erpnext/translations/el.csv
@@ -389,6 +389,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,Προβλεπόμενες Διαδικασίες
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,Εμφάνιση μόνο POS
 DocType: Supplier Group,Supplier Group Name,Όνομα ομάδας προμηθευτών
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Σημειώστε τη συμμετοχή ως <b></b>
 DocType: Driver,Driving License Categories,Κατηγορίες Άδειας οδήγησης
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,Εισαγάγετε την ημερομηνία παράδοσης
 DocType: Depreciation Schedule,Make Depreciation Entry,Κάντε Αποσβέσεις Έναρξη
@@ -999,6 +1000,7 @@
 DocType: Company,Delete Company Transactions,Διαγραφή Συναλλαγές Εταιρείας
 DocType: Production Plan Item,Quantity and Description,Ποσότητα και περιγραφή
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,Αριθμός αναφοράς και ημερομηνία αναφοράς είναι υποχρεωτική για την Τράπεζα συναλλαγών
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ορίστε την Ονοματοδοσία για {0} μέσω του Setup&gt; Settings&gt; Naming Series
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Προσθήκη / επεξεργασία φόρων και επιβαρύνσεων
 DocType: Payment Entry Reference,Supplier Invoice No,Αρ. τιμολογίου του προμηθευτή
 DocType: Territory,For reference,Για αναφορά
@@ -4237,6 +4239,8 @@
 DocType: Grant Application,Grant Application Details ,Λεπτομέρειες αίτησης επιχορήγησης
 DocType: Employee Separation,Employee Separation,Διαχωρισμός υπαλλήλων
 DocType: BOM Item,Original Item,Αρχικό στοιχείο
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Διαγράψτε τον υπάλληλο <a href=""#Form/Employee/{0}"">{0}</a> \ για να ακυρώσετε αυτό το έγγραφο"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Ημερομηνία εγγράφου
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},Εγγραφές τέλους Δημιουργήθηκε - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Κατηγορία Λογαριασμού
@@ -5266,6 +5270,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Ρύθμιση Εκδηλώσεις σε {0}, καθόσον ο εργαζόμενος συνδέεται με την παρακάτω Πωλήσεις Άτομα που δεν έχει ένα όνομα χρήστη {1}"
 DocType: Timesheet,Billing Details,λεπτομέρειες χρέωσης
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,Πηγή και αποθήκη στόχος πρέπει να είναι διαφορετική
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ρυθμίστε το Σύστημα Ονοματοδοσίας Εργαζομένων σε Ανθρώπινο Δυναμικό&gt; Ρυθμίσεις HR
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,Η πληρωμή απέτυχε. Ελέγξτε το λογαριασμό GoCardless για περισσότερες λεπτομέρειες
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},Δεν επιτρέπεται να ενημερώσετε συναλλαγές αποθέματος παλαιότερες από {0}
 DocType: Stock Entry,Inspection Required,Απαιτείται έλεγχος
@@ -5499,6 +5504,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,Η τρέχουσα Λ.Υ. και η νέα Λ.Υ. δεν μπορεί να είναι ίδιες
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,Μισθός ID Slip
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,Η ημερομηνία συνταξιοδότησης πρέπει να είναι μεταγενέστερη από την ημερομηνία πρόσληψης
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Προμηθευτής&gt; Τύπος προμηθευτή
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,Πολλαπλές παραλλαγές
 DocType: Sales Invoice,Against Income Account,Κατά τον λογαριασμό εσόδων
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% Παραδόθηκαν
@@ -6328,6 +6334,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Ο ρόλος επιτρέπεται να καθορίζει παγωμένους λογαριασμούς & να επεξεργάζετε παγωμένες καταχωρήσεις
 DocType: Supplier Scorecard Scoring Variable,Path,Μονοπάτι
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,"Δεν είναι δυνατή η μετατροπή του κέντρου κόστους σε καθολικό, όπως έχει κόμβους-παιδιά"
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM Ο συντελεστής μετατροπής ({0} -&gt; {1}) δεν βρέθηκε για το στοιχείο: {2}
 DocType: Production Plan,Total Planned Qty,Συνολική προγραμματισμένη ποσότητα
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,Οι συναλλαγές έχουν ήδη ανατραπεί από τη δήλωση
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Αξία ανοίγματος
@@ -6550,6 +6557,7 @@
 DocType: Purchase Order,To Receive,Να Λάβω
 DocType: Leave Period,Holiday List for Optional Leave,Λίστα διακοπών για προαιρετική άδεια
 DocType: Item Tax Template,Tax Rates,Φορολογικοί δείκτες
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Κωδικός στοιχείου&gt; Ομάδα στοιχείων&gt; Μάρκα
 DocType: Asset,Asset Owner,Ιδιοκτήτης περιουσιακών στοιχείων
 DocType: Item,Website Content,Περιεχόμενο ιστότοπου
 DocType: Bank Account,Integration ID,Αναγνωριστικό ενοποίησης
@@ -6676,6 +6684,7 @@
 DocType: Stock Entry Detail,Additional Cost,Πρόσθετο κόστος
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher","Δεν μπορείτε να φιλτράρετε με βάση αρ. αποδεικτικού, αν είναι ομαδοποιημένες ανά αποδεικτικό"
 DocType: Quality Inspection,Incoming,Εισερχόμενος
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ρυθμίστε τη σειρά αρίθμησης για τη συμμετοχή μέσω του προγράμματος Εγκατάστασης&gt; Σειρά αρίθμησης
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Προεπιλεγμένα πρότυπα φόρου για τις πωλήσεις και την αγορά δημιουργούνται.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,Η καταγραφή Αποτέλεσμα Αξιολόγησης {0} υπάρχει ήδη.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Παράδειγμα: ABCD. #####. Εάν έχει οριστεί σειρά και η Παρτίδα αριθ. Δεν αναφέρεται στις συναλλαγές, τότε θα δημιουργηθεί αυτόματος αριθμός παρτίδας βάσει αυτής της σειράς. Εάν θέλετε πάντα να αναφέρετε ρητώς τον αριθμό παρτίδας για αυτό το στοιχείο, αφήστε το κενό. Σημείωση: αυτή η ρύθμιση θα έχει προτεραιότητα σε σχέση με το πρόθεμα σειράς ονομάτων στις ρυθμίσεις αποθεμάτων."
@@ -7017,6 +7026,7 @@
 DocType: BOM,Rate Of Materials Based On,Τιμή υλικών με βάση
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Αν είναι ενεργοποιημένη, ο τομέας Ακαδημαϊκός όρος θα είναι υποχρεωτικός στο εργαλείο εγγραφής προγραμμάτων."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","Τιμές εξαιρούμενων, μηδενικού και μη πραγματικών εισαγωγικών προμηθειών"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Πελάτης&gt; Ομάδα πελατών&gt; Επικράτεια
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>Η εταιρεία</b> είναι υποχρεωτικό φίλτρο.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,Καταργήστε την επιλογή όλων
 DocType: Purchase Taxes and Charges,On Item Quantity,Σχετικά με την ποσότητα του στοιχείου
@@ -7061,6 +7071,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,Έλλειψη ποσότητας
 DocType: Purchase Invoice,Input Service Distributor,Διανομέας υπηρεσιών εισόδου
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,Παραλλαγή Θέση {0} υπάρχει με ίδια χαρακτηριστικά
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Ρυθμίστε το Σύστημα Ονοματοδοσίας Εκπαιδευτών στην Εκπαίδευση&gt; Ρυθμίσεις Εκπαίδευσης
 DocType: Loan,Repay from Salary,Επιστρέψει από το μισθό
 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} για ποσό {2}
diff --git a/erpnext/translations/es.csv b/erpnext/translations/es.csv
index 3093e8f..5e4f0ed 100644
--- a/erpnext/translations/es.csv
+++ b/erpnext/translations/es.csv
@@ -389,6 +389,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,Procedimientos Prescritos
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,Mostrar solo POS
 DocType: Supplier Group,Supplier Group Name,Nombre del Grupo de Proveedores
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Marcar asistencia como <b></b>
 DocType: Driver,Driving License Categories,Categorías de Licencia de Conducir
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,"Por favor, introduzca la Fecha de Entrega"
 DocType: Depreciation Schedule,Make Depreciation Entry,Hacer la Entrada de Depreciación
@@ -999,6 +1000,7 @@
 DocType: Company,Delete Company Transactions,Eliminar las transacciones de la compañía
 DocType: Production Plan Item,Quantity and Description,Cantidad y descripción
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,Nro de referencia y fecha de referencia es obligatoria para las transacciones bancarias
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Configure Naming Series para {0} a través de Configuración&gt; Configuración&gt; Naming Series
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Añadir / Editar Impuestos y Cargos
 DocType: Payment Entry Reference,Supplier Invoice No,Factura de proveedor No.
 DocType: Territory,For reference,Para referencia
@@ -4199,6 +4201,8 @@
 DocType: Grant Application,Grant Application Details ,Detalles de Solicitud de Subvención
 DocType: Employee Separation,Employee Separation,Separación de Empleados
 DocType: BOM Item,Original Item,Artículo Original
+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","Elimine el empleado <a href=""#Form/Employee/{0}"">{0}</a> \ para cancelar este documento"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Fecha del Doc
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},Registros de cuotas creados - {0}
 DocType: Asset Category Account,Asset Category Account,Cuenta de categoría de activos
@@ -5228,6 +5232,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}","Ajustar Eventos a {0}, ya que el Empleado adjunto a las Personas de Venta siguientes no tiene un ID de Usuario{1}."
 DocType: Timesheet,Billing Details,Detalles de facturación
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,Almacén de Origen y Destino deben ser diferentes
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configure el Sistema de nombres de empleados en Recursos humanos&gt; Configuración de recursos humanos
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,Pago Fallido. Verifique su Cuenta GoCardless para más detalles
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},No tiene permisos para actualizar las transacciones de stock mayores al  {0}
 DocType: Stock Entry,Inspection Required,Inspección Requerida
@@ -5461,6 +5466,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,La lista de materiales (LdM) actual y la nueva no pueden ser las mismas
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,ID de Nómina
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,La fecha de jubilación debe ser mayor que la fecha de ingreso
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Proveedor&gt; Tipo de proveedor
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,Multiples Variantes
 DocType: Sales Invoice,Against Income Account,Contra cuenta de ingresos
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% Entregado
@@ -6290,6 +6296,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rol que permite definir cuentas congeladas y editar asientos congelados
 DocType: Supplier Scorecard Scoring Variable,Path,Camino
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,"No se puede convertir de 'Centros de Costos' a una cuenta del libro mayor, ya que tiene sub-grupos"
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Factor de conversión de UOM ({0} -&gt; {1}) no encontrado para el elemento: {2}
 DocType: Production Plan,Total Planned Qty,Cantidad Total Planificada
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,Transacciones ya retiradas del extracto
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Valor de Apertura
@@ -6512,6 +6519,7 @@
 DocType: Purchase Order,To Receive,Recibir
 DocType: Leave Period,Holiday List for Optional Leave,Lista de vacaciones para la licencia opcional
 DocType: Item Tax Template,Tax Rates,Las tasas de impuestos
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Código de artículo&gt; Grupo de artículos&gt; Marca
 DocType: Asset,Asset Owner,Propietario del activo
 DocType: Item,Website Content,Contenido del sitio web
 DocType: Bank Account,Integration ID,ID de integración
@@ -6637,6 +6645,7 @@
 DocType: Stock Entry Detail,Additional Cost,Costo adicional
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher","No se puede filtrar en función al 'No. de comprobante', si esta agrupado por el nombre"
 DocType: Quality Inspection,Incoming,Entrante
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Configure la serie de numeración para la Asistencia a través de Configuración&gt; Serie de numeración
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Se crean plantillas de impuestos predeterminadas para ventas y compras.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,El registro de Resultados de la Evaluación {0} ya existe.
 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.","Ejemplo: ABCD. #####. Si se establece una serie y no se menciona el No de lote en las transacciones, se creará un número de lote automático basado en esta serie. Si siempre quiere mencionar explícitamente el No de lote para este artículo, déjelo en blanco. Nota: esta configuración tendrá prioridad sobre el Prefijo de denominación de serie en Configuración de stock."
@@ -6978,6 +6987,7 @@
 DocType: BOM,Rate Of Materials Based On,Valor de materiales basado en
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Si está habilitado, el término académico del campo será obligatorio en la herramienta de inscripción al programa."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","Valores de suministros internos exentos, nulos y no GST"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo de clientes&gt; Territorio
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>La empresa</b> es un filtro obligatorio.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,Desmarcar todos
 DocType: Purchase Taxes and Charges,On Item Quantity,En Cantidad de Item
@@ -7022,6 +7032,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,Cantidad faltante
 DocType: Purchase Invoice,Input Service Distributor,Distribuidor de servicio de entrada
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,Existe la variante de artículo {0} con mismos atributos
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Configure el Sistema de nombres de instructores en Educación&gt; Configuración de educación
 DocType: Loan,Repay from Salary,Reembolso del Salario
 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},Solicitando el pago contra {0} {1} para la cantidad {2}
diff --git a/erpnext/translations/et.csv b/erpnext/translations/et.csv
index f743200..16c6127 100644
--- a/erpnext/translations/et.csv
+++ b/erpnext/translations/et.csv
@@ -386,6 +386,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,Ettenähtud protseduurid
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,Kuva ainult POS
 DocType: Supplier Group,Supplier Group Name,Tarnija grupi nimi
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Märgi kohalolijaks kui <b></b>
 DocType: Driver,Driving License Categories,Juhtimiskategooriad
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,Palun sisesta saatekuupäev
 DocType: Depreciation Schedule,Make Depreciation Entry,Tee kulum Entry
@@ -994,6 +995,7 @@
 DocType: Company,Delete Company Transactions,Kustuta tehingutes
 DocType: Production Plan Item,Quantity and Description,Kogus ja kirjeldus
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,Viitenumber ja viited kuupäev on kohustuslik Bank tehingu
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Valige Seadistamise seeria väärtuseks {0}, mis asub seadistuse&gt; Seadistused&gt; Seeriate nimetamine"
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Klienditeenindus Lisa / uuenda maksud ja tasud
 DocType: Payment Entry Reference,Supplier Invoice No,Tarnija Arve nr
 DocType: Territory,For reference,Sest viide
@@ -4189,6 +4191,8 @@
 DocType: Grant Application,Grant Application Details ,Toetage rakenduse üksikasju
 DocType: Employee Separation,Employee Separation,Töötaja eraldamine
 DocType: BOM Item,Original Item,Originaalüksus
+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","Selle dokumendi tühistamiseks kustutage töötaja <a href=""#Form/Employee/{0}"">{0}</a> \"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Dokumendi kuupäev
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},Fee Records Loodud - {0}
 DocType: Asset Category Account,Asset Category Account,Põhivarakategoori konto
@@ -5203,6 +5207,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}","Seadistamine Sündmused {0}, kuna töötaja juurde allpool müügiisikuid ei ole Kasutaja ID {1}"
 DocType: Timesheet,Billing Details,Arved detailid
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,Allika ja eesmärgi ladu peavad olema erinevad
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Palun seadistage töötajate nimetamise süsteem personaliressursist&gt; HR-sätted
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,"Makse ebaõnnestus. Palun kontrollige oma GoCardlessi kontot, et saada lisateavet"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},Ei ole lubatud uuendada laos tehingute vanem kui {0}
 DocType: Stock Entry,Inspection Required,Ülevaatus Nõutav
@@ -5434,6 +5439,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,Praegune BOM ja Uus BOM saa olla samad
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,Palgatõend ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,Erru minemise peab olema suurem kui Liitumis
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Tarnija&gt; Tarnija tüüp
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,Mitmed variandid
 DocType: Sales Invoice,Against Income Account,Sissetuleku konto
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% tarnitud
@@ -6260,6 +6266,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Role lubatud kehtestada külmutatud kontode ja Edit Külmutatud kanded
 DocType: Supplier Scorecard Scoring Variable,Path,Tee
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,"Ei saa teisendada Cost Center pearaamatu, sest see on tütartippu"
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM teisendustegurit ({0} -&gt; {1}) üksusele {2} ei leitud
 DocType: Production Plan,Total Planned Qty,Kokku planeeritud kogus
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,Tehingud on avaldusest juba taganenud
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Seis
@@ -6482,6 +6489,7 @@
 DocType: Purchase Order,To Receive,Saama
 DocType: Leave Period,Holiday List for Optional Leave,Puhkusloetelu valikuliseks puhkuseks
 DocType: Item Tax Template,Tax Rates,Maksumäärad
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kauba kood&gt; esemerühm&gt; kaubamärk
 DocType: Asset,Asset Owner,Vara omanik
 DocType: Item,Website Content,Veebisaidi sisu
 DocType: Bank Account,Integration ID,Integratsiooni ID
@@ -6607,6 +6615,7 @@
 DocType: Stock Entry Detail,Additional Cost,Lisakulu
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher","Ei filtreerimiseks Voucher Ei, kui rühmitatud Voucher"
 DocType: Quality Inspection,Incoming,Saabuva
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Palun seadistage kohaloleku jaoks numeratsiooniseeria seadistamise&gt; Numeratsiooniseeria kaudu
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Müügile ja ostule pääseb alla maksumallid.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,Hindamise tulemuste register {0} on juba olemas.
 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.","Näide: ABCD. #####. Kui seeria on seatud ja partii number tehingutes ei mainita, luuakse selle seeria põhjal automaatne partii number. Kui soovite alati selgesõnaliselt märkida selle üksuse partii nr, jätke see tühjaks. Märkus: see seade eelistab nimeserveri eesliidet varu seadetes."
@@ -6948,6 +6957,7 @@
 DocType: BOM,Rate Of Materials Based On,Hinda põhinevatest materjalidest
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Kui see on aktiveeritud, on programmi akadeemiline termin kohustuslik programmi registreerimisvahendis."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","Maksust vabastatud, nullmääraga ja mitte-GST-sisendtarnete väärtused"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Klient&gt; kliendirühm&gt; territoorium
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>Ettevõte</b> on kohustuslik filter.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,Puhasta kõik
 DocType: Purchase Taxes and Charges,On Item Quantity,Kauba kogus
@@ -6992,6 +7002,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,Puuduse Kogus
 DocType: Purchase Invoice,Input Service Distributor,Sisendteenuse levitaja
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,Punkt variant {0} on olemas sama atribuute
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Seadistage juhendaja nimetamise süsteem jaotises Haridus&gt; Hariduse sätted
 DocType: Loan,Repay from Salary,Tagastama alates Palk
 DocType: Exotel Settings,API Token,API tunnus
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Requesting payment against {0} {1} for amount {2},TELLIN tasumises {0} {1} jaoks kogus {2}
diff --git a/erpnext/translations/fa.csv b/erpnext/translations/fa.csv
index cb498c3..552c912 100644
--- a/erpnext/translations/fa.csv
+++ b/erpnext/translations/fa.csv
@@ -384,6 +384,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,روشهای پیشنهادی
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,فقط POS نمایش داده شود
 DocType: Supplier Group,Supplier Group Name,نام گروه تامین کننده
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,حضور علامت گذاری به عنوان <b></b>
 DocType: Driver,Driving License Categories,دسته بندی مجوز رانندگی
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,لطفا تاریخ تحویل را وارد کنید
 DocType: Depreciation Schedule,Make Depreciation Entry,ورود استهلاک
@@ -4121,6 +4122,8 @@
 DocType: Grant Application,Grant Application Details ,جزئیات برنامه Grant
 DocType: Employee Separation,Employee Separation,جدایی کارکنان
 DocType: BOM Item,Original Item,مورد اصلی
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","لطفاً برای لغو این سند ، <a href=""#Form/Employee/{0}"">{0}</a> \ کارمند را حذف کنید"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,تاریخ داک
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},سوابق هزینه ایجاد شده - {0}
 DocType: Asset Category Account,Asset Category Account,حساب دارایی رده
@@ -5113,6 +5116,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}",تنظیم رویدادها به {0}، از کارمند متصل به زیر Persons فروش یک ID کاربر ندارد {1}
 DocType: Timesheet,Billing Details,جزئیات صورتحساب
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,منبع و انبار هدف باید متفاوت باشد
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,لطفاً سیستم نامگذاری کارمندان را در منابع انسانی&gt; تنظیمات HR تنظیم کنید
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,پرداخت ناموفق. برای اطلاعات بیشتر، لطفا حساب GoCardless خود را بررسی کنید
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},اجازه به روز رسانی معاملات سهام مسن تر از {0}
 DocType: Stock Entry,Inspection Required,مورد نیاز بازرسی
@@ -5341,6 +5345,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,BOM BOM کنونی و جدید را نمی توان همان
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,حقوق و دستمزد ID لغزش
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,تاریخ بازنشستگی باید از تاریخ پیوستن بیشتر
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,عرضه کننده&gt; نوع عرضه کننده
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,گزینه های چندگانه
 DocType: Sales Invoice,Against Income Account,به حساب درآمد
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}٪ تحویل داده شد
@@ -6373,6 +6378,7 @@
 DocType: Purchase Order,To Receive,برای دریافت
 DocType: Leave Period,Holiday List for Optional Leave,لیست تعطیلات برای اقامت اختیاری
 DocType: Item Tax Template,Tax Rates,نرخ مالیات
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,کد کالا&gt; گروه مورد&gt; نام تجاری
 DocType: Asset,Asset Owner,صاحب دارایی
 DocType: Item,Website Content,محتوای وب سایت
 DocType: Bank Account,Integration ID,شناسه ادغام
@@ -6495,6 +6501,7 @@
 DocType: Stock Entry Detail,Additional Cost,هزینه های اضافی
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher",می توانید بر روی کوپن نه فیلتر بر اساس، در صورتی که توسط کوپن گروه بندی
 DocType: Quality Inspection,Incoming,وارد شونده
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,لطفاً سریال های شماره گذاری را برای حضور از طریق تنظیم&gt; سری شماره گذاری تنظیم کنید
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,قالب های پیش فرض مالی برای فروش و خرید ایجاد می شوند.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,ارزیابی نتیجه نتیجه {0} در حال حاضر وجود دارد.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.",به عنوان مثال: ABCD. #####. اگر مجموعه ای تنظیم شده است و Batch No در معاملات ذکر شده است، سپس شماره بلاک اتوماتیک بر اساس این سری ایجاد می شود. اگر همیشه می خواهید بطور صریح بیتی را برای این آیتم ذکر کنید، این را خالی بگذارید. توجه: این تنظیم اولویت بیش از Prefix سری نامگذاری در تنظیمات سهام است.
@@ -6829,6 +6836,7 @@
 DocType: BOM,Rate Of Materials Based On,نرخ مواد بر اساس
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.",در صورت فعال بودن، دوره Academic Term در ابزار ثبت نام برنامه اجباری خواهد بود.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies",مقادیر معافیت ، صفر درجه بندی شده و غیر GST منابع داخلی
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,مشتری&gt; گروه مشتری&gt; سرزمین
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>شرکت</b> فیلتر اجباری است.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,همه موارد را از حالت انتخاب خارج کنید
 DocType: Purchase Taxes and Charges,On Item Quantity,در مورد مورد
@@ -6873,6 +6881,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,کمبود تعداد
 DocType: Purchase Invoice,Input Service Distributor,توزیع کننده خدمات ورودی
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,نوع مورد {0} با ویژگی های مشابه وجود دارد
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,لطفاً سیستم نامگذاری مربی را در آموزش و پرورش&gt; تنظیمات آموزش تنظیم کنید
 DocType: Loan,Repay from Salary,بازپرداخت از حقوق و دستمزد
 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} برای مقدار {2}
diff --git a/erpnext/translations/fi.csv b/erpnext/translations/fi.csv
index 15b6853..cec0e56 100644
--- a/erpnext/translations/fi.csv
+++ b/erpnext/translations/fi.csv
@@ -389,6 +389,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,Esitetyt menettelyt
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,Näytä vain POS
 DocType: Supplier Group,Supplier Group Name,Toimittajan ryhmän nimi
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Merkitse läsnäolo nimellä <b></b>
 DocType: Driver,Driving License Categories,Ajokorttikategoriat
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,Anna toimituspäivä
 DocType: Depreciation Schedule,Make Depreciation Entry,Tee Poistot Entry
@@ -999,6 +1000,7 @@
 DocType: Company,Delete Company Transactions,poista yrityksen tapahtumia
 DocType: Production Plan Item,Quantity and Description,Määrä ja kuvaus
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,Viitenumero ja viitepäivämäärä on pakollinen Pankin myynnin
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Aseta Naming-sarjan asetukseksi {0} Asetukset&gt; Asetukset&gt; Sarjasta nimeäminen -kohdassa
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Lisää / muokkaa veroja ja maksuja
 DocType: Payment Entry Reference,Supplier Invoice No,toimittajan laskun nro
 DocType: Territory,For reference,viitteeseen
@@ -4199,6 +4201,8 @@
 DocType: Grant Application,Grant Application Details ,Apurahan hakemustiedot
 DocType: Employee Separation,Employee Separation,Työntekijöiden erottaminen
 DocType: BOM Item,Original Item,Alkuperäinen tuote
+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","Poista työntekijä <a href=""#Form/Employee/{0}"">{0}</a> \ peruuttaaksesi tämän asiakirjan"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Doc Date
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},Fee Records Luotu - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Luokka Account
@@ -5216,6 +5220,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}","Tapahtuma asetettu arvoon {0}, koska myyntihenkilöön liitetty työntekijä ei omista käyttäjätunnusta {1}"
 DocType: Timesheet,Billing Details,Laskutustiedot
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,Lähde ja kohde varasto on oltava eri
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Asenna Työntekijöiden nimeämisjärjestelmä kohtaan Henkilöstöresurssit&gt; HR-asetukset
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,Maksu epäonnistui. Tarkista GoCardless-tilisi tarkempia tietoja
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},ei ole sallittua päivittää yli {0} vanhoja varastotapahtumia
 DocType: Stock Entry,Inspection Required,tarkistus vaaditaan
@@ -5449,6 +5454,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,nykyinen BOM ja uusi BOM ei voi olla samoja
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,Palkka Slip ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,Eläkkeellesiirtymispäivän on oltava työsuhteen aloituspäivää myöhemmin
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Toimittaja&gt; Toimittajan tyyppi
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,Useita vaihtoehtoja
 DocType: Sales Invoice,Against Income Account,tulotilin kodistus
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% toimitettu
@@ -6278,6 +6284,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,rooli voi jäädyttää- sekä muokata jäädytettyjä kirjauksia
 DocType: Supplier Scorecard Scoring Variable,Path,polku
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,"kustannuspaikasta ei voi siirtää tilikirjaan, sillä kustannuspaikalla on alasidoksia"
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM-muuntokerrointa ({0} -&gt; {1}) ei löydy tuotteelle: {2}
 DocType: Production Plan,Total Planned Qty,Suunniteltu kokonaismäärä
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,Tapahtumat palautettiin jo lausunnosta
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Opening Arvo
@@ -6500,6 +6507,7 @@
 DocType: Purchase Order,To Receive,Saavuta
 DocType: Leave Period,Holiday List for Optional Leave,Lomalista vapaaehtoiseen lomaan
 DocType: Item Tax Template,Tax Rates,Verokannat
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Tuotekoodi&gt; Tuoteryhmä&gt; Tuotemerkki
 DocType: Asset,Asset Owner,Omaisuuden omistaja
 DocType: Item,Website Content,Verkkosivun sisältö
 DocType: Bank Account,Integration ID,Integrointitunnus
@@ -6625,6 +6633,7 @@
 DocType: Stock Entry Detail,Additional Cost,Muita Kustannukset
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher",ei voi suodattaa tositenumero pohjalta mikäli tosite on ryhmässä
 DocType: Quality Inspection,Incoming,saapuva
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Asenna läsnäolosuhteiden numerointisarjat kohdasta Asetukset&gt; Numerointisarja
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Myynnin ja ostoksen oletusmaksumalleja luodaan.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,Arviointi Tulosrekisteri {0} on jo olemassa.
 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.","Esimerkki: ABCD. #####. Jos sarja on asetettu ja eränumeroa ei ole mainittu liiketoimissa, automaattinen eränumero luodaan tämän sarjan perusteella. Jos haluat aina mainita erikseen tämän erän erät, jätä tämä tyhjäksi. Huomaa: tämä asetus on etusijalla Naming-sarjan etuliitteen asetuksissa."
@@ -6972,6 +6981,7 @@
 DocType: BOM,Rate Of Materials Based On,Materiaalilaskenta perustuen
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Jos tämä on käytössä, kentän akateeminen termi on Pakollinen ohjelman rekisteröintityökalussa."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","Verottomien, nollaan luokiteltujen ja muiden kuin GST-sisäisten tarvikkeiden arvot"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Asiakas&gt; Asiakasryhmä&gt; Alue
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>Yritys</b> on pakollinen suodatin.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,Poista kaikki
 DocType: Purchase Taxes and Charges,On Item Quantity,Tuotteen määrä
@@ -7016,6 +7026,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,Vajaa määrä
 DocType: Purchase Invoice,Input Service Distributor,Tulopalvelun jakelija
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,Tuote variantti {0} ovat olemassa samoja ominaisuuksia
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Asenna ohjaajien nimeämisjärjestelmä kohtaan Koulutus&gt; Koulutusasetukset
 DocType: Loan,Repay from Salary,Maksaa maasta Palkka
 DocType: Exotel Settings,API Token,API-tunnus
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Requesting payment against {0} {1} for amount {2},Maksupyynnön vastaan {0} {1} määräksi {2}
diff --git a/erpnext/translations/fr.csv b/erpnext/translations/fr.csv
index f3b40ff..c63c949 100644
--- a/erpnext/translations/fr.csv
+++ b/erpnext/translations/fr.csv
@@ -389,6 +389,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,Procédures prescrites
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,Afficher uniquement les points de vente
 DocType: Supplier Group,Supplier Group Name,Nom du groupe de fournisseurs
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Marquer la présence comme <b></b>
 DocType: Driver,Driving License Categories,Catégories de permis de conduire
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,Entrez la Date de Livraison
 DocType: Depreciation Schedule,Make Depreciation Entry,Créer une Écriture d'Amortissement
@@ -1000,6 +1001,7 @@
 DocType: Company,Delete Company Transactions,Supprimer les Transactions de la Société
 DocType: Production Plan Item,Quantity and Description,Quantité et description
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,Le N° de Référence et la Date de Référence sont nécessaires pour une Transaction Bancaire
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Veuillez définir la série de noms pour {0} via Configuration&gt; Paramètres&gt; Série de noms
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Ajouter / Modifier Taxes et Charges
 DocType: Payment Entry Reference,Supplier Invoice No,N° de Facture du Fournisseur
 DocType: Territory,For reference,Pour référence
@@ -4241,6 +4243,8 @@
 DocType: Grant Application,Grant Application Details ,Détails de la demande de subvention
 DocType: Employee Separation,Employee Separation,Départ des employés
 DocType: BOM Item,Original Item,Article original
+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","Veuillez supprimer l&#39;employé <a href=""#Form/Employee/{0}"">{0}</a> \ pour annuler ce document"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Date du document
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},Archive d'Honoraires Créée - {0}
 DocType: Asset Category Account,Asset Category Account,Compte de Catégorie d'Actif
@@ -5270,6 +5274,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}","Définir les Événements à {0}, puisque l'employé attaché au Commercial ci-dessous n'a pas d'ID Utilisateur {1}"
 DocType: Timesheet,Billing Details,Détails de la Facturation
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,Entrepôt source et destination doivent être différents
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Veuillez configurer le système de dénomination des employés dans Ressources humaines&gt; Paramètres RH
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,Le paiement a échoué. Veuillez vérifier votre compte GoCardless pour plus de détails
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},Non autorisé à mettre à jour les transactions du stock antérieures à {0}
 DocType: Stock Entry,Inspection Required,Inspection obligatoire
@@ -5503,6 +5508,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,La LDM actuelle et la nouvelle LDM ne peuvent être pareilles
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,ID Fiche de Paie
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,La Date de Départ à la Retraite doit être supérieure à Date d'Embauche
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Fournisseur&gt; Type de fournisseur
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,Variantes multiples
 DocType: Sales Invoice,Against Income Account,Pour le Compte de Produits
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% Livré
@@ -6332,6 +6338,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rôle Autorisé à Geler des Comptes & à Éditer des Écritures Gelées
 DocType: Supplier Scorecard Scoring Variable,Path,Chemin
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,Conversion impossible du Centre de Coûts en livre car il possède des nœuds enfants
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Facteur de conversion UdM ({0} -&gt; {1}) introuvable pour l&#39;article: {2}
 DocType: Production Plan,Total Planned Qty,Quantité totale prévue
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,Transactions déjà extraites de la déclaration
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Valeur d'Ouverture
@@ -6554,6 +6561,7 @@
 DocType: Purchase Order,To Receive,À Recevoir
 DocType: Leave Period,Holiday List for Optional Leave,Liste de jours fériés pour congé facultatif
 DocType: Item Tax Template,Tax Rates,Les taux d&#39;imposition
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Code article&gt; Groupe d&#39;articles&gt; Marque
 DocType: Asset,Asset Owner,Propriétaire de l'Actif
 DocType: Item,Website Content,Contenu du site Web
 DocType: Bank Account,Integration ID,ID d&#39;intégration
@@ -6679,6 +6687,7 @@
 DocType: Stock Entry Detail,Additional Cost,Frais Supplémentaire
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher","Impossible de filtrer sur la base du N° de Coupon, si les lignes sont regroupées par Coupon"
 DocType: Quality Inspection,Incoming,Entrant
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Veuillez configurer la série de numérotation pour l&#39;assistance via Configuration&gt; Série de numérotation
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Les modèles de taxe par défaut pour les ventes et les achats sont créés.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,Le Résultat d'Évaluation {0} existe déjà.
 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.","Exemple: ABCD. #####. Si la série est définie et que le numéro de lot n'est pas mentionné dans les transactions, un numéro de lot sera automatiquement créé en avec cette série. Si vous préferez mentionner explicitement et systématiquement le numéro de lot pour cet article, laissez ce champ vide. Remarque: ce paramètre aura la priorité sur le préfixe de la série dans les paramètres de stock."
@@ -7021,6 +7030,7 @@
 DocType: BOM,Rate Of Materials Based On,Prix des Matériaux Basé sur
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Si cette option est activée, le champ Période académique sera obligatoire dans l&#39;outil d&#39;inscription au programme."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","Valeurs des fournitures importées exonérées, assorties d&#39;une cote zéro et non liées à la TPS"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Client&gt; Groupe de clients&gt; Territoire
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>La société</b> est un filtre obligatoire.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,Décocher tout
 DocType: Purchase Taxes and Charges,On Item Quantity,Sur quantité d&#39;article
@@ -7065,6 +7075,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,Qté de Pénurie
 DocType: Purchase Invoice,Input Service Distributor,Distributeur de service d&#39;entrée
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,La variante de l'article {0} existe avec les mêmes caractéristiques
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Veuillez configurer le système de dénomination de l&#39;instructeur dans Éducation&gt; Paramètres de l&#39;éducation
 DocType: Loan,Repay from Salary,Rembourser avec le Salaire
 DocType: Exotel Settings,API Token,Jeton d&#39;API
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Requesting payment against {0} {1} for amount {2},Demande de Paiement pour {0} {1} pour le montant {2}
diff --git a/erpnext/translations/gu.csv b/erpnext/translations/gu.csv
index e3d010a..1ff8d69 100644
--- a/erpnext/translations/gu.csv
+++ b/erpnext/translations/gu.csv
@@ -384,6 +384,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,નિયત કાર્યવાહી
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,માત્ર POS બતાવો
 DocType: Supplier Group,Supplier Group Name,પુરવઠોકર્તા ગ્રુપનું નામ
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,તરીકે હાજરી માર્ક કરો <b></b>
 DocType: Driver,Driving License Categories,ડ્રાઇવિંગ લાઈસન્સ શ્રેણીઓ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,ડિલિવરી તારીખ દાખલ કરો
 DocType: Depreciation Schedule,Make Depreciation Entry,અવમૂલ્યન પ્રવેશ કરો
@@ -4119,6 +4120,8 @@
 DocType: Grant Application,Grant Application Details ,ગ્રાન્ટ એપ્લિકેશન વિગતો
 DocType: Employee Separation,Employee Separation,કર્મચારી વિભાજન
 DocType: BOM Item,Original Item,મૂળ વસ્તુ
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","કૃપા કરીને આ દસ્તાવેજ રદ કરવા માટે કર્મચારી <a href=""#Form/Employee/{0}"">{0}</a> delete કા deleteી નાખો"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,દસ્તાવેજ તારીખ
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},ફી રેકોર્ડ્સ બનાવનાર - {0}
 DocType: Asset Category Account,Asset Category Account,એસેટ વર્ગ એકાઉન્ટ
@@ -5119,6 +5122,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","માટે ઘટનાઓ સેટિંગ {0}, કારણ કે કર્મચારી વેચાણ વ્યક્તિઓ નીચે જોડાયેલ એક વપરાશકર્તા id નથી {1}"
 DocType: Timesheet,Billing Details,બિલિંગ વિગતો
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,સ્ત્રોત અને લક્ષ્ય વેરહાઉસ અલગ જ હોવી જોઈએ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,કૃપા કરીને માનવ સંસાધન&gt; એચઆર સેટિંગ્સમાં કર્મચારી નામકરણ સિસ્ટમ સેટ કરો
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,ચૂકવણી નિષ્ફળ વધુ વિગતો માટે કૃપા કરીને તમારા GoCardless એકાઉન્ટને તપાસો
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},ન કરતાં જૂની સ્ટોક વ્યવહારો સુધારવા માટે મંજૂરી {0}
 DocType: Stock Entry,Inspection Required,નિરીક્ષણ જરૂરી
@@ -5348,6 +5352,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,વર્તમાન BOM અને નવા BOM જ ન હોઈ શકે
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,પગાર કાપલી ID ને
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,નિવૃત્તિ તારીખ જોડાયા તારીખ કરતાં મોટી હોવી જ જોઈએ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,સપ્લાયર&gt; સપ્લાયર પ્રકાર
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,મલ્ટીપલ વેરિયન્ટ્સ
 DocType: Sales Invoice,Against Income Account,આવક એકાઉન્ટ સામે
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% વિતરિત
@@ -6163,6 +6168,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,ભૂમિકા ફ્રોઝન એકાઉન્ટ્સ &amp; સંપાદિત કરો ફ્રોઝન પ્રવેશો સેટ કરવાની મંજૂરી
 DocType: Supplier Scorecard Scoring Variable,Path,પાથ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,"તે બાળક ગાંઠો છે, કારણ કે ખાતાવહી ખર્ચ કેન્દ્ર કન્વર્ટ કરી શકતા નથી"
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},આઇટમ માટે યુઓએમ કન્વર્ઝન પરિબળ ({0} -&gt; {1}) મળ્યું નથી: {2}
 DocType: Production Plan,Total Planned Qty,કુલ યોજનાવાળી જથ્થો
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,વ્યવહાર પહેલાથી જ નિવેદનમાંથી પાછો ખેંચ્યો છે
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,ખુલી ભાવ
@@ -6381,6 +6387,7 @@
 DocType: Purchase Order,To Receive,પ્રાપ્ત
 DocType: Leave Period,Holiday List for Optional Leave,વૈકલ્પિક રજા માટેની રજાઓની સૂચિ
 DocType: Item Tax Template,Tax Rates,કર દરો
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,આઇટમ કોડ&gt; આઇટમ જૂથ&gt; બ્રાન્ડ
 DocType: Asset,Asset Owner,અસેટ માલિક
 DocType: Item,Website Content,વેબસાઇટ સામગ્રી
 DocType: Bank Account,Integration ID,એકત્રિકરણ ID
@@ -6504,6 +6511,7 @@
 DocType: Stock Entry Detail,Additional Cost,વધારાના ખર્ચ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher","વાઉચર કોઈ પર આધારિત ફિલ્ટર કરી શકો છો, વાઉચર દ્વારા જૂથ તો"
 DocType: Quality Inspection,Incoming,ઇનકમિંગ
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,કૃપા કરીને સેટઅપ&gt; નંબરિંગ સિરીઝ દ્વારા હાજરી માટે નંબરિંગ શ્રેણી સેટ કરો
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,વેચાણ અને ખરીદી માટે ડિફોલ્ટ કર ટેમ્પ્લેટ બનાવવામાં આવે છે.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,મૂલ્યાંકન પરિણામ રેકોર્ડ {0} પહેલાથી અસ્તિત્વમાં છે.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","ઉદાહરણ: એબીસીડી. ##### જો શ્રેણી સેટ કરેલ હોય અને લેવડદેવડમાં બેચ નો ઉલ્લેખ નથી, તો પછી આ શ્રેણીના આધારે આપમેળે બેચ નંબર બનાવવામાં આવશે. જો તમે હંમેશા આ આઇટમ માટે બેચ નો ઉલ્લેખ કરશો, તો આને ખાલી છોડી દો. નોંધ: આ સેટિંગ, સ્ટોક સેટિંગ્સમાં નેમિંગ સિરીઝ પ્રીફિક્સ પર અગ્રતા લેશે."
@@ -6838,6 +6846,7 @@
 DocType: BOM,Rate Of Materials Based On,દર સામગ્રી પર આધારિત
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","જો સક્ષમ કરેલું હોય, તો ક્ષેત્ર નોંધણી સાધનમાં ફીલ્ડ એકેડેમિક ટર્મ ફરજિયાત રહેશે."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","મુક્તિ, શૂન્ય મૂલ્યાંકન અને જીએસટી સિવાયની આવક સપ્લાયના મૂલ્યો"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ગ્રાહક&gt; ગ્રાહક જૂથ&gt; ક્ષેત્ર
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>કંપની</b> ફરજિયાત ફિલ્ટર છે.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,અનચેક બધા
 DocType: Purchase Taxes and Charges,On Item Quantity,આઇટમ જથ્થા પર
@@ -6882,6 +6891,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,અછત Qty
 DocType: Purchase Invoice,Input Service Distributor,ઇનપુટ સેવા વિતરક
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,વસ્તુ ચલ {0} જ લક્ષણો સાથે હાજર
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,કૃપા કરીને શિક્ષણ&gt; શિક્ષણ સેટિંગ્સમાં પ્રશિક્ષક નામકરણ સિસ્ટમ સેટ કરો
 DocType: Loan,Repay from Salary,પગારની ચુકવણી
 DocType: Exotel Settings,API Token,API ટોકન
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Requesting payment against {0} {1} for amount {2},સામે ચુકવણી વિનંતી {0} {1} રકમ માટે {2}
diff --git a/erpnext/translations/hi.csv b/erpnext/translations/hi.csv
index 0d6f0c5..5081200 100644
--- a/erpnext/translations/hi.csv
+++ b/erpnext/translations/hi.csv
@@ -387,6 +387,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,निर्धारित प्रक्रियाएं
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,केवल पीओएस दिखाएं
 DocType: Supplier Group,Supplier Group Name,प्रदायक समूह का नाम
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,मार्क उपस्थिति के रूप में <b></b>
 DocType: Driver,Driving License Categories,ड्राइविंग लाइसेंस श्रेणियाँ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,कृपया डिलिवरी दिनांक दर्ज करें
 DocType: Depreciation Schedule,Make Depreciation Entry,मूल्यह्रास प्रवेश कर
@@ -996,6 +997,7 @@
 DocType: Company,Delete Company Transactions,कंपनी लेन-देन को हटाएं
 DocType: Production Plan Item,Quantity and Description,मात्रा और विवरण
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,संदर्भ कोई और संदर्भ तिथि बैंक लेन-देन के लिए अनिवार्य है
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,कृपया सेटिंग&gt; सेटिंग&gt; नामकरण श्रृंखला के माध्यम से {0} के लिए नामकरण श्रृंखला निर्धारित करें
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,कर और प्रभार जोड़ें / संपादित करें
 DocType: Payment Entry Reference,Supplier Invoice No,प्रदायक चालान नहीं
 DocType: Territory,For reference,संदर्भ के लिए
@@ -4235,6 +4237,8 @@
 DocType: Grant Application,Grant Application Details ,अनुदान आवेदन विवरण
 DocType: Employee Separation,Employee Separation,कर्मचारी पृथक्करण
 DocType: BOM Item,Original Item,मूल आइटम
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","कृपया इस दस्तावेज़ को रद्द करने के लिए कर्मचारी <a href=""#Form/Employee/{0}"">{0}</a> \ _ हटाएं"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,डॉक्टर तिथि
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},शुल्क रिकॉर्ड बनाया - {0}
 DocType: Asset Category Account,Asset Category Account,परिसंपत्ति वर्ग अकाउंट
@@ -5264,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}","को घटना की सेटिंग {0}, क्योंकि कर्मचारी बिक्री व्यक्तियों के नीचे से जुड़ी एक यूजर आईडी नहीं है {1}"
 DocType: Timesheet,Billing Details,बिलिंग विवरण
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,स्रोत और लक्ष्य गोदाम अलग होना चाहिए
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,कृपया मानव संसाधन&gt; HR सेटिंग्स में कर्मचारी नामकरण प्रणाली सेटअप करें
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,भुगतान असफल हुआ। अधिक जानकारी के लिए कृपया अपने GoCardless खाते की जांच करें
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},से शेयर लेनदेन पुराने अद्यतन करने की अनुमति नहीं है {0}
 DocType: Stock Entry,Inspection Required,आवश्यक निरीक्षण
@@ -5497,6 +5502,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,वर्तमान बीओएम और नई बीओएम ही नहीं किया जा सकता है
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,वेतन पर्ची आईडी
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,सेवानिवृत्ति की तिथि शामिल होने की तिथि से अधिक होना चाहिए
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,आपूर्तिकर्ता&gt; आपूर्तिकर्ता प्रकार
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,एकाधिक विविधताएं
 DocType: Sales Invoice,Against Income Account,आय खाता के खिलाफ
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% वितरित
@@ -6326,6 +6332,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,भूमिका जमे लेखा एवं संपादित जमे प्रविष्टियां सेट करने की अनुमति
 DocType: Supplier Scorecard Scoring Variable,Path,पथ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,यह बच्चे नोड्स के रूप में खाता बही के लिए लागत केंद्र बदला नहीं जा सकता
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM रूपांतरण कारक ({0} -&gt; {1}) आइटम के लिए नहीं मिला: {2}
 DocType: Production Plan,Total Planned Qty,कुल नियोजित मात्रा
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,लेन-देन पहले से ही बयान से मुकर गया
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,उद्घाटन मूल्य
@@ -6548,6 +6555,7 @@
 DocType: Purchase Order,To Receive,प्राप्त करने के लिए
 DocType: Leave Period,Holiday List for Optional Leave,वैकल्पिक छुट्टी के लिए अवकाश सूची
 DocType: Item Tax Template,Tax Rates,कर की दरें
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,आइटम कोड&gt; आइटम समूह&gt; ब्रांड
 DocType: Asset,Asset Owner,संपत्ति मालिक
 DocType: Item,Website Content,वेबसाइट की सामग्री
 DocType: Bank Account,Integration ID,एकीकरण आईडी
@@ -6674,6 +6682,7 @@
 DocType: Stock Entry Detail,Additional Cost,अतिरिक्त लागत
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher","वाउचर के आधार पर फ़िल्टर नहीं कर सकते नहीं, वाउचर के आधार पर समूहीकृत अगर"
 DocType: Quality Inspection,Incoming,आवक
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,कृपया सेटअप&gt; नंबरिंग श्रृंखला के माध्यम से उपस्थिति के लिए क्रमांकन श्रृंखला की स्थापना करें
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,विक्रय और खरीद के लिए डिफ़ॉल्ट कर टेम्पलेट बनाए गए हैं
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,मूल्यांकन परिणाम रिकॉर्ड {0} पहले से मौजूद है।
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","उदाहरण: एबीसीडी। #####। यदि श्रृंखला सेट की गई है और बैच संख्या का लेनदेन में उल्लेख नहीं किया गया है, तो इस श्रृंखला के आधार पर स्वचालित बैच संख्या बनाई जाएगी। यदि आप हमेशा इस आइटम के लिए बैच नंबर का स्पष्ट रूप से उल्लेख करना चाहते हैं, तो इसे खाली छोड़ दें। नोट: यह सेटिंग स्टॉक सेटिंग्स में नामकरण श्रृंखला उपसर्ग पर प्राथमिकता लेगी।"
@@ -7015,6 +7024,7 @@
 DocType: BOM,Rate Of Materials Based On,सामग्री के आधार पर दर
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","यदि सक्षम है, तो प्रोग्राम नामांकन उपकरण में फ़ील्ड अकादमिक अवधि अनिवार्य होगी।"
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","छूट, शून्य रेटेड और गैर-जीएसटी आवक आपूर्ति के मूल्य"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक समूह&gt; क्षेत्र
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>कंपनी</b> एक अनिवार्य फिल्टर है।
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,सब को अचयनित करें
 DocType: Purchase Taxes and Charges,On Item Quantity,आइटम मात्रा पर
@@ -7059,6 +7069,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,कमी मात्रा
 DocType: Purchase Invoice,Input Service Distributor,इनपुट सेवा वितरक
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,मद संस्करण {0} एक ही गुण के साथ मौजूद है
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,कृपया शिक्षा&gt; शिक्षा सेटिंग्स में इंस्ट्रक्टर नामकरण प्रणाली सेटअप करें
 DocType: Loan,Repay from Salary,वेतन से बदला
 DocType: Exotel Settings,API Token,एपीआई टोकन
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Requesting payment against {0} {1} for amount {2},के खिलाफ भुगतान का अनुरोध {0} {1} राशि के लिए {2}
diff --git a/erpnext/translations/hr.csv b/erpnext/translations/hr.csv
index 750c8f5..bad6e01 100644
--- a/erpnext/translations/hr.csv
+++ b/erpnext/translations/hr.csv
@@ -389,6 +389,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,Propisani postupci
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,Prikaži samo POS
 DocType: Supplier Group,Supplier Group Name,Naziv grupe dobavljača
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Označi prisustvo kao <b></b>
 DocType: Driver,Driving License Categories,Kategorije voznih dozvola
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,Unesite datum isporuke
 DocType: Depreciation Schedule,Make Depreciation Entry,Provjerite Amortizacija unos
@@ -999,6 +1000,7 @@
 DocType: Company,Delete Company Transactions,Brisanje transakcije tvrtke
 DocType: Production Plan Item,Quantity and Description,Količina i opis
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,Referentni broj i reference Datum obvezna je za banke transakcije
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Postavite Nameing Series za {0} putem Postavke&gt; Postavke&gt; Imenovanje serija
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Dodaj / uredi porez i pristojbe
 DocType: Payment Entry Reference,Supplier Invoice No,Dobavljač Račun br
 DocType: Territory,For reference,Za referencu
@@ -4238,6 +4240,8 @@
 DocType: Grant Application,Grant Application Details ,Pojedinosti o podnošenju zahtjeva
 DocType: Employee Separation,Employee Separation,Razdvajanje zaposlenika
 DocType: BOM Item,Original Item,Izvorna stavka
+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","Izbrišite zaposlenika <a href=""#Form/Employee/{0}"">{0}</a> \ da biste otkazali ovaj dokument"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Datum dokumenta
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},Naknada zapisa nastalih - {0}
 DocType: Asset Category Account,Asset Category Account,Imovina Kategorija račun
@@ -5267,6 +5271,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}","Postavljanje Događaji na {0}, budući da je zaposlenik u prilogu niže prodaje osoba nema ID korisnika {1}"
 DocType: Timesheet,Billing Details,Detalji o naplati
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,Izvorna i odredišna skladište mora biti drugačiji
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Postavite sustav imenovanja zaposlenika u Ljudski resursi&gt; HR postavke
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,Plaćanje neuspjelo. Više pojedinosti potražite u svojem računu za GoCardless
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},Nije dopušteno ažuriranje skladišnih transakcija starijih od {0}
 DocType: Stock Entry,Inspection Required,Inspekcija Obvezno
@@ -5500,6 +5505,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,Trenutni troškovnik i novi troškovnik ne mogu biti isti
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,Plaća proklizavanja ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,Datum umirovljenja mora biti veći od datuma pristupa
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Dobavljač&gt; vrsta dobavljača
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,Višestruke inačice
 DocType: Sales Invoice,Against Income Account,Protiv računu dohotka
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% Isporučeno
@@ -6329,6 +6335,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Uloga dopušteno postavljanje blokada računa i uređivanje Frozen Entries
 DocType: Supplier Scorecard Scoring Variable,Path,Staza
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,"Ne može se pretvoriti troška za knjigu , kao da ima djece čvorova"
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Faktor konverzije UOM ({0} -&gt; {1}) nije pronađen za stavku: {2}
 DocType: Production Plan,Total Planned Qty,Ukupni planirani broj
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,Transakcije su već povučene iz izjave
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Otvaranje vrijednost
@@ -6551,6 +6558,7 @@
 DocType: Purchase Order,To Receive,Primiti
 DocType: Leave Period,Holiday List for Optional Leave,Popis za odmor za izborni dopust
 DocType: Item Tax Template,Tax Rates,Porezne stope
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kod artikla&gt; Grupa artikala&gt; Marka
 DocType: Asset,Asset Owner,Vlasnik imovine
 DocType: Item,Website Content,Sadržaj web stranice
 DocType: Bank Account,Integration ID,Integracijski ID
@@ -6677,6 +6685,7 @@
 DocType: Stock Entry Detail,Additional Cost,Dodatni trošak
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher","Ne možete filtrirati na temelju vaučer No , ako grupirani po vaučer"
 DocType: Quality Inspection,Incoming,Dolazni
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Postavite brojevnu seriju za Attendance putem Postavljanje&gt; Numeriranje serija
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Osnovni su predlošci poreza za prodaju i kupnju.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,Zapis ocjena rezultata {0} već postoji.
 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.","Primjer: ABCD. #####. Ako je niz postavljen, a transakcije se ne navode u Batch No, tada će se automatski izračunati broj serije na temelju ove serije. Ako uvijek želite izričito spomenuti Nijednu seriju za ovu stavku, ostavite to prazno. Napomena: ta će postavka imati prednost pred Prefiksom serije naziva u Stock Settings."
@@ -7018,6 +7027,7 @@
 DocType: BOM,Rate Of Materials Based On,Stopa materijali na temelju
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Ako je omogućeno, polje Akademsko razdoblje bit će obvezno u Alatu za upis na program."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","Vrijednosti izuzetih, nultih bodova i unutarnjih isporuka bez GST-a"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kupac&gt; Grupa kupaca&gt; Teritorij
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>Tvrtka</b> je obvezan filtar.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,Poništite sve
 DocType: Purchase Taxes and Charges,On Item Quantity,Na Količina predmeta
@@ -7062,6 +7072,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,Nedostatak Kom
 DocType: Purchase Invoice,Input Service Distributor,Distributer ulaznih usluga
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,Inačica Stavka {0} postoji s istim atributima
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Postavite sustav imenovanja instruktora u Obrazovanje&gt; Postavke obrazovanja
 DocType: Loan,Repay from Salary,Vrati iz plaće
 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},Zahtjev za isplatu od {0} {1} za iznos {2}
diff --git a/erpnext/translations/hu.csv b/erpnext/translations/hu.csv
index 857791c..19e2b1c 100644
--- a/erpnext/translations/hu.csv
+++ b/erpnext/translations/hu.csv
@@ -389,6 +389,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,Előírt eljárások
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,Csak POS megjelenítése
 DocType: Supplier Group,Supplier Group Name,A beszállító csoport neve
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Jelölje meg a részvételt mint <b></b>
 DocType: Driver,Driving License Categories,Vezetői engedély kategóriái
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,"Kérjük, adja meg a szállítási határidőt"
 DocType: Depreciation Schedule,Make Depreciation Entry,ÉCS bejegyzés generálás
@@ -997,6 +998,7 @@
 DocType: Company,Delete Company Transactions,Vállalati tranzakciók törlése
 DocType: Production Plan Item,Quantity and Description,Mennyiség és leírás
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,Hivatkozási szám és Referencia dátum kötelező a Banki tranzakcióhoz
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Kérjük, állítsa a Naming Series értékét a (z) {0} beállításra a Beállítás&gt; Beállítások&gt; Soros elnevezés menüponttal"
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Adók és költségek hozzáadása / szerkesztése
 DocType: Payment Entry Reference,Supplier Invoice No,Beszállítói számla száma
 DocType: Territory,For reference,Referenciaként
@@ -4198,6 +4200,8 @@
 DocType: Grant Application,Grant Application Details ,Támogatási kérelem részletei
 DocType: Employee Separation,Employee Separation,Munkavállalói elválasztás
 DocType: BOM Item,Original Item,Eredeti tétel
+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","Kérjük, törölje a (z) <a href=""#Form/Employee/{0}"">{0}</a> alkalmazottat a dokumentum visszavonásához"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Doc dátum
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},Díj rekordok létrehozva - {0}
 DocType: Asset Category Account,Asset Category Account,Vagyontárgy kategória főkönyvi számla
@@ -5214,6 +5218,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}","Beállítás Események {0}, mivel az Alkalmazott hozzácsatolt a lenti értékesítőkhöz, akiknek  nincsenek felhasználói azonosítói: {1}"
 DocType: Timesheet,Billing Details,Számlázási adatok
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,Forrás és cél raktárnak különböznie kell
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Kérjük, állítsa be a Munkavállalók elnevezési rendszerét a Humán erőforrás&gt; HR beállítások menüpontban"
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,Fizetés meghiúsult. További részletekért tekintse meg GoCardless-fiókját
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},"Nem engedélyezett a készlet tranzakciók frissítése, mely régebbi, mint {0}"
 DocType: Stock Entry,Inspection Required,Minőség-ellenőrzés szükséges
@@ -5447,6 +5452,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,Jelenlegi anyagjegyzék és az ÚJ anyagjegyzés nem lehet ugyanaz
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,Bérpapír ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,"Nyugdíjazás dátumának nagyobbnak kell lennie, mint Csatlakozás dátuma"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Szállító&gt; Beszállító típusa
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,Több változat
 DocType: Sales Invoice,Against Income Account,Elleni jövedelem számla
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% szállítva
@@ -6275,6 +6281,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Beosztás élesítheni a zárolt számlákat & szerkeszthesse a zárolt bejegyzéseket
 DocType: Supplier Scorecard Scoring Variable,Path,Útvonal
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,Nem lehet átalakítani költséghelyet főkönyvi számlán hiszen vannak al csomópontjai
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM konverziós tényező ({0} -&gt; {1}) nem található az elemre: {2}
 DocType: Production Plan,Total Planned Qty,Teljes tervezett mennyiség
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,A tranzakciók már visszavonultak a nyilatkozatból
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Nyitó érték
@@ -6495,6 +6502,7 @@
 DocType: Purchase Order,To Receive,Beérkeztetés
 DocType: Leave Period,Holiday List for Optional Leave,Távolléti lista az opcionális távollétekhez
 DocType: Item Tax Template,Tax Rates,Adókulcsok
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Cikkszám&gt; Tételcsoport&gt; Márka
 DocType: Asset,Asset Owner,Vagyontárgy tulajdonos
 DocType: Item,Website Content,Weboldal tartalma
 DocType: Bank Account,Integration ID,Integrációs azonosító
@@ -6620,6 +6628,7 @@
 DocType: Stock Entry Detail,Additional Cost,Járulékos költség
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher","Nem tudja szűrni utalvány szám alapján, ha utalványonként csoportosított"
 DocType: Quality Inspection,Incoming,Bejövő
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Kérjük, állítsa be a számozási sorozatokat a jelenléthez a Beállítás&gt; Számozási sorozat segítségével"
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Az értékesítés és a vásárlás alapértelmezett adómintáit létre hozták.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,Értékelés eredménye rekord {0} már létezik.
 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.","Példa: ABCD. #####. Ha sorozatot állít be, és a tétel nem szerepel a tranzakciókban, akkor a sorozaton alapuló automatikus tételszám kerül létrehozásra. Ha mindig erről a tételr köteg számról szeretné kifejezetten megemlíteni a tételszámot, hagyja üresen. Megjegyzés: ez a beállítás elsőbbséget élvez a készletbeállítások között az elnevezési sorozat előtag felett a leltár beállításoknál."
@@ -6961,6 +6970,7 @@
 DocType: BOM,Rate Of Materials Based On,Anyagköltség számítás módja
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Ha engedélyezve van, az Akadémiai mező mező kötelező lesz a program beiratkozási eszközben."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","Az adómentes, nulla névleges és nem GST behozatali termékek értékei"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Vevő&gt; Vevőcsoport&gt; Terület
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>A társaság</b> kötelező szűrő.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,Összes kijelöletlen
 DocType: Purchase Taxes and Charges,On Item Quantity,A tétel mennyiségen
@@ -7005,6 +7015,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,Hiány Mennyisége
 DocType: Purchase Invoice,Input Service Distributor,Bemeneti szolgáltató
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,Tétel változat {0} létezik azonos Jellemzőkkel
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,"Kérjük, állítsa be az Oktató elnevezési rendszert az Oktatás&gt; Oktatási beállítások menüben"
 DocType: Loan,Repay from Salary,Bérből törleszteni
 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},Fizetési igény ehhez {0} {1} ezzel az összeggel {2}
diff --git a/erpnext/translations/id.csv b/erpnext/translations/id.csv
index 3c3d609..9d3b1c4 100644
--- a/erpnext/translations/id.csv
+++ b/erpnext/translations/id.csv
@@ -389,6 +389,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,Hanya tampilkan POS
 DocType: Supplier Group,Supplier Group Name,Nama Grup Pemasok
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Tandai kehadiran sebagai <b></b>
 DocType: Driver,Driving License Categories,Kategori Lisensi Mengemudi
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,Harap masukkan Tanggal Pengiriman
 DocType: Depreciation Schedule,Make Depreciation Entry,Membuat Penyusutan Masuk
@@ -999,6 +1000,7 @@
 DocType: Company,Delete Company Transactions,Hapus Transaksi Perusahaan
 DocType: Production Plan Item,Quantity and Description,Kuantitas dan Deskripsi
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,Referensi ada dan Tanggal referensi wajib untuk transaksi Bank
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Silakan tentukan Seri Penamaan untuk {0} melalui Pengaturan&gt; Pengaturan&gt; Seri Penamaan
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Tambah / Edit Pajak dan Biaya
 DocType: Payment Entry Reference,Supplier Invoice No,Nomor Faktur Supplier
 DocType: Territory,For reference,Untuk referensi
@@ -4221,6 +4223,8 @@
 DocType: Grant Application,Grant Application Details ,Berikan Rincian Aplikasi
 DocType: Employee Separation,Employee Separation,Pemisahan Karyawan
 DocType: BOM Item,Original Item,Barang Asli
+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","Hapus Karyawan <a href=""#Form/Employee/{0}"">{0}</a> \ untuk membatalkan dokumen ini"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Tanggal Dokumen
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},Biaya Rekaman Dibuat - {0}
 DocType: Asset Category Account,Asset Category Account,Aset Kategori Akun
@@ -5238,6 +5242,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}","Mengatur Acara untuk {0}, karena karyawan yang melekat di bawah Penjualan Orang tidak memiliki User ID {1}"
 DocType: Timesheet,Billing Details,Detail penagihan
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,Sumber dan gudang target harus berbeda
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Silakan atur Sistem Penamaan Karyawan di Sumber Daya Manusia&gt; Pengaturan SDM
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,Pembayaran gagal. Silakan periksa Akun GoCardless Anda untuk lebih jelasnya
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},Tidak diizinkan memperbarui transaksi persediaan lebih lama dari {0}
 DocType: Stock Entry,Inspection Required,Inspeksi Diperlukan
@@ -5471,6 +5476,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,BOM Lancar dan New BOM tidak bisa 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,Tanggal Of Pensiun harus lebih besar dari Tanggal Bergabung
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Pemasok&gt; Jenis Pemasok
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,Beberapa varian
 DocType: Sales Invoice,Against Income Account,Terhadap Akun Pendapatan
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% Terkirim
@@ -6300,6 +6306,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Peran Diizinkan Set Beku Account & Edit Frozen 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 dapat mengkonversi Pusat Biaya untuk buku karena memiliki node anak
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Faktor Konversi UOM ({0} -&gt; {1}) tidak ditemukan untuk item: {2}
 DocType: Production Plan,Total Planned Qty,Total Rencana Qty
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,Transaksi sudah diambil dari pernyataan
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Nilai pembukaan
@@ -6522,6 +6529,7 @@
 DocType: Purchase Order,To Receive,Menerima
 DocType: Leave Period,Holiday List for Optional Leave,Daftar Liburan untuk Cuti Opsional
 DocType: Item Tax Template,Tax Rates,Tarif pajak
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kode Barang&gt; Grup Barang&gt; Merek
 DocType: Asset,Asset Owner,Pemilik aset
 DocType: Item,Website Content,Konten situs web
 DocType: Bank Account,Integration ID,ID Integrasi
@@ -6647,6 +6655,7 @@
 DocType: Stock Entry Detail,Additional Cost,Biaya tambahan
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher","Tidak dapat memfilter berdasarkan No. Voucher, jika dikelompokkan berdasarkan Voucher"
 DocType: Quality Inspection,Incoming,Incoming
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Silakan atur seri penomoran untuk Kehadiran melalui Pengaturan&gt; Seri Penomoran
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Template pajak default untuk penjualan dan pembelian telah dibuat.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,Catatan Hasil Penilaian {0} sudah ada.
 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 seri disetel dan Batch No tidak disebutkan dalam transaksi, maka nomor bets otomatis akan dibuat berdasarkan seri ini. Jika Anda selalu ingin menyebutkan secara eksplisit Batch No untuk item ini, biarkan ini kosong. Catatan: pengaturan ini akan menjadi prioritas di atas Awalan Seri Penamaan dalam Pengaturan Stok."
@@ -6988,6 +6997,7 @@
 DocType: BOM,Rate Of Materials Based On,Laju Bahan Berbasis On
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Jika diaktifkan, bidang Istilah Akademik akan Wajib di 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 pasokan masuk yang dikecualikan, nihil, dan non-GST"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Grup Pelanggan&gt; Wilayah
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>Perusahaan</b> adalah filter wajib.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,Jangan tandai semua
 DocType: Purchase Taxes and Charges,On Item Quantity,Pada Kuantitas Barang
@@ -7032,6 +7042,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,Kekurangan Jumlah
 DocType: Purchase Invoice,Input Service Distributor,Distributor Layanan Input
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,Item varian {0} ada dengan atribut yang sama
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Silakan siapkan Sistem Penamaan Instruktur di Pendidikan&gt; Pengaturan Pendidikan
 DocType: Loan,Repay from Salary,Membayar 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 terhadap {0} {1} untuk jumlah {2}
diff --git a/erpnext/translations/is.csv b/erpnext/translations/is.csv
index 5df8d53..f32513f 100644
--- a/erpnext/translations/is.csv
+++ b/erpnext/translations/is.csv
@@ -389,6 +389,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,Fyrirframgreindar aðferðir
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,Sýna aðeins POS
 DocType: Supplier Group,Supplier Group Name,Nafn seljanda
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Merkja mætingu sem <b></b>
 DocType: Driver,Driving License Categories,Ökuskírteini Flokkar
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,Vinsamlegast sláðu inn afhendingardagsetningu
 DocType: Depreciation Schedule,Make Depreciation Entry,Gera Afskriftir færslu
@@ -999,6 +1000,7 @@
 DocType: Company,Delete Company Transactions,Eyða Transactions Fyrirtækið
 DocType: Production Plan Item,Quantity and Description,Magn og lýsing
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,Tilvísun Nei og Frestdagur er nauðsynlegur fyrir banka viðskiptin
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vinsamlegast stilltu Naming Series fyrir {0} með Setup&gt; Settings&gt; Naming Series
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Bæta við / breyta sköttum og gjöldum
 DocType: Payment Entry Reference,Supplier Invoice No,Birgir Reikningur nr
 DocType: Territory,For reference,til viðmiðunar
@@ -4199,6 +4201,8 @@
 DocType: Grant Application,Grant Application Details ,Veita umsókn upplýsingar
 DocType: Employee Separation,Employee Separation,Aðskilnaður starfsmanna
 DocType: BOM Item,Original Item,Upprunalegt atriði
+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","Vinsamlegast eytt starfsmanninum <a href=""#Form/Employee/{0}"">{0}</a> \ til að hætta við þetta skjal"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Skjal dagsetning
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},Fee Records Búið - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Flokkur Reikningur
@@ -5216,6 +5220,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}","Stilling viðburðir til {0}, þar sem Starfsmannafélag fylgir að neðan sölufólk er ekki með notendanafn {1}"
 DocType: Timesheet,Billing Details,Billing Upplýsingar
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,Uppspretta og miða vöruhús verður að vera öðruvísi
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vinsamlegast settu upp nafnakerfi starfsmanna í mannauð&gt; HR stillingar
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,Greiðsla mistókst. Vinsamlegast athugaðu GoCardless reikninginn þinn til að fá frekari upplýsingar
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},Ekki leyft að uppfæra lager viðskipti eldri en {0}
 DocType: Stock Entry,Inspection Required,skoðun Required
@@ -5449,6 +5454,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,Núverandi BOM og New BOM getur ekki verið það sama
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,Laun Slip ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,Dagsetning starfsloka verður að vera hærri en Dagsetning Tengja
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Birgir&gt; Gerð birgis
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,Margfeldi afbrigði
 DocType: Sales Invoice,Against Income Account,Against þáttatekjum
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% Skilað
@@ -6278,6 +6284,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Hlutverk leyft að setja á frysta reikninga &amp; Sýsla Frozen færslur
 DocType: Supplier Scorecard Scoring Variable,Path,Leið
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,Ekki hægt að umbreyta Kostnaður Center til aðalbók eins og það hefur barnið hnúta
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM viðskiptaþáttur ({0} -&gt; {1}) fannst ekki fyrir hlutinn: {2}
 DocType: Production Plan,Total Planned Qty,Samtals áætlað magn
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,Viðskipti hafa þegar verið endurheimt frá yfirlýsingunni
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,opnun Value
@@ -6500,6 +6507,7 @@
 DocType: Purchase Order,To Receive,Til að taka á móti
 DocType: Leave Period,Holiday List for Optional Leave,Holiday List fyrir valfrjálst leyfi
 DocType: Item Tax Template,Tax Rates,Skattaverð
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Atriðakóði&gt; Vöruflokkur&gt; Vörumerki
 DocType: Asset,Asset Owner,Eigandi eigna
 DocType: Item,Website Content,Innihald vefsíðu
 DocType: Bank Account,Integration ID,Sameiningarkenni
@@ -6625,6 +6633,7 @@
 DocType: Stock Entry Detail,Additional Cost,aukakostnaðar
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher",Getur ekki síað byggð á skírteini nr ef flokkaðar eftir skírteini
 DocType: Quality Inspection,Incoming,Komandi
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vinsamlegast settu upp númeraröð fyrir mætingu með uppsetningu&gt; Númeraröð
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Sjálfgefin skatta sniðmát fyrir sölu og kaup eru búnar til.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,Niðurstaða mats {0} er þegar til.
 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.",Dæmi: ABCD. #####. Ef röð er stillt og lota nr er ekki getið í viðskiptum þá verður sjálfkrafa lotunúmer búið til byggt á þessari röð. Ef þú vilt alltaf nefna lotu nr. Fyrir þetta atriði skaltu láta þetta vera autt. Athugaðu: Þessi stilling mun taka forgang yfir forskeyti fyrir nafngiftaröð í lagerstillingum.
@@ -6966,6 +6975,7 @@
 DocType: BOM,Rate Of Materials Based On,Hlutfall af efni byggt á
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Ef slökkt er á, verður fræðasvið akur að vera skylt í forritaskráningartól."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","Gildi undanþeginna, óverðmætra birgða sem eru ekki metin og ekki GST"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Viðskiptavinur&gt; Viðskiptavinahópur&gt; Landsvæði
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>Fyrirtækið</b> er lögboðin sía.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,Afhakaðu allt
 DocType: Purchase Taxes and Charges,On Item Quantity,Um magn hlutar
@@ -7010,6 +7020,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,skortur Magn
 DocType: Purchase Invoice,Input Service Distributor,Dreifingaraðili fyrir inntak
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,Liður afbrigði {0} hendi með sömu eiginleika
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Vinsamlegast settu upp kennslukerfi kennslukerfis í menntun&gt; Menntunarstillingar
 DocType: Loan,Repay from Salary,Endurgreiða frá Laun
 DocType: Exotel Settings,API Token,API auðkenni
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Requesting payment against {0} {1} for amount {2},Biðum greiðslu gegn {0} {1} fyrir upphæð {2}
diff --git a/erpnext/translations/it.csv b/erpnext/translations/it.csv
index ce69518..6667122 100644
--- a/erpnext/translations/it.csv
+++ b/erpnext/translations/it.csv
@@ -389,6 +389,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,Procedure prescritte
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,Mostra solo POS
 DocType: Supplier Group,Supplier Group Name,Nome del gruppo di fornitori
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Segna la partecipazione come <b></b>
 DocType: Driver,Driving License Categories,Categorie di patenti di guida
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,Inserisci la Data di Consegna
 DocType: Depreciation Schedule,Make Depreciation Entry,Crea una scrittura per l'ammortamento
@@ -999,6 +1000,7 @@
 DocType: Company,Delete Company Transactions,Elimina transazioni Azienda
 DocType: Production Plan Item,Quantity and Description,Quantità e descrizione
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,Di riferimento e di riferimento Data è obbligatoria per la transazione Bank
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Impostare Naming Series per {0} tramite Setup&gt; Impostazioni&gt; Naming Series
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Aggiungere / Modificare tasse e ricarichi
 DocType: Payment Entry Reference,Supplier Invoice No,Fattura Fornitore N.
 DocType: Territory,For reference,Per riferimento
@@ -4240,6 +4242,8 @@
 DocType: Grant Application,Grant Application Details ,Concedere i dettagli dell&#39;applicazione
 DocType: Employee Separation,Employee Separation,Separazione dei dipendenti
 DocType: BOM Item,Original Item,Articolo originale
+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","Elimina il dipendente <a href=""#Form/Employee/{0}"">{0}</a> \ per annullare questo documento"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Doc Data
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},Records Fee Creato - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Categoria account
@@ -5269,6 +5273,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}","Impostazione Eventi a {0}, in quanto il dipendente attaccato al di sotto personale di vendita non dispone di un ID utente {1}"
 DocType: Timesheet,Billing Details,Dettagli di fatturazione
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,Magazzino di Origine e di Destinazione devono essere diversi
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configurare il sistema di denominazione dei dipendenti in Risorse umane&gt; Impostazioni risorse umane
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,Pagamento fallito. Controlla il tuo account GoCardless per maggiori dettagli
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},Non è permesso aggiornare i documenti di magazzino di età superiore a {0}
 DocType: Stock Entry,Inspection Required,Ispezione Obbligatorio
@@ -5502,6 +5507,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,BOM corrente e New BOM non può essere lo stesso
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,Stipendio slittamento ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,La Data di pensionamento deve essere successiva alla Data Assunzione
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Fornitore&gt; Tipo di fornitore
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,Varianti multiple
 DocType: Sales Invoice,Against Income Account,Per Reddito Conto
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% Consegnato
@@ -6332,6 +6338,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Ruolo permesso di impostare conti congelati e modificare le voci congelati
 DocType: Supplier Scorecard Scoring Variable,Path,Percorso
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,Impossibile convertire centro di costo a registro come ha nodi figlio
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Fattore di conversione UOM ({0} -&gt; {1}) non trovato per l&#39;articolo: {2}
 DocType: Production Plan,Total Planned Qty,Qtà totale pianificata
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,Transazioni già recuperate dall&#39;istruzione
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Valore di apertura
@@ -6554,6 +6561,7 @@
 DocType: Purchase Order,To Receive,Ricevere
 DocType: Leave Period,Holiday List for Optional Leave,Lista vacanze per ferie facoltative
 DocType: Item Tax Template,Tax Rates,Aliquote fiscali
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Codice articolo&gt; Gruppo articoli&gt; Marchio
 DocType: Asset,Asset Owner,Proprietario del bene
 DocType: Item,Website Content,Contenuto del sito Web
 DocType: Bank Account,Integration ID,ID integrazione
@@ -6679,6 +6687,7 @@
 DocType: Stock Entry Detail,Additional Cost,Costo aggiuntivo
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher","Non è possibile filtrare sulla base del N. Voucher, se raggruppati per Voucher"
 DocType: Quality Inspection,Incoming,In arrivo
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Impostare le serie di numerazione per la partecipazione tramite Impostazione&gt; Serie di numerazione
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Vengono creati modelli di imposta predefiniti per vendite e acquisti.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,Risultato della valutazione {0} già esistente.
 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.","Esempio: ABCD. #####. Se la serie è impostata e il numero di lotto non è menzionato nelle transazioni, verrà creato il numero di lotto automatico in base a questa serie. Se vuoi sempre menzionare esplicitamente il numero di lotto per questo articolo, lascia vuoto. Nota: questa impostazione avrà la priorità sul Prefisso serie di denominazione nelle Impostazioni stock."
@@ -7020,6 +7029,7 @@
 DocType: BOM,Rate Of Materials Based On,Tasso di materiali a base di
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Se abilitato, il campo Periodo Accademico sarà obbligatorio nello Strumento di Registrazione del Programma."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","Valori di forniture interne esenti, nulli e non GST"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Gruppo di clienti&gt; Territorio
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>La società</b> è un filtro obbligatorio.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,Deseleziona tutto
 DocType: Purchase Taxes and Charges,On Item Quantity,Sulla quantità dell&#39;articolo
@@ -7064,6 +7074,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,Carenza Quantità
 DocType: Purchase Invoice,Input Service Distributor,Distributore di servizi di input
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,Variante item {0} esiste con le stesse caratteristiche
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Configura il sistema di denominazione dell&#39;istruttore in Istruzione&gt; Impostazioni istruzione
 DocType: Loan,Repay from Salary,Rimborsare da Retribuzione
 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},Richiesta di Pagamento contro {0} {1} per quantità {2}
diff --git a/erpnext/translations/ja.csv b/erpnext/translations/ja.csv
index 0dc49e4..1905326 100644
--- a/erpnext/translations/ja.csv
+++ b/erpnext/translations/ja.csv
@@ -389,6 +389,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,規定の手続き
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,POSのみ表示
 DocType: Supplier Group,Supplier Group Name,サプライヤグループ名
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,出席としてマーク<b></b>
 DocType: Driver,Driving License Categories,運転免許のカテゴリ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,納期を入力してください
 DocType: Depreciation Schedule,Make Depreciation Entry,減価償却のエントリを作成します
@@ -1000,6 +1001,7 @@
 DocType: Company,Delete Company Transactions,会社の取引を削除
 DocType: Production Plan Item,Quantity and Description,数量と説明
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,銀行取引には参照番号と参照日が必須です
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,[設定]&gt; [設定]&gt; [命名シリーズ]で{0}の命名シリーズを設定してください
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,租税公課の追加/編集
 DocType: Payment Entry Reference,Supplier Invoice No,サプライヤー請求番号
 DocType: Territory,For reference,参考のため
@@ -4257,6 +4259,8 @@
 DocType: Grant Application,Grant Application Details ,助成金申請詳細
 DocType: Employee Separation,Employee Separation,従業員の分離
 DocType: BOM Item,Original Item,オリジナルアイテム
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","このドキュメントをキャンセルするには、従業員<a href=""#Form/Employee/{0}"">{0}</a> \を削除してください"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,ドキュメントの日付
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},作成したフィーレコード -  {0}
 DocType: Asset Category Account,Asset Category Account,資産カテゴリーアカウント
@@ -5285,6 +5289,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}",以下の営業担当者に配置された従業員にはユーザーID {1} が無いため、{0}にイベントを設定します
 DocType: Timesheet,Billing Details,支払明細
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,ソースとターゲット・ウェアハウスは異なっている必要があります
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,人事管理&gt; HR設定で従業員命名システムを設定してください
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,支払いに失敗しました。詳細はGoCardlessアカウントで確認してください
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},{0}よりも古い在庫取引を更新することはできません
 DocType: Stock Entry,Inspection Required,要検査
@@ -5518,6 +5523,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,「現在の部品表」と「新しい部品表」は同じにすることはできません
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,給与明細ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,退職日は入社日より後でなければなりません
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,サプライヤ&gt;サプライヤタイプ
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,複数のバリエーション
 DocType: Sales Invoice,Against Income Account,対損益勘定
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}%配送済
@@ -6347,6 +6353,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,アカウントの凍結と凍結エントリの編集が許可された役割
 DocType: Supplier Scorecard Scoring Variable,Path,パス
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,子ノードがあるため、コストセンターを元帳に変換することはできません
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},アイテムのUOM換算係数({0}-&gt; {1})が見つかりません:{2}
 DocType: Production Plan,Total Planned Qty,計画総数
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,ステートメントからすでに取り出されたトランザクション
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,始値
@@ -6569,6 +6576,7 @@
 DocType: Purchase Order,To Receive,受領する
 DocType: Leave Period,Holiday List for Optional Leave,オプション休暇の休日一覧
 DocType: Item Tax Template,Tax Rates,税率
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,商品コード&gt;商品グループ&gt;ブランド
 DocType: Asset,Asset Owner,資産所有者
 DocType: Item,Website Content,ウェブサイトのコンテンツ
 DocType: Bank Account,Integration ID,統合ID
@@ -6695,6 +6703,7 @@
 DocType: Stock Entry Detail,Additional Cost,追加費用
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher",伝票でグループ化されている場合、伝票番号でフィルタリングすることはできません。
 DocType: Quality Inspection,Incoming,収入
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,[設定]&gt; [番号シリーズ]を使用して、出席の番号シリーズを設定してください
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,販売および購買のデフォルト税テンプレートが登録されます。
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,評価結果レコード{0}は既に存在します。
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.",例:ABCD。#####。 seriesが設定され、トランザクションでBatch Noが指定されていない場合、このシリーズに基づいて自動バッチ番号が作成されます。この項目のBatch Noを明示的に指定する場合は、この項目を空白のままにしておきます。注:この設定は、ストック設定のネーミングシリーズ接頭辞よりも優先されます。
@@ -7034,6 +7043,7 @@
 DocType: BOM,Rate Of Materials Based On,資材単価基準
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.",有効にすると、Program Enrollment ToolにAcademic Termフィールドが必須となります。
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies",免除、ゼロ評価および非GSTの対内供給の価値
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,顧客&gt;顧客グループ&gt;テリトリー
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>会社</b>は必須フィルターです。
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,すべて選択解除
 DocType: Purchase Taxes and Charges,On Item Quantity,商品数量について
@@ -7078,6 +7088,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,不足数量
 DocType: Purchase Invoice,Input Service Distributor,入力サービス配給業者
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,アイテムバリエーション{0}は同じ属性で存在しています
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,[教育]&gt; [教育の設定]でインストラクターの命名システムを設定してください
 DocType: Loan,Repay from Salary,給与から返済
 DocType: Exotel Settings,API Token,APIトークン
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Requesting payment against {0} {1} for amount {2},量 {2} 用の {0} {1}に対する支払依頼
diff --git a/erpnext/translations/km.csv b/erpnext/translations/km.csv
index 1c0d27f..57d9b93 100644
--- a/erpnext/translations/km.csv
+++ b/erpnext/translations/km.csv
@@ -387,6 +387,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,នីតិវិធីដែលបានកំណត់
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,បង្ហាញតែម៉ាស៊ីនឆូតកាត
 DocType: Supplier Group,Supplier Group Name,ឈ្មោះក្រុមអ្នកផ្គត់ផ្គង់
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,សម្គាល់ការចូលរួមជា <b></b>
 DocType: Driver,Driving License Categories,អាជ្ញាប័ណ្ណបើកបរប្រភេទ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,សូមបញ្ចូលកាលបរិច្ឆេទដឹកជញ្ជូន
 DocType: Depreciation Schedule,Make Depreciation Entry,ធ្វើឱ្យធាតុរំលស់
@@ -990,6 +991,7 @@
 DocType: Company,Delete Company Transactions,លុបប្រតិបត្តិការក្រុមហ៊ុន
 DocType: Production Plan Item,Quantity and Description,បរិមាណនិងការពិពណ៌នា។
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,សេចក្តីយោងកាលបរិច្ឆេទទេនិងយោងចាំបាច់សម្រាប់ប្រតិបត្តិការគឺធនាគារ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,សូមកំណត់ឈ្មោះដាក់ឈ្មោះសំរាប់ {0} តាមរយៈតំឡើង&gt; ការកំណត់&gt; តំរុយឈ្មោះ
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,បន្ថែម / កែសម្រួលពន្ធនិងការចោទប្រកាន់
 DocType: Payment Entry Reference,Supplier Invoice No,វិក័យប័ត្រគ្មានការផ្គត់ផ្គង់
 DocType: Territory,For reference,សម្រាប់ជាឯកសារយោង
@@ -4167,6 +4169,8 @@
 DocType: Grant Application,Grant Application Details ,ផ្តល់សេចក្តីលម្អិតអំពីការអនុវត្ត
 DocType: Employee Separation,Employee Separation,ការបំបែកបុគ្គលិក
 DocType: BOM Item,Original Item,ធាតុដើម
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","សូមលុបនិយោជិក <a href=""#Form/Employee/{0}"">{0}</a> \ ដើម្បីលុបចោលឯកសារនេះ"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,កាលបរិច្ឆេទឯកសារ
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},កំណត់ត្រាថ្លៃសេវាបានបង្កើត - {0}
 DocType: Asset Category Account,Asset Category Account,គណនីទ្រព្យសកម្មប្រភេទ
@@ -5172,6 +5176,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","ការកំណត់ព្រឹត្តិការណ៍ដើម្បី {0}, ចាប់តាំងពីបុគ្គលិកដែលបានភ្ជាប់ទៅខាងក្រោមនេះការលក់របស់បុគ្គលមិនមានលេខសម្គាល់អ្នកប្រើ {1}"
 DocType: Timesheet,Billing Details,សេចក្ដីលម្អិតវិក័យប័ត្រ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,ប្រភពនិងឃ្លាំងគោលដៅត្រូវតែខុសគ្នា
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,សូមរៀបចំប្រព័ន្ធដាក់ឈ្មោះនិយោជិកនៅក្នុងធនធានមនុស្ស&gt; ការកំណត់ធនធានមនុស្ស
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,ការទូទាត់បរាជ័យ។ សូមពិនិត្យមើលគណនី GoCardless របស់អ្នកសម្រាប់ព័ត៌មានលម្អិត
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},មិនត្រូវបានអនុញ្ញាតឱ្យធ្វើបច្ចុប្បន្នភាពប្រតិបតិ្តការភាគហ៊ុនចាស់ជាង {0}
 DocType: Stock Entry,Inspection Required,អធិការកិច្ចដែលបានទាមទារ
@@ -5406,6 +5411,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,Bom បច្ចុប្បន្ននិងថ្មី Bom មិនអាចជាដូចគ្នា
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,លេខសម្គាល់ប័ណ្ណប្រាក់ខែ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,កាលបរិច្ឆេទនៃការចូលនិវត្តន៍ត្រូវតែធំជាងកាលបរិច្ឆេទនៃការចូលរួម
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,ក្រុមហ៊ុនផ្គត់ផ្គង់&gt; ប្រភេទអ្នកផ្គត់ផ្គង់
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,វ៉ារ្យ៉ង់ច្រើន
 DocType: Sales Invoice,Against Income Account,ប្រឆាំងនឹងគណនីចំណូល
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% ផ្តល់
@@ -6466,6 +6472,7 @@
 DocType: Purchase Order,To Receive,ដើម្បីទទួលបាន
 DocType: Leave Period,Holiday List for Optional Leave,បញ្ជីថ្ងៃឈប់សម្រាកសម្រាប់ការចេញជម្រើស
 DocType: Item Tax Template,Tax Rates,អត្រាពន្ធ។
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,លេខកូដរបស់ក្រុម&gt; ក្រុមក្រុម&gt; ម៉ាក
 DocType: Asset,Asset Owner,ម្ចាស់ទ្រព្យ
 DocType: Item,Website Content,មាតិកាគេហទំព័រ។
 DocType: Bank Account,Integration ID,លេខសម្គាល់សមាហរណកម្ម។
@@ -6592,6 +6599,7 @@
 DocType: Stock Entry Detail,Additional Cost,ការចំណាយបន្ថែមទៀត
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher",មិនអាចត្រងដោយផ្អែកលើប័ណ្ណគ្មានប្រសិនបើដាក់ជាក្រុមតាមប័ណ្ណ
 DocType: Quality Inspection,Incoming,មកដល់
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,សូមរៀបចំស៊េរីលេខរៀងសម្រាប់ការចូលរួមតាមរយៈតំឡើង&gt; លេខរៀង
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,គំរូពន្ធលំនាំដើមសម្រាប់ការលក់និងការទិញត្រូវបានបង្កើត។
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,កំណត់ត្រាការវាយតំលៃ {0} មានរួចហើយ។
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.",ឧទាហរណ៍: ABCD ។ ##### ។ ប្រសិនបើស៊េរីត្រូវបានកំណត់ហើយបាច់គ្មានត្រូវបានរៀបរាប់នៅក្នុងប្រតិបត្តិការបន្ទាប់មកលេខឡូហ្គោស្វ័យប្រវត្តិនឹងត្រូវបានបង្កើតឡើងដោយផ្អែកលើស៊េរីនេះ។ ប្រសិនបើអ្នកចង់និយាយបញ្ជាក់យ៉ាងច្បាស់ពីជំនាន់ទី 1 សម្រាប់ធាតុនេះសូមទុកវាឱ្យនៅទទេ។ ចំណាំ: ការកំណត់នេះនឹងយកអាទិភាពជាងបុព្វបទស៊េរីឈ្មោះក្នុងការកំណត់ស្តុក។
@@ -6933,6 +6941,7 @@
 DocType: BOM,Rate Of Materials Based On,អត្រានៃសម្ភារៈមូលដ្ឋាននៅលើ
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.",ប្រសិនបើបានបើកដំណើរការវគ្គសិក្សានឹងជាកាតព្វកិច្ចនៅក្នុងឧបករណ៍ចុះឈ្មោះកម្មវិធី។
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies",គុណតម្លៃនៃការលើកលែង Nil rated និងមិនមែន GST ផ្គត់ផ្គង់ចូល។
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,អតិថិជន&gt; ក្រុមអតិថិជន&gt; ទឹកដី
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>ក្រុមហ៊ុន</b> គឺជាតម្រងចាំបាច់។
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,ដោះធីកទាំងអស់
 DocType: Purchase Taxes and Charges,On Item Quantity,នៅលើបរិមាណធាតុ។
@@ -6978,6 +6987,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,កង្វះខាត Qty
 DocType: Purchase Invoice,Input Service Distributor,អ្នកចែកចាយសេវាកម្មបញ្ចូល។
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,វ៉ារ្យ៉ង់ធាតុ {0} មានដែលមានគុណលក្ខណៈដូចគ្នា
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,សូមតំឡើងប្រព័ន្ធដាក់ឈ្មោះគ្រូនៅក្នុងការអប់រំ&gt; ការកំណត់ការអប់រំ
 DocType: Loan,Repay from Salary,សងពីប្រាក់ខែ
 DocType: Exotel Settings,API Token,API ថូខឹន។
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Requesting payment against {0} {1} for amount {2},ស្នើសុំការទូទាត់ប្រឆាំងនឹង {0} {1} ចំនួន {2}
diff --git a/erpnext/translations/kn.csv b/erpnext/translations/kn.csv
index 72be57d..a513094 100644
--- a/erpnext/translations/kn.csv
+++ b/erpnext/translations/kn.csv
@@ -381,6 +381,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,ಶಿಫಾರಸು ವಿಧಾನಗಳು
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,ಪಿಓಎಸ್ ಮಾತ್ರ ತೋರಿಸು
 DocType: Supplier Group,Supplier Group Name,ಪೂರೈಕೆದಾರ ಗುಂಪು ಹೆಸರು
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,ಹಾಜರಾತಿಯನ್ನು ಗುರುತಿಸಿ <b></b>
 DocType: Driver,Driving License Categories,ಚಾಲಕ ಪರವಾನಗಿ ವರ್ಗಗಳು
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,ದಯವಿಟ್ಟು ಡೆಲಿವರಿ ದಿನಾಂಕವನ್ನು ನಮೂದಿಸಿ
 DocType: Depreciation Schedule,Make Depreciation Entry,ಸವಕಳಿ ಎಂಟ್ರಿ ಮಾಡಿ
@@ -4192,6 +4193,8 @@
 DocType: Grant Application,Grant Application Details ,ಅನುದಾನ ಅಪ್ಲಿಕೇಶನ್ ವಿವರಗಳು
 DocType: Employee Separation,Employee Separation,ಉದ್ಯೋಗಿ ಪ್ರತ್ಯೇಕಿಸುವಿಕೆ
 DocType: BOM Item,Original Item,ಮೂಲ ಐಟಂ
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","ಈ ಡಾಕ್ಯುಮೆಂಟ್ ರದ್ದುಗೊಳಿಸಲು ದಯವಿಟ್ಟು ನೌಕರ <a href=""#Form/Employee/{0}"">{0}</a> delete ಅನ್ನು ಅಳಿಸಿ"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,ಡಾಕ್ ದಿನಾಂಕ
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},ಶುಲ್ಕ ರೆಕಾರ್ಡ್ಸ್ ರಚಿಸಲಾಗಿದೆ - {0}
 DocType: Asset Category Account,Asset Category Account,ಆಸ್ತಿ ವರ್ಗ ಖಾತೆ
@@ -5204,6 +5207,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}",ಕ್ರಿಯೆಗಳು ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ {0} ರಿಂದ ಮಾರಾಟದ ವ್ಯಕ್ತಿಗಳು ಕೆಳಗೆ ಜೋಡಿಸಲಾದ ನೌಕರರ ಒಂದು ಬಳಕೆದಾರ ID ಹೊಂದಿಲ್ಲ {1}
 DocType: Timesheet,Billing Details,ಬಿಲ್ಲಿಂಗ್ ವಿವರಗಳು
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,ಮೂಲ ಮತ್ತು ಗುರಿ ಗೋದಾಮಿನ ಬೇರೆಯಾಗಿರಬೇಕು
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,ದಯವಿಟ್ಟು ಮಾನವ ಸಂಪನ್ಮೂಲ&gt; ಮಾನವ ಸಂಪನ್ಮೂಲ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ನೌಕರರ ಹೆಸರಿಸುವ ವ್ಯವಸ್ಥೆಯನ್ನು ಹೊಂದಿಸಿ
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,ಪಾವತಿ ವಿಫಲವಾಗಿದೆ. ದಯವಿಟ್ಟು ಹೆಚ್ಚಿನ ವಿವರಗಳಿಗಾಗಿ ನಿಮ್ಮ GoCardless ಖಾತೆಯನ್ನು ಪರಿಶೀಲಿಸಿ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},ಹೆಚ್ಚು ಸ್ಟಾಕ್ ವ್ಯವಹಾರ ಹಳೆಯ ನವೀಕರಿಸಲು ಅವಕಾಶ {0}
 DocType: Stock Entry,Inspection Required,ಇನ್ಸ್ಪೆಕ್ಷನ್ ಅಗತ್ಯವಿದೆ
@@ -5434,6 +5438,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,ಪ್ರಸ್ತುತ BOM ಮತ್ತು ಹೊಸ BOM ಇರಲಾಗುವುದಿಲ್ಲ
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,ಸಂಬಳ ಸ್ಲಿಪ್ ಐಡಿ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,ನಿವೃತ್ತಿ ದಿನಾಂಕ ಸೇರುವ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಇರಬೇಕು
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,ಸರಬರಾಜುದಾರ&gt; ಪೂರೈಕೆದಾರ ಪ್ರಕಾರ
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,ಬಹು ರೂಪಾಂತರಗಳು
 DocType: Sales Invoice,Against Income Account,ಆದಾಯ ಖಾತೆ ವಿರುದ್ಧ
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% ತಲುಪಿಸಲಾಗಿದೆ
@@ -6264,6 +6269,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,ಪಾತ್ರವನ್ನು ಘನೀಕೃತ ಖಾತೆಗಳು & ಸಂಪಾದಿಸಿ ಘನೀಕೃತ ನಮೂದುಗಳು ಹೊಂದಿಸಲು ಅನುಮತಿಸಲಾದ
 DocType: Supplier Scorecard Scoring Variable,Path,ಪಾಥ್
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,ಆಲ್ಡ್ವಿಚ್ childNodes ಲೆಡ್ಜರ್ ಒಂದು ವೆಚ್ಚದ ಕೇಂದ್ರವಾಗಿ ಪರಿವರ್ತಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
+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: Production Plan,Total Planned Qty,ಒಟ್ಟು ಯೋಜನೆ ಕ್ಯೂಟಿ
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,ವಹಿವಾಟುಗಳನ್ನು ಈಗಾಗಲೇ ಹೇಳಿಕೆಯಿಂದ ಹಿಂಪಡೆಯಲಾಗಿದೆ
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,ಆರಂಭಿಕ ಮೌಲ್ಯ
@@ -6482,6 +6488,7 @@
 DocType: Purchase Order,To Receive,ಪಡೆಯಲು
 DocType: Leave Period,Holiday List for Optional Leave,ಐಚ್ಛಿಕ ಬಿಡಿಗಾಗಿ ಹಾಲಿಡೇ ಪಟ್ಟಿ
 DocType: Item Tax Template,Tax Rates,ತೆರಿಗೆ ದರಗಳು
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,ಐಟಂ ಕೋಡ್&gt; ಐಟಂ ಗುಂಪು&gt; ಬ್ರಾಂಡ್
 DocType: Asset,Asset Owner,ಆಸ್ತಿ ಮಾಲೀಕ
 DocType: Item,Website Content,ವೆಬ್‌ಸೈಟ್ ವಿಷಯ
 DocType: Bank Account,Integration ID,ಇಂಟಿಗ್ರೇಷನ್ ಐಡಿ
@@ -6606,6 +6613,7 @@
 DocType: Stock Entry Detail,Additional Cost,ಹೆಚ್ಚುವರಿ ವೆಚ್ಚ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher","ಚೀಟಿ ಮೂಲಕ ವರ್ಗೀಕರಿಸಲಾಗಿದೆ ವೇಳೆ , ಚೀಟಿ ಸಂಖ್ಯೆ ಆಧರಿಸಿ ಫಿಲ್ಟರ್ ಸಾಧ್ಯವಿಲ್ಲ"
 DocType: Quality Inspection,Incoming,ಒಳಬರುವ
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ಸೆಟಪ್&gt; ಸಂಖ್ಯೆಯ ಸರಣಿಯ ಮೂಲಕ ಹಾಜರಾತಿಗಾಗಿ ದಯವಿಟ್ಟು ಸಂಖ್ಯೆಯ ಸರಣಿಯನ್ನು ಹೊಂದಿಸಿ
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,ಮಾರಾಟ ಮತ್ತು ಖರೀದಿಯ ಡೀಫಾಲ್ಟ್ ತೆರಿಗೆ ಟೆಂಪ್ಲೆಟ್ಗಳನ್ನು ರಚಿಸಲಾಗಿದೆ.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,ಅಸೆಸ್ಮೆಂಟ್ ಫಲಿತಾಂಶ ದಾಖಲೆ {0} ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","ಉದಾಹರಣೆ: ಎಬಿಸಿಡಿ #####. ಸರಣಿಯನ್ನು ಹೊಂದಿಸಿದ್ದರೆ ಮತ್ತು ವ್ಯವಹಾರದಲ್ಲಿ ಬ್ಯಾಚ್ ನನ್ನು ಉಲ್ಲೇಖಿಸದಿದ್ದರೆ, ಈ ಸರಣಿಯ ಆಧಾರದ ಮೇಲೆ ಸ್ವಯಂಚಾಲಿತ ಬ್ಯಾಚ್ ಸಂಖ್ಯೆಯನ್ನು ರಚಿಸಲಾಗುತ್ತದೆ. ಈ ಐಟಂಗಾಗಿ ಬ್ಯಾಚ್ ಸಂಖ್ಯೆ ಅನ್ನು ಸ್ಪಷ್ಟವಾಗಿ ನಮೂದಿಸಲು ನೀವು ಯಾವಾಗಲೂ ಬಯಸಿದರೆ, ಇದನ್ನು ಖಾಲಿ ಬಿಡಿ. ಗಮನಿಸಿ: ಈ ಸೆಟ್ಟಿಂಗ್ ಸ್ಟಾಕ್ ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ಹೆಸರಿಸುವ ಸರಣಿ ಪೂರ್ವಪ್ರತ್ಯಯದ ಮೇಲೆ ಪ್ರಾಶಸ್ತ್ಯ ತೆಗೆದುಕೊಳ್ಳುತ್ತದೆ."
@@ -6939,6 +6947,7 @@
 DocType: BOM,Rate Of Materials Based On,ಮೆಟೀರಿಯಲ್ಸ್ ಆಧರಿಸಿದ ದರ
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","ಸಕ್ರಿಯಗೊಳಿಸಿದಲ್ಲಿ, ಫೀಲ್ಡ್ ಅಕಾಡೆಮಿಕ್ ಟರ್ಮ್ ಪ್ರೋಗ್ರಾಂ ದಾಖಲಾತಿ ಪರಿಕರದಲ್ಲಿ ಕಡ್ಡಾಯವಾಗಿರುತ್ತದೆ."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","ವಿನಾಯಿತಿ, ನಿಲ್ ರೇಟ್ ಮತ್ತು ಜಿಎಸ್ಟಿ ಅಲ್ಲದ ಆಂತರಿಕ ಸರಬರಾಜುಗಳ ಮೌಲ್ಯಗಳು"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ಗ್ರಾಹಕ&gt; ಗ್ರಾಹಕ ಗುಂಪು&gt; ಪ್ರದೇಶ
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>ಕಂಪನಿ</b> ಕಡ್ಡಾಯ ಫಿಲ್ಟರ್ ಆಗಿದೆ.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,ಎಲ್ಲವನ್ನೂ
 DocType: Purchase Taxes and Charges,On Item Quantity,ಐಟಂ ಪ್ರಮಾಣದಲ್ಲಿ
@@ -6984,6 +6993,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,ಕೊರತೆ ಪ್ರಮಾಣ
 DocType: Purchase Invoice,Input Service Distributor,ಇನ್ಪುಟ್ ಸೇವಾ ವಿತರಕ
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,ಐಟಂ ಭಿನ್ನ {0} ಅದೇ ಲಕ್ಷಣಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,ಶಿಕ್ಷಣ&gt; ಶಿಕ್ಷಣ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ಬೋಧಕ ಹೆಸರಿಸುವ ವ್ಯವಸ್ಥೆಯನ್ನು ದಯವಿಟ್ಟು ಹೊಂದಿಸಿ
 DocType: Loan,Repay from Salary,ಸಂಬಳದಿಂದ ಬಂದ ಮರುಪಾವತಿ
 DocType: Exotel Settings,API Token,API ಟೋಕನ್
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Requesting payment against {0} {1} for amount {2},ವಿರುದ್ಧ ಪಾವತಿ ಮನವಿ {0} {1} ಪ್ರಮಾಣದ {2}
diff --git a/erpnext/translations/ko.csv b/erpnext/translations/ko.csv
index c94bd8a..b3226ea 100644
--- a/erpnext/translations/ko.csv
+++ b/erpnext/translations/ko.csv
@@ -390,6 +390,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,처방 된 절차
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,POS 만 표시
 DocType: Supplier Group,Supplier Group Name,공급 업체 그룹 이름
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,출석을로 표시 <b></b>
 DocType: Driver,Driving License Categories,운전 면허 카테고리
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,배달 날짜를 입력하십시오.
 DocType: Depreciation Schedule,Make Depreciation Entry,감가 상각 항목 확인
@@ -1007,6 +1008,7 @@
 DocType: Company,Delete Company Transactions,회사 거래 삭제
 DocType: Production Plan Item,Quantity and Description,수량 및 설명
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,참조 번호 및 참조 날짜는 은행 거래를위한 필수입니다
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,설정&gt; 설정&gt; 이름 지정 시리즈를 통해 이름 지정 시리즈를 {0}으로 설정하십시오.
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,세금과 요금 추가/편집
 DocType: Payment Entry Reference,Supplier Invoice No,공급 업체 송장 번호
 DocType: Territory,For reference,참고로
@@ -4276,6 +4278,8 @@
 DocType: Grant Application,Grant Application Details ,교부금 신청서 세부 사항
 DocType: Employee Separation,Employee Separation,직원 분리
 DocType: BOM Item,Original Item,원본 항목
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","이 문서를 취소하려면 직원 <a href=""#Form/Employee/{0}"">{0}을 (를)</a> 삭제하십시오"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,문서 날짜
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},요금 기록 작성 - {0}
 DocType: Asset Category Account,Asset Category Account,자산 분류 계정
@@ -5314,6 +5318,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","에 이벤트를 설정 {0}, 판매 사람 아래에 부착 된 직원이 사용자 ID를 가지고 있지 않기 때문에 {1}"
 DocType: Timesheet,Billing Details,결제 세부 정보
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,소스 및 대상웨어 하우스는 달라야합니다
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,인사 관리&gt; HR 설정에서 직원 이름 지정 시스템을 설정하십시오
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,결제 실패. 자세한 내용은 GoCardless 계정을 확인하십시오.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},이상 재고 거래는 이전 업데이트 할 수 없습니다 {0}
 DocType: Stock Entry,Inspection Required,검사 필수
@@ -5549,6 +5554,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,현재 BOM 및 새로운 BOM은 동일 할 수 없습니다
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,급여 슬립 ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,은퇴 날짜 가입 날짜보다 커야합니다
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,공급 업체&gt; 공급 업체 유형
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,여러 변형
 DocType: Sales Invoice,Against Income Account,손익 계정에 대한
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0} % 배달
@@ -6391,6 +6397,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,역할 동결 계정 및 편집 동결 항목을 설정할 수
 DocType: Supplier Scorecard Scoring Variable,Path,통로
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,이 자식 노드를 가지고 원장 비용 센터로 변환 할 수 없습니다
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},항목 {2}에 대한 UOM 변환 계수 ({0}-&gt; {1})를 찾을 수 없습니다
 DocType: Production Plan,Total Planned Qty,총 계획 수량
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,명세서에서 이미 회수 된 거래
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,영업 가치
@@ -6614,6 +6621,7 @@
 DocType: Purchase Order,To Receive,받다
 DocType: Leave Period,Holiday List for Optional Leave,선택적 휴가를위한 휴일 목록
 DocType: Item Tax Template,Tax Rates,세율
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,상품 코드&gt; 상품 그룹&gt; 브랜드
 DocType: Asset,Asset Owner,애셋 소유자
 DocType: Item,Website Content,웹 사이트 콘텐츠
 DocType: Bank Account,Integration ID,통합 ID
@@ -6740,6 +6748,7 @@
 DocType: Stock Entry Detail,Additional Cost,추가 비용
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher","바우처를 기반으로 필터링 할 수 없음, 바우처로 그룹화하는 경우"
 DocType: Quality Inspection,Incoming,수신
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,설정&gt; 넘버링 시리즈를 통해 출석 용 넘버링 시리즈를 설정하십시오
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,판매 및 구매에 대한 기본 세금 템플릿이 생성됩니다.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,평가 결과 레코드 {0}이 (가) 이미 있습니다.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.",예 : ABCD. #####. 계열이 설정되고 트랜잭션에서 일괄 처리 번호가 언급되지 않은 경우이 계열을 기반으로 자동 배치 번호가 생성됩니다. 이 항목에 대해 Batch No를 명시 적으로 언급하려면이 항목을 비워 두십시오. 참고 :이 설정은 재고 설정의 명명 시리즈 접두사보다 우선합니다.
@@ -7083,6 +7092,7 @@
 DocType: BOM,Rate Of Materials Based On,자료에 의거 한 속도
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.",이 옵션을 사용하면 프로그램 등록 도구에 Academic Term 입력란이 필수 항목으로 표시됩니다.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","면제, 무 정격 및 비 GST 내부 공급 가치"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,고객&gt; 고객 그룹&gt; 지역
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>회사</b> 는 필수 필터입니다.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,모두 선택 취소
 DocType: Purchase Taxes and Charges,On Item Quantity,품목 수량
@@ -7128,6 +7138,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,부족 수량
 DocType: Purchase Invoice,Input Service Distributor,입력 서비스 배급 자
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,항목 변형 {0} 같은 속성을 가진 존재
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,교육&gt; 교육 설정에서 강사 명명 시스템을 설정하십시오
 DocType: Loan,Repay from Salary,급여에서 상환
 DocType: Exotel Settings,API Token,API 토큰
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Requesting payment against {0} {1} for amount {2},에 대한 지불을 요청 {0} {1} 금액에 대한 {2}
diff --git a/erpnext/translations/ku.csv b/erpnext/translations/ku.csv
index 10dc953..d97aac4 100644
--- a/erpnext/translations/ku.csv
+++ b/erpnext/translations/ku.csv
@@ -380,6 +380,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,Pêvajûkirinên Qeydkirî
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,POS tenê nîşan bide
 DocType: Supplier Group,Supplier Group Name,Navê Giştî
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Mark beşdarbûn wek <b></b>
 DocType: Driver,Driving License Categories,Kategorî
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,"Ji kerema xwe, Dîroka Deliveryê bike"
 DocType: Depreciation Schedule,Make Depreciation Entry,Make Peyam Farhad.
@@ -986,6 +987,7 @@
 DocType: Company,Delete Company Transactions,Vemirandina Transactions Company
 DocType: Production Plan Item,Quantity and Description,Quantity and Description
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,Çavkanî No û Date: Çavkanî ji bo muameleyan Bank wêneke e
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ji kerema xwe Sêwirandina Navên foran ji bo {0} bi hêla Setup&gt; Mîhengên&gt; Navên Pîroz bikin
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Lê zêde bike Baca / Edit û doz li
 DocType: Payment Entry Reference,Supplier Invoice No,Supplier bi fatûreyên No
 DocType: Territory,For reference,ji bo referansa
@@ -5149,6 +5151,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}","Bikin Events {0}, ji ber ku Employee girêdayî jêr Persons Sales nade a ID&#39;ya bikarhêner heye ne {1}"
 DocType: Timesheet,Billing Details,Details Billing
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,Source û warehouse target divê cuda bê
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ji kerema xwe di Resavkaniya Mirovan de&gt; Sîstema Navkirin a Karmendiyê Saz bikin&gt; Mîhengên HR
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,Payment failed. Ji kerema xwe ji berfirehtir ji bo Agahdariya GoCardless binihêre
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},destûra te ya rojanekirina muameleyên borsayê yên kevintir ji {0}
 DocType: Stock Entry,Inspection Required,Serperiştiya Required
@@ -5378,6 +5381,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,BOM û niha New BOM ne dikarin heman
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,Meaş ID Slip
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,"Date Of Teqawîdiyê, divê mezintir Date of bizaveka be"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Hilberîner&gt; Tîpa pêşkêşkar
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,Pirrjimar Pirrjimar
 DocType: Sales Invoice,Against Income Account,Li dijî Account da-
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% Çiyan
@@ -6415,6 +6419,7 @@
 DocType: Purchase Order,To Receive,Hildan
 DocType: Leave Period,Holiday List for Optional Leave,Lîsteya Bersîvê Ji bo Bijareya Bijartinê
 DocType: Item Tax Template,Tax Rates,Rêjeyên bacan
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Koda Babetê&gt; Koma Rêzan&gt; Brand
 DocType: Asset,Asset Owner,Xwedêkariya xwedan
 DocType: Item,Website Content,Naveroka malperê
 DocType: Bank Account,Integration ID,Nasnameya yekbûnê
@@ -6538,6 +6543,7 @@
 DocType: Stock Entry Detail,Additional Cost,Cost Additional
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher","Can filter li ser Voucher No bingeha ne, eger ji aliyê Vienna kom"
 DocType: Quality Inspection,Incoming,Incoming
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ji kerema xwe ji hêla Tevlêbûnê&gt; Pêjeya Hejmarbûnê ve ji bo Pêvekêşandinê hejmarên hejmaran bikin
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Saziyên bacê yên ji bo firotin û kirînê ji nû ve tên afirandin.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,Nirxandina encamê {0} jixwe heye.
 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.","Nimûne: ABCD. #####. Heke ku rêzikek vekirî ye û Batch Na ne di nav veguhestinê de nirxandin, hingê hejmarek navnîşa otobusê otomatîk li ser vê pirtûkê hatiye afirandin. Heke hûn herdem herdem ji bo vê yekê tiştek balkêş binivîsin, ji vê derê vekin. Têbînî: ev sazkirinê dê li ser Sîsteyên Sûkê li ser Nameya Cîhanê ya Sermaseyê pêşniyar bibin."
@@ -6874,6 +6880,7 @@
 DocType: BOM,Rate Of Materials Based On,Rate ji materyalên li ser bingeha
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Heke çalak, zeviya Termê akademîk dê di navendên Bernameya Enrollmentê de nerast be."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","Nirxên amûrên xwerû, jêkûpêkkirî û ne-GST navxweyî"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Mişterî&gt; Koma Xerîdar&gt; Herêm
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>Pargîdan</b> fîlterkerek domdar e.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,menuya hemû
 DocType: Purchase Taxes and Charges,On Item Quantity,Li ser qumarê tişt
@@ -6919,6 +6926,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,kêmbûna Qty
 DocType: Purchase Invoice,Input Service Distributor,Belavkarê Karûbarê Input
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,variant babete {0} bi taybetmendiyên xwe heman heye
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Ji kerema xwe Li Perwerde&gt; Mîhengên Perwerdehiyê Sîstema Navkirin a Sêwiran saz bikin
 DocType: Loan,Repay from Salary,H&#39;eyfê ji Salary
 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},Ku daxwaz dikin tezmînat li dijî {0} {1} ji bo mîktarê {2}
diff --git a/erpnext/translations/lo.csv b/erpnext/translations/lo.csv
index d1ec26a..35f744d 100644
--- a/erpnext/translations/lo.csv
+++ b/erpnext/translations/lo.csv
@@ -390,6 +390,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,Procedures ສັ່ງ
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,ສະແດງພຽງແຕ່ POS
 DocType: Supplier Group,Supplier Group Name,Supplier Group Name
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,ໝາຍ ເອົາການເຂົ້າຮຽນເປັນ <b></b>
 DocType: Driver,Driving License Categories,ປະເພດໃບອະນຸຍາດຂັບຂີ່
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,ກະລຸນາໃສ່ວັນທີ່ສົ່ງ
 DocType: Depreciation Schedule,Make Depreciation Entry,ເຮັດໃຫ້ການເຂົ້າຄ່າເສື່ອມລາຄາ
@@ -1007,6 +1008,7 @@
 DocType: Company,Delete Company Transactions,ລົບລາຍະການບໍລິສັດ
 DocType: Production Plan Item,Quantity and Description,ຈຳ ນວນແລະລາຍລະອຽດ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,ກະສານອ້າງອີງບໍ່ມີແລະວັນທີເອກະສານແມ່ນການບັງຄັບສໍາລັບການເຮັດທຸລະກໍາທະນາຄານ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,ກະລຸນາຕັ້ງຊຸດການໃສ່ຊື່ ສຳ ລັບ {0} ຜ່ານການຕັ້ງຄ່າ&gt; ການຕັ້ງຄ່າ&gt; ຊຸດການຕັ້ງຊື່
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,ເພີ່ມ / ແກ້ໄຂພາສີອາກອນແລະຄ່າບໍລິການ
 DocType: Payment Entry Reference,Supplier Invoice No,Supplier Invoice No
 DocType: Territory,For reference,ສໍາລັບການກະສານອ້າງອີງ
@@ -4238,6 +4240,8 @@
 DocType: Grant Application,Grant Application Details ,Grant Application Details
 DocType: Employee Separation,Employee Separation,Employee Separation
 DocType: BOM Item,Original Item,Original Item
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","ກະລຸນາລຶບພະນັກງານ <a href=""#Form/Employee/{0}"">{0}</a> \ ເພື່ອຍົກເລີກເອກະສານນີ້"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Doc Date
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},ຄ່າບໍລິການບັນທຶກຂຽນເມື່ອຫລາຍ - {0}
 DocType: Asset Category Account,Asset Category Account,ບັນຊີຊັບສິນປະເພດ
@@ -5264,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}","ການສ້າງຕັ້ງກິດຈະກໍາເພື່ອ {0}, ນັບຕັ້ງແຕ່ພະນັກງານທີ່ຕິດກັບຂ້າງລຸ່ມນີ້ຄົນຂາຍບໍ່ມີ User ID {1}"
 DocType: Timesheet,Billing Details,ລາຍລະອຽດການເອີ້ນເກັບເງິນ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,ແຫຼ່ງຂໍ້ມູນແລະຄັງສິນຄ້າເປົ້າຫມາຍຕ້ອງໄດ້ຮັບທີ່ແຕກຕ່າງກັນ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,ກະລຸນາຕິດຕັ້ງລະບົບການຕັ້ງຊື່ພະນັກງານໃນຊັບພະຍາກອນມະນຸດ&gt; ການຕັ້ງຄ່າ HR
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,ການຊໍາລະເງິນລົ້ມເຫລວ. ໂປດກວດເບິ່ງບັນຊີ GoCardless ຂອງທ່ານສໍາລັບລາຍລະອຽດເພີ່ມເຕີມ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},ບໍ່ອະນຸຍາດໃຫ້ປັບປຸງການເຮັດທຸລະຫຸ້ນອາຍຸຫຼາຍກວ່າ {0}
 DocType: Stock Entry,Inspection Required,ການກວດກາຕ້ອງ
@@ -5499,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 ປັດຈຸບັນແລະໃຫມ່ BOM ບໍ່ສາມາດຈະເປັນຄືກັນ
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,ເງິນເດືອນ ID Slip
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,ວັນທີ່ສະຫມັກຂອງເງິນກະສຽນຈະຕ້ອງຫຼາຍກ່ວາວັນທີຂອງການເຂົ້າຮ່ວມ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,ຜູ້ສະ ໜອງ ສິນຄ້າ&gt; ປະເພດຜູ້ສະ ໜອງ ສິນຄ້າ
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,Multiple Variants
 DocType: Sales Invoice,Against Income Account,ຕໍ່ບັນຊີລາຍໄດ້
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% ສົ່ງ
@@ -6341,6 +6347,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,ພາລະບົດບາດອະນຸຍາດໃຫ້ກໍານົດບັນຊີ Frozen ແລະແກ້ໄຂການອອກສຽງ Frozen
 DocType: Supplier Scorecard Scoring Variable,Path,ເສັ້ນທາງ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,ບໍ່ສາມາດແປງສູນຕົ້ນທຶນການບັນຊີຍ້ອນວ່າມັນມີຂໍ້ເດັກ
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},ປັດໄຈການປ່ຽນ UOM ({0} -&gt; {1}) ບໍ່ພົບ ສຳ ລັບລາຍການ: {2}
 DocType: Production Plan,Total Planned Qty,Total Planned Qty
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,ການເຮັດທຸລະ ກຳ ໄດ້ຖອຍລົງຈາກ ຄຳ ຖະແຫຼງການແລ້ວ
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,ມູນຄ່າການເປີດ
@@ -6564,6 +6571,7 @@
 DocType: Purchase Order,To Receive,ທີ່ຈະໄດ້ຮັບ
 DocType: Leave Period,Holiday List for Optional Leave,ລາຍຊື່ພັກຜ່ອນສໍາລັບການເລືອກທາງເລືອກ
 DocType: Item Tax Template,Tax Rates,ອັດຕາອາກອນ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,ລະຫັດສິນຄ້າ&gt; ກຸ່ມລາຍການ&gt; ຍີ່ຫໍ້
 DocType: Asset,Asset Owner,ເຈົ້າຂອງຊັບສິນ
 DocType: Item,Website Content,ເນື້ອຫາຂອງເວບໄຊທ໌
 DocType: Bank Account,Integration ID,ບັດປະສົມປະສານ
@@ -6690,6 +6698,7 @@
 DocType: Stock Entry Detail,Additional Cost,ຄ່າໃຊ້ຈ່າຍເພີ່ມເຕີມ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher","ບໍ່ສາມາດກັ່ນຕອງໂດຍອີງໃສ່ Voucher No, ຖ້າຫາກວ່າເປັນກຸ່ມຕາມ Voucher"
 DocType: Quality Inspection,Incoming,ເຂົ້າມາ
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ກະລຸນາຕິດຕັ້ງຊຸດ ໝາຍ ເລກ ສຳ ລັບການເຂົ້າຮຽນຜ່ານການຕິດຕັ້ງ&gt; ຊຸດເລກ ລຳ ດັບ
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,ແມ່ແບບພາສີມາດຕະຖານສໍາລັບການຂາຍແລະການຊື້ໄດ້ຖືກສ້າງຂຶ້ນ.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,ບັນທຶກການປະເມີນຜົນ {0} ມີຢູ່ແລ້ວ.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.",ຕົວຢ່າງ: ABCD #####. ຖ້າຊຸດໄດ້ຖືກກໍານົດແລະ Batch No ບໍ່ໄດ້ກ່າວເຖິງໃນການເຮັດທຸລະກໍາແລ້ວຈໍານວນ batch ອັດຕະໂນມັດຈະຖືກສ້າງຂຶ້ນໂດຍອີງໃສ່ຊຸດນີ້. ຖ້າທ່ານຕ້ອງການທີ່ຈະກ່າວຢ່າງລະອຽດກ່ຽວກັບເຄື່ອງຫມາຍການຜະລິດສໍາລັບສິນຄ້ານີ້ໃຫ້ປ່ອຍໃຫ້ມັນຫວ່າງ. ຫມາຍເຫດ: ການຕັ້ງຄ່ານີ້ຈະມີຄວາມສໍາຄັນກວ່າຊື່ຊຸດຊື່ໃນການຕັ້ງຄ່າຫຼັກຊັບ.
@@ -7033,6 +7042,7 @@
 DocType: BOM,Rate Of Materials Based On,ອັດຕາຂອງວັດສະດຸພື້ນຖານກ່ຽວກັບ
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","ຖ້າເປີດໃຊ້, ໄລຍະທາງວິຊາການຈະເປັນຂໍ້ບັງຄັບໃນເຄື່ອງມືການເຂົ້າຮຽນຂອງໂຄງການ."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","ຄຸນຄ່າຂອງການຍົກເວັ້ນ, ການຈັດອັນດັບແລະການສະ ໜອງ ທີ່ບໍ່ແມ່ນ GST ພາຍໃນ"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ລູກຄ້າ&gt; ກຸ່ມລູກຄ້າ&gt; ອານາເຂດ
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>ບໍລິສັດ</b> ແມ່ນຕົວກອງທີ່ ຈຳ ເປັນ.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,ຍົກເລີກທັງຫມົດ
 DocType: Purchase Taxes and Charges,On Item Quantity,ກ່ຽວກັບ ຈຳ ນວນສິນຄ້າ
@@ -7078,6 +7088,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,ການຂາດແຄນຈໍານວນ
 DocType: Purchase Invoice,Input Service Distributor,ຕົວແທນ ຈຳ ໜ່າຍ ບໍລິການຂາເຂົ້າ
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,variant item {0} ມີຢູ່ກັບຄຸນລັກສະນະດຽວກັນ
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,ກະລຸນາຕິດຕັ້ງລະບົບການຕັ້ງຊື່ຜູ້ສອນໃນການສຶກສາ&gt; ການຕັ້ງຄ່າການສຶກສາ
 DocType: Loan,Repay from Salary,ຕອບບຸນແທນຄຸນຈາກເງິນເດືອນ
 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} ສໍາລັບຈໍານວນເງິນທີ່ {2}
diff --git a/erpnext/translations/lt.csv b/erpnext/translations/lt.csv
index 2cb1485..97e8a36 100644
--- a/erpnext/translations/lt.csv
+++ b/erpnext/translations/lt.csv
@@ -389,6 +389,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,Nustatytos procedūros
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,Rodyti tik POS
 DocType: Supplier Group,Supplier Group Name,Tiekėjo grupės pavadinimas
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Pažymėkite dalyvavimą kaip <b></b>
 DocType: Driver,Driving License Categories,Vairuotojo pažymėjimo kategorijos
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,Įveskite pristatymo datą
 DocType: Depreciation Schedule,Make Depreciation Entry,Padaryti nusidėvėjimo įrašą
@@ -4229,6 +4230,8 @@
 DocType: Grant Application,Grant Application Details ,Pareiškimo detalės
 DocType: Employee Separation,Employee Separation,Darbuotojų atskyrimas
 DocType: BOM Item,Original Item,Originalus elementas
+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","Ištrinkite darbuotoją <a href=""#Form/Employee/{0}"">{0}</a> \, kad galėtumėte atšaukti šį dokumentą"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Dokumento data
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},Fee Įrašai Sukurta - {0}
 DocType: Asset Category Account,Asset Category Account,Turto Kategorija paskyra
@@ -5255,6 +5258,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}","Nustatymas įvykių {0}, nes pridedamas prie žemiau pardavėjai darbuotojas neturi naudotojo ID {1}"
 DocType: Timesheet,Billing Details,Atsiskaitymo informacija
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,Originalo ir vertimo sandėlis turi skirtis
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Prašome nustatyti darbuotojų įvardijimo sistemą skyriuje Žmogiškieji ištekliai&gt; HR nustatymai
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,"Mokėjimas nepavyko. Prašome patikrinti savo &quot;GoCardless&quot; sąskaitą, kad gautumėte daugiau informacijos"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},Neleidžiama atnaujinti akcijų sandorius senesnis nei {0}
 DocType: Stock Entry,Inspection Required,Patikrinimo Reikalinga
@@ -5488,6 +5492,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,Dabartinis BOM ir Naujoji BOM negali būti tas pats
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,Pajamos Kuponas ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,Data nuo išėjimo į pensiją turi būti didesnis nei įstoti data
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Tiekėjas&gt; Tiekėjo tipas
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,Keli variantai
 DocType: Sales Invoice,Against Income Account,Prieš pajamų sąskaita
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% Pristatyta
@@ -6329,6 +6334,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Vaidmuo leidžiama nustatyti užšaldytų sąskaitų ir redaguoti Šaldyti įrašai
 DocType: Supplier Scorecard Scoring Variable,Path,Kelias
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,"Negali konvertuoti Cost centrą knygoje, nes ji turi vaikų mazgai"
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM konversijos koeficientas ({0} -&gt; {1}) nerastas elementui: {2}
 DocType: Production Plan,Total Planned Qty,Bendras planuojamas kiekis
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,Sandoriai jau atimami iš pareiškimo
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,atidarymo kaina
@@ -6552,6 +6558,7 @@
 DocType: Purchase Order,To Receive,Gauti
 DocType: Leave Period,Holiday List for Optional Leave,Atostogų sąrašas pasirinktinai
 DocType: Item Tax Template,Tax Rates,Mokesčių tarifai
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Prekės kodas&gt; Prekių grupė&gt; Prekės ženklas
 DocType: Asset,Asset Owner,Turto savininkas
 DocType: Item,Website Content,Svetainės turinys
 DocType: Bank Account,Integration ID,Integracijos ID
@@ -6677,6 +6684,7 @@
 DocType: Stock Entry Detail,Additional Cost,Papildoma Kaina
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher","Negali filtruoti pagal lakšto, jei grupuojamas kuponą"
 DocType: Quality Inspection,Incoming,įeinantis
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Prašome nustatyti numeracijos serijas lankymui per sąranką&gt; Numeravimo serijos
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Sukuriami numatyti mokesčių šablonai pardavimui ir pirkimui.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,Vertinimo rezultatų įrašas {0} jau egzistuoja.
 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.","Pavyzdys: ABCD. #####. Jei serijos yra nustatytos ir partijos Nr nėra minimi sandoriuose, tada automatinis partijos numeris bus sukurtas pagal šią seriją. Jei visada norite aiškiai paminėti šios prekės partiją, palikite tuščią. Pastaba: šis nustatymas bus pirmenybė prieš vardų serijos prefiksą, esantį atsargų nustatymuose."
@@ -7020,6 +7028,7 @@
 DocType: BOM,Rate Of Materials Based On,Norma medžiagų pagrindu
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Jei įjungta, &quot;Academic Term&quot; laukas bus privalomas programos įregistravimo įrankyje."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","Neapmokestinamų, neapmokestinamų ir ne GST įvežamų atsargų vertės"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Klientas&gt; Klientų grupė&gt; Teritorija
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>Bendrovė</b> yra privalomas filtras.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,Nuimkite visus
 DocType: Purchase Taxes and Charges,On Item Quantity,Ant prekės kiekio
@@ -7065,6 +7074,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,trūkumo Kiekis
 DocType: Purchase Invoice,Input Service Distributor,Įvesties paslaugų platintojas
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,Prekė variantas {0} egzistuoja pačių savybių
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Prašome įdiegti instruktoriaus pavadinimo sistemą švietime&gt; Švietimo nustatymai
 DocType: Loan,Repay from Salary,Grąžinti iš Pajamos
 DocType: Exotel Settings,API Token,API prieigos raktas
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Requesting payment against {0} {1} for amount {2},"Prašančioji mokėjimą nuo {0} {1} už sumą, {2}"
diff --git a/erpnext/translations/lv.csv b/erpnext/translations/lv.csv
index 5961fc5..64fcbbe 100644
--- a/erpnext/translations/lv.csv
+++ b/erpnext/translations/lv.csv
@@ -388,6 +388,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,Noteiktas procedūras
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,Rādīt tikai POS
 DocType: Supplier Group,Supplier Group Name,Piegādātāja grupas nosaukums
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Atzīmēt apmeklējumu kā <b></b>
 DocType: Driver,Driving License Categories,Vadītāja apliecību kategorijas
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,"Lūdzu, ievadiet piegādes datumu"
 DocType: Depreciation Schedule,Make Depreciation Entry,Padarīt Nolietojums Entry
@@ -1002,6 +1003,7 @@
 DocType: Company,Delete Company Transactions,Dzēst Uzņēmums Darījumi
 DocType: Production Plan Item,Quantity and Description,Daudzums un apraksts
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,Atsauces Nr un atsauces datums ir obligāta Bank darījumu
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Lūdzu, iestatiet nosaukšanas sēriju uz {0}, izmantojot Iestatīšana&gt; Iestatījumi&gt; Sēriju nosaukšana"
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Pievienot / rediģēt nodokļiem un maksājumiem
 DocType: Payment Entry Reference,Supplier Invoice No,Piegādātāju rēķinu Nr
 DocType: Territory,For reference,Par atskaites
@@ -4226,6 +4228,8 @@
 DocType: Grant Application,Grant Application Details ,Piešķirt pieteikuma informāciju
 DocType: Employee Separation,Employee Separation,Darbinieku nodalīšana
 DocType: BOM Item,Original Item,Oriģināla prece
+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","Lūdzu, izdzēsiet darbinieku <a href=""#Form/Employee/{0}"">{0}</a> \, lai atceltu šo dokumentu"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Doc Datums
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},Maksa Records Izveidoja - {0}
 DocType: Asset Category Account,Asset Category Account,Asset kategorija konts
@@ -5250,6 +5254,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}","Setting notikumi {0}, jo darbinieku pievienots zemāk Sales personām nav lietotāja ID {1}"
 DocType: Timesheet,Billing Details,Norēķinu Details
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,Avota un mērķa noliktava jāatšķiras
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Lūdzu, iestatiet Personāla nosaukšanas sistēma personāla resursos&gt; HR iestatījumi"
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,"Maksājums neizdevās. Lai saņemtu sīkāku informāciju, lūdzu, pārbaudiet GoCardless kontu"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},"Nav atļauts izmainīt akciju darījumiem, kas vecāki par {0}"
 DocType: Stock Entry,Inspection Required,Inspekcija Nepieciešamais
@@ -5483,6 +5488,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,Pašreizējā BOM un New BOM nevar būt vienādi
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,Alga Slip ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,Brīža līdz pensionēšanās jābūt lielākam nekā datums savienošana
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Piegādātājs&gt; Piegādātāja tips
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,Vairāki varianti
 DocType: Sales Invoice,Against Income Account,Pret ienākuma kontu
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% Pasludināts
@@ -6324,6 +6330,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Loma atļauts noteikt iesaldētos kontus un rediģēt Saldētas Ieraksti
 DocType: Supplier Scorecard Scoring Variable,Path,Ceļš
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,"Nevar pārvērst izmaksu centru, lai grāmatai, jo tā ir bērnu mezgliem"
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Vienumam {2} nav atrasts UOM konversijas koeficients ({0} -&gt; {1}).
 DocType: Production Plan,Total Planned Qty,Kopējais plānotais daudzums
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,Darījumi jau ir atkāpti no paziņojuma
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,atklāšanas Value
@@ -6547,6 +6554,7 @@
 DocType: Purchase Order,To Receive,Saņemt
 DocType: Leave Period,Holiday List for Optional Leave,Brīvdienu saraksts izvēles atvaļinājumam
 DocType: Item Tax Template,Tax Rates,Nodokļu likmes
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Preces kods&gt; Vienību grupa&gt; Zīmols
 DocType: Asset,Asset Owner,Īpašuma īpašnieks
 DocType: Item,Website Content,Vietnes saturs
 DocType: Bank Account,Integration ID,Integrācijas ID
@@ -6673,6 +6681,7 @@
 DocType: Stock Entry Detail,Additional Cost,Papildu izmaksas
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher","Nevar filtrēt balstīta uz kupona, ja grupēti pēc kuponu"
 DocType: Quality Inspection,Incoming,Ienākošs
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Lūdzu, iestatiet apmeklējumu numerācijas sērijas, izmantojot Iestatīšana&gt; Numerācijas sērija"
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Tiek veidoti noklusējuma nodokļu veidnes pārdošanai un pirkšanai.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,Novērtējuma rezultātu reģistrs {0} jau eksistē.
 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.","Piemērs: ABCD. #####. Ja sērija ir iestatīta un Partijas Nr nav minēts darījumos, automātiskais partijas numurs tiks izveidots, pamatojoties uz šo sēriju. Ja jūs vienmēr vēlaties skaidri norādīt šī vienuma partijas Nr, atstājiet šo tukšu. Piezīme. Šis iestatījums būs prioritāte salīdzinājumā ar nosaukumu sērijas prefiksu krājumu iestatījumos."
@@ -7016,6 +7025,7 @@
 DocType: BOM,Rate Of Materials Based On,Novērtējiet materiālu specifikācijas Based On
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Ja tas ir iespējots, lauka akadēmiskais termins būs obligāts programmas uzņemšanas rīkā."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","Ar nodokli neapliekamo, ar nulli apliekamo un ar GST nesaistīto iekšējo piegāžu vērtības"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Klients&gt; Klientu grupa&gt; Teritorija
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>Uzņēmums</b> ir obligāts filtrs.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,Noņemiet visas
 DocType: Purchase Taxes and Charges,On Item Quantity,Uz preces daudzumu
@@ -7061,6 +7071,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,Trūkums Daudz
 DocType: Purchase Invoice,Input Service Distributor,Ievades pakalpojumu izplatītājs
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,Postenis variants {0} nepastāv ar tiem pašiem atribūtiem
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,"Lūdzu, iestatiet instruktora nosaukšanas sistēmu sadaļā Izglītība&gt; Izglītības iestatījumi"
 DocType: Loan,Repay from Salary,Atmaksāt no algas
 DocType: Exotel Settings,API Token,API pilnvara
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Requesting payment against {0} {1} for amount {2},Pieprasot samaksu pret {0} {1} par summu {2}
diff --git a/erpnext/translations/mk.csv b/erpnext/translations/mk.csv
index 41eac2d..43d62fe 100644
--- a/erpnext/translations/mk.csv
+++ b/erpnext/translations/mk.csv
@@ -385,6 +385,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,Пропишани процедури
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,Прикажи само POS
 DocType: Supplier Group,Supplier Group Name,Име на група на набавувач
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Означи присуство како <b></b>
 DocType: Driver,Driving License Categories,Категории за возачка дозвола
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,Внесете го датумот на испорака
 DocType: Depreciation Schedule,Make Depreciation Entry,Направете Амортизација Влегување
@@ -993,6 +994,7 @@
 DocType: Company,Delete Company Transactions,Избриши компанијата Трансакции
 DocType: Production Plan Item,Quantity and Description,Количина и опис
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,Референтен број и референтен датум е задолжително за банкарски трансакции
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Поставете Серија за именување за {0} преку Поставување&gt; Поставки&gt; Серии за именување
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Додај / Уреди даноци и такси
 DocType: Payment Entry Reference,Supplier Invoice No,Добавувачот Фактура бр
 DocType: Territory,For reference,За референца
@@ -4177,6 +4179,8 @@
 DocType: Grant Application,Grant Application Details ,Детали за апликација за грант
 DocType: Employee Separation,Employee Separation,Одделување на вработените
 DocType: BOM Item,Original Item,Оригинална точка
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Избришете го вработениот <a href=""#Form/Employee/{0}"">{0}</a> \ за да го откажете овој документ"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Док Датум
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},Надомест записи создадени - {0}
 DocType: Asset Category Account,Asset Category Account,Средства Категорија сметка
@@ -5183,6 +5187,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Поставување на настани во {0}, бидејќи вработените во прилог на подолу продажба на лица нема User ID {1}"
 DocType: Timesheet,Billing Details,Детали за наплата
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,Изворот и целните склад мора да бидат различни
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Поставете го системот за именување на вработените во човечки ресурси&gt; Поставки за човечки ресурси
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,Исплатата не успеа. Ве молиме проверете ја вашата GoCardless сметка за повеќе детали
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},Не е дозволено да се ажурира акции трансакции постари од {0}
 DocType: Stock Entry,Inspection Required,Инспекција што се бара
@@ -5414,6 +5419,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,Тековни Бум и Нов Бум не може да биде ист
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,Плата фиш проект
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,Денот на неговото пензионирање мора да биде поголема од датумот на пристап
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Добавувач&gt; Тип на снабдувач
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,Повеќе варијанти
 DocType: Sales Invoice,Against Income Account,Против профил доход
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% Дадени
@@ -6458,6 +6464,7 @@
 DocType: Purchase Order,To Receive,За да добиете
 DocType: Leave Period,Holiday List for Optional Leave,Листа на летови за изборно напуштање
 DocType: Item Tax Template,Tax Rates,Даночни стапки
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Код на точка&gt; Група на производи&gt; Бренд
 DocType: Asset,Asset Owner,Сопственик на средства
 DocType: Item,Website Content,Содржина на веб-страница
 DocType: Bank Account,Integration ID,ИД за интеграција
@@ -6581,6 +6588,7 @@
 DocType: Stock Entry Detail,Additional Cost,Дополнителни трошоци
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher","Не може да се филтрираат врз основа на ваучер Не, ако се групираат според ваучер"
 DocType: Quality Inspection,Incoming,Дојдовни
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Поставете серија за нумерирање за присуство преку Поставување&gt; Серии за нумерирање
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Основни даночни обрасци за продажба и купување се создаваат.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,Оценка Резултатот од резултатот {0} веќе постои.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Пример: ABCD. #####. Ако серијата е поставена и Batch No не е споменат во трансакциите, тогаш автоматски сериски број ќе биде креиран врз основа на оваа серија. Ако секогаш сакате експлицитно да го споменате Batch No за оваа ставка, оставете го ова празно. Забелешка: оваа поставка ќе има приоритет над Префиксот за назив на сериите во поставките на акции."
@@ -6918,6 +6926,7 @@
 DocType: BOM,Rate Of Materials Based On,Стапка на материјали врз основа на
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Ако е овозможено, полето Академски термин ќе биде задолжително во алатката за запишување на програмата."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","Вредности на ослободени, нула отценети и не-GST внатрешни резерви"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Група на клиенти&gt; Територија
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>Компанијата</b> е задолжителен филтер.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,Отстранете ги сите
 DocType: Purchase Taxes and Charges,On Item Quantity,На количината на артикалот
@@ -6963,6 +6972,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,Недостаток Количина
 DocType: Purchase Invoice,Input Service Distributor,Дистрибутер за влезни услуги
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,Постои ставка варијанта {0} со истите атрибути
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,"Ве молиме, поставете Систем за именување на инструктори во образованието&gt; Поставки за образование"
 DocType: Loan,Repay from Salary,Отплати од плата
 DocType: Exotel Settings,API Token,АПИ Токен
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Requesting payment against {0} {1} for amount {2},Барајќи исплата од {0} {1} за износот {2}
diff --git a/erpnext/translations/ml.csv b/erpnext/translations/ml.csv
index b5c19ba..1685a2e 100644
--- a/erpnext/translations/ml.csv
+++ b/erpnext/translations/ml.csv
@@ -382,6 +382,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,നിർദ്ദിഷ്ട നടപടികൾ
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,POS മാത്രം കാണിക്കുക
 DocType: Supplier Group,Supplier Group Name,വിതരണക്കാരൻ ഗ്രൂപ്പ് നാമം
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,ഹാജർ അടയാളപ്പെടുത്തുക <b></b>
 DocType: Driver,Driving License Categories,ഡ്രൈവിംഗ് ലൈസൻസ് വിഭാഗങ്ങൾ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,ഡെലിവറി തീയതി നൽകുക
 DocType: Depreciation Schedule,Make Depreciation Entry,മൂല്യത്തകർച്ച എൻട്രി നിർമ്മിക്കുക
@@ -4121,6 +4122,8 @@
 DocType: Grant Application,Grant Application Details ,അപേക്ഷകൾ അനുവദിക്കുക
 DocType: Employee Separation,Employee Separation,തൊഴിലുടമ വേർപിരിയൽ
 DocType: BOM Item,Original Item,യഥാർത്ഥ ഇനം
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","ഈ പ്രമാണം റദ്ദാക്കുന്നതിന് ജീവനക്കാരൻ <a href=""#Form/Employee/{0}"">{0}</a> delete ഇല്ലാതാക്കുക"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,പ്രമാണ തീയതി
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},സൃഷ്ടിച്ചു ഫീസ് റെക്കോർഡ്സ് - {0}
 DocType: Asset Category Account,Asset Category Account,അസറ്റ് വർഗ്ഗം അക്കൗണ്ട്
@@ -5118,6 +5121,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}","സെയിൽസ് പേഴ്സൺസ് താഴെ ഘടിപ്പിച്ചിരിക്കുന്ന ജീവനക്കാർ {1} ഒരു ഉപയോക്താവിന്റെ ഐഡി ഇല്ല ശേഷം, ലേക്കുള്ള {0} ഇവന്റുകൾ ക്രമീകരിക്കുന്നു"
 DocType: Timesheet,Billing Details,ബില്ലിംഗ് വിശദാംശങ്ങൾ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,"ഉറവിട, ടാർഗെറ്റ് വെയർഹൗസ് വ്യത്യസ്തമായിരിക്കണം"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,ഹ്യൂമൻ റിസോഴ്സ്&gt; എച്ച്ആർ ക്രമീകരണങ്ങളിൽ ജീവനക്കാരുടെ പേരിടൽ സംവിധാനം സജ്ജമാക്കുക
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,പേയ്മെന്റ് പരാജയപ്പെട്ടു. കൂടുതൽ വിശദാംശങ്ങൾക്ക് നിങ്ങളുടെ GoCardless അക്കൗണ്ട് പരിശോധിക്കുക
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},{0} ചെന്നവർ സ്റ്റോക്ക് ഇടപാടുകൾ പുതുക്കുന്നതിനായി അനുവാദമില്ല
 DocType: Stock Entry,Inspection Required,ഇൻസ്പെക്ഷൻ ആവശ്യമുണ്ട്
@@ -5347,6 +5351,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,ഇപ്പോഴത്തെ BOM ലേക്ക് ന്യൂ BOM ഒന്നുതന്നെയായിരിക്കരുത്
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,ശമ്പള ജി ഐഡി
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,വിരമിക്കുന്ന തീയതി ചേരുന്നു തീയതി വലുതായിരിക്കണം
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,വിതരണക്കാരൻ&gt; വിതരണ തരം
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,വിവിധ വകഭേദങ്ങൾ
 DocType: Sales Invoice,Against Income Account,ആദായ അക്കൗണ്ടിനെതിരായ
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,കൈമാറി {0}%
@@ -6168,6 +6173,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,ശീതീകരിച്ച അക്കൗണ്ടുകൾ &amp; എഡിറ്റ് ശീതീകരിച്ച എൻട്രികൾ സജ്ജമാക്കുക അനുവദിച്ചു റോൾ
 DocType: Supplier Scorecard Scoring Variable,Path,പാത
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,അത് കുട്ടി റോഡുകളുണ്ട് പോലെ ലെഡ്ജർ വരെ ചെലവ് കേന്ദ്രം പരിവർത്തനം ചെയ്യാൻ കഴിയുമോ
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},ഇനത്തിനായി UOM പരിവർത്തന ഘടകം ({0} -&gt; {1}) കണ്ടെത്തിയില്ല: {2}
 DocType: Production Plan,Total Planned Qty,മൊത്തം ആസൂത്രണ കോഡ്
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,ഇടപാടുകൾ ഇതിനകം പ്രസ്താവനയിൽ നിന്ന് വീണ്ടെടുത്തു
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,തുറക്കുന്നു മൂല്യം
@@ -6385,6 +6391,7 @@
 DocType: Purchase Order,To Receive,സ്വീകരിക്കാൻ
 DocType: Leave Period,Holiday List for Optional Leave,ഓപ്ഷണൽ അവധിക്കുള്ള അവധി ലിസ്റ്റ്
 DocType: Item Tax Template,Tax Rates,നികുതി നിരക്കുകൾ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,ഇന കോഡ്&gt; ഐറ്റം ഗ്രൂപ്പ്&gt; ബ്രാൻഡ്
 DocType: Asset,Asset Owner,അസറ്റ് ഉടമസ്ഥൻ
 DocType: Item,Website Content,വെബ്‌സൈറ്റ് ഉള്ളടക്കം
 DocType: Bank Account,Integration ID,ഇന്റഗ്രേഷൻ ഐഡി
@@ -6509,6 +6516,7 @@
 DocType: Stock Entry Detail,Additional Cost,അധിക ചെലവ്
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher","വൗച്ചർ ഭൂഖണ്ടക്രമത്തിൽ എങ്കിൽ, വൗച്ചർ പോസ്റ്റ് അടിസ്ഥാനമാക്കി ഫിൽട്ടർ ചെയ്യാൻ കഴിയില്ല"
 DocType: Quality Inspection,Incoming,ഇൻകമിംഗ്
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,സജ്ജീകരണം&gt; നമ്പറിംഗ് സീരീസ് വഴി അറ്റൻഡൻസിനായി നമ്പറിംഗ് സീരീസ് സജ്ജമാക്കുക
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,വിൽപ്പനയ്ക്കായി വാങ്ങുന്നതിനും വാങ്ങുന്നതിനുമുള്ള സ്ഥിര ടാക്സ് ടെംപ്ലേറ്റുകൾ സൃഷ്ടിക്കുന്നു.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,മൂല്യനിർണ്ണയ ഫല റിക്കോഡ് {0} ഇതിനകം നിലവിലുണ്ട്.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","ഉദാഹരണം: ABCD. #####. സീരീസ് സജ്ജമാക്കിയാൽ, ബാച്ച് നോയിംഗ് ഇടപാടുകളിൽ പരാമർശിച്ചിട്ടില്ലെങ്കിൽ, ഈ ശ്രേണിയെ അടിസ്ഥാനമാക്കി യാന്ത്രിക ബാച്ച് നമ്പർ സൃഷ്ടിക്കും. ഈ ഇനത്തിനായി ബാച്ച് നമ്പറെ നിങ്ങൾ എപ്പോഴും സ്പഷ്ടമായി സൂചിപ്പിക്കണമെങ്കിൽ, ഇത് ശൂന്യമാക്കിയിടുക. കുറിപ്പ്: സ്റ്റോക്കിംഗ് ക്രമീകരണങ്ങളിൽ നാമമുള്ള സീരീസ് പ്രിഫിക്സിൽ ഈ ക്രമീകരണം മുൻഗണന നൽകും."
@@ -6843,6 +6851,7 @@
 DocType: BOM,Rate Of Materials Based On,മെറ്റീരിയൽസ് അടിസ്ഥാനത്തിൽ ഓൺ നിരക്ക്
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","പ്രാപ്തമാക്കിയാൽ, ഫീൽഡ് അക്കാദമിക് ടേം പ്രോഗ്രാം എൻറോൾമെന്റ് ടൂളിൽ നിർബന്ധമാണ്."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies",ഒഴിവാക്കിയതും ഇല്ല റേറ്റുചെയ്തതും ജിഎസ്ടി അല്ലാത്തതുമായ ആന്തരിക വിതരണങ്ങളുടെ മൂല്യങ്ങൾ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,കസ്റ്റമർ&gt; കസ്റ്റമർ ഗ്രൂപ്പ്&gt; ടെറിട്ടറി
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>കമ്പനി</b> നിർബന്ധിത ഫിൽട്ടറാണ്.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,എല്ലാത്തിൻറെയും പരിശോധന
 DocType: Purchase Taxes and Charges,On Item Quantity,ഇനത്തിന്റെ അളവിൽ
@@ -6888,6 +6897,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,ദൌർലഭ്യം Qty
 DocType: Purchase Invoice,Input Service Distributor,ഇൻപുട്ട് സേവന വിതരണക്കാരൻ
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,ഇനം വേരിയന്റ് {0} ഒരേ ആട്രിബ്യൂട്ടുകളുമുള്ള നിലവിലുണ്ട്
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,വിദ്യാഭ്യാസം&gt; വിദ്യാഭ്യാസ ക്രമീകരണങ്ങളിൽ ഇൻസ്ട്രക്ടർ നാമകരണ സംവിധാനം സജ്ജമാക്കുക
 DocType: Loan,Repay from Salary,ശമ്പളത്തിൽ നിന്ന് പകരം
 DocType: Exotel Settings,API Token,API ടോക്കൺ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Requesting payment against {0} {1} for amount {2},തുക {0} {1} നേരെ പേയ്മെന്റ് അഭ്യർത്ഥിക്കുന്നു {2}
diff --git a/erpnext/translations/mr.csv b/erpnext/translations/mr.csv
index 52e961a..b21d57d 100644
--- a/erpnext/translations/mr.csv
+++ b/erpnext/translations/mr.csv
@@ -388,6 +388,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,विहित कार्यपद्धती
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,केवळ POS दर्शवा
 DocType: Supplier Group,Supplier Group Name,पुरवठादार गट नाव
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,म्हणून हजेरी लावा <b></b>
 DocType: Driver,Driving License Categories,ड्रायव्हिंग लायसेन्स श्रेण्या
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,कृपया वितरण तारीख प्रविष्ट करा
 DocType: Depreciation Schedule,Make Depreciation Entry,घसारा प्रवेश करा
@@ -4166,6 +4167,8 @@
 DocType: Grant Application,Grant Application Details ,अर्ज विनंती मंजूर करा
 DocType: Employee Separation,Employee Separation,कर्मचारी विभेदन
 DocType: BOM Item,Original Item,मूळ आयटम
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","कृपया हा कागदजत्र रद्द करण्यासाठी कर्मचारी <a href=""#Form/Employee/{0}"">{0}.</a> हटवा"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,दस्तऐवज तारीख
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},फी रेकॉर्ड तयार - {0}
 DocType: Asset Category Account,Asset Category Account,मालमत्ता वर्ग खाते
@@ -5178,6 +5181,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","इव्हेंट सेट {0}, विक्री व्यक्ती खाली संलग्न कर्मचारी पासून वापरकर्ता आयडी नाही {1}"
 DocType: Timesheet,Billing Details,बिलिंग तपशील
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,स्त्रोत आणि लक्ष्य कोठार भिन्न असणे आवश्यक आहे
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,मानव संसाधन&gt; एचआर सेटिंग्जमध्ये कर्मचारी नेमिंग सिस्टम सेट करा
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,भरणा अयशस्वी. कृपया अधिक तपशीलांसाठी आपले GoCardless खाते तपासा
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},{0} पेक्षा जुने स्टॉक व्यवहार अद्ययावत करण्याची परवानगी नाही
 DocType: Stock Entry,Inspection Required,तपासणी आवश्यक
@@ -5409,6 +5413,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,वर्तमान BOM आणि नवीन BOM समान असू शकत नाही
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,पगाराच्या स्लिप्स आयडी
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,निवृत्ती तारीख प्रवेश दिनांक पेक्षा जास्त असणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,पुरवठादार&gt; पुरवठादार प्रकार
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,एकाधिक वेरिएंट
 DocType: Sales Invoice,Against Income Account,उत्पन्न खाते विरुद्ध
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% वितरण
@@ -6235,6 +6240,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,भूमिका फ्रोजन खाती सेट करण्याची परवानगी आणि फ्रोजन नोंदी संपादित करा
 DocType: Supplier Scorecard Scoring Variable,Path,पथ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,त्याला child nodes आहेत म्हणून खातेवही खर्च केंद्र रूपांतरित करू शकत नाही
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},आयटमसाठी यूओएम रूपांतरण घटक ({0} -&gt; {1}) आढळला नाही: {2}
 DocType: Production Plan,Total Planned Qty,एकूण नियोजित खंड
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,विधानांमधून व्यवहार आधीपासूनच मागे घेण्यात आले आहेत
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,उघडण्याचे  मूल्य
@@ -6453,6 +6459,7 @@
 DocType: Purchase Order,To Receive,प्राप्त करण्यासाठी
 DocType: Leave Period,Holiday List for Optional Leave,पर्यायी रजेसाठी सुट्टी यादी
 DocType: Item Tax Template,Tax Rates,कर दर
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,आयटम कोड&gt; आयटम गट&gt; ब्रँड
 DocType: Asset,Asset Owner,मालमत्ता मालक
 DocType: Item,Website Content,वेबसाइट सामग्री
 DocType: Bank Account,Integration ID,एकत्रीकरण आयडी
@@ -6577,6 +6584,7 @@
 DocType: Stock Entry Detail,Additional Cost,अतिरिक्त खर्च
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher","व्हाउचर नाही आधारित फिल्टर करू शकत नाही, व्हाउचर प्रमाणे गटात समाविष्ट केले तर"
 DocType: Quality Inspection,Incoming,येणार्या
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,कृपया सेटअप&gt; क्रमांकिंग सीरिजद्वारे उपस्थितीसाठी क्रमांकन मालिका सेट करा
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,विक्री आणि खरेदीसाठी डिफॉल्ट कर टेम्पलेट तयार केले जातात.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,मूल्यांकन परिणाम रेकॉर्ड {0} आधीपासूनच अस्तित्वात आहे.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","उदाहरण: एबीसीडी. ##### जर मालिका सेट केली असेल आणि व्यवहारांमध्ये बॅच नंबरचा उल्लेख केला नसेल तर या मालिकेनुसार स्वयंचलित बॅच नंबर तयार केला जाईल. आपण नेहमी या आयटमसाठी बॅच नंबरचा स्पष्टपणे उल्लेख करू इच्छित असल्यास, हे रिक्त सोडा. टीप: हे सेटिंग शेअर सेटिंग्जमधील नामांकन सिरीज उपसर्गापेक्षा प्राथमिकता घेईल."
@@ -6913,6 +6921,7 @@
 DocType: BOM,Rate Of Materials Based On,दर साहित्य आधारित रोजी
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","सक्षम असल्यास, प्रोग्राम एनरोलमेंट टूलमध्ये फील्ड शैक्षणिक कालावधी अनिवार्य असेल."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","माफी, शून्य रेट आणि जीएसटी-नसलेली आवक पुरवठा याची मूल्ये"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक गट&gt; प्रदेश
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>कंपनी</b> अनिवार्य फिल्टर आहे.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,सर्व अनचेक करा
 DocType: Purchase Taxes and Charges,On Item Quantity,आयटम प्रमाण वर
@@ -6958,6 +6967,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,कमतरता Qty
 DocType: Purchase Invoice,Input Service Distributor,इनपुट सेवा वितरक
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,आयटम  variant {0} ज्याच्यामध्ये समान गुणधर्म अस्तित्वात आहेत
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,कृपया शिक्षण&gt; शिक्षण सेटिंग्ज मधील इन्स्ट्रक्टर नामांकन प्रणाली सेट करा
 DocType: Loan,Repay from Salary,पगार पासून परत फेड करा
 DocType: Exotel Settings,API Token,एपीआय टोकन
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Requesting payment against {0} {1} for amount {2},विरुद्ध पैसे विनंती {0} {1} रक्कम {2}
diff --git a/erpnext/translations/ms.csv b/erpnext/translations/ms.csv
index 8eb5007..45de81f 100644
--- a/erpnext/translations/ms.csv
+++ b/erpnext/translations/ms.csv
@@ -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
@@ -1007,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 &gt; Settings &gt; Naming Series,Sila tetapkan Siri Penamaan untuk {0} melalui Persediaan&gt; Tetapan&gt; 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
@@ -4238,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
@@ -5264,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 &gt; HR Settings,Sila persediaan Sistem Penamaan Pekerja dalam Sumber Manusia&gt; 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
@@ -5499,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 &gt; Supplier Type,Pembekal&gt; 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
@@ -6341,6 +6347,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Peranan Dibenarkan untuk Set Akaun Frozen &amp; 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} -&gt; {1}) not found for item: {2},Faktor penukaran UOM ({0} -&gt; {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
@@ -6564,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 &gt; Item Group &gt; Brand,Kod Item&gt; Kumpulan Item&gt; Jenama
 DocType: Asset,Asset Owner,Pemilik Aset
 DocType: Item,Website Content,Kandungan Laman Web
 DocType: Bank Account,Integration ID,ID Integrasi
@@ -6690,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 &gt; Numbering Series,Sila persediaan siri penomboran untuk Kehadiran melalui Persediaan&gt; 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."
@@ -7033,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 &gt; Customer Group &gt; Territory,Pelanggan&gt; Kumpulan Pelanggan&gt; 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
@@ -7078,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 &gt; Education Settings,Sila persediaan Sistem Penamaan Pengajar dalam Pendidikan&gt; 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}
diff --git a/erpnext/translations/my.csv b/erpnext/translations/my.csv
index 8467665..73cec59 100644
--- a/erpnext/translations/my.csv
+++ b/erpnext/translations/my.csv
@@ -390,6 +390,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,သတ်မှတ်ထားသည့်လုပ်ထုံးလုပ်နည်းများ
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,သာ POS ပြရန်
 DocType: Supplier Group,Supplier Group Name,ပေးသွင်း Group မှအမည်
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,အဖြစ်တက်ရောက်သူမှတ်သားပါ <b></b>
 DocType: Driver,Driving License Categories,လိုင်စင်အုပ်စုများမောင်းနှင်
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,Delivery နေ့စွဲကိုရိုက်ထည့်ပေးပါ
 DocType: Depreciation Schedule,Make Depreciation Entry,တန်ဖိုး Entry &#39;Make
@@ -1007,6 +1008,7 @@
 DocType: Company,Delete Company Transactions,ကုမ္ပဏီငွေကြေးကိစ္စရှင်းလင်းမှု Delete
 DocType: Production Plan Item,Quantity and Description,အရေအတွက်နှင့်ဖျေါပွခကျြ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,ကိုးကားစရာအဘယ်သူမျှမနှင့်ကိုးကားစရာနေ့စွဲဘဏ်မှငွေပေးငွေယူဘို့မဖြစ်မနေဖြစ်ပါသည်
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,ကျေးဇူးပြု၍ Setup&gt; Settings&gt; Naming Series မှ {0} အတွက် Naming Series ကိုသတ်မှတ်ပါ
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,/ Edit ကိုအခွန်နှင့်စွပ်စွဲချက် Add
 DocType: Payment Entry Reference,Supplier Invoice No,ပေးသွင်းပြေစာမရှိ
 DocType: Territory,For reference,ကိုးကားနိုင်ရန်
@@ -5256,6 +5258,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}",အရောင်း Persons အောက်ကမှပူးတွဲထမ်းတစ်ဦးအသုံးပြုသူ ID {1} ရှိသည်ပါဘူးကတည်းက {0} မှပွဲများကိုပြင်ဆင်ခြင်း
 DocType: Timesheet,Billing Details,ငွေတောင်းခံအသေးစိတ်
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,အရင်းအမြစ်နှင့်ပစ်မှတ်ဂိုဒေါင်မတူညီတဲ့သူဖြစ်ရမည်
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,ကျေးဇူးပြု၍ လူ့စွမ်းအားအရင်းအမြစ်&gt; HR ဆက်တင်တွင် Employee Naming System ကိုထည့်သွင်းပါ
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,ငွေပေးချေမှုရမည့်မအောင်မြင်ပါ။ အသေးစိတ်အဘို့သင့် GoCardless အကောင့်စစ်ဆေးပါ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},{0} ထက်အသက်အရွယ်ကြီးစတော့ရှယ်ယာအရောင်းအ update လုပ်ဖို့ခွင့်မပြု
 DocType: Stock Entry,Inspection Required,စစ်ဆေးရေးလိုအပ်ပါသည်
@@ -5491,6 +5494,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,လက်ရှိ BOM နှင့် New BOM အတူတူမဖွစျနိုငျ
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,လစာစလစ်ဖြတ်ပိုင်းပုံစံ ID ကို
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,အငြိမ်းစားအမျိုးမျိုးနေ့စွဲအတူနေ့စွဲထက် သာ. ကြီးမြတ်ဖြစ်ရမည်
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,ပေးသွင်းသူ&gt; ပေးသွင်းသူအမျိုးအစား
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,အကွိမျမြားစှာမူကွဲ
 DocType: Sales Invoice,Against Income Account,ဝင်ငွေခွန်အကောင့်ဆန့်ကျင်
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,ကယ်နှုတ်တော်မူ၏ {0}%
@@ -6332,6 +6336,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Frozen Accounts ကို &amp; Edit ကိုအေးခဲ Entries Set မှ Allowed အခန်းကဏ္ဍ
 DocType: Supplier Scorecard Scoring Variable,Path,path
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,ဒါကြောင့်ကလေးဆုံမှတ်များရှိပါတယ်အဖြစ်လယ်ဂျာမှကုန်ကျစရိတ် Center က convert နိုင်ဘူး
+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: Production Plan,Total Planned Qty,စုစုပေါင်းစီစဉ်ထားအရည်အတွက်
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,ပြီးသားကြေညာချက်ကနေ retreived ငွေကြေးလွှဲပြောင်းမှုမှာ
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,ဖွင့်လှစ် Value တစ်ခု
@@ -6553,6 +6558,7 @@
 DocType: Purchase Order,To Receive,လက်ခံမှ
 DocType: Leave Period,Holiday List for Optional Leave,မလုပ်မဖြစ်ခွင့်များအတွက်အားလပ်ရက်များစာရင်း
 DocType: Item Tax Template,Tax Rates,အခွန်နှုန်း
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,ပစ္စည်းကုဒ်&gt; ပစ္စည်းအုပ်စု&gt; ကုန်အမှတ်တံဆိပ်
 DocType: Asset,Asset Owner,ပိုင်ဆိုင်မှုပိုင်ရှင်
 DocType: Item,Website Content,ဝက်ဘ်ဆိုက်အကြောင်းအရာ
 DocType: Bank Account,Integration ID,ပေါင်းစည်းရေး ID ကို
@@ -6679,6 +6685,7 @@
 DocType: Stock Entry Detail,Additional Cost,အပိုဆောင်းကုန်ကျစရိတ်
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher","ဘောက်ချာများကအုပ်စုဖွဲ့လျှင်, voucher မရှိပါအပေါ်အခြေခံပြီး filter နိုင်ဘူး"
 DocType: Quality Inspection,Incoming,incoming
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ကျေးဇူးပြု၍ Setup&gt; Numbering Series မှတဆင့်တက်ရောက်သူများအတွက်နံပါတ်စဉ်ဆက်တင်များကိုစီစဉ်ပေးပါ
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,အရောင်းနှင့်ဝယ်ယူဘို့ default အခွန်တင်းပလိတ်များဖန်တီးနေကြသည်။
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,အကဲဖြတ်ရလဒ်စံချိန် {0} ရှိပြီးဖြစ်သည်။
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","ဥပမာ: ABCD ##### ။ ။ စီးရီးသတ်မှတ်နှင့်အသုတ်လိုက်အဘယ်သူမျှမငွေကြေးလွှဲပြောင်းမှုမှာဖော်ပြခဲ့တဲ့သည်မဟုတ်, ထို့နောက်အလိုအလျှောက်အသုတ်အရေအတွက်ကဒီစီးရီးအပေါ်အခြေခံပြီးဖန်တီးလိမ့်မည်။ အကယ်. သင်အမြဲအတိအလင်းဤအရာအတွက်အဘယ်သူမျှမဘတ်ချ်ဖော်ပြထားခြင်းချင်လျှင်, ဤအလွတ်ထားခဲ့ပါ။ မှတ်ချက်: ဒီ setting ကိုစတော့အိတ်ချိန်ညှိမှုများအတွက်အမည်ဖြင့်သမုတ်စီးရီးရှေ့စာလုံးကျော်ဦးစားပေးကိုယူပါလိမ့်မယ်။"
@@ -7022,6 +7029,7 @@
 DocType: BOM,Rate Of Materials Based On,ပစ္စည်းများအခြေတွင်အမျိုးမျိုး rate
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","enabled လြှငျ, လယ်ပြင်ပညာရေးဆိုင်ရာ Term အစီအစဉ်ကျောင်းအပ် Tool ကိုအတွက်မသင်မနေရဖြစ်လိမ့်မည်။"
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","ထောက်ပံ့ရေးပစ္စည်းများအတွင်းကင်းလွတ်ခွင့်, nil rated နှင့် Non-GST ၏တန်ဖိုးများ"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ဖောက်သည်&gt; ဖောက်သည်အုပ်စု&gt; နယ်မြေ
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>ကုမ္ပဏီသည်</b> မဖြစ်မနေလိုအပ်သော filter တစ်ခုဖြစ်သည်။
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,အားလုံးကို uncheck လုပ်
 DocType: Purchase Taxes and Charges,On Item Quantity,Item အရေအတွက်တွင်
@@ -7067,6 +7075,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,ပြတ်လပ်မှု Qty
 DocType: Purchase Invoice,Input Service Distributor,input Service ကိုဖြန့်ဖြူး
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,item မူကွဲ {0} အတူတူ Attribute တွေနှင့်အတူတည်ရှိမှု့
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,ကျေးဇူးပြုပြီးပညာရေး&gt; ပညာရေးချိန်ညှိချက်များတွင်နည်းပြအမည်ပေးခြင်းစနစ်ကိုထည့်သွင်းပါ
 DocType: Loan,Repay from Salary,လစာထဲကနေပြန်ဆပ်
 DocType: Exotel Settings,API Token,API ကိုတိုကင်
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Requesting payment against {0} {1} for amount {2},ငွေပမာဏများအတွက် {0} {1} ဆန့်ကျင်ငွေပေးချေမှုတောင်းခံ {2}
diff --git a/erpnext/translations/nl.csv b/erpnext/translations/nl.csv
index 1b2f08b..b01def4 100644
--- a/erpnext/translations/nl.csv
+++ b/erpnext/translations/nl.csv
@@ -390,6 +390,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,Voorgeschreven procedures
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,Toon alleen POS
 DocType: Supplier Group,Supplier Group Name,Naam Leveranciergroep
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Markeer aanwezigheid als <b></b>
 DocType: Driver,Driving License Categories,Rijbewijscategorieën
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,Vul de Leveringsdatum in
 DocType: Depreciation Schedule,Make Depreciation Entry,Maak Afschrijvingen Entry
@@ -1005,6 +1006,7 @@
 DocType: Company,Delete Company Transactions,Verwijder Company Transactions
 DocType: Production Plan Item,Quantity and Description,Hoeveelheid en beschrijving
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,Referentienummer en Reference Data is verplicht voor Bank transactie
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Stel Naming Series in op {0} via Setup&gt; Instellingen&gt; Naming Series
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Toevoegen / Bewerken Belastingen en Heffingen
 DocType: Payment Entry Reference,Supplier Invoice No,Factuurnr. Leverancier
 DocType: Territory,For reference,Ter referentie
@@ -4269,6 +4271,8 @@
 DocType: Grant Application,Grant Application Details ,Aanvraagdetails toekennen
 DocType: Employee Separation,Employee Separation,Werknemersscheiding
 DocType: BOM Item,Original Item,Origineel item
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Verwijder de werknemer <a href=""#Form/Employee/{0}"">{0}</a> \ om dit document te annuleren"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Doc Date
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},Fee Records Gemaakt - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Categorie Account
@@ -5305,6 +5309,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}","Instellen Events naar {0}, omdat de werknemer die aan de onderstaande Sales Personen die niet beschikt over een gebruikers-ID {1}"
 DocType: Timesheet,Billing Details,Billing Details
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,Bron en doel magazijn moet verschillen
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Stel het naamgevingssysteem voor werknemers in via Human Resource&gt; HR-instellingen
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,Betaling mislukt. Controleer uw GoCardless-account voor meer informatie
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},Niet toegestaan om voorraadtransacties ouder dan  {0} bij te werken
 DocType: Stock Entry,Inspection Required,Inspectie Verplicht
@@ -5540,6 +5545,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,Huidige Stuklijst en Nieuwe Stuklijst kunnen niet hetzelfde zijn
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,Loonstrook ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,Pensioneringsdatum moet groter zijn dan datum van indiensttreding
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Leverancier&gt; Type leverancier
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,Meerdere varianten
 DocType: Sales Invoice,Against Income Account,Tegen Inkomstenrekening
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% Geleverd
@@ -6382,6 +6388,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rol toegestaan om Stel Frozen Accounts & bewerken Frozen Entries
 DocType: Supplier Scorecard Scoring Variable,Path,Pad
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,Kan kostenplaats niet omzetten naar grootboek vanwege onderliggende nodes
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM-conversiefactor ({0} -&gt; {1}) niet gevonden voor item: {2}
 DocType: Production Plan,Total Planned Qty,Totaal aantal geplande
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,Transacties zijn al teruggetrokken uit de verklaring
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,opening Value
@@ -6605,6 +6612,7 @@
 DocType: Purchase Order,To Receive,Ontvangen
 DocType: Leave Period,Holiday List for Optional Leave,Vakantielijst voor optioneel verlof
 DocType: Item Tax Template,Tax Rates,BELASTINGTARIEVEN
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Artikelcode&gt; Artikelgroep&gt; Merk
 DocType: Asset,Asset Owner,Activa-eigenaar
 DocType: Item,Website Content,Website inhoud
 DocType: Bank Account,Integration ID,Integratie ID
@@ -6732,6 +6740,7 @@
 DocType: Stock Entry Detail,Additional Cost,Bijkomende kosten
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher","Kan niet filteren op basis van vouchernummer, indien gegroepeerd per voucher"
 DocType: Quality Inspection,Incoming,Inkomend
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Stel nummeringseries in voor Aanwezigheid via Setup&gt; Nummeringsseries
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Standaardbelastingsjablonen voor verkopen en kopen worden gemaakt.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,Beoordeling Resultaat record {0} bestaat al.
 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.","Voorbeeld: ABCD. #####. Als reeks is ingesteld en Batch-nummer niet in transacties wordt vermeld, wordt op basis van deze reeks automatisch batchnummer gemaakt. Als u Batch-nummer voor dit artikel altijd expliciet wilt vermelden, laat dit veld dan leeg. Opmerking: deze instelling heeft voorrang boven het voorvoegsel Naamgevingsreeks in Voorraadinstellingen."
@@ -7073,6 +7082,7 @@
 DocType: BOM,Rate Of Materials Based On,Prijs van materialen op basis van
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Indien ingeschakeld, is de veld Academic Term verplicht in het programma-inschrijvingsinstrument."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","Waarden van vrijgestelde, nihil en niet-GST inkomende leveringen"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Klant&gt; Klantengroep&gt; Gebied
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>Bedrijf</b> is een verplicht filter.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,Verwijder het vinkje bij alle
 DocType: Purchase Taxes and Charges,On Item Quantity,Op artikelhoeveelheid
@@ -7117,6 +7127,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,Tekort Aantal
 DocType: Purchase Invoice,Input Service Distributor,Input Service Distributeur
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,Artikel variant {0} bestaat met dezelfde kenmerken
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Stel het instructeursysteem in onder onderwijs&gt; onderwijsinstellingen
 DocType: Loan,Repay from Salary,Terugbetalen van Loon
 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},Betalingsverzoeken tegen {0} {1} van {2} bedrag
diff --git a/erpnext/translations/no.csv b/erpnext/translations/no.csv
index e6f3e43..b000af8 100644
--- a/erpnext/translations/no.csv
+++ b/erpnext/translations/no.csv
@@ -390,6 +390,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,Foreskrevne prosedyrer
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,Vis bare POS
 DocType: Supplier Group,Supplier Group Name,Leverandørgruppens navn
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Merk oppmøte som <b></b>
 DocType: Driver,Driving License Categories,Kjørelisenskategorier
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,Vennligst oppgi Leveringsdato
 DocType: Depreciation Schedule,Make Depreciation Entry,Gjør Avskrivninger Entry
@@ -1007,6 +1008,7 @@
 DocType: Company,Delete Company Transactions,Slett transaksjoner
 DocType: Production Plan Item,Quantity and Description,Mengde og beskrivelse
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,Referansenummer og Reference Date er obligatorisk for Bank transaksjon
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Angi Naming Series for {0} via Setup&gt; Settings&gt; Naming Series
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Legg til / Rediger skatter og avgifter
 DocType: Payment Entry Reference,Supplier Invoice No,Leverandør Faktura Nei
 DocType: Territory,For reference,For referanse
@@ -4233,6 +4235,8 @@
 DocType: Grant Application,Grant Application Details ,Gi søknadsdetaljer
 DocType: Employee Separation,Employee Separation,Ansattes separasjon
 DocType: BOM Item,Original Item,Originalelement
+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","Slett ansatt <a href=""#Form/Employee/{0}"">{0}</a> \ for å avbryte dette dokumentet"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Dok dato
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},Fee Records Laget - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Kategori konto
@@ -5257,6 +5261,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}","Innstilling Hendelser til {0}, siden den ansatte knyttet til under selgerne ikke har en bruker-ID {1}"
 DocType: Timesheet,Billing Details,Fakturadetaljer
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,Kilde og mål lageret må være annerledes
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Sett inn ansattes navnsystem i menneskelige ressurser&gt; HR-innstillinger
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,Betalingen feilet. Vennligst sjekk din GoCardless-konto for mer informasjon
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},Ikke lov til å oppdatere lagertransaksjoner eldre enn {0}
 DocType: Stock Entry,Inspection Required,Inspeksjon påkrevd
@@ -5492,6 +5497,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,Nåværende BOM og New BOM kan ikke være det samme
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,Lønn Slip ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,Pensjoneringstidspunktet må være større enn tidspunktet for inntreden
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Leverandør&gt; Leverandørtype
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,Flere variasjoner
 DocType: Sales Invoice,Against Income Account,Mot Inntekt konto
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% Leveres
@@ -6334,6 +6340,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rolle lov til å sette Frosne Kontoer og Rediger Frosne Entries
 DocType: Supplier Scorecard Scoring Variable,Path,Sti
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,Kan ikke konvertere kostnadssted til hovedbok som den har barnet noder
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM konverteringsfaktor ({0} -&gt; {1}) ikke funnet for varen: {2}
 DocType: Production Plan,Total Planned Qty,Totalt planlagt antall
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,Transaksjoner er allerede gjenopprettet fra uttalelsen
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,åpning Verdi
@@ -6557,6 +6564,7 @@
 DocType: Purchase Order,To Receive,Å Motta
 DocType: Leave Period,Holiday List for Optional Leave,Ferieliste for valgfritt permisjon
 DocType: Item Tax Template,Tax Rates,Skattesatser
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Varekode&gt; Varegruppe&gt; Merke
 DocType: Asset,Asset Owner,Asset Eier
 DocType: Item,Website Content,Innhold på nettstedet
 DocType: Bank Account,Integration ID,Integrasjons-ID
@@ -6682,6 +6690,7 @@
 DocType: Stock Entry Detail,Additional Cost,Tilleggs Cost
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher","Kan ikke filtrere basert på Voucher Nei, hvis gruppert etter Voucher"
 DocType: Quality Inspection,Incoming,Innkommende
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Angi nummereringsserier for Oppmøte via Oppsett&gt; Nummereringsserier
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Standard skattemaler for salg og kjøp opprettes.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,Vurderingsresultatrekord {0} eksisterer allerede.
 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.","Eksempel: ABCD. #####. Hvis serier er satt og Batch nr ikke er nevnt i transaksjoner, vil automatisk batchnummer bli opprettet basert på denne serien. Hvis du alltid vil uttrykkelig nevne Batch nr for dette elementet, la dette være tomt. Merk: Denne innstillingen vil ha prioritet i forhold til Naming Series Prefix i lagerinnstillinger."
@@ -7023,6 +7032,7 @@
 DocType: BOM,Rate Of Materials Based On,Valuta materialer basert på
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Hvis aktivert, vil feltet faglig semester være obligatorisk i programopptakingsverktøyet."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","Verdier av unntatte, ikke-klassifiserte og ikke-GST-innforsyninger"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundegruppe&gt; Territorium
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>Selskapet</b> er et obligatorisk filter.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,Fjern haken ved alle
 DocType: Purchase Taxes and Charges,On Item Quantity,På varemengde
@@ -7067,6 +7077,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,Mangel Antall
 DocType: Purchase Invoice,Input Service Distributor,Distributør for inndata
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,Sak variant {0} finnes med samme attributtene
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Vennligst konfigurer Instruktør Namning System i Utdanning&gt; Utdanningsinnstillinger
 DocType: Loan,Repay from Salary,Smelle fra Lønn
 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},Ber om betaling mot {0} {1} for mengden {2}
diff --git a/erpnext/translations/pl.csv b/erpnext/translations/pl.csv
index 93ce7a2..a05934b 100644
--- a/erpnext/translations/pl.csv
+++ b/erpnext/translations/pl.csv
@@ -390,6 +390,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,Zalecane procedury
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,Pokaż tylko POS
 DocType: Supplier Group,Supplier Group Name,Nazwa grupy dostawcy
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Oznacz obecność jako <b></b>
 DocType: Driver,Driving License Categories,Kategorie prawa jazdy
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,Proszę podać datę doręczenia
 DocType: Depreciation Schedule,Make Depreciation Entry,Bądź Amortyzacja Entry
@@ -1007,6 +1008,7 @@
 DocType: Company,Delete Company Transactions,Usuń Transakcje Spółki
 DocType: Production Plan Item,Quantity and Description,Ilość i opis
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,Numer referencyjny i data jest obowiązkowe dla transakcji Banku
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ustaw Serie nazw dla {0} poprzez Ustawienia&gt; Ustawienia&gt; Serie nazw
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,
 DocType: Payment Entry Reference,Supplier Invoice No,Nr faktury dostawcy
 DocType: Territory,For reference,Dla referencji
@@ -4277,6 +4279,8 @@
 DocType: Grant Application,Grant Application Details ,Przyznaj szczegóły aplikacji
 DocType: Employee Separation,Employee Separation,Separacja pracowników
 DocType: BOM Item,Original Item,Oryginalna pozycja
+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","Usuń pracownika <a href=""#Form/Employee/{0}"">{0}</a> \, aby anulować ten dokument"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Doc Data
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},Utworzono Records Fee - {0}
 DocType: Asset Category Account,Asset Category Account,Konto Aktywów Kategoria
@@ -5315,6 +5319,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}","Ustawianie zdarzenia do {0}, ponieważ urzędnik dołączone do sprzedaży poniżej osób nie posiada identyfikator użytkownika {1}"
 DocType: Timesheet,Billing Details,Szczegóły płatności
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,Źródło i magazyn docelowy musi być inna
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Skonfiguruj system nazewnictwa pracowników w dziale Zasoby ludzkie&gt; Ustawienia HR
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,"Płatność nie powiodła się. Sprawdź swoje konto bez karty, aby uzyskać więcej informacji"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},Niedozwolona jest modyfikacja transakcji zapasów starszych niż {0}
 DocType: Stock Entry,Inspection Required,Wymagana kontrola
@@ -5549,6 +5554,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,Wynagrodzenie Slip ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,Data przejścia na emeryturę musi być większa niż Data wstąpienia
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Dostawca&gt; Rodzaj dostawcy
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,Wiele wariantów
 DocType: Sales Invoice,Against Income Account,Konto przychodów
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% dostarczono
@@ -6391,6 +6397,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rola Zezwalająca na Zamrażanie Kont i Edycję Zamrożonych Wpisów
 DocType: Supplier Scorecard Scoring Variable,Path,Ścieżka
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,"Nie można przekonwertować centrum kosztów do księgi głównej, jak to ma węzły potomne"
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Nie znaleziono współczynnika konwersji UOM ({0} -&gt; {1}) dla elementu: {2}
 DocType: Production Plan,Total Planned Qty,Całkowita planowana ilość
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,Transakcje już wycofane z wyciągu
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Wartość otwarcia
@@ -6614,6 +6621,7 @@
 DocType: Purchase Order,To Receive,Otrzymać
 DocType: Leave Period,Holiday List for Optional Leave,Lista urlopowa dla Opcjonalnej Nieobecności
 DocType: Item Tax Template,Tax Rates,Wysokość podatków
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kod pozycji&gt; Grupa produktów&gt; Marka
 DocType: Asset,Asset Owner,Właściciel zasobu
 DocType: Item,Website Content,Zawartość strony internetowej
 DocType: Bank Account,Integration ID,Identyfikator integracji
@@ -6741,6 +6749,7 @@
 DocType: Stock Entry Detail,Additional Cost,Dodatkowy koszt
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher","Nie można przefiltrować wg Podstawy, jeśli pogrupowano z użyciem Podstawy"
 DocType: Quality Inspection,Incoming,Przychodzące
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Skonfiguruj serie numeracji dla frekwencji poprzez Ustawienia&gt; Serie numeracji
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Definiowane są domyślne szablony podatkowe dla sprzedaży i zakupu.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,Wynik Wynik {0} już istnieje.
 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.","Przykład: ABCD. #####. Jeśli seria jest ustawiona, a numer partii nie jest wymieniony w transakcjach, na podstawie tej serii zostanie utworzony automatyczny numer partii. Jeśli zawsze chcesz wyraźnie podać numer partii dla tego produktu, pozostaw to pole puste. Uwaga: to ustawienie ma pierwszeństwo przed prefiksem serii nazw w Ustawieniach fotografii."
@@ -7084,6 +7093,7 @@
 DocType: BOM,Rate Of Materials Based On,Stawka Materiałów Wzorowana na
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Jeśli opcja jest włączona, pole Akademickie oznaczenie będzie obowiązkowe w narzędziu rejestrowania programu."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","Wartości zwolnionych, zerowych i niezawierających GST dostaw wewnętrznych"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Klient&gt; Grupa klientów&gt; Terytorium
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>Firma</b> jest obowiązkowym filtrem.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,Odznacz wszystkie
 DocType: Purchase Taxes and Charges,On Item Quantity,Na ilość przedmiotu
@@ -7129,6 +7139,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,Niedobór szt
 DocType: Purchase Invoice,Input Service Distributor,Wprowadź dystrybutora usług
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,Pozycja wariant {0} istnieje z samymi atrybutami
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Skonfiguruj system nazewnictwa instruktorów w sekcji Edukacja&gt; Ustawienia edukacji
 DocType: Loan,Repay from Salary,Spłaty z pensji
 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},Żądanie zapłatę przed {0} {1} w ilości {2}
diff --git a/erpnext/translations/ps.csv b/erpnext/translations/ps.csv
index 5a5f276..7bd2199 100644
--- a/erpnext/translations/ps.csv
+++ b/erpnext/translations/ps.csv
@@ -384,6 +384,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,ټاکل شوي کړنلارې
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,یواځې POS ښودل
 DocType: Supplier Group,Supplier Group Name,د سپلویزی ګروپ نوم
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,د شتون په توګه نښه کول د <b></b>
 DocType: Driver,Driving License Categories,د موټر چلولو جوازونو کټګوري
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,مهرباني وکړئ د سپارلو نېټه ولیکئ
 DocType: Depreciation Schedule,Make Depreciation Entry,د استهالک د داخلولو د کمکیانو لپاره
@@ -4152,6 +4153,8 @@
 DocType: Grant Application,Grant Application Details ,د غوښتنلیک توضیحات
 DocType: Employee Separation,Employee Separation,د کار کولو جلا کول
 DocType: BOM Item,Original Item,اصلي توکي
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","مهرباني وکړئ د دې سند لغوه کولو لپاره کارمند <a href=""#Form/Employee/{0}"">{0}</a> delete حذف کړئ"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,د ډاټا تاریخ
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},فیس سوابق ايجاد - {0}
 DocType: Asset Category Account,Asset Category Account,د شتمنیو د حساب کټه ګورۍ
@@ -5157,6 +5160,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}",د خوښو ته پیښی {0}، ځکه چې د کارګر ته لاندې خرڅلاو هغه اشخاص چې د وصل يو کارن تذکرو نه لري {1}
 DocType: Timesheet,Billing Details,د بیلونو په بشپړه توګه کتل
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,سرچینه او هدف ګدام بايد توپير ولري
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,مهرباني وکړئ د بشري سرچینو&gt; HR ترتیبات کې د کارمند نوم ورکولو سیسټم تنظیم کړئ
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,تادیات ناکام شول. مهرباني وکړئ د نورو جزیاتو لپاره د ګرمسیرless حساب وګورئ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},اجازه نه سټاک معاملو د اوسمهالولو په پرتله د زړو {0}
 DocType: Stock Entry,Inspection Required,تفتیش مطلوب
@@ -5387,6 +5391,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,اوسني هیښ او نوي هیښ نه شي کولای ورته وي
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,معاش ټوټه ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,نېټه د تقاعد باید په پرتله د داخلیدل نېټه ډيره وي
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,عرضه کونکي&gt; عرضه کونکي ډول
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,ګڼ شمیر متغیرات
 DocType: Sales Invoice,Against Income Account,په وړاندې پر عايداتو باندې حساب
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}٪ تحویلوونکی
@@ -6216,6 +6221,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,رول اجازه ګنګل حسابونه ایډیټ ګنګل توکي ټاکل شوی
 DocType: Supplier Scorecard Scoring Variable,Path,پټه
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,ته د پنډو لګښت مرکز بدلوي نشي کولای، ځکه دا د ماشوم غوټو لري
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},د UOM د بدلون فاکتور ({0} -&gt; {1}) د توکي لپاره ونه موندل شو: {2}
 DocType: Production Plan,Total Planned Qty,ټول پلان شوي مقدار
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,معاملې دمخه د بیان څخه بیرته اخیستل شوي
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,د پرانستلو په ارزښت
@@ -6435,6 +6441,7 @@
 DocType: Purchase Order,To Receive,تر لاسه
 DocType: Leave Period,Holiday List for Optional Leave,د اختیاري لیږد لپاره د رخصتي لیست
 DocType: Item Tax Template,Tax Rates,د مالیې نرخونه
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,د توکو کوډ&gt; د توکو ګروپ&gt; نښه
 DocType: Asset,Asset Owner,د شتمنی مالک
 DocType: Item,Website Content,د ویب پا Contentې مینځپانګه
 DocType: Bank Account,Integration ID,د ادغام ID
@@ -6559,6 +6566,7 @@
 DocType: Stock Entry Detail,Additional Cost,اضافي لګښت
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher",نه ګټمنو نه پر بنسټ کولای شي Filter، که ګروپ له خوا د ګټمنو
 DocType: Quality Inspection,Incoming,راتلونکي
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,مهرباني وکړئ د تنظیم کولو له لارې د شمیره ورکولو لړۍ له لارې د ګډون لپاره د شمېرنې لړۍ تنظیم کړئ
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,د پلور او اخیستلو لپاره د اصلي مالیې ټیکنالوژي جوړېږي.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,د ارزونې پایلې ریکارډ {0} لا د مخه وجود لري.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.",بېلګه: ABCD. #####. که چیرې سلسله جوړه شي او بسته نه په لیږد کې ذکر شوي، نو د دې لړۍ پر بنسټ به د اتوماتیک بچ شمیره جوړه شي. که تاسو غواړئ چې په ښکاره توګه د دې شیدو لپاره د بچ نښې یادونه وکړئ، دا خالي کړئ. یادونه: دا ترتیب به د سټاک په سیسټمونو کې د نومونې سیریلیز انفکس په ترڅ کې لومړیتوب واخلي.
@@ -6896,6 +6904,7 @@
 DocType: BOM,Rate Of Materials Based On,کچه د موادو پر بنسټ
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.",که چیرې فعال شي، ساحه اکادمیکه اصطالح به د پروګرام په شمول کولو کې وسیله وي.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies",د معافیت ، نیل درج شوي او غیر جی ایس ټي داخلي تحویلیو ارزښتونه
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,پیرودونکي&gt; د پیرودونکي ګروپ&gt; سیمه
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>شرکت</b> لازمي فلټر دی.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,څلورڅنډی په ټولو
 DocType: Purchase Taxes and Charges,On Item Quantity,د توکو مقدار
@@ -6941,6 +6950,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,په کمښت کې Qty
 DocType: Purchase Invoice,Input Service Distributor,ننوت خدمت توزیع کونکی
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,د قالب variant {0} سره ورته صفاتو شتون
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,مهرباني وکړئ د ښوونې او روزنې ترتیبات کې د ښوونکي نوم ورکولو سیسټم تنظیم کړئ
 DocType: Loan,Repay from Salary,له معاش ورکول
 DocType: Exotel Settings,API Token,د API ټوکن
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Requesting payment against {0} {1} for amount {2},د غوښتنې په وړاندې د پیسو {0} د {1} لپاره د اندازه {2}
diff --git a/erpnext/translations/pt.csv b/erpnext/translations/pt.csv
index 1b96d9e..68b92e5 100644
--- a/erpnext/translations/pt.csv
+++ b/erpnext/translations/pt.csv
@@ -390,6 +390,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,Procedimentos prescritos
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,Mostrar apenas POS
 DocType: Supplier Group,Supplier Group Name,Nome do Grupo de Fornecedores
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Marcar presença como <b></b>
 DocType: Driver,Driving License Categories,Categorias de licenças de condução
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,Digite Data de Entrega
 DocType: Depreciation Schedule,Make Depreciation Entry,Efetuar Registo de Depreciação
@@ -1007,6 +1008,7 @@
 DocType: Company,Delete Company Transactions,Eliminar Transações da Empresa
 DocType: Production Plan Item,Quantity and Description,Quantidade e Descrição
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,É obrigatório colocar o Nº de Referência e a Data de Referência para as transações bancárias
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Defina Naming Series como {0} em Configuração&gt; Configurações&gt; Naming Series
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Adicionar / Editar Impostos e Taxas
 DocType: Payment Entry Reference,Supplier Invoice No,Nr. de Fatura de Fornecedor
 DocType: Territory,For reference,Para referência
@@ -4269,6 +4271,8 @@
 DocType: Grant Application,Grant Application Details ,Detalhes do pedido de concessão
 DocType: Employee Separation,Employee Separation,Separação de funcionários
 DocType: BOM Item,Original Item,Item Original
+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","Por favor, exclua o funcionário <a href=""#Form/Employee/{0}"">{0}</a> \ para cancelar este documento"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Data do Doc
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},Registos de Propinas Criados - {0}
 DocType: Asset Category Account,Asset Category Account,Categoria de Conta de Ativo
@@ -5306,6 +5310,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}","A Configurar Eventos para {0}, uma vez que o Funcionário vinculado ao Vendedor abaixo não possui uma ID de Utilizador {1}"
 DocType: Timesheet,Billing Details,Dados de Faturação
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,A fonte e o armazém de destino devem ser diferentes um do outro
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configure o sistema de nomeação de funcionários em Recursos humanos&gt; Configurações de RH
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,"Pagamento falhou. Por favor, verifique a sua conta GoCardless para mais detalhes"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},Não é permitido atualizar transações com ações mais antigas que {0}
 DocType: Stock Entry,Inspection Required,Inspeção Obrigatória
@@ -5541,6 +5546,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,A LDM Atual e a Nova LDN não podem ser iguais
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,ID de Folha de Vencimento
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,A Data De Saída deve ser posterior à Data de Admissão
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Fornecedor&gt; Tipo de fornecedor
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,Variantes múltiplas
 DocType: Sales Invoice,Against Income Account,Na Conta de Rendimentos
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% Entregue
@@ -6382,6 +6388,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Função Permitida para Definir as Contas Congeladas e Editar Registos Congelados
 DocType: Supplier Scorecard Scoring Variable,Path,Caminho
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,"Não é possível converter o Centro de Custo a livro, uma vez que tem subgrupos"
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Fator de conversão de UOM ({0} -&gt; {1}) não encontrado para o item: {2}
 DocType: Production Plan,Total Planned Qty,Qtd total planejado
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,Transações já recuperadas da declaração
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Valor Inicial
@@ -6605,6 +6612,7 @@
 DocType: Purchase Order,To Receive,A Receber
 DocType: Leave Period,Holiday List for Optional Leave,Lista de férias para licença opcional
 DocType: Item Tax Template,Tax Rates,Taxas de impostos
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Código do item&gt; Grupo de itens&gt; Marca
 DocType: Asset,Asset Owner,Proprietário de ativos
 DocType: Item,Website Content,Conteúdo do site
 DocType: Bank Account,Integration ID,ID de integração
@@ -6732,6 +6740,7 @@
 DocType: Stock Entry Detail,Additional Cost,Custo Adicional
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher","Não pode filtrar com base no Nr. de Voucher, se estiver agrupado por Voucher"
 DocType: Quality Inspection,Incoming,Entrada
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Configure séries de numeração para Presença em Configuração&gt; Série de numeração
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Os modelos de imposto padrão para vendas e compra são criados.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,Avaliação O registro de resultados {0} já existe.
 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.","Exemplo: ABCD. #####. Se a série estiver configurada e o número de lote não for mencionado nas transações, o número de lote automático será criado com base nessa série. Se você sempre quiser mencionar explicitamente o Lote Não para este item, deixe em branco. Nota: esta configuração terá prioridade sobre o prefixo da série de nomeação em Configurações de estoque."
@@ -7081,6 +7090,7 @@
 DocType: BOM,Rate Of Materials Based On,Taxa de Materiais Baseada Em
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Se ativado, o Termo Acadêmico do campo será obrigatório na Ferramenta de Inscrição do Programa."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","Valores de suprimentos internos isentos, nulos e não-GST"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo de clientes&gt; Território
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>A empresa</b> é um filtro obrigatório.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,Desmarcar todos
 DocType: Purchase Taxes and Charges,On Item Quantity,Na quantidade do item
@@ -7126,6 +7136,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,Qtd de Escassez
 DocType: Purchase Invoice,Input Service Distributor,Distribuidor de serviços de entrada
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,A variante do Item {0} já existe com mesmos atributos
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Configure o Sistema de Nomenclatura do Instrutor em Educação&gt; Configurações da Educação
 DocType: Loan,Repay from Salary,Reembolsar a partir de Salário
 DocType: Exotel Settings,API Token,Token da API
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Requesting payment against {0} {1} for amount {2},Solicitando o pagamento contra {0} {1} para montante {2}
diff --git a/erpnext/translations/ro.csv b/erpnext/translations/ro.csv
index 4243d65..3c13ef0 100644
--- a/erpnext/translations/ro.csv
+++ b/erpnext/translations/ro.csv
@@ -390,6 +390,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,Proceduri prescrise
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,Afișați numai POS
 DocType: Supplier Group,Supplier Group Name,Numele grupului de furnizori
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Marcați prezența ca <b></b>
 DocType: Driver,Driving License Categories,Categorii de licență de conducere
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,Introduceți data livrării
 DocType: Depreciation Schedule,Make Depreciation Entry,Asigurați-vă Amortizarea Intrare
@@ -1007,6 +1008,7 @@
 DocType: Company,Delete Company Transactions,Ștergeți Tranzacții de Firma
 DocType: Production Plan Item,Quantity and Description,Cantitate și descriere
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,De referință nr și de referință Data este obligatorie pentru tranzacție bancară
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vă rugăm să setați Naming Series pentru {0} prin Setare&gt; Setări&gt; Serie pentru denumire
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Adaugaţi / editaţi taxe și cheltuieli
 DocType: Payment Entry Reference,Supplier Invoice No,Furnizor Factura Nu
 DocType: Territory,For reference,Pentru referință
@@ -4275,6 +4277,8 @@
 DocType: Grant Application,Grant Application Details ,Detalii privind cererile de finanțare
 DocType: Employee Separation,Employee Separation,Separarea angajaților
 DocType: BOM Item,Original Item,Articolul original
+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","Vă rugăm să ștergeți angajatul <a href=""#Form/Employee/{0}"">{0}</a> \ pentru a anula acest document"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Data Documentelor
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},Taxa de inregistrare Creat - {0}
 DocType: Asset Category Account,Asset Category Account,Cont activ Categorie
@@ -5312,6 +5316,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}","Setarea Evenimente la {0}, deoarece angajatul atașat la mai jos de vânzare Persoanele care nu are un ID de utilizator {1}"
 DocType: Timesheet,Billing Details,Detalii de facturare
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,Sursa și depozitul țintă trebuie să fie diferit
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vă rugăm să configurați sistemul de numire a angajaților în resurse umane&gt; Setări HR
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,Plata esuata. Verificați contul GoCardless pentru mai multe detalii
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},Nu este permis să actualizeze tranzacțiile bursiere mai vechi de {0}
 DocType: Stock Entry,Inspection Required,Inspecție obligatorii
@@ -5547,6 +5552,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,FDM-ul curent și FDM-ul nou nu pot fi identici
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,ID-ul de salarizare alunecare
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,Data Pensionare trebuie să fie ulterioara Datei Aderării
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Furnizor&gt; Tip furnizor
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,Variante multiple
 DocType: Sales Invoice,Against Income Account,Comparativ contului de venit
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% Livrat
@@ -6389,6 +6395,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rolul pot organiza conturile înghețate și congelate Editați intrările
 DocType: Supplier Scorecard Scoring Variable,Path,cale
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,"Nu se poate converti de cost Centrul de registru, deoarece are noduri copil"
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Factorul de conversie UOM ({0} -&gt; {1}) nu a fost găsit pentru articol: {2}
 DocType: Production Plan,Total Planned Qty,Cantitatea totală planificată
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,Tranzacțiile au fost retrase din extras
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Valoarea de deschidere
@@ -6612,6 +6619,7 @@
 DocType: Purchase Order,To Receive,A Primi
 DocType: Leave Period,Holiday List for Optional Leave,Lista de vacanță pentru concediul opțional
 DocType: Item Tax Template,Tax Rates,Taxe de impozitare
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Cod articol&gt; Grup de articole&gt; Marcă
 DocType: Asset,Asset Owner,Proprietarul de proprietar
 DocType: Item,Website Content,Conținutul site-ului web
 DocType: Bank Account,Integration ID,ID de integrare
@@ -6739,6 +6747,7 @@
 DocType: Stock Entry Detail,Additional Cost,Cost aditional
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher","Nu se poate filtra pe baza voucher Nr., în cazul gruparii in functie de Voucher"
 DocType: Quality Inspection,Incoming,Primite
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vă rugăm să configurați seria de numerotare pentru prezență prin Setare&gt; Numerotare
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Se creează șabloane fiscale predefinite pentru vânzări și achiziții.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,Inregistrarea Rezultatului evaluării {0} există deja.
 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.","Exemplu: ABCD. #####. Dacă seria este setată și numărul lotului nu este menționat în tranzacții, atunci numărul lotului automat va fi creat pe baza acestei serii. Dacă doriți întotdeauna să menționați în mod explicit numărul lotului pentru acest articol, lăsați acest lucru necompletat. Notă: această setare va avea prioritate față de Prefixul Seriei de Nomenclatoare din Setările de stoc."
@@ -7081,6 +7090,7 @@
 DocType: BOM,Rate Of Materials Based On,Rate de materiale bazate pe
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Dacă este activată, domeniul Academic Term va fi obligatoriu în Instrumentul de înscriere în program."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","Valorile livrărilor interne scutite, nule și fără GST"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Client&gt; Grup de clienți&gt; Teritoriul
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>Compania</b> este un filtru obligatoriu.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,Deselecteaza tot
 DocType: Purchase Taxes and Charges,On Item Quantity,Pe cantitatea articolului
@@ -7126,6 +7136,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,Lipsă Cantitate
 DocType: Purchase Invoice,Input Service Distributor,Distribuitor de servicii de intrare
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,Postul varianta {0} există cu aceleași atribute
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Vă rugăm să configurați Sistemul de denumire a instructorului în Educație&gt; Setări educație
 DocType: Loan,Repay from Salary,Rambursa din salariu
 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},Se solicita plata contra {0} {1} pentru suma {2}
diff --git a/erpnext/translations/ru.csv b/erpnext/translations/ru.csv
index 591b4d7..b949294 100644
--- a/erpnext/translations/ru.csv
+++ b/erpnext/translations/ru.csv
@@ -390,6 +390,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,Предписанные процедуры
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,Показать только POS
 DocType: Supplier Group,Supplier Group Name,Название группы поставщиков
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Отметить посещаемость как <b></b>
 DocType: Driver,Driving License Categories,Категории водительских прав
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,Укажите дату поставки
 DocType: Depreciation Schedule,Make Depreciation Entry,Сделать запись амортизации
@@ -1007,6 +1008,7 @@
 DocType: Company,Delete Company Transactions,Удалить Сделки Компания
 DocType: Production Plan Item,Quantity and Description,Количество и описание
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,Ссылка № и дата Reference является обязательным для операции банка
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Пожалуйста, установите серию имен для {0} через Настройка&gt; Настройки&gt; Серия имен"
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Добавить или изменить налоги и сборы
 DocType: Payment Entry Reference,Supplier Invoice No,Поставщик Счет №
 DocType: Territory,For reference,Для справки
@@ -4272,6 +4274,8 @@
 DocType: Grant Application,Grant Application Details ,Сведения о предоставлении гранта
 DocType: Employee Separation,Employee Separation,Разделение сотрудников
 DocType: BOM Item,Original Item,Оригинальный товар
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Пожалуйста, удалите Сотрудника <a href=""#Form/Employee/{0}"">{0}</a> \, чтобы отменить этот документ"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Дата документа
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},Создано записей платы - {0}
 DocType: Asset Category Account,Asset Category Account,Категория активов Счет
@@ -5308,6 +5312,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Настройка событий для {0}, так как работник прилагается к ниже продавцы не имеют идентификатор пользователя {1}"
 DocType: Timesheet,Billing Details,Платежные реквизиты
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,Исходный и целевой склад должны быть разными
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Пожалуйста, настройте систему имен сотрудников в разделе «Управление персоналом»&gt; «Настройки HR»"
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,"Платеж не прошел. Пожалуйста, проверьте свою учетную запись GoCardless для получения более подробной информации."
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},"Не допускается обновление операций перемещений по складу, старше чем {0}"
 DocType: Stock Entry,Inspection Required,Инспекция Обязательные
@@ -5543,6 +5548,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,"Текущий спецификации и Нью-BOM не может быть таким же,"
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,Зарплата скольжения ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,Дата выхода на пенсию должен быть больше даты присоединения
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Поставщик&gt; Тип поставщика
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,Несколько вариантов
 DocType: Sales Invoice,Against Income Account,Со счета доходов
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% доставлено
@@ -6383,6 +6389,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Роль разрешено устанавливать замороженные счета & Редактировать Замороженные Записи
 DocType: Supplier Scorecard Scoring Variable,Path,Дорожка
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,"Невозможно преобразовать МВЗ в книге, как это имеет дочерние узлы"
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Коэффициент преобразования UOM ({0} -&gt; {1}) не найден для элемента: {2}
 DocType: Production Plan,Total Planned Qty,Общее количество запланированных
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,Транзакции уже получены из заявления
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Начальное значение
@@ -6606,6 +6613,7 @@
 DocType: Purchase Order,To Receive,Получить
 DocType: Leave Period,Holiday List for Optional Leave,Список праздников для дополнительного отпуска
 DocType: Item Tax Template,Tax Rates,Налоговые ставки
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Код товара&gt; Группа товаров&gt; Марка
 DocType: Asset,Asset Owner,Владелец актива
 DocType: Item,Website Content,Содержание сайта
 DocType: Bank Account,Integration ID,ID интеграции
@@ -6733,6 +6741,7 @@
 DocType: Stock Entry Detail,Additional Cost,Дополнительная стоимость
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher","Не можете фильтровать на основе ваучером Нет, если сгруппированы по ваучером"
 DocType: Quality Inspection,Incoming,Входящий
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Пожалуйста, настройте серию нумерации для Посещаемости через Настройка&gt; Серия нумерации"
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Создаются шаблоны налогов по умолчанию для продаж и покупки.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,Запись результатов оценки {0} уже существует.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Пример: ABCD. #####. Если серия установлена, а номер партии не упоминается в транзакциях, то на основе этой серии автоматически будет создан номер партии. Если вы хотите всегда специально указывать номер партии для этого продукта, оставьте это поле пустым. Примечание: эта настройка будет иметь приоритет над Префиксом идентификации по имени в Настройках Склада."
@@ -7076,6 +7085,7 @@
 DocType: BOM,Rate Of Materials Based On,Оценить материалов на основе
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Если включено, поле «Академический срок» будет обязательным в Инструменте регистрации программы."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","Значения льготных, нулевых и не связанных с GST внутренних поставок"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Группа клиентов&gt; Территория
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>Компания</b> является обязательным фильтром.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,Снять все
 DocType: Purchase Taxes and Charges,On Item Quantity,На количество товара
@@ -7121,6 +7131,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,Нехватка Кол-во
 DocType: Purchase Invoice,Input Service Distributor,Дистрибьютор услуг ввода
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,Модификация продукта {0} с этими атрибутами существует
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,"Пожалуйста, настройте систему имен инструкторов в «Образование»&gt; «Настройки образования»"
 DocType: Loan,Repay from Salary,Погашать из заработной платы
 DocType: Exotel Settings,API Token,API-токен
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Requesting payment against {0} {1} for amount {2},Запрос платеж против {0} {1} на сумму {2}
diff --git a/erpnext/translations/si.csv b/erpnext/translations/si.csv
index 8044e85..cd66197 100644
--- a/erpnext/translations/si.csv
+++ b/erpnext/translations/si.csv
@@ -381,6 +381,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,නියමිත ක්රියාපටිපාටිය
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,POS පමණක් පෙන්වන්න
 DocType: Supplier Group,Supplier Group Name,සැපයුම් කණ්ඩායම් නම
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,පැමිණීම ලෙස සලකුණු කරන්න <b></b>
 DocType: Driver,Driving License Categories,රියදුරු බලපත්ර කාණ්ඩය
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,කරුණාකර සැපයුම් දිනය ඇතුලත් කරන්න
 DocType: Depreciation Schedule,Make Depreciation Entry,ක්ෂය සටහන් කරන්න
@@ -4145,6 +4146,8 @@
 DocType: Grant Application,Grant Application Details ,අයදුම් කිරීමේ තොරතුරු ලබා දීම
 DocType: Employee Separation,Employee Separation,සේවක වෙන්වීම
 DocType: BOM Item,Original Item,මුල්ම අයිතමය
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","මෙම ලේඛනය අවලංගු කිරීමට කරුණාකර සේවකයා <a href=""#Form/Employee/{0}"">{0}</a> delete මකන්න"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,ලේඛන දිනය
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},නිර්මාණය කරන ලද්දේ ගාස්තු වාර්තා - {0}
 DocType: Asset Category Account,Asset Category Account,වත්කම් ප්රවර්ගය ගිණුම්
@@ -5145,6 +5148,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}",", {0} වෙත සිදුවීම් කිරීම විකුණුම් පුද්ගලයන් පහත අනුයුක්ත සේවක වූ පරිශීලක අනන්යාංකය {1} සිදු නොවන බැවිනි"
 DocType: Timesheet,Billing Details,බිල්ගත විස්තර
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,මූලාශ්රය සහ ඉලක්කය ගබඩා සංකීර්ණය වෙනස් විය යුතුය
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,කරුණාකර සේවක නම් කිරීමේ පද්ධතිය මානව සම්පත්&gt; මානව සම්පත් සැකසුම් තුළ සකසන්න
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,ගෙවීම් අසාර්ථකයි. වැඩි විස්තර සඳහා ඔබගේ GoCardless ගිණුම පරීක්ෂා කරන්න
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},{0} කට වඩා පැරණි කොටස් ගනුදෙනු යාවත්කාලීන කිරීමට අවසර නැත
 DocType: Stock Entry,Inspection Required,පරීක්ෂණ අවශ්ය
@@ -5375,6 +5379,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,වත්මන් ද්රව්ය ලේඛණය හා නව ද්රව්ය ලේඛණය සමාන විය නොහැකි
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,වැටුප් පුරවා හැඳුනුම්පත
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,විශ්රාම ගිය දිනය සමඟ සම්බන්ධවීම දිනය වඩා වැඩි විය යුතුය
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,සැපයුම්කරු&gt; සැපයුම්කරු වර්ගය
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,බහු ප්රභේද
 DocType: Sales Invoice,Against Income Account,ආදායම් ගිණුම එරෙහිව
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% භාර
@@ -6204,6 +6209,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,ශීත කළ ගිණුම් සහ සංස්කරණය කරන්න ශීත කළ අයැදුම්පත් සිටුවම් කිරීමට කාර්යභාරය
 DocType: Supplier Scorecard Scoring Variable,Path,මාර්ගය
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,ලෙජර් පිරිවැය මධ්යස්ථානය බවට පත් කළ නොහැක එය ළමා මංසල කර ඇති පරිදි
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},අයිතමය සඳහා UOM පරිවර්තන සාධකය ({0} -&gt; {1}) හමු නොවීය: {2}
 DocType: Production Plan,Total Planned Qty,මුලුමනින් සැලසුම්ගත Q
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,ගනුදෙනු දැනටමත් ප්රකාශයෙන් ලබාගෙන ඇත
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,විවෘත කළ අගය
@@ -6421,6 +6427,7 @@
 DocType: Purchase Order,To Receive,ලබා ගැනීමට
 DocType: Leave Period,Holiday List for Optional Leave,විකල්ප නිවාඩු සඳහා නිවාඩු ලැයිස්තුව
 DocType: Item Tax Template,Tax Rates,බදු අනුපාත
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,අයිතම කේතය&gt; අයිතම සමූහය&gt; වෙළඳ නාමය
 DocType: Asset,Asset Owner,වත්කම් අයිතිකරු
 DocType: Item,Website Content,වෙබ් අඩවි අන්තර්ගතය
 DocType: Bank Account,Integration ID,ඒකාබද්ධ කිරීමේ හැඳුනුම්පත
@@ -6545,6 +6552,7 @@
 DocType: Stock Entry Detail,Additional Cost,අමතර පිරිවැය
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher","වවුචරයක් වර්ගීකරණය නම්, වවුචරයක් නොමැත මත පදනම් පෙරීමට නොහැකි"
 DocType: Quality Inspection,Incoming,ලැබෙන
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,කරුණාකර පැමිණීම සඳහා අංකනය කිරීමේ ශ්‍රේණිය සැකසුම&gt; අංකනය මාලාව හරහා සකසන්න
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,විකිණුම් සහ මිලදී ගැනීම සඳහා පෙරනිමි බදු ආකෘති නිර්මාණය කර ඇත.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,තක්සේරු ප්රතිඵල ප්රතිඵලය {0} දැනටමත් පවතී.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","උදාහරණය: ABCD. #####. කාණ්ඩ මාලාවක් සකසා ඇත්නම් සහ කාණ්ඩ අංක සඳහන් නොකරනු ලැබේ. පසුව මෙම ශ්රේණිය පදනම් කර ගත් ස්වයංක්රීය කාණ්ඩය වේ. මෙම අයිතමය සඳහා යාවත්කාලීන කිරීම සඳහා ඔබ සැමවිටම අවශ්ය නම්, මෙය හිස්ව තබන්න. සටහන: මෙම සැකසුම නාමකරණ අනුප්රාප්තිකය තුළ ඇති සැකසීම් වලදී ප්රමුඛතාව හිමිවනු ඇත."
@@ -6878,6 +6886,7 @@
 DocType: BOM,Rate Of Materials Based On,ද්රව්ය මත පදනම් මත අනුපාතය
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","සක්රීය නම්, වැඩසටහන් බඳවා ගැනීමේ මෙවලමෙහි ඇති ක්ෂේත්ර අධ්යයන වාරය අනිවාර්ය වේ."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","නිදහස් කරන ලද, ශ්‍රේණිගත නොකළ සහ ජීඑස්ටී නොවන අභ්‍යන්තර සැපයුම්වල වටිනාකම්"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,පාරිභෝගික&gt; පාරිභෝගික කණ්ඩායම&gt; ප්‍රදේශය
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>සමාගම</b> අනිවාර්ය පෙරණයකි.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,සියලු නොතේරූ නිසාවෙන්
 DocType: Purchase Taxes and Charges,On Item Quantity,අයිතමයේ ප්‍රමාණය මත
@@ -6923,6 +6932,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,හිඟය යවන ලද
 DocType: Purchase Invoice,Input Service Distributor,ආදාන සේවා බෙදාහරින්නා
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,අයිතමය ප්රභේද්යයක් {0} එම ලක්ෂණ සහිත පවතී
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,කරුණාකර අධ්‍යාපන&gt; අධ්‍යාපන සැකසුම් තුළ උපදේශක නම් කිරීමේ පද්ධතිය සකසන්න
 DocType: Loan,Repay from Salary,වැටුප් සිට ආපසු ගෙවීම
 DocType: Exotel Settings,API Token,API ටෝකන්
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Requesting payment against {0} {1} for amount {2},මුදල සඳහා {0} {1} එරෙහිව ගෙවීම් ඉල්ලා {2}
diff --git a/erpnext/translations/sk.csv b/erpnext/translations/sk.csv
index e2bf0a8..4230825 100644
--- a/erpnext/translations/sk.csv
+++ b/erpnext/translations/sk.csv
@@ -390,6 +390,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,Predpísané postupy
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,Zobraziť len POS
 DocType: Supplier Group,Supplier Group Name,Názov skupiny dodávateľov
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Označiť účasť ako <b></b>
 DocType: Driver,Driving License Categories,Kategórie vodičských preukazov
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,Zadajte dátum doručenia
 DocType: Depreciation Schedule,Make Depreciation Entry,Urobiť Odpisy Entry
@@ -1007,6 +1008,7 @@
 DocType: Company,Delete Company Transactions,Zmazať transakcie spoločnosti
 DocType: Production Plan Item,Quantity and Description,Množstvo a popis
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,Referenčné číslo a referenčný dátum je povinný pre bankové transakcie
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Prosím pomenujte Series pre {0} cez Setup&gt; Settings&gt; Naming Series
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Pridať / Upraviť dane a poplatky
 DocType: Payment Entry Reference,Supplier Invoice No,Dodávateľská faktúra č
 DocType: Territory,For reference,Pro srovnání
@@ -4276,6 +4278,8 @@
 DocType: Grant Application,Grant Application Details ,Podrobnosti o žiadosti o grant
 DocType: Employee Separation,Employee Separation,Oddelenie zamestnancov
 DocType: BOM Item,Original Item,Pôvodná položka
+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","Ak chcete tento dokument zrušiť, odstráňte zamestnanca <a href=""#Form/Employee/{0}"">{0}</a> \"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Dátum dokumentu
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},Fee Records Vytvoril - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Kategórie Account
@@ -5313,6 +5317,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}","Nastavenie udalostí do {0}, pretože zamestnanec pripojená k nižšie predajcom nemá ID užívateľa {1}"
 DocType: Timesheet,Billing Details,fakturačné údaje
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,Zdrojové a cieľové sklad sa musí líšiť
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Nastavte systém pomenovávania zamestnancov v časti Ľudské zdroje&gt; Nastavenia ľudských zdrojov
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,Platba zlyhala. Skontrolujte svoj účet GoCardless pre viac informácií
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},Není dovoleno měnit obchodů s akciemi starší než {0}
 DocType: Stock Entry,Inspection Required,Kontrola je povinná
@@ -5548,6 +5553,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,Aktuální BOM a New BOM nemůže být stejné
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,Plat Slip ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,"Datum odchodu do důchodu, musí být větší než Datum spojování"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Dodávateľ&gt; Typ dodávateľa
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,Viac variantov
 DocType: Sales Invoice,Against Income Account,Proti účet příjmů
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% dodané
@@ -6388,6 +6394,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Role povoleno nastavit zmrazené účty a upravit Mražené Příspěvky
 DocType: Supplier Scorecard Scoring Variable,Path,cesta
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,"Nelze převést nákladového střediska na knihy, protože má podřízené uzly"
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Prepočítavací faktor UOM ({0} -&gt; {1}) nenájdený pre položku: {2}
 DocType: Production Plan,Total Planned Qty,Celkový plánovaný počet
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,"Transakcie, ktoré už boli z výkazu prevzaté"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,otvorenie Value
@@ -6611,6 +6618,7 @@
 DocType: Purchase Order,To Receive,Obdržať
 DocType: Leave Period,Holiday List for Optional Leave,Dovolenkový zoznam pre voliteľnú dovolenku
 DocType: Item Tax Template,Tax Rates,Daňové sadzby
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kód položky&gt; Skupina položiek&gt; Značka
 DocType: Asset,Asset Owner,Majiteľ majetku
 DocType: Item,Website Content,Obsah webových stránok
 DocType: Bank Account,Integration ID,Integračné ID
@@ -6738,6 +6746,7 @@
 DocType: Stock Entry Detail,Additional Cost,Dodatočné náklady
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher","Nelze filtrovat na základě poukazu ne, pokud seskupeny podle poukazu"
 DocType: Quality Inspection,Incoming,Přicházející
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Nastavte číslovaciu sériu pre účasť cez Nastavenie&gt; Číslovacie série
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Predvolené daňové šablóny pre predaj a nákup sú vytvorené.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,Hodnotenie výsledkov {0} už existuje.
 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.","Príklad: ABCD. #####. Ak je nastavená séria a v transakciách sa neuvádza dávka, potom sa na základe tejto série vytvorí automatické číslo dávky. Ak chcete vždy výslovne uviesť číslo dávky pre túto položku, ponechajte prázdne. Poznámka: Toto nastavenie bude mať prednosť pred prefixom série Naming v nastaveniach zásob."
@@ -7081,6 +7090,7 @@
 DocType: BOM,Rate Of Materials Based On,Hodnotit materiálů na bázi
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Ak je povolené, pole Akademický termín bude povinné v programe Program registrácie."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","Hodnoty vyňatých, nulových a nemateriálnych vnútorných dodávok"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Zákazník&gt; Skupina zákazníkov&gt; Územie
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>Spoločnosť</b> je povinný filter.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,Zrušte zaškrtnutie políčka všetko
 DocType: Purchase Taxes and Charges,On Item Quantity,Na množstvo položky
@@ -7126,6 +7136,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,Nedostatek Množství
 DocType: Purchase Invoice,Input Service Distributor,Distribútor vstupných služieb
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,Variant Položky {0} existuje s rovnakými vlastnosťami
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Nastavte Pomenovací systém inštruktorov v časti Vzdelanie&gt; Nastavenia vzdelávania
 DocType: Loan,Repay from Salary,Splatiť z platu
 DocType: Exotel Settings,API Token,Rozhranie API
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Requesting payment against {0} {1} for amount {2},Požiadavka na platbu proti {0} {1} na sumu {2}
diff --git a/erpnext/translations/sl.csv b/erpnext/translations/sl.csv
index ad70a22..8eef545 100644
--- a/erpnext/translations/sl.csv
+++ b/erpnext/translations/sl.csv
@@ -390,6 +390,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,Predpisani postopki
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,Prikaži samo POS
 DocType: Supplier Group,Supplier Group Name,Ime skupine izvajalcev
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Označi udeležbo kot <b></b>
 DocType: Driver,Driving License Categories,Kategorije vozniških dovoljenj
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,Vnesite datum dostave
 DocType: Depreciation Schedule,Make Depreciation Entry,Naj Amortizacija Začetek
@@ -1006,6 +1007,7 @@
 DocType: Company,Delete Company Transactions,Izbriši transakcije družbe
 DocType: Production Plan Item,Quantity and Description,Količina in opis
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,Referenčna številka in referenčni datum je obvezna za banke transakcijo
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Prosimo, nastavite Naming Series za {0} z nastavitvijo&gt; Settings&gt; Naming Series"
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Dodaj / Uredi davkov in dajatev
 DocType: Payment Entry Reference,Supplier Invoice No,Dobavitelj Račun Ne
 DocType: Territory,For reference,Za sklic
@@ -4232,6 +4234,8 @@
 DocType: Grant Application,Grant Application Details ,Podrobnosti o aplikaciji za dodelitev sredstev
 DocType: Employee Separation,Employee Separation,Razdelitev zaposlenih
 DocType: BOM Item,Original Item,Izvirna postavka
+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","Prosimo, da izbrišete zaposlenega <a href=""#Form/Employee/{0}"">{0}</a> \, če želite preklicati ta dokument"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Doc Datum
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},Fee Records Created - {0}
 DocType: Asset Category Account,Asset Category Account,Sredstvo Kategorija račun
@@ -5256,6 +5260,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}","Nastavitev dogodkov na {0}, saj je zaposlenih pritrjen na spodnji prodaje oseb nima uporabniško {1}"
 DocType: Timesheet,Billing Details,Podrobnosti o obračunavanju
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,Vir in cilj skladišče mora biti drugačen
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Prosimo, nastavite sistem poimenovanja zaposlenih v kadrovski službi&gt; Nastavitve človeških virov"
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,Plačilo ni uspelo. Preverite svoj GoCardless račun za več podrobnosti
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},"Ni dovoljeno, da posodobite transakcije zalog starejši od {0}"
 DocType: Stock Entry,Inspection Required,Pregled Zahtevan
@@ -5490,6 +5495,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,Trenutni BOM in New BOM ne more biti enaka
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,Plača Slip ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,Datum upokojitve mora biti večji od datuma pridružitve
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Dobavitelj&gt; Vrsta dobavitelja
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,Večkratne različice
 DocType: Sales Invoice,Against Income Account,Proti dohodkov
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% Dostavljeno
@@ -6331,6 +6337,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,"Vloga dovoliti, da določijo zamrznjenih računih in uredi Zamrznjen Entries"
 DocType: Supplier Scorecard Scoring Variable,Path,Pot
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,"Ni mogoče pretvoriti v stroškovni center za knjigo, saj ima otrok vozlišč"
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Faktor konverzije za UOM ({0} -&gt; {1}) za element: {2}
 DocType: Production Plan,Total Planned Qty,Skupno načrtovano število
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,Transakcije so že umaknjene iz izpisa
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Otvoritev Vrednost
@@ -6554,6 +6561,7 @@
 DocType: Purchase Order,To Receive,Prejeti
 DocType: Leave Period,Holiday List for Optional Leave,Seznam počitnic za izbirni dopust
 DocType: Item Tax Template,Tax Rates,Davčne stopnje
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Koda izdelka&gt; Skupina izdelkov&gt; Blagovna znamka
 DocType: Asset,Asset Owner,Lastnik sredstev
 DocType: Item,Website Content,Vsebina spletnega mesta
 DocType: Bank Account,Integration ID,ID integracije
@@ -6680,6 +6688,7 @@
 DocType: Stock Entry Detail,Additional Cost,Dodatne Stroški
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher","Filter ne more temeljiti na kupona št, če je združena s Voucher"
 DocType: Quality Inspection,Incoming,Dohodni
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Nastavite serijsko številčenje za udeležbo prek Setup&gt; Numbering Series
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Ustvari so privzete davčne predloge za prodajo in nakup.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,Ocenjevanje Rezultat zapisa {0} že obstaja.
 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.","Primer: ABCD. #####. Če je serija nastavljena in številka paketa ni navedena v transakcijah, bo na podlagi te serije izdelana avtomatična serijska številka. Če za to postavko vedno želite izrecno omeniti Lot št., Pustite to prazno. Opomba: ta nastavitev bo imela prednost pred imeniku serije Prefix v nastavitvah zalog."
@@ -7023,6 +7032,7 @@
 DocType: BOM,Rate Of Materials Based On,Oceni materialov na osnovi
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Če je omogočeno, bo polje Academic Term Obvezno v orodju za vpisovanje programov."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","Vrednosti oproščenih, z ničelno vrednostjo in vhodnih dobav brez GST"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Stranka&gt; Skupina kupcev&gt; Ozemlje
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>Podjetje</b> je obvezen filter.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,Odznači vse
 DocType: Purchase Taxes and Charges,On Item Quantity,Na Količina izdelka
@@ -7068,6 +7078,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,Pomanjkanje Kol
 DocType: Purchase Invoice,Input Service Distributor,Distributer vhodnih storitev
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,Obstaja postavka varianta {0} z enakimi atributi
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Nastavite sistem poimenovanja inštruktorjev v izobraževanju&gt; Nastavitve za izobraževanje
 DocType: Loan,Repay from Salary,Poplačilo iz Plača
 DocType: Exotel Settings,API Token,API žeton
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Requesting payment against {0} {1} for amount {2},Zahteva plačilo pred {0} {1} za znesek {2}
diff --git a/erpnext/translations/sq.csv b/erpnext/translations/sq.csv
index 6bdf35d..1fe647b 100644
--- a/erpnext/translations/sq.csv
+++ b/erpnext/translations/sq.csv
@@ -385,6 +385,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,Procedurat e përshkruara
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,Trego vetëm POS
 DocType: Supplier Group,Supplier Group Name,Emri i grupit të furnitorit
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Shënoni frekuentimin si <b></b>
 DocType: Driver,Driving License Categories,Kategoritë e Licencës së Drejtimit
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,Ju lutemi shkruani datën e dorëzimit
 DocType: Depreciation Schedule,Make Depreciation Entry,Bëni Amortizimi Hyrja
@@ -991,6 +992,7 @@
 DocType: Company,Delete Company Transactions,Fshij Transaksionet Company
 DocType: Production Plan Item,Quantity and Description,Sasia dhe Përshkrimi
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,I Referencës dhe Referenca Date është e detyrueshme për transaksion Bank
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ju lutemi vendosni Seritë e Emërtimit për {0} përmes Konfigurimit&gt; Cilësimet&gt; Seritë e Emrave
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Add / Edit taksat dhe tatimet
 DocType: Payment Entry Reference,Supplier Invoice No,Furnizuesi Fatura Asnjë
 DocType: Territory,For reference,Për referencë
@@ -4163,6 +4165,8 @@
 DocType: Grant Application,Grant Application Details ,Detajet e Aplikimit të Grantit
 DocType: Employee Separation,Employee Separation,Ndarja e Punonjësve
 DocType: BOM Item,Original Item,Origjinal
+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","Ju lutemi fshini punonjësin <a href=""#Form/Employee/{0}"">{0}</a> \ për të anulluar këtë dokument"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Data e Dokumentit
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},Records tarifë Krijuar - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Kategoria Llogaria
@@ -5165,6 +5169,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}","Vendosja Ngjarje për {0}, pasi që punonjësit e bashkangjitur më poshtë Personave Sales nuk ka një ID User {1}"
 DocType: Timesheet,Billing Details,detajet e faturimit
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,Burimi dhe depo objektiv duhet të jetë i ndryshëm
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ju lutemi vendosni Sistemin e Emërtimit të Punonjësve në Burimet Njerëzore&gt; Cilësimet e BNJ
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,Pagesa dështoi. Kontrollo llogarinë tënde GoCardless për më shumë detaje
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},Nuk lejohet të përtërini transaksioneve të aksioneve të vjetër se {0}
 DocType: Stock Entry,Inspection Required,Kerkohet Inspektimi
@@ -5395,6 +5400,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,BOM aktuale dhe të reja bom nuk mund të jetë e njëjtë
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,Paga Slip ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,Data e daljes në pension duhet të jetë më i madh se data e bashkimit
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Furnizuesi&gt; Lloji i furnizuesit
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,Variante të shumëfishta
 DocType: Sales Invoice,Against Income Account,Kundër llogarisë së të ardhurave
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% Dorëzuar
@@ -6429,6 +6435,7 @@
 DocType: Purchase Order,To Receive,Për të marrë
 DocType: Leave Period,Holiday List for Optional Leave,Lista e pushimeve për pushim fakultativ
 DocType: Item Tax Template,Tax Rates,Mimet e taksave
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kodi i Artikullit&gt; Grupi i Artikujve&gt; Marka
 DocType: Asset,Asset Owner,Pronar i aseteve
 DocType: Item,Website Content,Përmbajtja e faqes në internet
 DocType: Bank Account,Integration ID,ID e integrimit
@@ -6551,6 +6558,7 @@
 DocType: Stock Entry Detail,Additional Cost,Kosto shtesë
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher","Nuk mund të filtruar në bazë të Voucher Jo, qoftë të grupuara nga Bonon"
 DocType: Quality Inspection,Incoming,Hyrje
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ju lutemi vendosni seritë e numrave për Pjesëmarrje përmes Konfigurimit&gt; Seritë e numrave
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Modelet e taksave të parazgjedhur për shitje dhe blerje krijohen.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,Regjistrimi i rezultatit të rezultatit {0} tashmë ekziston.
 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.","Shembull: ABCD. #####. Nëse seria është vendosur dhe No Batch nuk është përmendur në transaksionet, atëherë numri i batch automatik do të krijohet bazuar në këtë seri. Nëse gjithmonë doni të përmendni në mënyrë eksplicite Jo Serisë për këtë artikull, lini këtë bosh. Shënim: Ky vendosje do të ketë prioritet mbi Prefixin e Serisë së Emërtimit në Rregullimet e Stock."
@@ -6886,6 +6894,7 @@
 DocType: BOM,Rate Of Materials Based On,Shkalla e materialeve në bazë të
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Nëse aktivizohet, termi akademik i fushës do të jetë i detyrueshëm në programin e regjistrimit të programit."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","Vlerat e furnizimeve të brendshme, të pavlefshme dhe të vlerësuara jo-GST përbrenda"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Klienti&gt; Grupi i klientëve&gt; Territori
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>Kompania</b> është një filtër i detyrueshëm.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,Uncheck gjitha
 DocType: Purchase Taxes and Charges,On Item Quantity,Në sasinë e sendit
@@ -6930,6 +6939,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,Mungesa Qty
 DocType: Purchase Invoice,Input Service Distributor,Distributori i Shërbimit të Hyrjes
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,Item variant {0} ekziston me atributet e njëjta
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Ju lutemi vendosni Sistemin e Emërtimit të Instruktorëve në Arsim&gt; Cilësimet e arsimit
 DocType: Loan,Repay from Salary,Paguajë nga paga
 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},Kerkuar pagesën kundër {0} {1} për sasi {2}
diff --git a/erpnext/translations/sr.csv b/erpnext/translations/sr.csv
index cf871ef..4c088f5 100644
--- a/erpnext/translations/sr.csv
+++ b/erpnext/translations/sr.csv
@@ -390,6 +390,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,Прописане процедуре
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,Прикажи само ПОС
 DocType: Supplier Group,Supplier Group Name,Име групе добављача
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Означи присуство као <b></b>
 DocType: Driver,Driving License Categories,Возачке дозволе категорије
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,Молимо унесите датум испоруке
 DocType: Depreciation Schedule,Make Depreciation Entry,Маке Трошкови Ентри
@@ -1005,6 +1006,7 @@
 DocType: Company,Delete Company Transactions,Делете Цомпани трансакције
 DocType: Production Plan Item,Quantity and Description,Количина и опис
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,Референца број и референце Датум је обавезна за банке трансакције
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Молимо поставите Наминг Сериес за {0} путем Подешавање&gt; Подешавања&gt; Именовање серије
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Адд / Едит порези и таксе
 DocType: Payment Entry Reference,Supplier Invoice No,Снабдевач фактура бр
 DocType: Territory,For reference,За референце
@@ -4270,6 +4272,8 @@
 DocType: Grant Application,Grant Application Details ,Грант Апплицатион Детаилс
 DocType: Employee Separation,Employee Separation,Раздвајање запослених
 DocType: BOM Item,Original Item,Оригинал Итем
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Избришите запосленика <a href=""#Form/Employee/{0}"">{0}</a> \ да бисте отказали овај документ"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Доц Дате
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},Накнада Записи Цреатед - {0}
 DocType: Asset Category Account,Asset Category Account,Средство Категорија налог
@@ -5308,6 +5312,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Постављање Догађаји на {0}, јер запослени у прилогу у наставку продаје лица нема Усер ИД {1}"
 DocType: Timesheet,Billing Details,Детаљи наплате
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,Извор и циљ складиште мора бити другачија
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Молимо вас да подесите систем именовања запослених у људским ресурсима&gt; ХР подешавања
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,Уплата није успела. Проверите свој ГоЦардлесс рачун за више детаља
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},Није дозвољено да ажурирате акција трансакције старије од {0}
 DocType: Stock Entry,Inspection Required,Инспекција Обавезно
@@ -5542,6 +5547,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,"Текущий спецификации и Нью- BOM не может быть таким же,"
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,Плата Слип ИД
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,Дата выхода на пенсию должен быть больше даты присоединения
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Добављач&gt; врста добављача
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,Вишеструке варијанте
 DocType: Sales Invoice,Against Income Account,Против приход
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% Испоручено
@@ -6384,6 +6390,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Улога дозвољено да постављају блокада трансакцијских рачуна & Едит Фрозен записи
 DocType: Supplier Scorecard Scoring Variable,Path,Пут
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,"Невозможно преобразовать МВЗ в книге , как это имеет дочерние узлы"
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Фактор конверзије УОМ ({0} -&gt; {1}) није пронађен за ставку: {2}
 DocType: Production Plan,Total Planned Qty,Укупна планирана количина
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,Трансакције су већ повучене из извода
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Отварање Вредност
@@ -6607,6 +6614,7 @@
 DocType: Purchase Order,To Receive,Примити
 DocType: Leave Period,Holiday List for Optional Leave,Лист за одмор за опциони одлазак
 DocType: Item Tax Template,Tax Rates,Пореске стопе
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Код артикла&gt; Група артикала&gt; Марка
 DocType: Asset,Asset Owner,Власник имовине
 DocType: Item,Website Content,Садржај веб странице
 DocType: Bank Account,Integration ID,ИД интеграције
@@ -6734,6 +6742,7 @@
 DocType: Stock Entry Detail,Additional Cost,Додатни трошак
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher","Не можете да филтрирате на основу ваучер Не , ако груписани по ваучер"
 DocType: Quality Inspection,Incoming,Долазни
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Молимо вас да подесите серију нумерирања за Аттенданце путем Подешавање&gt; Серија нумерирања
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Основани порезни предлошци за продају и куповину су створени.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,Оцењивање Резултат записа {0} већ постоји.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Пример: АБЦД. #####. Ако је серија подешена и Батцх Но се не помиње у трансакцијама, онда ће се на основу ове серије креирати аутоматски број серије. Уколико увек желите да експлицитно наведете Батцх Но за ову ставку, оставите ово празним. Напомена: ово подешавање ће имати приоритет над Префиксом назива серија у поставкама залиха."
@@ -7075,6 +7084,7 @@
 DocType: BOM,Rate Of Materials Based On,Стопа материјала на бази
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Ако је омогућено, поље Академски термин ће бити обавезно у алату за упис програма."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","Вриједности изузетих, нултих оцјена и улазних залиха које нису ГСТ"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Купац&gt; Група купаца&gt; Територија
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>Компанија</b> је обавезан филтер.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,Искључи све
 DocType: Purchase Taxes and Charges,On Item Quantity,Количина артикла
@@ -7120,6 +7130,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,Мањак Количина
 DocType: Purchase Invoice,Input Service Distributor,Дистрибутер улазне услуге
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,Тачка варијанта {0} постоји са истим атрибутима
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Поставите систем именовања инструктора у Образовање&gt; Подешавања образовања
 DocType: Loan,Repay from Salary,Отплатити од плате
 DocType: Exotel Settings,API Token,АПИ Токен
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Requesting payment against {0} {1} for amount {2},Тражећи исплату од {0} {1} за износ {2}
diff --git a/erpnext/translations/sv.csv b/erpnext/translations/sv.csv
index b882651..55f9794 100644
--- a/erpnext/translations/sv.csv
+++ b/erpnext/translations/sv.csv
@@ -390,6 +390,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,Föreskrivna förfaranden
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,Visa bara POS
 DocType: Supplier Group,Supplier Group Name,Leverantörsgruppsnamn
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Markera närvaro som <b></b>
 DocType: Driver,Driving License Categories,Körkortskategorier
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,Ange leveransdatum
 DocType: Depreciation Schedule,Make Depreciation Entry,Göra Av- Entry
@@ -1006,6 +1007,7 @@
 DocType: Company,Delete Company Transactions,Radera Företagstransactions
 DocType: Production Plan Item,Quantity and Description,Kvantitet och beskrivning
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,Referensnummer och referens Datum är obligatorisk för Bank transaktion
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ange Naming Series för {0} via Setup&gt; Inställningar&gt; Naming Series
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Lägg till / redigera skatter och avgifter
 DocType: Payment Entry Reference,Supplier Invoice No,Leverantörsfaktura Nej
 DocType: Territory,For reference,Som referens
@@ -4233,6 +4235,8 @@
 DocType: Grant Application,Grant Application Details ,Ange ansökningsdetaljer
 DocType: Employee Separation,Employee Separation,Anställd separering
 DocType: BOM Item,Original Item,Ursprunglig artikel
+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","Radera anställden <a href=""#Form/Employee/{0}"">{0}</a> \ för att avbryta detta dokument"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Doc Datum
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},Arvodes Records Skapad - {0}
 DocType: Asset Category Account,Asset Category Account,Tillgångsslag konto
@@ -5259,6 +5263,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}","Inställning Händelser till {0}, eftersom personal bifogas nedan försäljare inte har en användar-ID {1}"
 DocType: Timesheet,Billing Details,Faktureringsuppgifter
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,Källa och mål lager måste vara annorlunda
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Installera anställdes namngivningssystem i mänskliga resurser&gt; HR-inställningar
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,Betalning misslyckades. Kontrollera ditt GoCardless-konto för mer information
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},Ej tillåtet att uppdatera lagertransaktioner äldre än {0}
 DocType: Stock Entry,Inspection Required,Inspektion krävs
@@ -5494,6 +5499,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,Aktuell BOM och Nya BOM kan inte vara samma
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,Lön Slip ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,Datum för pensionering måste vara större än Datum för att delta
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Leverantör&gt; Leverantörstyp
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,Flera varianter
 DocType: Sales Invoice,Against Income Account,Mot Inkomst konto
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% Levererad
@@ -6335,6 +6341,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Roll tillåtas att fastställa frysta konton och Redigera Frysta Inlägg
 DocType: Supplier Scorecard Scoring Variable,Path,Väg
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,Det går inte att konvertera kostnadsställe till huvudbok då den har underordnade noder
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM-omvandlingsfaktor ({0} -&gt; {1}) hittades inte för artikeln: {2}
 DocType: Production Plan,Total Planned Qty,Totalt planerat antal
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,Transaktioner har redan återkommit från uttalandet
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,öppnings Värde
@@ -6558,6 +6565,7 @@
 DocType: Purchase Order,To Receive,Att Motta
 DocType: Leave Period,Holiday List for Optional Leave,Semesterlista för valfritt semester
 DocType: Item Tax Template,Tax Rates,Skattesatser
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Produktkod&gt; Produktgrupp&gt; Märke
 DocType: Asset,Asset Owner,Tillgångsägare
 DocType: Item,Website Content,Webbplatsinnehåll
 DocType: Bank Account,Integration ID,Integrations-ID
@@ -6684,6 +6692,7 @@
 DocType: Stock Entry Detail,Additional Cost,Extra kostnad
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher",Kan inte filtrera baserat på kupong nr om grupperad efter kupong
 DocType: Quality Inspection,Incoming,Inkommande
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ställ in numreringsserier för närvaro via Setup&gt; Numbering Series
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Standardskattmallar för försäljning och inköp skapas.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,Bedömningsresultatrekord {0} existerar redan.
 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.","Exempel: ABCD. #####. Om serier är inställda och batchnummer inte nämns i transaktioner, kommer automatiskt batchnummer att skapas baserat på denna serie. Om du alltid vill uttryckligen ange parti nr för det här objektet, lämna det här tomt. Obs! Den här inställningen kommer att prioriteras över namngivningssprefixet i lagerinställningar."
@@ -7026,6 +7035,7 @@
 DocType: BOM,Rate Of Materials Based On,Hastighet av material baserade på
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.",Om det är aktiverat är fältet Academic Term obligatoriskt i Programinmälningsverktyget.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","Värden för undantagna, nollklassade och icke-GST-leveranser"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kund&gt; Kundgrupp&gt; Territorium
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>Företaget</b> är ett obligatoriskt filter.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,Avmarkera alla
 DocType: Purchase Taxes and Charges,On Item Quantity,På artikelkvantitet
@@ -7070,6 +7080,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,Brist Antal
 DocType: Purchase Invoice,Input Service Distributor,Distributör av ingångsservice
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,Punkt variant {0} finns med samma attribut
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Installera instruktörens namngivningssystem i utbildning&gt; Utbildningsinställningar
 DocType: Loan,Repay from Salary,Repay från Lön
 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},Begärande betalning mot {0} {1} för mängden {2}
diff --git a/erpnext/translations/sw.csv b/erpnext/translations/sw.csv
index 33c65ad..e67d3a9 100644
--- a/erpnext/translations/sw.csv
+++ b/erpnext/translations/sw.csv
@@ -389,6 +389,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,Taratibu zilizowekwa
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,Onyesha POS tu
 DocType: Supplier Group,Supplier Group Name,Jina la kundi la wasambazaji
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Marko mahudhurio kama <b></b>
 DocType: Driver,Driving License Categories,Makundi ya leseni ya kuendesha gari
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,Tafadhali ingiza tarehe ya utoaji
 DocType: Depreciation Schedule,Make Depreciation Entry,Fanya kuingia kwa kushuka kwa thamani
@@ -998,6 +999,7 @@
 DocType: Company,Delete Company Transactions,Futa Shughuli za Kampuni
 DocType: Production Plan Item,Quantity and Description,Kiasi na Maelezo
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,Kitabu cha Marejeo na Kumbukumbu ni lazima kwa shughuli za Benki
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Tafadhali weka Mfululizo wa Jina la {0} kupitia Kusanidi&gt; Mipangilio&gt; Mfululizo wa Kumtaja
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Ongeza / Badilisha Taxes na Malipo
 DocType: Payment Entry Reference,Supplier Invoice No,Nambari ya ankara ya wasambazaji
 DocType: Territory,For reference,Kwa kumbukumbu
@@ -4193,6 +4195,8 @@
 DocType: Grant Application,Grant Application Details ,Ruhusu Maelezo ya Maombi
 DocType: Employee Separation,Employee Separation,Ugawaji wa Waajiriwa
 DocType: BOM Item,Original Item,Nakala ya awali
+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","Tafadhali futa Mfanyikazi <a href=""#Form/Employee/{0}"">{0}</a> \ ili kughairi hati hii"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Tarehe ya Hati
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},Kumbukumbu za ada zilizoundwa - {0}
 DocType: Asset Category Account,Asset Category Account,Akaunti ya Jamii ya Mali
@@ -5209,6 +5213,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}","Kuweka Matukio kwa {0}, kwa kuwa Mfanyikazi amefungwa kwa Watu chini ya Mauzo hawana ID ya Mtumiaji {1}"
 DocType: Timesheet,Billing Details,Maelezo ya kulipia
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,Chanzo na lengo la ghala lazima iwe tofauti
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Tafadhali wasanidi Mfumo wa Kumtaja Mfanyikazi katika Rasilimali Watu&gt; Mipangilio ya HR
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,Malipo Imeshindwa. Tafadhali angalia Akaunti yako ya GoCardless kwa maelezo zaidi
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},Hairuhusiwi kusasisha ushirikiano wa hisa zaidi kuliko {0}
 DocType: Stock Entry,Inspection Required,Ukaguzi unahitajika
@@ -5441,6 +5446,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,BOM ya sasa na BOM Mpya haiwezi kuwa sawa
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,Kitambulisho cha Mshahara wa Mshahara
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,Tarehe ya Kustaafu lazima iwe kubwa kuliko Tarehe ya kujiunga
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Mtoaji&gt; Aina ya wasambazaji
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,Vipengele vingi
 DocType: Sales Invoice,Against Income Account,Dhidi ya Akaunti ya Mapato
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% Ametolewa
@@ -6270,6 +6276,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Uwezo wa Kuruhusiwa Kuweka Akaunti Zenye Frozen &amp; Hariri Vitisho vya Frozen
 DocType: Supplier Scorecard Scoring Variable,Path,Njia
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,Haiwezi kubadilisha Kituo cha Gharama kwenye kiwanja kama ina nodes za watoto
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Sababu ya ubadilishaji wa UOM ({0} -&gt; {1}) haipatikani kwa kipengee: {2}
 DocType: Production Plan,Total Planned Qty,Uchina Uliopangwa
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,Manunuzi tayari yameshatolewa kutoka kwa taarifa
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Thamani ya Ufunguzi
@@ -6492,6 +6499,7 @@
 DocType: Purchase Order,To Receive,Kupokea
 DocType: Leave Period,Holiday List for Optional Leave,Orodha ya Likizo ya Kuondoka kwa Hiari
 DocType: Item Tax Template,Tax Rates,Viwango vya Ushuru
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Nambari ya Bidhaa&gt; Kikundi cha bidhaa&gt; Brand
 DocType: Asset,Asset Owner,Mmiliki wa Mali
 DocType: Item,Website Content,Yaliyomo kwenye Tovuti
 DocType: Bank Account,Integration ID,Kitambulisho cha Ujumuishaji
@@ -6617,6 +6625,7 @@
 DocType: Stock Entry Detail,Additional Cost,Gharama za ziada
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher","Haiwezi kuchuja kulingana na Voucher No, ikiwa imewekwa na Voucher"
 DocType: Quality Inspection,Incoming,Inakuja
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Tafadhali sasisha safu za nambari za Kuhudhuria kupitia Usanidi&gt; Mfululizo wa hesabu
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Vidokezo vya kodi za kutosha kwa mauzo na ununuzi vinaloundwa.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,Tathmini ya Matokeo ya Tathmini {0} tayari imepo.
 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.","Mfano: ABCD. #####. Ikiwa mfululizo umewekwa na Batch No haijajwajwa katika shughuli, basi nambari ya kundi la moja kwa moja litaundwa kulingana na mfululizo huu. Ikiwa daima unataka kueleza wazi Kundi Hakuna kwa kipengee hiki, chagua hii tupu. Kumbuka: mipangilio hii itachukua kipaumbele juu ya Kiambatisho cha Msaada wa Naming katika Mipangilio ya Hifadhi"
@@ -6957,6 +6966,7 @@
 DocType: BOM,Rate Of Materials Based On,Kiwango cha Vifaa vya msingi
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Ikiwa imewezeshwa, Muda wa Kitaa wa Shule utakuwa wa lazima katika Chombo cha Usajili wa Programu."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","Thamani za misamaha, vifaa vya ndani visivyo na kipimo na visivyo vya GST"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Mteja&gt; Kikundi cha Wateja&gt; Wilaya
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>Kampuni</b> ni kichujio cha lazima.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,Futa yote
 DocType: Purchase Taxes and Charges,On Item Quantity,Juu ya Wingi wa kitu
@@ -7001,6 +7011,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,Uchina wa Ufupi
 DocType: Purchase Invoice,Input Service Distributor,Msambazaji wa Huduma ya Kuingiza
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,Tofauti ya kipengee {0} ipo na sifa sawa
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Tafadhali wasanidi Mfumo wa Kumtaja Mtaalam katika Elimu&gt; Mipangilio ya elimu
 DocType: Loan,Repay from Salary,Malipo kutoka kwa Mshahara
 DocType: Exotel Settings,API Token,Ishara ya API
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Requesting payment against {0} {1} for amount {2},Inalipa malipo dhidi ya {0} {1} kwa kiasi {2}
diff --git a/erpnext/translations/ta.csv b/erpnext/translations/ta.csv
index f53e40a..cb3b238 100644
--- a/erpnext/translations/ta.csv
+++ b/erpnext/translations/ta.csv
@@ -384,6 +384,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,பரிந்துரைக்கப்பட்ட நடைமுறைகள்
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,POS ஐ மட்டும் காட்டு
 DocType: Supplier Group,Supplier Group Name,சப்ளையர் குழு பெயர்
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,வருகை என குறிக்கவும் <b></b>
 DocType: Driver,Driving License Categories,உரிமம் வகைகளை டிரைவிங்
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,டெலிவரி தேதி உள்ளிடுக
 DocType: Depreciation Schedule,Make Depreciation Entry,தேய்மானம் நுழைவு செய்ய
@@ -4180,6 +4181,8 @@
 DocType: Grant Application,Grant Application Details ,விண்ணப்பப் படிவங்களை வழங்குதல்
 DocType: Employee Separation,Employee Separation,ஊழியர் பிரிப்பு
 DocType: BOM Item,Original Item,அசல் பொருள்
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","இந்த ஆவணத்தை ரத்து செய்ய பணியாளர் <a href=""#Form/Employee/{0}"">{0}</a> delete ஐ நீக்கவும்"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,ஆவண தேதி
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},கட்டணம் பதிவுகள்   உருவாக்கப்பட்டது - {0}
 DocType: Asset Category Account,Asset Category Account,சொத்து வகை கணக்கு
@@ -5191,6 +5194,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","அமைத்தல் நிகழ்வுகள் {0}, விற்பனை நபர்கள் கீழே இணைக்கப்பட்டுள்ளது பணியாளர் ஒரு பயனர் ஐடி இல்லை என்பதால் {1}"
 DocType: Timesheet,Billing Details,பில்லிங் விவரங்கள்
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,மூல மற்றும் இலக்கு கிடங்கில் வேறு இருக்க வேண்டும்
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,மனிதவள&gt; மனிதவள அமைப்புகளில் பணியாளர் பெயரிடும் முறையை அமைக்கவும்
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,கட்டணம் தோல்வியடைந்தது. மேலும் விவரங்களுக்கு உங்கள் GoCardless கணக்கைச் சரிபார்க்கவும்
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},விட பங்கு பரிவர்த்தனைகள் பழைய இற்றைப்படுத்த முடியாது {0}
 DocType: Stock Entry,Inspection Required,ஆய்வு தேவை
@@ -5421,6 +5425,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,தற்போதைய BOM மற்றும் நியூ BOM அதே இருக்க முடியாது
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,சம்பளம் ஸ்லிப் ஐடி
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,ஓய்வு நாள் சேர தேதி விட அதிகமாக இருக்க வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,சப்ளையர்&gt; சப்ளையர் வகை
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,பல மாறுபாடுகள்
 DocType: Sales Invoice,Against Income Account,வருமான கணக்கு எதிராக
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% வழங்கப்படுகிறது
@@ -6244,6 +6249,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,பங்கு உறைந்த கணக்குகள் & திருத்து உறைந்த பதிவுகள் அமைக்க அனுமதி
 DocType: Supplier Scorecard Scoring Variable,Path,பாதை
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,அது குழந்தை முனைகள் என லெட்ஜரிடம் செலவு மையம் மாற்ற முடியாது
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},உருப்படிக்கு UOM மாற்று காரணி ({0} -&gt; {1}) காணப்படவில்லை: {2}
 DocType: Production Plan,Total Planned Qty,மொத்த திட்டமிடப்பட்ட Qty
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,பரிவர்த்தனைகள் ஏற்கனவே அறிக்கையிலிருந்து மீட்டெடுக்கப்பட்டன
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,திறப்பு மதிப்பு
@@ -6461,6 +6467,7 @@
 DocType: Purchase Order,To Receive,பெற
 DocType: Leave Period,Holiday List for Optional Leave,விருப்ப விடுப்புக்கான விடுமுறை பட்டியல்
 DocType: Item Tax Template,Tax Rates,வரி விகிதங்கள்
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,பொருள் குறியீடு&gt; பொருள் குழு&gt; பிராண்ட்
 DocType: Asset,Asset Owner,சொத்து உரிமையாளர்
 DocType: Item,Website Content,வலைத்தள உள்ளடக்கம்
 DocType: Bank Account,Integration ID,ஒருங்கிணைப்பு ஐடி
@@ -6584,6 +6591,7 @@
 DocType: Stock Entry Detail,Additional Cost,கூடுதல் செலவு
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher","வவுச்சர் அடிப்படையில் வடிகட்ட முடியாது இல்லை , ரசீது மூலம் தொகுக்கப்பட்டுள்ளது என்றால்"
 DocType: Quality Inspection,Incoming,உள்வரும்
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,அமைவு&gt; எண்ணைத் தொடர் வழியாக வருகைக்கான எண்ணைத் தொடரை அமைக்கவும்
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,விற்பனை மற்றும் வாங்குதலுக்கான இயல்புநிலை வரி வார்ப்புருக்கள் உருவாக்கப்படுகின்றன.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,மதிப்பீட்டு முடிவு பதிவேற்றம் {0} ஏற்கனவே உள்ளது.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","எடுத்துக்காட்டு: ABCD. #####. தொடர் அமைக்கப்பட்டிருந்தால், பரிமாற்றங்களில் பாஷ் நோட் குறிப்பிடப்படவில்லை என்றால், இந்தத் தொடரின் அடிப்படையில் தானியங்குத் தொகுதி எண் உருவாக்கப்படும். இந்த உருப்படியின் பேட்ச் இலக்கம் வெளிப்படையாக குறிப்பிட விரும்புவீர்களானால், இது வெறுமையாகும். குறிப்பு: இந்த அமைப்பு முன்னுரிமைகளை முன்னுரிமை பெறுகிறது."
@@ -6916,6 +6924,7 @@
 DocType: BOM,Rate Of Materials Based On,ஆனால் அடிப்படையில் பொருட்களின் விகிதம்
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","இயக்கப்பட்டிருந்தால், படிப்படியான நுழைவுக் கருவியில் துறையில் கல்வி கட்டாயம் கட்டாயமாக இருக்கும்."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","விலக்கு, மதிப்பிடப்பட்ட மற்றும் ஜிஎஸ்டி அல்லாத உள் பொருட்களின் மதிப்புகள்"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,வாடிக்கையாளர்&gt; வாடிக்கையாளர் குழு&gt; பிரதேசம்
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>நிறுவனம்</b> ஒரு கட்டாய வடிப்பான்.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,அனைத்தையும் தேர்வுநீக்கு
 DocType: Purchase Taxes and Charges,On Item Quantity,உருப்படி அளவு
@@ -6960,6 +6969,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,பற்றாக்குறைவே அளவு
 DocType: Purchase Invoice,Input Service Distributor,உள்ளீட்டு சேவை விநியோகஸ்தர்
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,பொருள் மாறுபாடு {0} அதே பண்புகளை கொண்ட உள்ளது
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,கல்வி&gt; கல்வி அமைப்புகளில் பயிற்றுவிப்பாளர் பெயரிடும் முறையை அமைக்கவும்
 DocType: Loan,Repay from Salary,சம்பளம் இருந்து திருப்பி
 DocType: Exotel Settings,API Token,API டோக்கன்
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Requesting payment against {0} {1} for amount {2},எதிராக கட்டணம் கோருகிறது {0} {1} அளவு {2}
diff --git a/erpnext/translations/te.csv b/erpnext/translations/te.csv
index ac19c67..da13f52 100644
--- a/erpnext/translations/te.csv
+++ b/erpnext/translations/te.csv
@@ -381,6 +381,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,సూచించిన పద్ధతులు
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,POS ను మాత్రమే చూపించు
 DocType: Supplier Group,Supplier Group Name,సరఫరాదారు సమూహం పేరు
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,హాజరును గుర్తించండి <b></b>
 DocType: Driver,Driving License Categories,డ్రైవింగ్ లైసెన్స్ కేటగిరీలు
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,దయచేసి డెలివరీ తేదీని నమోదు చేయండి
 DocType: Depreciation Schedule,Make Depreciation Entry,అరుగుదల ఎంట్రీ చేయండి
@@ -4133,6 +4134,8 @@
 DocType: Grant Application,Grant Application Details ,దరఖాస్తు వివరాలు ఇవ్వండి
 DocType: Employee Separation,Employee Separation,ఉద్యోగి వేరు
 DocType: BOM Item,Original Item,అసలు అంశం
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","ఈ పత్రాన్ని రద్దు చేయడానికి దయచేసి ఉద్యోగి <a href=""#Form/Employee/{0}"">{0}</a> delete ను తొలగించండి"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Doc తేదీ
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},ఫీజు రికార్డ్స్ రూపొందించబడింది - {0}
 DocType: Asset Category Account,Asset Category Account,ఆస్తి వర్గం ఖాతా
@@ -5126,6 +5129,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","ఈవెంట్స్ చేస్తోంది {0}, సేల్స్ పర్సన్స్ క్రింద జత ఉద్యోగి వాడుకరి ID లేదు నుండి {1}"
 DocType: Timesheet,Billing Details,బిల్లింగ్ వివరాలు
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,మూల మరియు లక్ష్య గిడ్డంగిలో భిన్నంగా ఉండాలి
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,దయచేసి మానవ వనరులు&gt; హెచ్ ఆర్ సెట్టింగులలో ఉద్యోగుల నామకరణ వ్యవస్థను సెటప్ చేయండి
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,చెల్లింపు విఫలమైంది. దయచేసి మరిన్ని వివరాల కోసం మీ GoCardless ఖాతాను తనిఖీ చేయండి
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},లేదు కంటే పాత స్టాక్ లావాదేవీలు అప్డేట్ అనుమతి {0}
 DocType: Stock Entry,Inspection Required,ఇన్స్పెక్షన్ అవసరం
@@ -5354,6 +5358,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,ప్రస్తుత BOM మరియు న్యూ BOM అదే ఉండకూడదు
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,జీతం స్లిప్ ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,రిటైర్మెంట్ డేట్ అఫ్ చేరడం తేదీ కంటే ఎక్కువ ఉండాలి
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,సరఫరాదారు&gt; సరఫరాదారు రకం
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,బహుళ వైవిధ్యాలు
 DocType: Sales Invoice,Against Income Account,ఆదాయపు ఖాతా వ్యతిరేకంగా
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% పంపిణీ
@@ -6179,6 +6184,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,పాత్ర ఘనీభవించిన అకౌంట్స్ &amp; సవరించు ఘనీభవించిన ఎంట్రీలు సెట్ చేయడానికి అనుమతించాలో
 DocType: Supplier Scorecard Scoring Variable,Path,మార్గం
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,ఇది పిల్లల నోడ్స్ కలిగి లెడ్జర్ కాస్ట్ సెంటర్ మార్చేందుకు కాదు
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},అంశం కోసం UOM మార్పిడి కారకం ({0} -&gt; {1}) కనుగొనబడలేదు: {2}
 DocType: Production Plan,Total Planned Qty,మొత్తం ప్రణాళికాబద్ధమైన Qty
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,లావాదేవీలు ఇప్పటికే స్టేట్మెంట్ నుండి తిరిగి పొందబడ్డాయి
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,ఓపెనింగ్ విలువ
@@ -6396,6 +6402,7 @@
 DocType: Purchase Order,To Receive,అందుకోవడం
 DocType: Leave Period,Holiday List for Optional Leave,ఐచ్ఛిక సెలవు కోసం హాలిడే జాబితా
 DocType: Item Tax Template,Tax Rates,పన్ను రేట్లు
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,ఐటెమ్ కోడ్&gt; ఐటెమ్ గ్రూప్&gt; బ్రాండ్
 DocType: Asset,Asset Owner,ఆస్తి యజమాని
 DocType: Item,Website Content,వెబ్‌సైట్ కంటెంట్
 DocType: Bank Account,Integration ID,ఇంటిగ్రేషన్ ID
@@ -6519,6 +6526,7 @@
 DocType: Stock Entry Detail,Additional Cost,అదనపు ఖర్చు
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher","ఓచర్ లేవు ఆధారంగా వడపోత కాదు, ఓచర్ ద్వారా సమూహం ఉంటే"
 DocType: Quality Inspection,Incoming,ఇన్కమింగ్
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,దయచేసి సెటప్&gt; నంబరింగ్ సిరీస్ ద్వారా హాజరు కోసం నంబరింగ్ సిరీస్‌ను సెటప్ చేయండి
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,అమ్మకాలు మరియు కొనుగోలు కోసం డిఫాల్ట్ పన్ను టెంప్లేట్లు సృష్టించబడతాయి.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,అసెస్మెంట్ ఫలితం రికార్డు {0} ఇప్పటికే ఉంది.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","ఉదాహరణ: ABCD. #####. సిరీస్ సెట్ చేయబడి ఉంటే మరియు బ్యాచ్ నో లావాదేవీలలో పేర్కొనబడకపోతే, ఈ సిరీస్ ఆధారంగా ఆటోమేటిక్ బ్యాచ్ నంబర్ సృష్టించబడుతుంది. ఈ అంశానికి బ్యాచ్ నంబర్ను స్పష్టంగా చెప్పాలని మీరు అనుకుంటే, దీన్ని ఖాళీగా వదిలేయండి. గమనిక: ఈ సెట్టింగులు స్టాకింగ్ సెట్టింగులలో నామకరణ సీరీస్ ప్రిఫిక్స్ మీద ప్రాధాన్యతనిస్తాయి."
@@ -6851,6 +6859,7 @@
 DocType: BOM,Rate Of Materials Based On,రేటు పదార్థాల బేస్డ్ న
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","ప్రారంభించబడితే, ఫీల్డ్ అకాడెమిక్ టర్మ్ ప్రోగ్రామ్ ఎన్రాల్మెంట్ టూల్లో తప్పనిసరి అవుతుంది."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","మినహాయింపు, నిల్ రేటెడ్ మరియు జిఎస్టి కాని లోపలి సరఫరా విలువలు"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,కస్టమర్&gt; కస్టమర్ గ్రూప్&gt; భూభాగం
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>కంపెనీ</b> తప్పనిసరి వడపోత.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,అన్నింటినీ
 DocType: Purchase Taxes and Charges,On Item Quantity,అంశం పరిమాణంపై
@@ -6896,6 +6905,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,కొరత ప్యాక్ చేసిన అంశాల
 DocType: Purchase Invoice,Input Service Distributor,ఇన్‌పుట్ సేవా పంపిణీదారు
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,అంశం వేరియంట్ {0} అదే లక్షణాలు తో ఉంది
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,దయచేసి విద్య&gt; విద్యా సెట్టింగులలో బోధకుడు నామకరణ వ్యవస్థను సెటప్ చేయండి
 DocType: Loan,Repay from Salary,జీతం నుండి తిరిగి
 DocType: Exotel Settings,API Token,API టోకెన్
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Requesting payment against {0} {1} for amount {2},వ్యతిరేకంగా చెల్లింపు అభ్యర్థించడం {0} {1} మొత్తం {2}
diff --git a/erpnext/translations/th.csv b/erpnext/translations/th.csv
index eb73bf7..63793c9 100644
--- a/erpnext/translations/th.csv
+++ b/erpnext/translations/th.csv
@@ -390,6 +390,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,ขั้นตอนที่กำหนดไว้
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,แสดงเฉพาะ POS
 DocType: Supplier Group,Supplier Group Name,ชื่อกลุ่มผู้จัดจำหน่าย
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,ทำเครื่องหมายการเข้าร่วมประชุมเป็น <b></b>
 DocType: Driver,Driving License Categories,ประเภทใบอนุญาตขับรถ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,โปรดป้อนวันที่จัดส่ง
 DocType: Depreciation Schedule,Make Depreciation Entry,บันทึกรายการค่าเสื่อมราคา
@@ -1007,6 +1008,7 @@
 DocType: Company,Delete Company Transactions,ลบรายการที่ บริษัท
 DocType: Production Plan Item,Quantity and Description,ปริมาณและคำอธิบาย
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,อ้างอิงและการอ้างอิงวันที่มีผลบังคับใช้สำหรับการทำธุรกรรมธนาคาร
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,โปรดตั้ง Naming Series สำหรับ {0} ผ่านการตั้งค่า&gt; การตั้งค่า&gt; Naming Series
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,เพิ่ม / แก้ไข ภาษีและค่าธรรมเนียม
 DocType: Payment Entry Reference,Supplier Invoice No,ใบแจ้งหนี้ที่ผู้ผลิตไม่มี
 DocType: Territory,For reference,สำหรับการอ้างอิง
@@ -4278,6 +4280,8 @@
 DocType: Grant Application,Grant Application Details ,ให้รายละเอียดการสมัคร
 DocType: Employee Separation,Employee Separation,แยกพนักงาน
 DocType: BOM Item,Original Item,รายการต้นฉบับ
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","โปรดลบพนักงาน <a href=""#Form/Employee/{0}"">{0}</a> \ เพื่อยกเลิกเอกสารนี้"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Doc Date
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},ค่าธรรมเนียมระเบียนที่สร้าง - {0}
 DocType: Asset Category Account,Asset Category Account,บัญชีสินทรัพย์ประเภท
@@ -5316,6 +5320,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}",การตั้งค่ากิจกรรมเพื่อ {0} เนื่องจากพนักงานที่แนบมาด้านล่างนี้พนักงานขายไม่ได้ User ID {1}
 DocType: Timesheet,Billing Details,รายละเอียดการเรียกเก็บเงิน
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,แหล่งที่มาและคลังสินค้าเป้าหมายต้องแตกต่าง
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,โปรดตั้งค่าระบบการตั้งชื่อพนักงานในทรัพยากรมนุษย์&gt; การตั้งค่าทรัพยากรบุคคล
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,การชำระเงินล้มเหลว โปรดตรวจสอบบัญชี GoCardless ของคุณเพื่อดูรายละเอียดเพิ่มเติม
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},ไม่ได้รับอนุญาตในการปรับปรุงการทำธุรกรรมหุ้นเก่ากว่า {0}
 DocType: Stock Entry,Inspection Required,การตรวจสอบที่จำเป็น
@@ -5551,6 +5556,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,BOM ปัจจุบันและ ใหม่ BOM ไม่สามารถ จะเหมือนกัน
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,เงินเดือน ID สลิป
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,วันที่ ของ การเกษียณอายุ ต้องมากกว่า วันที่ เข้าร่วม
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,ผู้ผลิต&gt; ประเภทผู้จำหน่าย
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,หลายรูปแบบ
 DocType: Sales Invoice,Against Income Account,กับบัญชีรายได้
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% ส่งแล้ว
@@ -6392,6 +6398,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,บทบาทที่ได้รับอนุญาตให้ตั้ง บัญชีแช่แข็ง และแก้ไขรายการแช่แข็ง
 DocType: Supplier Scorecard Scoring Variable,Path,เส้นทาง
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,ไม่สามารถแปลง ศูนย์ต้นทุน ไปยัง บัญชีแยกประเภท ที่มี ต่อมน้ำเด็ก
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},ไม่พบปัจจัยการแปลง UOM ({0} -&gt; {1}) สำหรับรายการ: {2}
 DocType: Production Plan,Total Planned Qty,จำนวนตามแผนทั้งหมด
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,ธุรกรรมได้รับมาจากคำสั่งนี้แล้ว
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,ราคาเปิด
@@ -6615,6 +6622,7 @@
 DocType: Purchase Order,To Receive,ที่จะได้รับ
 DocType: Leave Period,Holiday List for Optional Leave,รายการวันหยุดสำหรับการลาตัวเลือก
 DocType: Item Tax Template,Tax Rates,อัตราภาษี
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,รหัสรายการ&gt; กลุ่มรายการ&gt; แบรนด์
 DocType: Asset,Asset Owner,เจ้าของสินทรัพย์
 DocType: Item,Website Content,เนื้อหาเว็บไซต์
 DocType: Bank Account,Integration ID,ID การรวม
@@ -6741,6 +6749,7 @@
 DocType: Stock Entry Detail,Additional Cost,ค่าใช้จ่ายเพิ่มเติม
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher",ไม่สามารถกรอง ตาม คูปอง ไม่ ถ้า จัดกลุ่มตาม คูปอง
 DocType: Quality Inspection,Incoming,ขาเข้า
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,โปรดตั้งค่าหมายเลขลำดับสำหรับการเข้าร่วมผ่านการตั้งค่า&gt; ลำดับเลข
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,เทมเพลตภาษีที่เป็นค่าเริ่มต้นสำหรับการขายและซื้อจะสร้างขึ้น
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,บันทึกผลลัพธ์การประเมิน {0} มีอยู่แล้ว
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.",ตัวอย่าง: ABCD ##### ถ้ามีชุดชุดและเลขที่แบทช์ไม่ได้กล่าวถึงในธุรกรรมระบบจะสร้างเลขที่แบทช์อัตโนมัติตามชุดข้อมูลนี้ หากคุณต้องการระบุอย่างชัดแจ้งถึงแบทช์สำหรับรายการนี้ให้เว้นว่างไว้ หมายเหตุ: การตั้งค่านี้จะมีความสำคัญเหนือคำนำหน้าแบบตั้งชื่อในการตั้งค่าสต็อก
@@ -7084,6 +7093,7 @@
 DocType: BOM,Rate Of Materials Based On,อัตราวัสดุตาม
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.",หากเปิดใช้งานระยะเวลาการศึกษาภาคสนามจะเป็นข้อบังคับในเครื่องมือการลงทะเบียนโปรแกรม
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies",ค่าของวัสดุที่ได้รับการยกเว้นไม่ได้รับการจัดอันดับไม่มีและไม่มี GST
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ลูกค้า&gt; กลุ่มลูกค้า&gt; อาณาเขต
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>บริษัท</b> เป็นตัวกรองที่จำเป็น
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,ยกเลิกการเลือกทั้งหมด
 DocType: Purchase Taxes and Charges,On Item Quantity,ในปริมาณรายการ
@@ -7129,6 +7139,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,ปัญหาการขาดแคลนจำนวน
 DocType: Purchase Invoice,Input Service Distributor,จำหน่ายบริการป้อนข้อมูล
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,ตัวแปรรายการ {0} อยู่ที่มีลักษณะเดียวกัน
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,โปรดตั้งค่าระบบการตั้งชื่อผู้สอนในด้านการศึกษา&gt; การตั้งค่าการศึกษา
 DocType: Loan,Repay from Salary,ชำระคืนจากเงินเดือน
 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} สำหรับจำนวนเงิน {2}
diff --git a/erpnext/translations/tr.csv b/erpnext/translations/tr.csv
index e1d94ef..d8458bc 100644
--- a/erpnext/translations/tr.csv
+++ b/erpnext/translations/tr.csv
@@ -420,6 +420,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,Öngörülen Prosedürler
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,Sadece POS göster
 DocType: Supplier Group,Supplier Group Name,Tedarikçi Grubu Adı
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Katılımı olarak işaretle <b></b>
 DocType: Driver,Driving License Categories,Sürücü Belgesi Kategorileri
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,Lütfen Teslimat Tarihini Giriniz
 DocType: Depreciation Schedule,Make Depreciation Entry,Amortisman kaydı yap
@@ -1086,6 +1087,7 @@
 DocType: Company,Delete Company Transactions,Şirket İşlemleri sil
 DocType: Production Plan Item,Quantity and Description,Miktar ve Açıklama
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,Referans No ve Referans Tarih Banka işlem için zorunludur
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Lütfen Kurulum&gt; Ayarlar&gt; Adlandırma Serisi aracılığıyla {0} için Adlandırma Serisini ayarlayın
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Ekle / Düzenle Vergi ve Harçlar
 DocType: Payment Entry Reference,Supplier Invoice No,Tedarikçi Fatura No
 DocType: Payment Entry Reference,Supplier Invoice No,Tedarikçi Fatura No
@@ -4596,6 +4598,8 @@
 DocType: Grant Application,Grant Application Details ,Hibe Başvurusu Ayrıntıları
 DocType: Employee Separation,Employee Separation,Çalışan Ayrılığı
 DocType: BOM Item,Original Item,Orijinal öğe
+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","Bu dokümanı iptal etmek için lütfen Çalışan <a href=""#Form/Employee/{0}"">{0}</a> \ &#39;yı silin"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Doküman Tarihi
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},Ücret Kayıtları düzenlendi - {0}
 DocType: Asset Category Account,Asset Category Account,Varlık Tipi Hesabı
@@ -5713,6 +5717,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}","Olaylar ayarlanması {0}, Satış Kişilerin altına bağlı çalışan bir kullanıcı kimliğine sahip olmadığından {1}"
 DocType: Timesheet,Billing Details,Fatura Detayları
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,Kaynak ve hedef depo farklı olmalıdır
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Lütfen İnsan Kaynakları&gt; İK Ayarları bölümünde Çalışan Adlandırma Sistemini kurun
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,Ödeme başarısız. Daha fazla bilgi için lütfen GoCardless Hesabınızı kontrol edin
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},{0} dan eski stok işlemlerini güncellemeye izin yok
 DocType: Stock Entry,Inspection Required,Muayene Gerekli
@@ -5959,6 +5964,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,Cari BOM ve Yeni BOM aynı olamaz
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,Maaş Kayma kimliği
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,Emeklilik Tarihi katılım tarihinden büyük olmalıdır
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Tedarikçi&gt; Tedarikçi Türü
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,Çoklu Varyantlar
 DocType: Sales Invoice,Against Income Account,Karşılık Gelir Hesabı
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% Teslim Edildi
@@ -6855,6 +6861,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rol Dondurulmuş Hesaplar ve Düzenleme Dondurulmuş Girişleri Set İzin
 DocType: Supplier Scorecard Scoring Variable,Path,yol
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,Çocuk nodları olduğundan Maliyet Merkezi ana deftere dönüştürülemez
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},{2} öğesi için UOM Dönüşüm faktörü ({0} -&gt; {1}) bulunamadı.
 DocType: Production Plan,Total Planned Qty,Toplam Planlanan Adet
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,İşlemler zaten ifadeden alındı
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,açılış Değeri
@@ -7097,6 +7104,7 @@
 DocType: Purchase Order,To Receive,Almak
 DocType: Leave Period,Holiday List for Optional Leave,İsteğe Bağlı İzin İçin Tatil Listesi
 DocType: Item Tax Template,Tax Rates,Vergi oranları
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Ürün Kodu&gt; Ürün Grubu&gt; Marka
 DocType: Asset,Asset Owner,Varlık Sahibi
 DocType: Item,Website Content,Web sitesi içeriği
 DocType: Bank Account,Integration ID,Entegrasyon kimliği
@@ -7239,6 +7247,7 @@
 DocType: Stock Entry Detail,Additional Cost,Ek maliyet
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher","Dekont, olarak gruplandırıldı ise Makbuz numarasına dayalı filtreleme yapamaz"
 DocType: Quality Inspection,Incoming,Alınan
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Lütfen Katılım&gt; Numaralandırma Serisi aracılığıyla Katılım için numaralandırma serilerini ayarlayın
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Satışlar ve satın alımlar için varsayılan vergi şablonları oluşturulmuştur.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,Değerlendirme Sonuç kaydı {0} zaten var.
 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.","Örnek: ABCD. #####. İşlemler için seri ayarlanmış ve Parti Numarası belirtilmediyse, bu seriye göre otomatik parti numarası oluşturulacaktır. Bu öğe için her zaman Batch No&#39;dan açıkça bahsetmek isterseniz, bunu boş bırakın. Not: Bu ayar, Stok Ayarları&#39;nda Adlandırma Serisi Önekine göre öncelikli olacaktır."
@@ -7607,6 +7616,7 @@
 DocType: BOM,Rate Of Materials Based On,Dayalı Ürün Br. Fiyatı
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Etkinleştirilmişse, Program Kayıt Aracı&#39;nda alan Akademik Şartı Zorunlu olacaktır."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","Muaf, sıfır değer ve GST dışı iç arz değerleri"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Müşteri&gt; Müşteri Grubu&gt; Bölge
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>Şirket</b> zorunlu bir filtredir.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,Tümünü işaretleme
 DocType: Purchase Taxes and Charges,On Item Quantity,Öğe Miktarı
@@ -7655,6 +7665,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,Yetersizlik adeti
 DocType: Purchase Invoice,Input Service Distributor,Giriş Servis Dağıtıcısı
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,Ürün çeşidi {0} aynı özelliklere sahip bulunmaktadır
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Lütfen Eğitim&gt; Eğitim Ayarları bölümünde Eğitmen Adlandırma Sistemini kurun
 DocType: Loan,Repay from Salary,Maaş dan ödemek
 DocType: Exotel Settings,API Token,API Simgesi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Requesting payment against {0} {1} for amount {2},"karşı ödeme talep {0}, {1} miktarda {2}"
diff --git a/erpnext/translations/uk.csv b/erpnext/translations/uk.csv
index d914e8a..9616c8a 100644
--- a/erpnext/translations/uk.csv
+++ b/erpnext/translations/uk.csv
@@ -390,6 +390,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,Прописані процедури
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,Показати тільки POS
 DocType: Supplier Group,Supplier Group Name,Назва групи постачальників
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Позначити відвідуваність як <b></b>
 DocType: Driver,Driving License Categories,Категорії авторизації
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,"Будь ласка, введіть дату доставки"
 DocType: Depreciation Schedule,Make Depreciation Entry,Створити операцію амортизації
@@ -1007,6 +1008,7 @@
 DocType: Company,Delete Company Transactions,Видалити операції компанії
 DocType: Production Plan Item,Quantity and Description,Кількість та опис
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,Посилання № та дата Reference є обов&#39;язковим для операції банку
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Будь ласка, встановіть назву серії на {0} за допомогою пункту Налаштування&gt; Налаштування&gt; Іменування серії"
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Додати / редагувати податки та збори
 DocType: Payment Entry Reference,Supplier Invoice No,Номер рахунку постачальника
 DocType: Territory,For reference,Для довідки
@@ -4236,6 +4238,8 @@
 DocType: Grant Application,Grant Application Details ,Детальні відомості про грант
 DocType: Employee Separation,Employee Separation,Розподіл працівників
 DocType: BOM Item,Original Item,Оригінальний предмет
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Видаліть працівника <a href=""#Form/Employee/{0}"">{0}</a> \, щоб скасувати цей документ"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Дата документа
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},Плата записи Створено - {0}
 DocType: Asset Category Account,Asset Category Account,Категорія активів Рахунок
@@ -5261,6 +5265,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Призначення подій до {0}, оскільки працівник приєднаний до нижчевказаного Відповідального з продажуі не має ідентифікатора користувача {1}"
 DocType: Timesheet,Billing Details,платіжна інформація
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,Вихідний і цільової склад повинні бути різними
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Будь ласка, налаштуйте Систему іменування співробітників у Людських ресурсах&gt; Налаштування HR"
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,"Оплата не вдалося. Будь ласка, перевірте свій GoCardless рахунок для отримання додаткової інформації"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},Не допускається оновлення складських операцій старше {0}
 DocType: Stock Entry,Inspection Required,Вимагається інспекція
@@ -5496,6 +5501,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,Нові норми не можуть бути такими ж як поточні
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,ID Зарплатного розрахунку
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,"Дата виходу на пенсію повинен бути більше, ніж дата влаштування"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Постачальник&gt; Тип постачальника
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,Кілька варіантів
 DocType: Sales Invoice,Against Income Account,На рахунок доходів
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% Доставлено
@@ -6338,6 +6344,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,"Роль, з якою можна встановлювати заблоковані рахунки та змінювати заблоковані проводки"
 DocType: Supplier Scorecard Scoring Variable,Path,Шлях
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,"Неможливо перетворити центр витрат у книгу, оскільки він має дочірні вузли"
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Коефіцієнт конверсії UOM ({0} -&gt; {1}) не знайдено для елемента: {2}
 DocType: Production Plan,Total Planned Qty,Загальна кількість запланованих
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,"Операції, вже вилучені з виписки"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Сума на початок роботи
@@ -6561,6 +6568,7 @@
 DocType: Purchase Order,To Receive,Отримати
 DocType: Leave Period,Holiday List for Optional Leave,Святковий список для необов&#39;язкового відпустки
 DocType: Item Tax Template,Tax Rates,Податкові ставки
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Код товару&gt; Група предметів&gt; Бренд
 DocType: Asset,Asset Owner,Власник майна
 DocType: Item,Website Content,Вміст веб-сайту
 DocType: Bank Account,Integration ID,Інтеграційний ідентифікатор
@@ -6687,6 +6695,7 @@
 DocType: Stock Entry Detail,Additional Cost,Додаткова вартість
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher",Неможливо фільтрувати по номеру документу якщо згруповано по документах
 DocType: Quality Inspection,Incoming,Вхідний
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Установіть серію нумерації для відвідування за допомогою параметра Налаштування&gt; Серія нумерації
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Шаблони податку за замовчуванням для продажу та покупки створені.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,Запис про результати оцінки {0} вже існує.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Приклад: ABCD. #####. Якщо серія встановлена і пакетний номер не згадується в транзакції, автоматичний номер партії буде створено на основі цієї серії. Якщо ви завжди хочете чітко вказати Batch No для цього елемента, залиште це порожнім. Примітка: цей параметр буде мати пріоритет над префіксом серії імен у розділі Налаштування запасу."
@@ -7030,6 +7039,7 @@
 DocType: BOM,Rate Of Materials Based On,Вартість матеріалів базується на
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Якщо включено, поле Academic Term буде обов&#39;язковим в інструменті реєстрації програм."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","Значення пільгових товарів, нульових значень та внутрішніх запасів без GST"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Клієнт&gt; Група клієнтів&gt; Територія
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>Компанія</b> - обов&#39;язковий фільтр.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,Скасувати всі
 DocType: Purchase Taxes and Charges,On Item Quantity,По кількості товару
@@ -7075,6 +7085,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,Брак к-сті
 DocType: Purchase Invoice,Input Service Distributor,Дистриб&#39;ютор послуг введення даних
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,Вже існує варіант позиції {0} з такими атрибутами
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,"Будь ласка, налаштуйте систему іменування інструкторів у програмі Освіта&gt; Налаштування освіти"
 DocType: Loan,Repay from Salary,Погашати із заробітної плати
 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} на суму {2}
diff --git a/erpnext/translations/ur.csv b/erpnext/translations/ur.csv
index 61b9410..b115fb4 100644
--- a/erpnext/translations/ur.csv
+++ b/erpnext/translations/ur.csv
@@ -382,6 +382,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,مقرر کردہ طریقہ کار
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,صرف POS دکھائیں
 DocType: Supplier Group,Supplier Group Name,سپلائر گروپ کا نام
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,بطور حاضری نشان زد کریں <b></b>
 DocType: Driver,Driving License Categories,ڈرائیونگ لائسنس زمرہ جات
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,ڈلیوری کی تاریخ درج کریں
 DocType: Depreciation Schedule,Make Depreciation Entry,ہراس اندراج
@@ -4139,6 +4140,8 @@
 DocType: Grant Application,Grant Application Details ,گرانٹ درخواست کی تفصیلات
 DocType: Employee Separation,Employee Separation,ملازم علیحدگی
 DocType: BOM Item,Original Item,اصل آئٹم
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","براہ کرم اس دستاویز کو منسوخ کرنے کے لئے ملازم <a href=""#Form/Employee/{0}"">{0}</a> delete کو حذف کریں"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,ڈاکٹر کی تاریخ
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},فیس ریکارڈز کی تشکیل - {0}
 DocType: Asset Category Account,Asset Category Account,ایسیٹ زمرہ اکاؤنٹ
@@ -5143,6 +5146,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}",کرنے کے واقعات کی ترتیب {0}، سیلز افراد کو ذیل میں کے ساتھ منسلک ملازم ایک صارف کی شناخت کی ضرورت نہیں ہے کے بعد سے {1}
 DocType: Timesheet,Billing Details,بلنگ کی تفصیلات
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,ذریعہ اور ہدف گودام مختلف ہونا لازمی ہے
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,برائے کرم انسانی وسائل&gt; HR کی ترتیبات میں ملازمین کے نام دینے کا نظام مرتب کریں
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,ادائیگی ناکام ہوگئی. مزید تفصیلات کے لئے براہ کرم اپنے گوشورڈ اکاؤنٹ چیک کریں
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},نہیں کے مقابلے میں بڑی عمر کے اسٹاک لین دین کو اپ ڈیٹ کرنے کی اجازت دی {0}
 DocType: Stock Entry,Inspection Required,معائنہ مطلوب
@@ -5371,6 +5375,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,موجودہ BOM اور نئی BOM ہی نہیں ہو سکتا
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,تنخواہ کی پرچی ID
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,ریٹائرمنٹ کے تاریخ شمولیت کی تاریخ سے زیادہ ہونا چاہیے
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,سپلائر&gt; سپلائر کی قسم
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,ایک سے زیادہ متغیرات
 DocType: Sales Invoice,Against Income Account,انکم اکاؤنٹ کے خلاف
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}٪ پھنچ گیا
@@ -6195,6 +6200,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,کردار منجمد اکاؤنٹس اور ترمیم منجمد اندراجات مقرر کرنے کی اجازت
 DocType: Supplier Scorecard Scoring Variable,Path,راستہ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,یہ بچے نوڈ ہے کے طور پر لیجر لاگت مرکز میں تبدیل نہیں کرسکتا
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM کے تبادلوں کا عنصر ({0} -&gt; {1}) آئٹم کے لئے نہیں ملا: {2}
 DocType: Production Plan,Total Planned Qty,کل منصوبہ بندی کی مقدار
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,لین دین پہلے ہی بیان سے پیچھے ہٹ گیا ہے۔
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,افتتاحی ویلیو
@@ -6414,6 +6420,7 @@
 DocType: Purchase Order,To Receive,وصول کرنے کے لئے
 DocType: Leave Period,Holiday List for Optional Leave,اختیاری اجازت کے لئے چھٹیوں کی فہرست
 DocType: Item Tax Template,Tax Rates,ٹیکس کی شرح
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,آئٹم کوڈ&gt; آئٹم گروپ&gt; برانڈ
 DocType: Asset,Asset Owner,اثاثہ مالک
 DocType: Item,Website Content,ویب سائٹ کا مواد۔
 DocType: Bank Account,Integration ID,انضمام ID
@@ -6536,6 +6543,7 @@
 DocType: Stock Entry Detail,Additional Cost,اضافی لاگت
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher",واؤچر نمبر کی بنیاد پر فلٹر کر سکتے ہیں، واؤچر کی طرف سے گروپ ہے
 DocType: Quality Inspection,Incoming,موصولہ
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,براہ کرم حاضری کے لئے نمبر بندی سیریز سیٹ اپ&gt; نمبرنگ سیریز کے ذریعے ترتیب دیں
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,سیلز اور خریداری کے لئے پہلے سے طے شدہ ٹیکس ٹیمپلیٹس بنائے جاتے ہیں.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,تشخیص کا نتیجہ ریکارڈ {0} پہلے ہی موجود ہے.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.",مثال: ABCD. #####. اگر سلسلہ سیٹ کیا جاتا ہے اور بیچ ٹرانزیکشنز میں ذکر نہیں کیا جاتا ہے، تو اس سلسلے کی بنیاد پر خود کار طریقے سے بیچ نمبر پیدا کی جائے گی. اگر آپ ہمیشہ اس آئٹم کے لئے بیچ نمبر کا ذکر کرنا چاہتے ہیں، تو اسے خالی چھوڑ دیں. نوٹ: یہ ترتیب اسٹاک کی ترتیبات میں نامنگ سیریز کے سابقہ پریفکس پر ترجیح لے گی.
@@ -6872,6 +6880,7 @@
 DocType: BOM,Rate Of Materials Based On,شرح معدنیات کی بنیاد پر
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.",اگر فعال ہو تو، فیلڈ تعلیمی ٹرم پروگرام کے اندراج کے آلے میں لازمی ہوگا.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies",مستثنیٰ ، نیل ریٹیڈ اور غیر جی ایس ٹی اندر کی فراہمی کی قدر۔
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,کسٹمر&gt; کسٹمر گروپ&gt; علاقہ
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>کمپنی</b> لازمی فلٹر ہے۔
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,تمام کو غیر منتخب
 DocType: Purchase Taxes and Charges,On Item Quantity,آئٹم کی مقدار پر۔
@@ -6917,6 +6926,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,کمی کی مقدار
 DocType: Purchase Invoice,Input Service Distributor,ان پٹ سروس ڈسٹریبیوٹر۔
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,آئٹم ویرینٹ {0} اسی صفات کے ساتھ موجود
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,براہ کرم تعلیم&gt; تعلیم کی ترتیبات میں انسٹرکٹر نام دینے کا نظام مرتب کریں
 DocType: Loan,Repay from Salary,تنخواہ سے ادا
 DocType: Exotel Settings,API Token,API ٹوکن۔
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Requesting payment against {0} {1} for amount {2},{2} {1} کے خلاف ادائیگی {2}
diff --git a/erpnext/translations/uz.csv b/erpnext/translations/uz.csv
index 2e0bef6..e7fdd01 100644
--- a/erpnext/translations/uz.csv
+++ b/erpnext/translations/uz.csv
@@ -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&#39;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
@@ -998,6 +999,7 @@
 DocType: Company,Delete Company Transactions,Kompaniya jarayonini o&#39;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&#39;yicha bitim uchun Yo&#39;naltiruvchi Yo&#39;naltiruvchi va Yo&#39;nalish sanasi majburiy hisoblanadi
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Iltimos, sozlash&gt; Sozlamalar&gt; Nomlash seriyalari orqali {0} uchun nomlash seriyasini o&#39;rnating"
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Soliqlarni va to&#39;lovlarni qo&#39;shish / tahrirlash
 DocType: Payment Entry Reference,Supplier Invoice No,Yetkazib beruvchi hisob raqami №
 DocType: Territory,For reference,Malumot uchun
@@ -4192,6 +4194,8 @@
 DocType: Grant Application,Grant Application Details ,Dastur haqida batafsil ma&#39;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&#39;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
@@ -5207,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&#39;rsatilgan Sotish Sotuviga qo&#39;yilgan xodimlar uchun foydalanuvchi identifikatori yo&#39;q {1}"
 DocType: Timesheet,Billing Details,To&#39;lov ma&#39;lumoti
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,Resurslar va maqsadli omborlar boshqacha bo&#39;lishi kerak
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Iltimos, xodimlarni nomlash tizimini inson resurslari&gt; Kadrlar sozlamalarida o&#39;rnating"
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,"To&#39;lov amalga oshmadi. Iltimos, batafsil ma&#39;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
@@ -5440,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&#39;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&#39;shilish sanasidan katta bo&#39;lishi kerak
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Ta&#39;minotchi&gt; Ta&#39;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
@@ -6268,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&#39;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&#39;chirish qurilmasiga aylantira olmaysiz, chunki u tugmachalarga ega"
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM konversiya koeffitsienti ({0} -&gt; {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
@@ -6490,6 +6497,7 @@
 DocType: Purchase Order,To Receive,Qabul qilmoq
 DocType: Leave Period,Holiday List for Optional Leave,Majburiy bo&#39;lmagan yo&#39;l uchun dam olish ro&#39;yxati
 DocType: Item Tax Template,Tax Rates,Soliq stavkalari
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Element kodi&gt; Tovar guruhi&gt; Tovar
 DocType: Asset,Asset Owner,Shaxs egasi
 DocType: Item,Website Content,Veb-sayt tarkibi
 DocType: Bank Account,Integration ID,Integratsiya identifikatori
@@ -6615,6 +6623,7 @@
 DocType: Stock Entry Detail,Additional Cost,Qo&#39;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&#39;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 &gt; Numbering Series,Iltimos Setup&gt; 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&#39;rnatilgan bo&#39;lsa va Batch No ko&#39;rsatilgan bo&#39;lsa, bu ketma-ketlik asosida avtomatik partiya raqami yaratiladi. Agar siz doimo bu element uchun &quot;Partiya No&quot; ni aniq ko&#39;rsatishni istasangiz, bo&#39;sh qoldiring. Eslatma: Ushbu sozlama Stok Sozlamalarida Nominal Seriya Prefiksidan ustunlik qiladi."
@@ -6956,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&#39;yxatga olish vositasida Akademiyasi muddat majburiy bo&#39;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&#39;lmagan ichki ta&#39;minot qiymatlari"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Xaridor&gt; Mijozlar guruhi&gt; 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&#39;yicha
@@ -7000,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 &gt; Education Settings,"Iltimos, Ta&#39;lim beruvchiga nom berish tizimini Ta&#39;lim sozlamalarida o&#39;rnating"
 DocType: Loan,Repay from Salary,Ish haqidan to&#39;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}
diff --git a/erpnext/translations/vi.csv b/erpnext/translations/vi.csv
index dbfcc91..5d6a765 100644
--- a/erpnext/translations/vi.csv
+++ b/erpnext/translations/vi.csv
@@ -390,6 +390,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,Thủ tục quy định
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,Chỉ hiển thị POS
 DocType: Supplier Group,Supplier Group Name,Tên nhóm nhà cung cấp
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Đánh dấu tham dự như <b></b>
 DocType: Driver,Driving License Categories,Lái xe hạng mục
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,Vui lòng nhập ngày giao hàng
 DocType: Depreciation Schedule,Make Depreciation Entry,Tạo bút toán khấu hao
@@ -1006,6 +1007,7 @@
 DocType: Company,Delete Company Transactions,Xóa Giao dịch Công ty
 DocType: Production Plan Item,Quantity and Description,Số lượng và mô tả
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,Số tham khảo và Kỳ hạn tham khảo là bắt buộc đối với giao dịch ngân hàng
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vui lòng đặt Sê-ri đặt tên cho {0} qua Cài đặt&gt; Cài đặt&gt; Sê-ri đặt tên
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Thêm / Sửa Thuế và phí
 DocType: Payment Entry Reference,Supplier Invoice No,Nhà cung cấp hóa đơn Không
 DocType: Territory,For reference,Để tham khảo
@@ -4241,6 +4243,8 @@
 DocType: Grant Application,Grant Application Details ,Chi tiết Đơn xin Cấp phép
 DocType: Employee Separation,Employee Separation,Tách nhân viên
 DocType: BOM Item,Original Item,Mục gốc
+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","Vui lòng xóa Nhân viên <a href=""#Form/Employee/{0}"">{0}</a> \ để hủy tài liệu này"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Ngày tài liệu
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},Hồ sơ Phí Tạo - {0}
 DocType: Asset Category Account,Asset Category Account,Loại tài khoản tài sản
@@ -5279,6 +5283,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}","Thiết kiện để {0}, vì các nhân viên thuộc dưới Sales Người không có một ID người dùng {1}"
 DocType: Timesheet,Billing Details,Chi tiết Thanh toán
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,Nguồn và kho đích phải khác nhau
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vui lòng thiết lập Hệ thống đặt tên nhân viên trong Nhân sự&gt; Cài đặt nhân sự
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,Thanh toán không thành công. Vui lòng kiểm tra Tài khoản GoCard của bạn để biết thêm chi tiết
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},Không được cập nhật giao dịch tồn kho cũ hơn {0}
 DocType: Stock Entry,Inspection Required,Kiểm tra yêu cầu
@@ -5514,6 +5519,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,BOM BOM hiện tại và mới không thể giống nhau
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,ID Phiếu lương
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,Ngày nghỉ hưu phải lớn hơn ngày gia nhập
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Nhà cung cấp&gt; Loại nhà cung cấp
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,Nhiều biến thể
 DocType: Sales Invoice,Against Income Account,Đối với tài khoản thu nhập
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}% Đã giao hàng
@@ -6355,6 +6361,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Vai trò được phép thiết lập các tài khoản đóng băng & chỉnh sửa các bút toán vô hiệu hóa
 DocType: Supplier Scorecard Scoring Variable,Path,Con đường
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,Không thể chuyển đổi Chi phí bộ phận sổ cái vì nó có các nút con
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Không tìm thấy yếu tố chuyển đổi UOM ({0} -&gt; {1}) cho mục: {2}
 DocType: Production Plan,Total Planned Qty,Tổng số lượng dự kiến
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,Giao dịch đã được truy xuất từ tuyên bố
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Giá trị mở
@@ -6578,6 +6585,7 @@
 DocType: Purchase Order,To Receive,Nhận
 DocType: Leave Period,Holiday List for Optional Leave,Danh sách kỳ nghỉ cho nghỉ phép tùy chọn
 DocType: Item Tax Template,Tax Rates,Thuế suất
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Mã hàng&gt; Nhóm vật phẩm&gt; Thương hiệu
 DocType: Asset,Asset Owner,Chủ tài sản
 DocType: Item,Website Content,Nội dung trang web
 DocType: Bank Account,Integration ID,ID tích hợp
@@ -6704,6 +6712,7 @@
 DocType: Stock Entry Detail,Additional Cost,Chi phí bổ sung
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher","Không thể lọc dựa trên số hiệu Voucher, nếu nhóm theo Voucher"
 DocType: Quality Inspection,Incoming,Đến
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vui lòng thiết lập chuỗi đánh số cho Tham dự thông qua Cài đặt&gt; Sê-ri đánh số
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Mẫu thuế mặc định cho bán hàng và mua hàng được tạo.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,Bản ghi kết quả đánh giá {0} đã tồn tại.
 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.","Ví dụ: ABCD. #####. Nếu chuỗi được đặt và Số lô không được đề cập trong giao dịch, thì số lô tự động sẽ được tạo dựa trên chuỗi này. Nếu bạn luôn muốn đề cập rõ ràng Lô hàng cho mục này, hãy để trống trường này. Lưu ý: cài đặt này sẽ được ưu tiên hơn Tiền tố Series đặt tên trong Cài đặt chứng khoán."
@@ -7047,6 +7056,7 @@
 DocType: BOM,Rate Of Materials Based On,Tỷ giá vật liệu dựa trên
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Nếu được bật, thuật ngữ Học thuật của trường sẽ được bắt buộc trong Công cụ đăng ký chương trình."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies","Giá trị của các nguồn cung cấp miễn trừ, không được xếp hạng và không phải GST"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Khách hàng&gt; Nhóm khách hàng&gt; Lãnh thổ
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>Công ty</b> là một bộ lọc bắt buộc.
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,Bỏ chọn tất cả
 DocType: Purchase Taxes and Charges,On Item Quantity,Về số lượng vật phẩm
@@ -7092,6 +7102,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,Lượng thiếu hụt
 DocType: Purchase Invoice,Input Service Distributor,Nhà phân phối dịch vụ đầu vào
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,Biến thể mẫu hàng {0} tồn tại với cùng một thuộc tính
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Vui lòng thiết lập Hệ thống đặt tên giảng viên trong giáo dục&gt; Cài đặt giáo dục
 DocType: Loan,Repay from Salary,Trả nợ từ lương
 DocType: Exotel Settings,API Token,Mã thông báo API
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Requesting payment against {0} {1} for amount {2},Yêu cầu thanh toán đối với {0} {1} cho số tiền {2}
diff --git a/erpnext/translations/zh.csv b/erpnext/translations/zh.csv
index 811f291..a562462 100644
--- a/erpnext/translations/zh.csv
+++ b/erpnext/translations/zh.csv
@@ -390,6 +390,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,规定程序
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,只显示POS
 DocType: Supplier Group,Supplier Group Name,供应商群组名称
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,将出席人数标记为<b></b>
 DocType: Driver,Driving License Categories,驾驶执照类别
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,请输入交货日期
 DocType: Depreciation Schedule,Make Depreciation Entry,创建计算折旧凭证
@@ -1007,6 +1008,7 @@
 DocType: Company,Delete Company Transactions,删除正式上线前的测试数据
 DocType: Production Plan Item,Quantity and Description,数量和描述
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,银行交易中参考编号和参考日期必填
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,请通过设置&gt;设置&gt;命名系列为{0}设置命名系列
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,添加/编辑税金及费用
 DocType: Payment Entry Reference,Supplier Invoice No,供应商费用清单编号
 DocType: Territory,For reference,供参考
@@ -4255,6 +4257,8 @@
 DocType: Grant Application,Grant Application Details ,授予申请细节
 DocType: Employee Separation,Employee Separation,员工离职
 DocType: BOM Item,Original Item,原物料
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","请删除员工<a href=""#Form/Employee/{0}"">{0}</a> \以取消此文档"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Doc Date
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},费纪录已建立 -  {0}
 DocType: Asset Category Account,Asset Category Account,资产类别的科目
@@ -5279,6 +5283,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}",设置活动为{0},因为附连到下面的销售者的员工不具有用户ID {1}
 DocType: Timesheet,Billing Details,开票(帐单)信息
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,源和目标仓库必须是不同的
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,请在人力资源&gt;人力资源设置中设置员工命名系统
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,支付失败。请检查您的GoCardless科目以了解更多信息
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},不允许对早于{0}的库存交易进行更新
 DocType: Stock Entry,Inspection Required,需要检验
@@ -5514,6 +5519,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,当前BOM和新BOM不能相同
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,工资单编号
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,退休日期必须大于入职日期
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,供应商&gt;供应商类型
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,多种变体
 DocType: Sales Invoice,Against Income Account,针对的收益账目
 apps/erpnext/erpnext/controllers/website_list_for_contact.py,{0}% Delivered,{0}%交付
@@ -6355,6 +6361,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,允许设置冻结科目和编辑冻结凭证的角色
 DocType: Supplier Scorecard Scoring Variable,Path,路径
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,不能将成本中心转换为分类账,因为它有子项。
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},找不到项目{2}的UOM转换因子({0}-&gt; {1})
 DocType: Production Plan,Total Planned Qty,总计划数量
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,已从报表中检索到的交易
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,期初金额
@@ -6578,6 +6585,7 @@
 DocType: Purchase Order,To Receive,等收货
 DocType: Leave Period,Holiday List for Optional Leave,可选假期的假期列表
 DocType: Item Tax Template,Tax Rates,税率
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,物料代码&gt;物料组&gt;品牌
 DocType: Asset,Asset Owner,资产所有者
 DocType: Item,Website Content,网站内容
 DocType: Bank Account,Integration ID,集成ID
@@ -6704,6 +6712,7 @@
 DocType: Stock Entry Detail,Additional Cost,额外费用
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher",按凭证分类后不能根据凭证编号过滤
 DocType: Quality Inspection,Incoming,来料检验
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,请通过“设置”&gt;“编号序列”为出勤设置编号序列
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,销售和采购的默认税收模板被创建。
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,评估结果记录{0}已经存在。
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.",例如:ABCD。#####。如果系列已设置且交易中未输入批号,则将根据此系列创建自动批号。如果您始终想要明确提及此料品的批号,请将此留为空白。注意:此设置将优先于库存设置中的名录前缀。
@@ -7047,6 +7056,7 @@
 DocType: BOM,Rate Of Materials Based On,基于以下的物料单价
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.",如果启用,则在学期注册工具中,字段学术期限将是强制性的。
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies",豁免,零税率和非商品及服务税内向供应的价值
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,客户&gt;客户组&gt;地区
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>公司</b>是强制性过滤器。
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,取消全选
 DocType: Purchase Taxes and Charges,On Item Quantity,关于物品数量
@@ -7092,6 +7102,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,短缺数量
 DocType: Purchase Invoice,Input Service Distributor,输入服务分销商
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,相同属性物料变体{0}已存在
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,请在“教育”&gt;“教育设置”中设置教师命名系统
 DocType: Loan,Repay from Salary,从工资偿还
 DocType: Exotel Settings,API Token,API令牌
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Requesting payment against {0} {1} for amount {2},请求对付款{0} {1}量{2}
diff --git a/erpnext/translations/zh_tw.csv b/erpnext/translations/zh_tw.csv
index 326cce4..958977a 100644
--- a/erpnext/translations/zh_tw.csv
+++ b/erpnext/translations/zh_tw.csv
@@ -347,6 +347,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Prescribed Procedures,規定程序
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js,Show only POS,只顯示POS
 DocType: Supplier Group,Supplier Group Name,供應商集團名稱
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,將出席人數標記為<b></b>
 DocType: Driver,Driving License Categories,駕駛執照類別
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please enter Delivery Date,請輸入交貨日期
 DocType: Depreciation Schedule,Make Depreciation Entry,計提折舊進入
@@ -918,6 +919,7 @@
 DocType: Company,Delete Company Transactions,刪除公司事務
 DocType: Production Plan Item,Quantity and Description,數量和描述
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference No and Reference Date is mandatory for Bank transaction,參考編號和參考日期是強制性的銀行交易
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,請通過設置&gt;設置&gt;命名系列為{0}設置命名系列
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,新增 / 編輯稅金及費用
 DocType: Payment Entry Reference,Supplier Invoice No,供應商發票號碼
 DocType: Territory,For reference,供參考
@@ -3897,6 +3899,8 @@
 DocType: Grant Application,Grant Application Details ,授予申請細節
 DocType: Employee Separation,Employee Separation,員工分離
 DocType: BOM Item,Original Item,原始項目
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","請刪除員工<a href=""#Form/Employee/{0}"">{0}</a> \以取消此文檔"
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py,Fee Records Created - {0},費紀錄創造 -  {0}
 DocType: Asset Category Account,Asset Category Account,資產類別的帳戶
 apps/erpnext/erpnext/controllers/item_variant.py,The value {0} is already assigned to an exisiting Item {2}.,值{0}已分配給現有項{2}。
@@ -4861,6 +4865,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}",設置活動為{0},因為附連到下面的銷售者的僱員不具有用戶ID {1}
 DocType: Timesheet,Billing Details,結算明細
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Source and target warehouse must be different,源和目標倉庫必須是不同的
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,請在人力資源&gt;人力資源設置中設置員工命名系統
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py,Payment Failed. Please check your GoCardless Account for more details,支付失敗。請檢查您的GoCardless帳戶以了解更多詳情
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},不允許更新比{0}舊的庫存交易
 DocType: Stock Entry,Inspection Required,需要檢驗
@@ -5075,6 +5080,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,當前BOM和新BOM不能相同
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py,Salary Slip ID,工資單編號
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Date Of Retirement must be greater than Date of Joining,日期退休必須大於加入的日期
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,供應商&gt;供應商類型
 apps/erpnext/erpnext/stock/doctype/item/item.js,Multiple Variants,多種變體
 DocType: Sales Invoice,Against Income Account,對收入帳戶
 DocType: Subscription,Trial Period Start Date,試用期開始日期
@@ -5850,6 +5856,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,允許設定凍結帳戶和編輯凍結分錄的角色
 DocType: Supplier Scorecard Scoring Variable,Path,路徑
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py,Cannot convert Cost Center to ledger as it has child nodes,不能成本中心轉換為總賬,因為它有子節點
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},找不到項目{2}的UOM轉換因子({0}-&gt; {1})
 DocType: Production Plan,Total Planned Qty,總計劃數量
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Transactions already retreived from the statement,已從報表中檢索到的交易
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,開度值
@@ -6057,6 +6064,7 @@
 DocType: Purchase Order,To Receive,接受
 DocType: Leave Period,Holiday List for Optional Leave,可選假期的假期列表
 DocType: Item Tax Template,Tax Rates,稅率
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,物料代碼&gt;物料組&gt;品牌
 DocType: Asset,Asset Owner,資產所有者
 DocType: Item,Website Content,網站內容
 DocType: Purchase Invoice,Reason For Putting On Hold,擱置的理由
@@ -6173,6 +6181,7 @@
 DocType: Stock Entry Detail,Additional Cost,額外費用
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,"Can not filter based on Voucher No, if grouped by Voucher",是冷凍的帳戶。要禁止該帳戶創建/編輯事務,你需要角色
 DocType: Quality Inspection,Incoming,來
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,請通過“設置”&gt;“編號序列”為出勤設置編號序列
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,銷售和採購的默認稅收模板被創建。
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py,Assessment Result record {0} already exists.,評估結果記錄{0}已經存在。
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.",例如:ABCD。#####。如果系列已設置且交易中未提及批號,則將根據此系列創建自動批號。如果您始終想要明確提及此料品的批號,請將此留為空白。注意:此設置將優先於庫存設置中的命名系列前綴。
@@ -6487,6 +6496,7 @@
 DocType: BOM,Rate Of Materials Based On,材料成本基於
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.",如果啟用,則在學期註冊工具中,字段學術期限將是強制性的。
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Values of exempt, nil rated and non-GST inward supplies",豁免,零稅率和非商品及服務稅內向供應的價值
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,客戶&gt;客戶組&gt;地區
 apps/erpnext/erpnext/regional/report/datev/datev.py,<b>Company</b> is a mandatory filter.,<b>公司</b>是強制性過濾器。
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Uncheck all,取消所有
 DocType: Purchase Taxes and Charges,On Item Quantity,關於物品數量
@@ -6529,6 +6539,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Shortage Qty,短缺數量
 DocType: Purchase Invoice,Input Service Distributor,輸入服務分銷商
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item variant {0} exists with same attributes,項目變種{0}存在具有相同屬性
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,請在“教育”&gt;“教育設置”中設置教師命名系統
 DocType: Loan,Repay from Salary,從工資償還
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Requesting payment against {0} {1} for amount {2},請求對付款{0} {1}量{2}
 DocType: Additional Salary,Salary Slip,工資單