fix: conflicts
diff --git a/erpnext/translations/sl.csv b/erpnext/translations/sl.csv
index 408db89..8eef545 100644
--- a/erpnext/translations/sl.csv
+++ b/erpnext/translations/sl.csv
@@ -44,7 +44,6 @@
DocType: Exchange Rate Revaluation Account,New Exchange Rate,Nov tečaj
apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py,Currency is required for Price List {0},Valuta je potrebna za tečajnico {0}
DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Bo izračunano v transakciji.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource > HR Settings,"Prosimo, nastavite sistem poimenovanja zaposlenih v kadrovskem sektorju> Nastavitve človeških virov"
DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-YYYY-
DocType: Purchase Order,Customer Contact,Stranka Kontakt
DocType: Shift Type,Enable Auto Attendance,Omogoči samodejno udeležbo
@@ -96,6 +95,7 @@
DocType: Support Settings,Support Settings,Nastavitve podpora
apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0} is added in the child company {1},Račun {0} je dodan v otroškem podjetju {1}
apps/erpnext/erpnext/erpnext_integrations/doctype/exotel_settings/exotel_settings.py,Invalid credentials,Neveljavne poverilnice
+apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js,Mark Work From Home,Označi delo od doma
apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,ITC Available (whether in full op part),ITC Na voljo (v celoti v delu)
DocType: Amazon MWS Settings,Amazon MWS Settings,Amazonske nastavitve MWS
apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Processing Vouchers,Obdelava bonov
@@ -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
@@ -409,7 +410,6 @@
apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py,Membership Details,Podrobnosti o članstvu
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,{0} {1}: Supplier is required against Payable account {2},{0} {1}: zahtevan je Dobavitelj za račun izdatkov {2}
apps/erpnext/erpnext/config/buying.py,Items and Pricing,Predmeti in Cene
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer > Customer Group > Territory,Stranka> Skupina kupcev> Ozemlje
apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html,Total hours: {0},Skupno število ur: {0}
apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py,From Date should be within the Fiscal Year. Assuming From Date = {0},Od datuma mora biti v poslovnem letu. Ob predpostavki Od datuma = {0}
DocType: Patient Medical Record,HLC-PMR-.YYYY.-,HLC-PMR-YYYY.-
@@ -456,7 +456,6 @@
DocType: Quiz Result,Selected Option,Izbrana možnost
DocType: SG Creation Tool Course,SG Creation Tool Course,SG ustvarjanja orodje za golf
DocType: Bank Statement Transaction Invoice Item,Payment Description,Opis plačila
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Prosimo, nastavite Naming Series za {0} z nastavitvijo> Settings> Naming Series"
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Insufficient Stock,Nezadostna zaloga
DocType: Email Digest,New Sales Orders,Novi prodajni nalogi
DocType: Bank Account,Bank Account,Bančni račun
@@ -778,6 +777,7 @@
DocType: Healthcare Settings,Require Lab Test Approval,Zahtevajte odobritev testa za laboratorij
DocType: Attendance,Working Hours,Delovni čas
apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html,Total Outstanding,Skupaj izjemen
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -> {1}) not found for item: {2},Faktor konverzije za UOM ({0} -> {1}) za element: {2}
DocType: Naming Series,Change the starting / current sequence number of an existing series.,Spremenite izhodiščno / trenutno zaporedno številko obstoječega zaporedja.
DocType: Accounts Settings,Percentage you are allowed to bill more against the amount ordered. For example: If the order value is $100 for an item and tolerance is set as 10% then you are allowed to bill for $110.,"Odstotek vam lahko zaračuna več v primerjavi z naročenim zneskom. Na primer: Če je vrednost naročila za izdelek 100 USD in je toleranca nastavljena na 10%, potem lahko zaračunate 110 USD."
DocType: Dosage Strength,Strength,Moč
@@ -1007,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 > Settings > Naming Series,"Prosimo, nastavite Naming Series za {0} z nastavitvijo> Settings> 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
@@ -1271,7 +1272,6 @@
DocType: Pricing Rule Item Group,Pricing Rule Item Group,Skupina izdelkov s predpisi o cenah
DocType: Travel Itinerary,Travel To,Potovati v
apps/erpnext/erpnext/config/accounts.py,Exchange Rate Revaluation master.,Poveljnik prevrednotenja deviznega tečaja
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup > Numbering Series,Nastavite serijsko številčenje za udeležbo prek Setup> Numbering Series
apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Write Off Amount,Napišite enkratnem znesku
DocType: Leave Block List Allow,Allow User,Dovoli Uporabnik
DocType: Journal Entry,Bill No,Bill Ne
@@ -1628,6 +1628,7 @@
DocType: Sales Team,Incentives,Spodbude
apps/erpnext/erpnext/accounts/general_ledger.py,Values Out Of Sync,Vrednosti niso sinhronizirane
apps/erpnext/erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py,Difference Value,Vrednost razlike
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup > Numbering Series,Nastavite serijsko številčenje za udeležbo prek Setup> Numbering Series
DocType: SMS Log,Requested Numbers,Zahtevane številke
DocType: Volunteer,Evening,Večer
DocType: Quiz,Quiz Configuration,Konfiguracija kviza
@@ -1795,6 +1796,7 @@
DocType: Student Admission,Publish on website,Objavi na spletni strani
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Supplier Invoice Date cannot be greater than Posting Date,Datum dobavitelj na računu ne sme biti večja od Napotitev Datum
DocType: Installation Note,MAT-INS-.YYYY.-,MAT-INS-.LLLL.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code > Item Group > Brand,Koda izdelka> Skupina izdelkov> Blagovna znamka
DocType: Subscription,Cancelation Date,Datum preklica
DocType: Purchase Invoice Item,Purchase Order Item,Naročilnica item
DocType: Agriculture Task,Agriculture Task,Kmetijska naloga
@@ -2401,7 +2403,6 @@
DocType: Target Detail,Target Distribution,Target Distribution
DocType: Purchase Invoice,06-Finalization of Provisional assessment,06-Dokončanje začasne ocene
apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Parties and Addresses,Uvozne stranke in naslovi
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -> {1}) not found for item: {2},Faktor konverzije za UOM ({0} -> {1}) za element: {2}
DocType: Salary Slip,Bank Account No.,Št. bančnega računa
DocType: Naming Series,This is the number of the last created transaction with this prefix,To je številka zadnjega ustvarjene transakcijo s tem predpono
DocType: Supplier Scorecard,"Scorecard variables can be used, as well as:
@@ -2795,6 +2796,9 @@
DocType: Pricing Rule,Supplier Group,Skupina dobaviteljev
apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py,{0} Digest,{0} Razlaga
apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0}: From Time and To Time of {1} is overlapping with {2},Vrstica {0}: V času in času {1} se prekrivajo z {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,"A BOM with name {0} already exists for item {1}.
+ <br> Did you rename the item? Please contact Administrator / Tech support
+ ",Za element {1} že obstaja BOM z imenom {0}. <br> Ali ste izdelek preimenovali? Obrnite se na skrbnika / tehnično podporo
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Stock Liabilities,Zaloga Obveznosti
DocType: Purchase Invoice,Supplier Warehouse,Dobavitelj Skladišče
DocType: Opportunity,Contact Mobile No,Kontaktna mobilna številka
@@ -3242,6 +3246,7 @@
DocType: Quality Inspection,MAT-QA-.YYYY.-,MAT-QA-YYYY-
DocType: Quality Meeting Table,Quality Meeting Table,Kakovostna tabela za sestanke
apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,Obiščite forume
+apps/erpnext/erpnext/projects/doctype/task/task.py,Cannot complete task {0} as its dependant task {1} are not ccompleted / cancelled.,"Naloge ni mogoče dokončati {0}, ker njegova odvisna naloga {1} ni dokončana / preklicana."
DocType: Student,Student Mobile Number,Študent mobilno številko
DocType: Item,Has Variants,Ima različice
DocType: Employee Benefit Claim,Claim Benefit For,Claim Benefit For
@@ -3402,7 +3407,6 @@
apps/erpnext/erpnext/education/doctype/fee_structure/fee_structure.js,Create Fee Schedule,Ustvari urnik pristojbin
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py,Repeat Customer Revenue,Ponovite Customer Prihodki
DocType: Soil Texture,Silty Clay Loam,Silty Clay Loam
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education > Education Settings,Nastavite sistem poimenovanja inštruktorjev v izobraževanju> Nastavitve za izobraževanje
DocType: Quiz,Enter 0 to waive limit,Vnesite 0 za omejitev omejitve
DocType: Bank Statement Settings,Mapped Items,Kartirani elementi
DocType: Amazon MWS Settings,IT,IT
@@ -3436,7 +3440,6 @@
Please create or link {1} Assets with respective document.",Ustvarjeno ali povezano z {0} ni dovolj sredstev. \ Ustvarite ali povežite {1} Sredstva z ustreznim dokumentom.
DocType: Pricing Rule,Apply Rule On Brand,Uporabi pravilo o blagovni znamki
DocType: Task,Actual End Date (via Time Sheet),Dejanski končni datum (preko Čas lista)
-apps/erpnext/erpnext/projects/doctype/task/task.py,Cannot close task {0} as its dependant task {1} is not closed.,"Naloge ni mogoče zapreti {0}, ker njena odvisna naloga {1} ni zaprta."
DocType: Soil Texture,Soil Type,Vrsta tal
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Amount {0} {1} against {2} {3},Znesek {0} {1} proti {2} {3}
,Quotation Trends,Trendi ponudb
@@ -3466,6 +3469,7 @@
DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Stalni ocenjevalni list dobavitelja
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,Row {0}: Bill of Materials not found for the Item {1},Vrstica {0}: Kosovnica nismo našli v postavki {1}
DocType: Contract Fulfilment Checklist,Requirement,Zahteva
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource > HR Settings,"Prosimo, nastavite sistem poimenovanja zaposlenih v kadrovski službi> Nastavitve človeških virov"
DocType: Journal Entry,Accounts Receivable,Terjatve
DocType: Quality Goal,Objectives,Cilji
DocType: HR Settings,Role Allowed to Create Backdated Leave Application,Vloga dovoljena za ustvarjanje programa za nazaj
@@ -3607,6 +3611,7 @@
DocType: Student Applicant,Applied,Applied
apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Details of Outward Supplies and inward supplies liable to reverse charge,"Podrobnosti o zunanjih potrebščinah in notranjih zalogah, za katere je mogoče povratno polnjenje"
apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Re-open,Re-open
+apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py,Not permitted. Please disable the Lab Test Template,Ni dovoljeno. Onemogočite predlogo za preskus laboratorija
DocType: Sales Invoice Item,Qty as per Stock UOM,Kol. kot na UOM
apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Name,Ime skrbnika2
apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,Root Company,Root Company
@@ -3666,6 +3671,7 @@
apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js,Type of Business,Vrsta podjetja
DocType: Sales Invoice,Consumer,Potrošniški
apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Prosimo, izberite Dodeljeni znesek, fakture Vrsta in številka računa v atleast eno vrstico"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Prosimo, nastavite Naming Series za {0} z nastavitvijo> Settings> Naming Series"
apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py,Cost of New Purchase,Stroški New Nakup
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,Sales Order required for Item {0},Sales Order potreben za postavko {0}
DocType: Grant Application,Grant Description,Grant Opis
@@ -3692,7 +3698,6 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please click on 'Generate Schedule' to get schedule,"Prosimo, kliknite na "ustvarjajo Seznamu", da bi dobili razpored"
DocType: Item,"Purchase, Replenishment Details","Podrobnosti o nakupu, dopolnitvi"
DocType: Products Settings,Enable Field Filters,Omogoči filtre polja
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code > Item Group > Brand,Koda izdelka> Skupina izdelkov> Blagovna znamka
apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot be Purchase Item also",""Artikel, ki ga zagotavlja stranka", tudi ni mogoče kupiti"
DocType: Blanket Order Item,Ordered Quantity,Naročeno Količina
apps/erpnext/erpnext/public/js/setup_wizard.js,"e.g. ""Build tools for builders""",npr "Build orodja za gradbenike"
@@ -4164,7 +4169,7 @@
DocType: Authorization Rule,Applicable To (Role),Ki se uporabljajo za (vloga)
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html,Pending Leaves,Čakajoči listi
DocType: BOM Update Tool,Replace BOM,Zamenjajte BOM
-apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py,Code {0} already exist,Koda {0} že obstaja
+apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py,Code {0} already exist,Koda {0} že obstaja
DocType: Patient Encounter,Procedures,Postopki
apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Sales orders are not available for production,Prodajna naročila niso na voljo za proizvodnjo
DocType: Asset Movement,Purpose,Namen
@@ -4229,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
@@ -4261,6 +4268,7 @@
DocType: Warranty Claim,Service Address,Storitev Naslov
apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.js,Import Master Data,Uvozi glavne podatke
DocType: Asset Maintenance Task,Calibration,Praznovanje
+apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py,Lab Test Item {0} already exist,Predmet laboratorijskega testa {0} že obstaja
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,{0} is a company holiday,{0} je praznik podjetja
apps/erpnext/erpnext/projects/report/billing_summary.py,Billable Hours,Obračunske ure
apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py,Leave Status Notification,Pustite obvestilo o stanju
@@ -4614,7 +4622,7 @@
,Salary Register,plača Registracija
DocType: Company,Default warehouse for Sales Return,Privzeto skladišče za vračilo prodaje
DocType: Pick List,Parent Warehouse,Parent Skladišče
-DocType: Subscription,Net Total,Neto Skupaj
+DocType: C-Form Invoice Detail,Net Total,Neto Skupaj
apps/erpnext/erpnext/stock/doctype/batch/batch.py,"Set item's shelf life in days, to set expiry based on manufacturing date plus shelf-life.","Nastavite rok uporabe izdelka v dnevih, da nastavite rok uporabnosti glede na datum izdelave in rok uporabnosti."
apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Default BOM not found for Item {0} and Project {1},Privzeti BOM nismo našli v postavki {0} in projektno {1}
apps/erpnext/erpnext/regional/italy/utils.py,Row {0}: Please set the Mode of Payment in Payment Schedule,Vrstica {0}: v plačilni shemi nastavite način plačila
@@ -4729,7 +4737,7 @@
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Target warehouse is mandatory for row {0},Ciljna skladišče je obvezna za vrstico {0}
apps/erpnext/erpnext/config/retail.py,Retail Operations,Maloprodajne dejavnosti
DocType: Cheque Print Template,Primary Settings,primarni Nastavitve
-DocType: Attendance Request,Work From Home,Delo z doma
+DocType: Attendance,Work From Home,Delo z doma
DocType: Purchase Invoice,Select Supplier Address,Izberite Dobavitelj naslov
apps/erpnext/erpnext/public/js/event.js,Add Employees,Dodaj Zaposleni
DocType: Purchase Invoice Item,Quality Inspection,Quality Inspection
@@ -4973,8 +4981,6 @@
DocType: QuickBooks Migrator,Authorization URL,URL avtorizacije
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Amount {0} {1} {2} {3},Znesek {0} {1} {2} {3}
DocType: Account,Depreciation,Amortizacija
-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/accounts/doctype/share_transfer/share_transfer.py,The number of shares and the share numbers are inconsistent,Število delnic in številke delnic so neskladne
apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Supplier(s),Dobavitelj (-i)
DocType: Employee Attendance Tool,Employee Attendance Tool,Zaposleni Udeležba Tool
@@ -5254,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 > HR Settings,"Prosimo, nastavite sistem poimenovanja zaposlenih v kadrovski službi> 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
@@ -5281,7 +5288,6 @@
DocType: Cheque Print Template,Cheque Height,Ček Višina
DocType: Supplier,Supplier Details,Dobavitelj Podrobnosti
DocType: Setup Progress,Setup Progress,Napredek nastavitve
-DocType: Expense Claim,Approval Status,Stanje odobritve
apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,From value must be less than to value in row {0},Iz mora biti vrednost manj kot na vrednosti v vrstici {0}
DocType: Program,Intro Video,Intro video
DocType: Manufacturing Settings,Default Warehouses for Production,Privzeta skladišča za proizvodnjo
@@ -5489,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 > Supplier Type,Dobavitelj> 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
@@ -5625,7 +5632,6 @@
apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,Slots for {0} are not added to the schedule,Reže za {0} niso dodane v razpored
DocType: Product Bundle,List items that form the package.,"Seznam predmetov, ki tvorijo paket."
apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py,Target Location is required while transferring Asset {0},Med prenosom sredstev {0} je potrebna ciljna lokacija.
-apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py,Not permitted. Please disable the Test Template,"Ni dovoljeno. Prosimo, onemogočite preskusno predlogo"
DocType: Sales Invoice,Distance (in km),Oddaljenost (v km)
apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,Odstotek dodelitve mora biti enaka 100%
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,Izberite datum objave pred izbiro stranko
@@ -5756,7 +5762,6 @@
DocType: Purchase Invoice,Price List Exchange Rate,Cenik Exchange Rate
apps/erpnext/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py,All Supplier Groups,Vse skupine dobaviteljev
DocType: Employee Boarding Activity,Required for Employee Creation,Potreben za ustvarjanje zaposlenih
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier > Supplier Type,Dobavitelj> Vrsta dobavitelja
apps/erpnext/erpnext/accounts/doctype/account/account.py,Account Number {0} already used in account {1},Številka računa {0} je že uporabljena v računu {1}
DocType: GoCardless Mandate,Mandate,Mandat
DocType: Hotel Room Reservation,Booked,Rezervirano
@@ -5822,7 +5827,6 @@
DocType: Sales Partner,Sales Partner Name,Prodaja Partner Name
apps/erpnext/erpnext/hooks.py,Request for Quotations,Zahteva za Citati
DocType: Payment Reconciliation,Maximum Invoice Amount,Največja Znesek računa
-apps/erpnext/erpnext/accounts/doctype/bank_account/test_bank_account.py,BankAccount.validate_iban() failed for empty IBAN,Za prazen IBAN ni uspel BankAccount.validate_iban ()
DocType: Normal Test Items,Normal Test Items,Normalni preskusni elementi
DocType: QuickBooks Migrator,Company Settings,Nastavitve podjetja
DocType: Additional Salary,Overwrite Salary Structure Amount,Znesek nadomestila plače prepišite
@@ -5976,6 +5980,7 @@
DocType: Leave Allocation,Leave Period,Pustite obdobje
DocType: Item,Default Material Request Type,Privzeto Material Vrsta Zahteva
DocType: Supplier Scorecard,Evaluation Period,Ocenjevalno obdobje
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer > Customer Group > Territory,Stranka> Skupina kupcev> Ozemlje
apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js,Unknown,Neznan
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Work Order not created,Delovni nalog ni bil ustvarjen
apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
@@ -6332,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} -> {1}) not found for item: {2},Faktor konverzije za UOM ({0} -> {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
@@ -6340,8 +6346,11 @@
DocType: Material Request Plan Item,Required Quantity,Zahtevana količina
DocType: Lab Test Template,Lab Test Template,Lab Test Template
apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Računovodsko obdobje se prekriva z {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier > Supplier Type,Dobavitelj> Vrsta dobavitelja
apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,Prodajni račun
DocType: Purchase Invoice Item,Total Weight,Totalna teža
+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"
DocType: Pick List Item,Pick List Item,Izberi element seznama
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Commission on Sales,Komisija za prodajo
DocType: Job Offer Term,Value / Description,Vrednost / Opis
@@ -6456,6 +6465,7 @@
DocType: Contract,Signed On,Podpisano
DocType: Bank Account,Party Type,Vrsta Party
DocType: Discounted Invoice,Discounted Invoice,Popustni račun
+apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Označi udeležbo kot <b></b>
DocType: Payment Schedule,Payment Schedule,Urnik plačila
apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,No Employee found for the given employee field value. '{}': {},Za določeno vrednost polja zaposlenega ni bilo najdenega zaposlenega. '{}': {}
DocType: Item Attribute Value,Abbreviation,Kratica
@@ -6551,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 > Item Group > Brand,Koda izdelka> Skupina izdelkov> Blagovna znamka
DocType: Asset,Asset Owner,Lastnik sredstev
DocType: Item,Website Content,Vsebina spletnega mesta
DocType: Bank Account,Integration ID,ID integracije
@@ -6558,7 +6569,6 @@
DocType: Employee,Personal Email,Osebna Email
apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py,Total Variance,Skupne variance
DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Če je omogočeno, bo sistem objavili računovodske vnose za popis samodejno."
-apps/erpnext/erpnext/accounts/doctype/bank_account/test_bank_account.py,BankAccount.validate_iban() accepted invalid IBAN {},BankAccount.validate_iban () sprejel neveljaven IBAN {}
apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Brokerage,Posredništvo
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Attendance for employee {0} is already marked for this day,Udeležba na zaposlenega {0} je že označen za ta dan
DocType: Work Order Operation,"in Minutes
@@ -6678,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 > Numbering Series,Nastavite serijsko številčenje za udeležbo prek Setup> 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."
@@ -6829,6 +6840,7 @@
apps/erpnext/erpnext/regional/report/irs_1099/irs_1099.js,Print IRS 1099 Forms,Natisni obrazci IRS 1099
DocType: Asset,Check if Asset requires Preventive Maintenance or Calibration,"Preverite, ali sredstva potrebujejo preventivno vzdrževanje ali kalibracijo"
apps/erpnext/erpnext/public/js/setup_wizard.js,Company Abbreviation cannot have more than 5 characters,Kratica podjetja ne sme imeti več kot 5 znakov
+apps/erpnext/erpnext/setup/doctype/company/company.py,Parent Company must be a group company,Matična družba mora biti skupinska družba
DocType: Employee,Reports to,Poročila
,Unpaid Expense Claim,Neplačana Expense zahtevek
DocType: Payment Entry,Paid Amount,Znesek Plačila
@@ -6918,6 +6930,7 @@
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Opp Count,Opp Štetje
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Both Trial Period Start Date and Trial Period End Date must be set,Določiti je treba začetni datum preizkusnega obdobja in datum konca poskusnega obdobja
apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,Povprečna hitrost
+DocType: Appointment,Appointment With,Sestanek s
apps/erpnext/erpnext/controllers/accounts_controller.py,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Skupni znesek plačila v urniku plačil mora biti enak znesku zaokroženo / zaokroženo
apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate",""Izdelek, ki ga zagotavlja stranka", ne more imeti stopnje vrednotenja"
DocType: Subscription Plan Detail,Plan,Načrt
@@ -7019,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 > Customer Group > Territory,Stranka> Skupina kupcev> 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
@@ -7051,7 +7065,6 @@
apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Opp/Lead %,OPP / svinec%
DocType: Bank Guarantee,Bank Account Info,Informacije o bančnem računu
DocType: Bank Guarantee,Bank Guarantee Type,Vrsta bančne garancije
-apps/erpnext/erpnext/accounts/doctype/bank_account/test_bank_account.py,BankAccount.validate_iban() failed for valid IBAN {},BankAccount.validate_iban () ni uspel za veljavno IBAN {}
DocType: Payment Schedule,Invoice Portion,Delež računa
,Asset Depreciations and Balances,Premoženjem amortizacije in Stanja
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Amount {0} {1} transferred from {2} to {3},Znesek {0} {1} je preselil iz {2} na {3}
@@ -7065,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 > Education Settings,Nastavite sistem poimenovanja inštruktorjev v izobraževanju> 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}
@@ -7720,7 +7734,6 @@
apps/erpnext/erpnext/crm/doctype/email_campaign/email_campaign.py,Please set up the Campaign Schedule in the Campaign {0},"Prosimo, nastavite razpored akcije v kampanji {0}"
apps/erpnext/erpnext/config/buying.py,Price List master.,Cenik gospodar.
DocType: Task,Review Date,Pregled Datum
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Označi udeležbo kot <b></b>
DocType: BOM,Allow Alternative Item,Dovoli alternativni element
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Receipt doesn't have any Item for which Retain Sample is enabled.,"Potrdilo o nakupu nima nobenega predmeta, za katerega bi bil omogočen Retain Sample."
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Invoice Grand Total,Račun za skupni znesek
@@ -7950,7 +7963,6 @@
DocType: Amazon MWS Settings,Max Retry Limit,Najvišja poskusna omejitev
apps/erpnext/erpnext/accounts/page/pos/pos.js,Price List not found or disabled,Cenik ni mogoče najti ali onemogočena
DocType: Content Activity,Last Activity ,Zadnja aktivnost
-DocType: Student Applicant,Approved,Odobreno
DocType: Pricing Rule,Price,Cena
apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Employee relieved on {0} must be set as 'Left',Zaposleni razrešen na {0} mora biti nastavljen kot "levo"
DocType: Guardian,Guardian,Guardian
@@ -8122,6 +8134,7 @@
DocType: GL Entry,To Rename,Če želite preimenovati
DocType: Stock Entry,Repack,Zapakirajte
apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Select to add Serial Number.,"Izberite, če želite dodati serijsko številko."
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education > Education Settings,Nastavite sistem poimenovanja inštruktorjev v izobraževanju> Nastavitve za izobraževanje
apps/erpnext/erpnext/regional/italy/utils.py,Please set Fiscal Code for the customer '%s',"Prosimo, nastavite davčno kodo za stranko '% s'"
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select the Company first,Najprej izberite podjetje
DocType: Item Attribute,Numeric Values,Numerične vrednosti
@@ -8138,6 +8151,7 @@
apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html,Cart is Empty,Košarica je Prazna
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Item {0} has no Serial No. Only serilialized items \
can have delivery based on Serial No",Element {0} nima serijske številke. Samo serilializirani predmeti \ lahko imajo dostavo na podlagi serijske št
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Depreciated Amount,Znesek amortizacije
DocType: Vehicle,Model,Model
DocType: Work Order,Actual Operating Cost,Dejanski operacijski stroškov
DocType: Payment Entry,Cheque/Reference No,Ček / referenčna številka