[translations]
diff --git a/erpnext/translations/no.csv b/erpnext/translations/no.csv
index 879f9ca..b7c708b 100644
--- a/erpnext/translations/no.csv
+++ b/erpnext/translations/no.csv
@@ -11,7 +11,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +52,Account {0}: Parent account {1} can not be a ledger,Konto {0}: Parent konto {1} kan ikke være en hovedbok
 DocType: Item,Publish Item to hub.erpnext.com,Publiser varen til hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +88,Email Notifications,E-postvarsling
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +21,Evaluation,evaluering
+apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +22,Evaluation,evaluering
 DocType: Item,Default Unit of Measure,Standard måleenhet
 DocType: SMS Center,All Sales Partner Contact,All Sales Partner Kontakt
 DocType: Employee,Leave Approvers,La godkjennere
@@ -19,19 +19,20 @@
 DocType: Employee,Rented,Leide
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,Gjelder for User
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +192,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Stoppet produksjonsordre kan ikke avbestilles, Døves det første å avbryte"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +198,Do you really want to scrap this asset?,Har du virkelig ønsker å hugge denne eiendelen?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Stoppet produksjonsordre kan ikke avbestilles, Døves det første å avbryte"
+DocType: Vehicle Service,Mileage,Kilometer
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Har du virkelig ønsker å hugge denne eiendelen?
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Velg Standard Leverandør
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuta er nødvendig for Prisliste {0}
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Valuta er nødvendig for Prisliste {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Vil bli beregnet i transaksjonen.
 DocType: Address,County,fylke
 DocType: Purchase Order,Customer Contact,Kundekontakt
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,Obligatorisk feild - Program
 DocType: Job Applicant,Job Applicant,Jobbsøker
-apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +5,This is based on transactions against this Supplier. See timeline below for details,Dette er basert på transaksjoner mot denne leverandøren. Se tidslinjen nedenfor for detaljer
+apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Dette er basert på transaksjoner mot denne leverandøren. Se tidslinjen nedenfor for detaljer
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Ingen flere resultater.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Juridisk
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +158,Actual type tax cannot be included in Item rate in row {0},Faktiske typen skatt kan ikke inkluderes i Element rente i rad {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +166,Actual type tax cannot be included in Item rate in row {0},Faktiske typen skatt kan ikke inkluderes i Element rente i rad {0}
 DocType: C-Form,Customer,Kunde
 DocType: Purchase Receipt Item,Required By,Kreves av
 DocType: Delivery Note,Return Against Delivery Note,Tilbake mot følgeseddel
@@ -39,63 +40,68 @@
 DocType: Purchase Order,% Billed,% Fakturert
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Exchange Rate må være samme som {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Kundenavn
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,Bank account cannot be named as {0},Bankkonto kan ikke bli navngitt som {0}
+DocType: Vehicle,Natural Gas,Naturgass
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +130,Bank account cannot be named as {0},Bankkonto kan ikke bli navngitt som {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Hoder (eller grupper) mot hvilke regnskapspostene er laget og balanserer opprettholdes.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Outstanding for {0} cannot be less than zero ({1}),Enestående for {0} kan ikke være mindre enn null ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Outstanding for {0} cannot be less than zero ({1}),Enestående for {0} kan ikke være mindre enn null ({1})
 DocType: Manufacturing Settings,Default 10 mins,Standard 10 minutter
 DocType: Leave Type,Leave Type Name,La Type Navn
 apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,Vis åpen
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +149,Series Updated Successfully,Serien er oppdatert
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,Serien er oppdatert
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Sjekk ut
 DocType: Pricing Rule,Apply On,Påfør på
 DocType: Item Price,Multiple Item prices.,Flere varepriser.
 ,Purchase Order Items To Be Received,Purchase Order Elementer som skal mottas
 DocType: SMS Center,All Supplier Contact,All Leverandør Kontakt
-apps/erpnext/erpnext/projects/doctype/project/project.py +54,Expected End Date can not be less than Expected Start Date,Forventet Sluttdato kan ikke være mindre enn Tiltredelse
+apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,Forventet Sluttdato kan ikke være mindre enn Tiltredelse
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Pris må være samme som {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,New Leave Application,New La Application
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},Oppmøte Record {0} finnes mot Student {1} for kursplanen {2}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +256,New Leave Application,New La Application
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,Bank Draft
 DocType: Mode of Payment Account,Mode of Payment Account,Modus for betaling konto
 apps/erpnext/erpnext/stock/doctype/item/item.js +52,Show Variants,Vis Varianter
 DocType: Academic Term,Academic Term,semester
-apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,Materiale
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +616,Quantity,Antall
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +512,Accounts table cannot be blank.,Regnskap bordet kan ikke være tomt.
+apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Materiale
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +624,Quantity,Antall
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Customer> Kunde Group> Territory
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Accounts table cannot be blank.,Regnskap bordet kan ikke være tomt.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Loans (Liabilities),Lån (gjeld)
 DocType: Employee Education,Year of Passing,Year of Passing
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","Referanse:% s, Elementkode:% s og Kunde:% s"
+apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {item}, valuation rate not found for warehouse {warehouse}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {item}. Please create an incoming stock transaction, on or before {posting_date} {posting_time}, and then try submiting {current_document}","For Element {element}, verdivurdering sats ikke funnet etter lager {lager}. For å kunne gjøre regnskapspostene (bestilling utgifter), trenger vi verdsettelse sats for elementet {element}. Opprett en innkommende lager transaksjon på eller før {posting_date} {posting_time}, og deretter prøve submiting {current_document}"
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,På Lager
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,åpne spørsmål
 DocType: Designation,Designation,Betegnelse
 DocType: Production Plan Item,Production Plan Item,Produksjonsplan Sak
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +142,User {0} is already assigned to Employee {1},Bruker {0} er allerede tildelt Employee {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Bruker {0} er allerede tildelt Employee {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Helsevesen
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Forsinket betaling (dager)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +750,Invoice,Faktura
+apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,tjenesten Expense
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodisitet
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Regnskapsår {0} er nødvendig
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Forsvars
 DocType: Salary Component,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +198,Row {0}: {1} {2} does not match with {3},Rad {0}: {1} {2} samsvarer ikke med {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},Rad {0}: {1} {2} samsvarer ikke med {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Row # {0}:
 DocType: Timesheet,Total Costing Amount,Total koster Beløp
 DocType: Delivery Note,Vehicle No,Vehicle Nei
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +127,Please select Price List,Vennligst velg Prisliste
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Please select Price List,Vennligst velg Prisliste
 DocType: Production Order Operation,Work In Progress,Arbeid På Går
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource > HR Settings,Vennligst oppsett Employee Naming System i Human Resource> HR-innstillinger
+apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Vennligst velg dato
 DocType: Employee,Holiday List,Holiday List
 apps/erpnext/erpnext/public/js/setup_wizard.js +205,Accountant,Accountant
 DocType: Cost Center,Stock User,Stock User
 DocType: Company,Phone No,Telefonnr
-apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +47,Course Schedules created:,Kursrutetider opprettet:
+apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,Kursrutetider opprettet:
 apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},New {0} # {1}
 ,Sales Partners Commission,Sales Partners Commission
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +22,Abbreviation cannot have more than 5 characters,Forkortelse kan ikke ha mer enn fem tegn
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +21,Abbreviation cannot have more than 5 characters,Forkortelse kan ikke ha mer enn fem tegn
 DocType: Payment Request,Payment Request,Betaling Request
 DocType: Asset,Value After Depreciation,Verdi etter avskrivninger
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +7,Related,I slekt
+apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,I slekt
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,Dette er en rot konto og kan ikke redigeres.
 DocType: BOM,Operations,Operasjoner
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Kan ikke sette autorisasjon på grunnlag av Rabatt for {0}
@@ -110,8 +116,8 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Samme firma er angitt mer enn én gang
 DocType: Employee,Married,Gift
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Ikke tillatt for {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Få elementer fra
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Stock cannot be updated against Delivery Note {0},Stock kan ikke oppdateres mot følgeseddel {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +576,Get items from,Få elementer fra
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,Stock cannot be updated against Delivery Note {0},Stock kan ikke oppdateres mot følgeseddel {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produkt {0}
 DocType: Payment Reconciliation,Reconcile,Forsone
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Dagligvare
@@ -120,7 +126,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pensjonsfondene
 DocType: SMS Center,All Sales Person,All Sales Person
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** Månedlig Distribusjon ** hjelper deg distribuere Budsjett / Target over måneder hvis du har sesongvariasjoner i din virksomhet.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Salary Structure Missing,Lønn Struktur Missing
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,Lønn Struktur Missing
 DocType: Lead,Person Name,Person Name
 DocType: Sales Invoice Item,Sales Invoice Item,Salg Faktura Element
 DocType: Account,Credit,Credit
@@ -128,11 +134,12 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",for eksempel "Primary School" eller "University"
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,lager rapporter
 DocType: Warehouse,Warehouse Detail,Warehouse Detalj
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +189,Credit limit has been crossed for customer {0} {1}/{2},Kredittgrense er krysset for kunde {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +201,Credit limit has been crossed for customer {0} {1}/{2},Kredittgrense er krysset for kunde {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +31,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Begrepet Sluttdato kan ikke være senere enn året sluttdato av studieåret som begrepet er knyttet (studieåret {}). Korriger datoene, og prøv igjen."
 apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",""Er Fixed Asset" ikke kan være ukontrollert, som Asset post eksisterer mot elementet"
+DocType: Vehicle Service,Brake Oil,bremse~~POS=TRUNC Oil
 DocType: Tax Rule,Tax Type,Skatt Type
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,You are not authorized to add or update entries before {0},Du er ikke autorisert til å legge til eller oppdatere bloggen før {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +156,You are not authorized to add or update entries before {0},Du er ikke autorisert til å legge til eller oppdatere bloggen før {0}
 DocType: Item,Item Image (if not slideshow),Sak Image (hvis ikke show)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,En Customer eksisterer med samme navn
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Timepris / 60) * Faktisk Operation Tid
@@ -152,12 +159,12 @@
 DocType: Lead,Product Enquiry,Produkt Forespørsel
 DocType: Academic Term,Schools,skoler
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Skriv inn et selskap først
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +325,Please select Company first,Vennligst velg selskapet først
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,Vennligst velg selskapet først
 DocType: Employee Education,Under Graduate,Under Graduate
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Target På
 DocType: BOM,Total Cost,Totalkostnad
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Aktivitetsloggen:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Item {0} does not exist in the system or has expired,Element {0} finnes ikke i systemet eller er utløpt
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +66,Activity Log:,Aktivitetsloggen:
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,Element {0} finnes ikke i systemet eller er utløpt
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Eiendom
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Kontoutskrift
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmasi
@@ -165,18 +172,21 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","Tilgjengelig stk er {0}, må du {1}"
 DocType: Expense Claim Detail,Claim Amount,Krav Beløp
 DocType: Employee,Mr,Mr
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,Duplicate kundegruppen funnet i cutomer gruppetabellen
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Leverandør Type / leverandør
 DocType: Naming Series,Prefix,Prefix
 apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,Konsum
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Import Logg
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Trekk Material Request av typen Produksjon basert på de ovennevnte kriteriene
-DocType: Assessment Result,Grade,grade
+DocType: Training Result Employee,Grade,grade
 DocType: Sales Invoice Item,Delivered By Supplier,Levert av Leverandør
 DocType: SMS Center,All Contact,All kontakt
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Årslønn
+DocType: Daily Work Summary,Daily Work Summary,Daglig arbeid Oppsummering
 DocType: Period Closing Voucher,Closing Fiscal Year,Lukke regnskapsår
 apps/erpnext/erpnext/accounts/party.py +349,{0} {1} is frozen,{0} {1} er frosset
+apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,Velg eksisterende selskap for å skape Konto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Aksje Utgifter
 DocType: Journal Entry,Contra Entry,Contra Entry
 DocType: Journal Entry Account,Credit in Company Currency,Kreditt i selskapet Valuta
@@ -184,18 +194,17 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +316,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Akseptert + Avvist Antall må være lik mottatt kvantum for Element {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Leverer råvare til Purchase
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +130,At least one mode of payment is required for POS invoice.,I det minste én modus av betaling er nødvendig for POS faktura.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,I det minste én modus av betaling er nødvendig for POS faktura.
 DocType: Products Settings,Show Products as a List,Vis produkter på en liste
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Last ned mal, fyll riktige data og fest den endrede filen. Alle datoer og ansatt kombinasjon i den valgte perioden vil komme i malen, med eksisterende møteprotokoller"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,Item {0} is not active or end of life has been reached,Element {0} er ikke aktiv eller slutten av livet er nådd
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +471,Item {0} is not active or end of life has been reached,Element {0} er ikke aktiv eller slutten av livet er nådd
 apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,Eksempel: Grunnleggende matematikk
-apps/erpnext/erpnext/controllers/accounts_controller.py +617,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","For å inkludere skatt i rad {0} i Element rente, skatt i rader {1} må også inkluderes"
-apps/erpnext/erpnext/config/hr.py +166,Settings for HR Module,Innstillinger for HR Module
+apps/erpnext/erpnext/controllers/accounts_controller.py +663,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","For å inkludere skatt i rad {0} i Element rente, skatt i rader {1} må også inkluderes"
+apps/erpnext/erpnext/config/hr.py +177,Settings for HR Module,Innstillinger for HR Module
 DocType: SMS Center,SMS Center,SMS-senter
 DocType: Sales Invoice,Change Amount,endring Beløp
 DocType: BOM Replace Tool,New BOM,New BOM
-DocType: Timesheet,Batch Time Logs for billing.,Batch Tid Logger for fakturering.
 DocType: Depreciation Schedule,Make Depreciation Entry,Gjør Avskrivninger Entry
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Forespørsel Type
@@ -205,15 +214,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Execution,Execution
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Detaljene for operasjonen utføres.
 DocType: Serial No,Maintenance Status,Vedlikehold Status
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Leverandør er nødvendig mot Betales konto {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Elementer og priser
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Antall timer: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Fra dato bør være innenfor regnskapsåret. Antar Fra Date = {0}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +100,Cost Center {0} does not belong to Company {1},Kostnadssteds {0} ikke tilhører selskapet {1}
 DocType: Customer,Individual,Individuell
 DocType: Interest,Academics User,akademikere Bruker
 DocType: Cheque Print Template,Amount In Figure,Beløp I figur
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plan for vedlikeholdsbesøk.
 DocType: SMS Settings,Enter url parameter for message,Skriv inn url parameter for melding
+DocType: POS Profile,Customer Groups,kunde~~POS=TRUNC grupper~~POS=HEADCOMP
 DocType: Program Enrollment Tool,Students,studenter
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Regler for bruk av prising og rabatt.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Prisliste må være aktuelt for å kjøpe eller selge
@@ -228,6 +238,7 @@
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Bevilge blader for året.
 DocType: SG Creation Tool Course,SG Creation Tool Course,SG Creation Tool Course
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,La det stå tomt hvis du ønsker å hente alle kurs for valgt semester
+apps/erpnext/erpnext/controllers/selling_controller.py +168,Selling price for item {0} is lower than its {1}. Selling price should be atleast {2},Salgspris for elementet {0} er lavere enn {1}. Salgspris bør være atleast {2}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,utilstrekkelig Stock
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Deaktiver kapasitetsplanlegging og Time Tracking
 DocType: Email Digest,New Sales Orders,Nye salgsordrer
@@ -236,45 +247,47 @@
 DocType: Selling Settings,Default Territory,Standard Territory
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,TV
 DocType: Production Order Operation,Updated via 'Time Log',Oppdatert via 'Time Logg'
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +86,Account {0} does not belong to Company {1},Konto {0} tilhører ikke selskapet {1}
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},Advance beløpet kan ikke være større enn {0} {1}
 DocType: Naming Series,Series List for this Transaction,Serien Liste for denne transaksjonen
 DocType: Sales Invoice,Is Opening Entry,Åpner Entry
 DocType: Customer Group,Mention if non-standard receivable account applicable,Nevn hvis ikke-standard fordring konto aktuelt
 DocType: Course Schedule,Instructor Name,instruktør Name
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,For Warehouse is required before Submit,For Warehouse er nødvendig før Send
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,For Warehouse er nødvendig før Send
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Mottatt On
 DocType: Sales Partner,Reseller,Reseller
+DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Hvis det er merket, vil omfatte ikke-lager i materialet forespørsler."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Skriv inn Firma
 DocType: Delivery Note Item,Against Sales Invoice Item,Mot Salg Faktura Element
 ,Production Orders in Progress,Produksjonsordrer i Progress
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,Netto kontantstrøm fra finansierings
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1460,"LocalStorage is full , did not save","Localstorage er full, ikke spare"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1542,"LocalStorage is full , did not save","Localstorage er full, ikke spare"
 DocType: Lead,Address & Contact,Adresse og kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Legg ubrukte blader fra tidligere bevilgninger
 apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},Neste Recurring {0} vil bli opprettet på {1}
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +28,Another Budget record {0} already exists against {1} for fiscal year {2},En annen Budsjett rekord {0} finnes allerede mot {1} for regnskapsåret {2}
 DocType: Sales Partner,Partner website,partner nettstedet
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +104,Add Item,Legg til element
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Legg til element
 ,Contact Name,Kontakt Navn
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Oppretter lønn slip for ovennevnte kriterier.
+DocType: POS Customer Group,POS Customer Group,POS Kundegruppe
 DocType: Cheque Print Template,Line spacing for amount in words,Linjeavstand for beløpet i ord
-apps/erpnext/erpnext/templates/generators/item.html +78,No description given,Ingen beskrivelse gitt
+DocType: Vehicle,Additional Details,ekstra detaljer
+apps/erpnext/erpnext/templates/generators/item.html +77,No description given,Ingen beskrivelse gitt
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Be for kjøp.
-apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +5,This is based on the Time Sheets created against this project,Dette er basert på timelister som er opprettet mot dette prosjektet
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +213,Only the selected Leave Approver can submit this Leave Application,Bare den valgte La Godkjenner kan sende dette La Application
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Lindrende Dato må være større enn tidspunktet for inntreden
+apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Dette er basert på timelister som er opprettet mot dette prosjektet
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,Nettolønn kan ikke være mindre enn 0
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,Bare den valgte La Godkjenner kan sende dette La Application
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,Lindrende Dato må være større enn tidspunktet for inntreden
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,Later per år
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Rad {0}: Vennligst sjekk 'Er Advance "mot Account {1} hvis dette er et forskudd oppføring.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Rad {0}: Vennligst sjekk 'Er Advance "mot Account {1} hvis dette er et forskudd oppføring.
 apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},Warehouse {0} ikke tilhører selskapet {1}
 DocType: Email Digest,Profit & Loss,Profitt tap
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,liter
 DocType: Task,Total Costing Amount (via Time Sheet),Total Costing Beløp (via Timeregistrering)
 DocType: Item Website Specification,Item Website Specification,Sak Nettsted Spesifikasjon
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +443,Leave Blocked,La Blokkert
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item {0} has reached its end of life on {1},Element {0} har nådd slutten av livet på {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +453,Leave Blocked,La Blokkert
+apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} has reached its end of life on {1},Element {0} har nådd slutten av livet på {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +95,Bank Entries,Bank Entries
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +86,Annual,Årlig
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +111,Annual,Årlig
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Avstemming Element
 DocType: Stock Entry,Sales Invoice No,Salg Faktura Nei
 DocType: Material Request Item,Min Order Qty,Min Bestill Antall
@@ -285,16 +298,17 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Programvareutvikler
 DocType: Item,Minimum Order Qty,Minimum Antall
 DocType: Pricing Rule,Supplier Type,Leverandør Type
-DocType: Scheduling Tool,Course Start Date,Kursstart
+DocType: Course Scheduling Tool,Course Start Date,Kursstart
+,Student Batch-Wise Attendance,Student Batch-Wise Oppmøte
 DocType: Item,Publish in Hub,Publisere i Hub
 DocType: Student Admission,Student Admission,student Entre
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +691,Item {0} is cancelled,Element {0} er kansellert
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +823,Material Request,Materialet Request
+apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,Element {0} er kansellert
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,Materialet Request
 DocType: Bank Reconciliation,Update Clearance Date,Oppdater Lagersalg Dato
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,Abbreviation already used for another salary component,Forkortelse allerede brukt på en annen lønn komponent
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,Forkortelse allerede brukt på en annen lønn komponent
 DocType: Item,Purchase Details,Kjøps Detaljer
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +333,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Element {0} ble ikke funnet i 'Råvare Leveres' bord i innkjøpsordre {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Element {0} ble ikke funnet i 'Råvare Leveres' bord i innkjøpsordre {1}
 DocType: Employee,Relation,Relasjon
 DocType: Shipping Rule,Worldwide Shipping,Worldwide Shipping
 DocType: Student Guardian,Mother,Mor
@@ -305,32 +319,35 @@
 DocType: Notification Control,Notification Control,Varsling kontroll
 DocType: Lead,Suggestions,Forslag
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Set varegruppe-messig budsjetter på dette territoriet. Du kan også inkludere sesongvariasjoner ved å sette Distribution.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Betaling mot {0} {1} kan ikke være større enn utestående beløp {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Betaling mot {0} {1} kan ikke være større enn utestående beløp {2}
 DocType: Supplier,Address HTML,Adresse HTML
 DocType: Lead,Mobile No.,Mobile No.
 DocType: Maintenance Schedule,Generate Schedule,Generere Schedule
 DocType: Purchase Invoice Item,Expense Head,Expense Leder
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,Vennligst velg Charge Type først
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +138,Please select Charge Type first,Vennligst velg Charge Type først
 DocType: Student Group Student,Student Group Student,Student Gruppe Student
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Siste
+DocType: Vehicle Service,Inspection,Undersøkelse
 DocType: Email Digest,New Quotations,Nye Sitater
+DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,E-poster lønn slip til ansatte basert på foretrukne e-post valgt i Employee
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Den første La Godkjenner i listen vil bli definert som standard La Godkjenner
 DocType: Tax Rule,Shipping County,Shipping fylke
 apps/erpnext/erpnext/config/desktop.py +158,Learn,Lære
 DocType: Asset,Next Depreciation Date,Neste Avskrivninger Dato
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Aktivitet Kostnad per Employee
 DocType: Accounts Settings,Settings for Accounts,Innstillinger for kontoer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +629,Supplier Invoice No exists in Purchase Invoice {0},Leverandør Faktura Ingen eksisterer i fakturaen {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +635,Supplier Invoice No exists in Purchase Invoice {0},Leverandør Faktura Ingen eksisterer i fakturaen {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Administrer Sales Person treet.
 DocType: Job Applicant,Cover Letter,Cover Letter
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Utestående Sjekker og Innskudd å tømme
 DocType: Item,Synced With Hub,Synkronisert Med Hub
+DocType: Vehicle,Fleet Manager,Flåtesjef
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Feil Passord
 DocType: Item,Variant Of,Variant av
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +349,Completed Qty can not be greater than 'Qty to Manufacture',Fullført Antall kan ikke være større enn "Antall å Manufacture '
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,Completed Qty can not be greater than 'Qty to Manufacture',Fullført Antall kan ikke være større enn "Antall å Manufacture '
 DocType: Period Closing Voucher,Closing Account Head,Lukke konto Leder
 DocType: Employee,External Work History,Ekstern Work History
-apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Rundskriv Reference Error
+apps/erpnext/erpnext/projects/doctype/task/task.py +98,Circular Reference Error,Rundskriv Reference Error
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,I Words (eksport) vil være synlig når du lagrer følgeseddel.
 DocType: Cheque Print Template,Distance from left edge,Avstand fra venstre kant
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} enheter av [{1}] (# Form / post / {1}) finnes i [{2}] (# Form / Lager / {2})
@@ -339,7 +356,7 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Varsle på e-post om opprettelse av automatisk Material Request
 DocType: Journal Entry,Multi Currency,Multi Valuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Faktura Type
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +800,Delivery Note,Levering Note
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +831,Delivery Note,Levering Note
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Sette opp skatter
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Cost of Selges Asset
 apps/erpnext/erpnext/accounts/utils.py +310,Payment Entry has been modified after you pulled it. Please pull it again.,Betaling Entry har blitt endret etter at du trakk den. Kan trekke det igjen.
@@ -357,16 +374,17 @@
 DocType: Shipping Rule,Valid for Countries,Gyldig for Land
 apps/erpnext/erpnext/stock/doctype/item/item.js +51,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Denne varen er en mal, og kan ikke brukes i transaksjoner. Element attributter vil bli kopiert over i varianter med mindre 'No Copy' er satt"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Total Bestill Regnes
-apps/erpnext/erpnext/config/hr.py +186,"Employee designation (e.g. CEO, Director etc.).","Ansatt betegnelse (f.eks CEO, direktør etc.)."
+apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","Ansatt betegnelse (f.eks CEO, direktør etc.)."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,Skriv inn 'Gjenta på dag i måneden' feltverdi
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Hastigheten som Kunden Valuta omdannes til kundens basisvaluta
-apps/erpnext/erpnext/controllers/accounts_controller.py +554,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Kjøp Faktura kan ikke gjøres mot en eksisterende eiendel {1}
+DocType: Course Scheduling Tool,Course Scheduling Tool,Kurs Planlegging Tool
+apps/erpnext/erpnext/controllers/accounts_controller.py +564,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Kjøp Faktura kan ikke gjøres mot en eksisterende eiendel {1}
 DocType: Item Tax,Tax Rate,Skattesats
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} allerede bevilget for Employee {1} for perioden {2} til {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,Select Item,Velg element
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} allerede bevilget for Employee {1} for perioden {2} til {3}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Select Item,Velg element
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Sak: {0} klarte batch-messig, kan ikke forenes bruker \ Stock Forsoning, i stedet bruke Stock Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +143,Purchase Invoice {0} is already submitted,Fakturaen {0} er allerede sendt
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,Fakturaen {0} er allerede sendt
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch No må være samme som {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Konverter til ikke-konsernet
 apps/erpnext/erpnext/config/stock.py +117,Batch (lot) of an Item.,Batch (mye) av et element.
@@ -377,11 +395,10 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,Please see attachment,Vennligst se vedlegg
 DocType: Purchase Order,% Received,% Mottatt
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Opprett studentgrupper
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,Oppsett Allerede Komplett !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Oppsett Allerede Komplett !!
 ,Finished Goods,Ferdigvarer
 DocType: Delivery Note,Instructions,Bruksanvisning
 DocType: Quality Inspection,Inspected By,Inspisert av
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Leverandør> Leverandør Type
 DocType: Maintenance Visit,Maintenance Type,Vedlikehold Type
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serial No {0} tilhører ikke følgeseddel {1}
 apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Legg varer
@@ -401,18 +418,19 @@
 DocType: Salary Slip Timesheet,Working Hours,Arbeidstid
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Endre start / strøm sekvensnummer av en eksisterende serie.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Hvis flere Pris Regler fortsette å råde, blir brukerne bedt om å sette Priority manuelt for å løse konflikten."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +715,Purchase Return,Kjøp Return
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +723,Purchase Return,Kjøp Return
 ,Purchase Register,Kjøp Register
-DocType: Scheduling Tool,Rechedule,Rechedule
+DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Gjeldende avgifter
 DocType: Workstation,Consumable Cost,Forbrukskostnads
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,{0} ({1}) must have role 'Leave Approver',{0} ({1}) må ha rollen «La Godkjenner '
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +211,{0} ({1}) must have role 'Leave Approver',{0} ({1}) må ha rollen «La Godkjenner '
 DocType: Purchase Receipt,Vehicle Date,Vehicle Dato
 DocType: Student Log,Medical,Medisinsk
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +163,Reason for losing,Grunnen for å tape
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,Bly Eier kan ikke være det samme som Lead
 apps/erpnext/erpnext/accounts/utils.py +316,Allocated amount can not greater than unadjusted amount,Avsatt beløp kan ikke større enn ujustert beløp
 DocType: Announcement,Receiver,mottaker
-apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation er stengt på følgende datoer som per Holiday Liste: {0}
+apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},Workstation er stengt på følgende datoer som per Holiday Liste: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Muligheter
 DocType: Employee,Single,Enslig
 DocType: Account,Cost of Goods Sold,Varekostnad
@@ -426,13 +444,13 @@
 DocType: Delivery Note,% Installed,% Installert
 apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,Klasserom / Laboratorier etc hvor forelesningene kan planlegges.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Skriv inn firmanavn først
-DocType: BOM,Item Desription,Sak Desription
 DocType: Purchase Invoice,Supplier Name,Leverandør Name
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Les ERPNext Manual
 DocType: Account,Is Group,Is Gruppe
 DocType: Email Digest,Pending Purchase Orders,Avventer innkjøpsordrer
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automatisk Sett Serial Nos basert på FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Sjekk Leverandør fakturanummer Unikhet
+DocType: Vehicle Service,Oil Change,Oljeskift
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Til sak nr' kan ikke være mindre enn "From sak nr '
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Non Profit,Non Profit
 DocType: Production Order,Not Started,Ikke i gang
@@ -443,79 +461,79 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globale innstillinger for alle produksjonsprosesser.
 DocType: Accounts Settings,Accounts Frozen Upto,Regnskap Frozen Opp
 DocType: SMS Log,Sent On,Sendte På
-apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Attributtet {0} valgt flere ganger i attributter Table
+apps/erpnext/erpnext/stock/doctype/item/item.py +644,Attribute {0} selected multiple times in Attributes Table,Attributtet {0} valgt flere ganger i attributter Table
 DocType: HR Settings,Employee record is created using selected field. ,Ansatt posten er opprettet ved hjelp av valgte feltet.
 DocType: Sales Order,Not Applicable,Gjelder ikke
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Holiday mester.
 DocType: Request for Quotation Item,Required Date,Nødvendig Dato
 DocType: Delivery Note,Billing Address,Fakturaadresse
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +847,Please enter Item Code.,Skriv inn Element Code.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +841,Please enter Item Code.,Skriv inn Element Code.
 DocType: BOM,Costing,Costing
 DocType: Tax Rule,Billing County,Billings County
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Hvis det er merket, vil skattebeløpet betraktes som allerede er inkludert i Print Rate / Print Beløp"
 DocType: Request for Quotation,Message for Supplier,Beskjed til Leverandør
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Total Antall
 DocType: Employee,Health Concerns,Helse Bekymringer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,Ubetalte
-apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +38,Reserved for sale,Reservert for salg
+DocType: Process Payroll,Select Payroll Period,Velg Lønn Periode
+DocType: Purchase Invoice,Unpaid,Ubetalte
+apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Reservert for salg
 DocType: Packing Slip,From Package No.,Fra Package No.
 DocType: Item Attribute,To Range,Range
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Verdipapirer og innskudd
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Totalt blader tildelte er obligatorisk
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Totalt blader tildelte er obligatorisk
 DocType: Job Opening,Description of a Job Opening,Beskrivelse av en ledig jobb
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Ventende aktiviteter for i dag
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Tilskuerrekord.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Lønn Component for timebasert lønn.
 DocType: Sales Order Item,Used for Production Plan,Brukes for Produksjonsplan
 DocType: Manufacturing Settings,Time Between Operations (in mins),Time Between Operations (i minutter)
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +95,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} budsjettet for kontoen {1} mot kostnadssted {2} er {3}. Det vil overstige ved {4}
 DocType: Customer,Buyer of Goods and Services.,Kjøper av varer og tjenester.
 DocType: Journal Entry,Accounts Payable,Leverandørgjeld
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,De valgte stykklister er ikke for den samme varen
 DocType: Pricing Rule,Valid Upto,Gyldig Opp
+DocType: Training Event,Workshop,Verksted
 apps/erpnext/erpnext/public/js/setup_wizard.js +238,List a few of your customers. They could be organizations or individuals.,Liste noen av kundene dine. De kan være organisasjoner eller enkeltpersoner.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Direct Income,Direkte Inntekt
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Kan ikke filtrere basert på konto, hvis gruppert etter konto"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Administrative Officer
-apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,Acutal Qty {0} / Waiting Qty {1},Acutal Antall {0} / Waiting Antall {1}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Acutal Antall {0} / Waiting Antall {1}
 DocType: Timesheet Detail,Hrs,timer
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +309,Please select Company,Vennligst velg selskapet
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,Vennligst velg selskapet
 DocType: Stock Entry Detail,Difference Account,Forskjellen konto
-apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Kan ikke lukke oppgaven som sin avhengige oppgave {0} er ikke lukket.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +399,Please enter Warehouse for which Material Request will be raised,Skriv inn Warehouse hvor Material Request vil bli hevet
+apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,Kan ikke lukke oppgaven som sin avhengige oppgave {0} er ikke lukket.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +400,Please enter Warehouse for which Material Request will be raised,Skriv inn Warehouse hvor Material Request vil bli hevet
 DocType: Production Order,Additional Operating Cost,Ekstra driftskostnader
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetikk
 apps/erpnext/erpnext/stock/doctype/item/item.py +532,"To merge, following properties must be same for both items","Å fusjonere, må følgende egenskaper være lik for begge elementene"
 DocType: Shipping Rule,Net Weight,Netto Vekt
 DocType: Employee,Emergency Phone,Emergency Phone
-apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +28,Buy,Kjøpe
+apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Kjøpe
 ,Serial No Warranty Expiry,Ingen garanti Utløpsserie
 DocType: Sales Invoice,Offline POS Name,Offline POS Name
 DocType: Sales Order,To Deliver,Å Levere
 DocType: Purchase Invoice Item,Item,Sak
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1587,Serial no item cannot be a fraction,Serie ingen element kan ikke være en brøkdel
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,Serie ingen element kan ikke være en brøkdel
 DocType: Journal Entry,Difference (Dr - Cr),Forskjellen (Dr - Cr)
 DocType: Account,Profit and Loss,Gevinst og tap
 apps/erpnext/erpnext/config/stock.py +314,Managing Subcontracting,Administrerende Underleverandører
 DocType: Project,Project will be accessible on the website to these users,Prosjektet vil være tilgjengelig på nettstedet til disse brukerne
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Hastigheten som Prisliste valuta er konvertert til selskapets hovedvaluta
-apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},Konto {0} tilhører ikke selskapet: {1}
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,Forkortelse allerede brukt for et annet selskap
+apps/erpnext/erpnext/setup/doctype/company/company.py +57,Account {0} does not belong to company: {1},Konto {0} tilhører ikke selskapet: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +48,Abbreviation already used for another company,Forkortelse allerede brukt for et annet selskap
 DocType: Selling Settings,Default Customer Group,Standard Kundegruppe
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Supplier is required against Payable account {0},Leverandør er nødvendig mot Betales konto {0}
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Hvis deaktivere, 'Rounded Total-feltet ikke vil være synlig i enhver transaksjon"
 DocType: BOM,Operating Cost,Driftskostnader
 DocType: Sales Order Item,Gross Profit,Bruttofortjeneste
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +42,Increment cannot be 0,Tilveksten kan ikke være 0
 DocType: Production Planning Tool,Material Requirement,Material Requirement
 DocType: Company,Delete Company Transactions,Slett transaksjoner
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Reference No and Reference Date is mandatory for Bank transaction,Referansenummer og Reference Date er obligatorisk for Bank transaksjon
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,Referansenummer og Reference Date er obligatorisk for Bank transaksjon
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Legg til / Rediger skatter og avgifter
 DocType: Purchase Invoice,Supplier Invoice No,Leverandør Faktura Nei
 DocType: Territory,For reference,For referanse
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Kan ikke slette Serial No {0}, slik det brukes i aksjetransaksjoner"
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +240,Closing (Cr),Lukking (Cr)
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +104,Move Item,Flytt element
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +242,Closing (Cr),Lukking (Cr)
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,Flytt element
 DocType: Serial No,Warranty Period (Days),Garantiperioden (dager)
 DocType: Installation Note Item,Installation Note Item,Installasjon Merk Element
 DocType: Production Plan Item,Pending Qty,Venter Stk
@@ -534,11 +552,11 @@
 apps/erpnext/erpnext/config/accounts.py +257,Financial / accounting year.,Finansiell / regnskap år.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,akkumulerte verdier
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Sorry, kan Serial Nos ikke bli slått sammen"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +701,Make Sales Order,Gjør Salgsordre
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +725,Make Sales Order,Gjør Salgsordre
 DocType: Project Task,Project Task,Prosjektet Task
 ,Lead Id,Lead Id
 DocType: C-Form Invoice Detail,Grand Total,Grand Total
-DocType: Assessment,Course,Kurs
+DocType: Training Event,Course,Kurs
 DocType: Timesheet,Payslip,payslip
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +38,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Regnskapsår Startdato bør ikke være større enn regnskapsåret Sluttdato
 DocType: Issue,Resolution,Oppløsning
@@ -550,8 +568,8 @@
 DocType: Job Applicant,Resume Attachment,Fortsett Vedlegg
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Gjenta kunder
 DocType: Leave Control Panel,Allocate,Bevilge
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +728,Sales Return,Sales Return
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +91,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Merk: Totalt tildelte blader {0} bør ikke være mindre enn allerede innvilgede permisjoner {1} for perioden
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +759,Sales Return,Sales Return
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Merk: Totalt tildelte blader {0} bør ikke være mindre enn allerede innvilgede permisjoner {1} for perioden
 DocType: Announcement,Posted By,Postet av
 DocType: Item,Delivered by Supplier (Drop Ship),Levert av Leverandør (Drop Ship)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Database med potensielle kunder.
@@ -559,13 +577,16 @@
 apps/erpnext/erpnext/config/selling.py +28,Customer database.,Kundedatabase.
 DocType: Quotation,Quotation To,Sitat Å
 DocType: Lead,Middle Income,Middle Income
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),Åpning (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +797,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Standard Enhet for Element {0} kan ikke endres direkte fordi du allerede har gjort noen transaksjon (er) med en annen målenheter. Du må opprette et nytt element for å bruke et annet standardmålenheter.
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),Åpning (Cr)
+apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Standard Enhet for Element {0} kan ikke endres direkte fordi du allerede har gjort noen transaksjon (er) med en annen målenheter. Du må opprette et nytt element for å bruke et annet standardmålenheter.
 apps/erpnext/erpnext/accounts/utils.py +314,Allocated amount can not be negative,Bevilget beløpet kan ikke være negativ
 DocType: Purchase Order Item,Billed Amt,Billed Amt
+DocType: Training Result Employee,Training Result Employee,Trening Resultat Medarbeider
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,En logisk Warehouse mot som lager oppføringer er gjort.
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Salg Faktura Timeregistrering
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Referansenummer og Reference Date er nødvendig for {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},Referansenummer og Reference Date er nødvendig for {0}
+DocType: Process Payroll,Select Payment Account to make Bank Entry,Velg betalingskonto å lage Bank Entry
+apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Legg til Knowledge Base
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,Proposal Writing,Forslaget Writing
 DocType: Payment Entry Deduction,Payment Entry Deduction,Betaling Entry Fradrag
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,En annen Sales Person {0} finnes med samme Employee id
@@ -575,16 +596,20 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Time Tracking
 DocType: Fiscal Year Company,Fiscal Year Company,Regnskapsåret selskapet
 DocType: Packing Slip Item,DN Detail,DN Detalj
+DocType: Training Event,Conference,Konferanse
 DocType: Timesheet,Billed,Fakturert
 DocType: Batch,Batch Description,Batch Beskrivelse
-apps/erpnext/erpnext/accounts/utils.py +685,"Payment Gateway Account not created, please create one manually.","Betaling Gateway konto ikke opprettet, kan du opprette en manuelt."
+apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.","Betaling Gateway konto ikke opprettet, kan du opprette en manuelt."
 DocType: Delivery Note,Time at which items were delivered from warehouse,Tidspunktet da varene ble levert fra lageret
 DocType: Sales Invoice,Sales Taxes and Charges,Salgs Skatter og avgifter
 DocType: Employee,Organization Profile,Organisasjonsprofil
-apps/erpnext/erpnext/accounts/page/pos/pos.js +715,View Offline Records,Se Offline Records
+apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,Se Offline Records
 DocType: Student,Sibling Details,søsken Detaljer
+DocType: Vehicle Service,Vehicle Service,Vehicle service
 DocType: Employee,Reason for Resignation,Grunnen til Resignasjon
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,Mal for medarbeidersamtaler.
+DocType: Sales Invoice,Credit Note Issued,Kreditnota Utstedt
+DocType: Project Task,Weight,Vekt
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Faktura / Journal Entry Detaljer
 apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} {1} ikke i regnskapsåret {2}
 DocType: Buying Settings,Settings for Buying Module,Innstillinger for kjøp Module
@@ -595,9 +620,11 @@
 DocType: Maintenance Schedule,Maintenance Schedule,Vedlikeholdsplan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Da reglene for prissetting filtreres ut basert på Kunden, Kundens Group, Territory, leverandør, leverandør Type, Kampanje, Sales Partner etc."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Inventory,Netto endring i varelager
+apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Ingen standard Adressemal funnet. Opprett en ny fra Oppsett> Trykking og merkevarebygging> Adressemal.
 DocType: Employee,Passport Number,Passnummer
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Manager
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,Same item has been entered multiple times.,Samme elementet er angitt flere ganger.
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Ny kredittgrensen er mindre enn dagens utestående beløp for kunden. Kredittgrense må være atleast {0}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +247,Same item has been entered multiple times.,Samme elementet er angitt flere ganger.
 DocType: SMS Settings,Receiver Parameter,Mottaker Parameter
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"Based On" og "Grupper etter" ikke kan være det samme
 DocType: Sales Person,Sales Person Targets,Sales Person Targets
@@ -605,15 +632,17 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter email address,Skriv inn e-postadresse
 DocType: Production Order Operation,In minutes,I løpet av minutter
 DocType: Issue,Resolution Date,Oppløsning Dato
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +300,Timesheet created:,Timeregistrering opprettet:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +772,Please set default Cash or Bank account in Mode of Payment {0},Vennligst angi standard kontanter eller bankkontoen i modus for betaling {0}
+DocType: Student Batch Name,Batch Name,batch Name
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Timesheet created:,Timeregistrering opprettet:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,Please set default Cash or Bank account in Mode of Payment {0},Vennligst angi standard kontanter eller bankkontoen i modus for betaling {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +17,Enroll,Registrere
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,Journal Entry Sendt inn
 DocType: Selling Settings,Customer Naming By,Kunden Naming Av
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Vennligst oppsett Employee Naming System i Human Resource> HR-innstillinger
 DocType: Depreciation Schedule,Depreciation Amount,avskrivninger Beløp
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Konverter til konsernet
 DocType: Activity Cost,Activity Type,Aktivitetstype
 DocType: Request for Quotation,For individual supplier,For enkelte leverandør
+DocType: BOM Operation,Base Hour Rate(Company Currency),Base Hour Rate (Selskap Valuta)
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Leveres Beløp
 DocType: Supplier,Fixed Days,Faste Days
 DocType: Quotation Item,Item Balance,Sak Balance
@@ -626,43 +655,44 @@
 DocType: Company,Round Off Cost Center,Rund av kostnadssted
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +205,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Vedlikehold Besøk {0} må avbestilles før den avbryter denne salgsordre
 DocType: Item,Material Transfer,Material Transfer
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +205,Opening (Dr),Åpning (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +207,Opening (Dr),Åpning (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Oppslaget tidsstempel må være etter {0}
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Landed Cost skatter og avgifter
 DocType: Production Order Operation,Actual Start Time,Faktisk Starttid
 DocType: BOM Operation,Operation Time,Operation Tid
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,Bli ferdig
 DocType: Pricing Rule,Sales Manager,Salgssjef
-DocType: Salary Structure Employee,Base,Utgangspunkt
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,Utgangspunkt
 DocType: Timesheet,Total Billed Hours,Totalt fakturert timer
 DocType: Journal Entry,Write Off Amount,Skriv Off Beløp
 DocType: Journal Entry,Bill No,Bill Nei
 DocType: Company,Gain/Loss Account on Asset Disposal,Gevinst / tap-konto på Asset Avhending
 DocType: Purchase Invoice,Quarterly,Quarterly
 DocType: Selling Settings,Delivery Note Required,Levering Note Påkrevd
-DocType: Sales Order Item,Basic Rate (Company Currency),Basic Rate (Company Valuta)
+DocType: BOM Item,Basic Rate (Company Currency),Basic Rate (Company Valuta)
 DocType: Student Attendance,Student Attendance,student Oppmøte
 DocType: Sales Invoice Timesheet,Time Sheet,Tids skjema
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Spylings Råvare basert på
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,Please enter item details,Skriv inn elementdetaljer
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +59,Please enter item details,Skriv inn elementdetaljer
 DocType: Interest,Interest,Renter
-apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,Før salg
+apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Før salg
 DocType: Purchase Receipt,Other Details,Andre detaljer
 DocType: Account,Accounts,Kontoer
+DocType: Vehicle,Odometer Value (Last),Kilometerstand (Siste)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,Markedsføring
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,Payment Entry is already created,Betaling Entry er allerede opprettet
 DocType: Purchase Receipt Item Supplied,Current Stock,Nåværende Stock
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} ikke knyttet til Element {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +38,Preview Salary Slip,Forhåndsvisning Lønn Slip
-DocType: Company,Deafult Cost Center,Deafult kostnadssted
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,Account {0} has been entered multiple times,Konto {0} er angitt flere ganger
+apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} ikke knyttet til Element {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,Forhåndsvisning Lønn Slip
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,Konto {0} er angitt flere ganger
 DocType: Account,Expenses Included In Valuation,Kostnader som inngår i verdivurderings
 DocType: Employee,Provide email id registered in company,Gi e-id registrert i selskap
 DocType: Hub Settings,Seller City,Selger by
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,Velg en studentgruppe
+,Absent Student Report,Fraværende Student Rapporter
 DocType: Email Digest,Next email will be sent on:,Neste post vil bli sendt på:
 DocType: Offer Letter Term,Offer Letter Term,Tilby Letter Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Elementet har varianter.
+apps/erpnext/erpnext/stock/doctype/item/item.py +623,Item has variants.,Elementet har varianter.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,Element {0} ikke funnet
 DocType: Bin,Stock Value,Stock Verdi
 apps/erpnext/erpnext/accounts/doctype/account/account.py +25,Company {0} does not exist,Selskapet {0} finnes ikke
@@ -685,30 +715,31 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{0} is not a stock Item,{0} er ikke en lagervare
 DocType: Mode of Payment Account,Default Account,Standard konto
 DocType: Payment Entry,Received Amount (Company Currency),Mottatt beløp (Selskap Valuta)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +169,Lead must be set if Opportunity is made from Lead,Lead må stilles inn hvis Opportunity er laget av Lead
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +180,Lead must be set if Opportunity is made from Lead,Lead må stilles inn hvis Opportunity er laget av Lead
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Vennligst velg ukentlig off dag
 DocType: Production Order Operation,Planned End Time,Planlagt Sluttid
 ,Sales Person Target Variance Item Group-Wise,Sales Person Target Avviks varegruppe-Wise
 apps/erpnext/erpnext/accounts/doctype/account/account.py +96,Account with existing transaction cannot be converted to ledger,Konto med eksisterende transaksjon kan ikke konverteres til Ledger
 DocType: Delivery Note,Customer's Purchase Order No,Kundens innkjøpsordre Nei
+DocType: Budget,Budget Against,budsjett Against
 DocType: Employee,Cell Number,Cell Number
 apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,Auto Materiell Forespørsler Generert
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Mistet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,You can not enter current voucher in 'Against Journal Entry' column,Du kan ikke legge inn dagens kupong i "Against Journal Entry-kolonnen
-apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +39,Reserved for manufacturing,Reservert for produksjon
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,You can not enter current voucher in 'Against Journal Entry' column,Du kan ikke legge inn dagens kupong i "Against Journal Entry-kolonnen
+apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Reservert for produksjon
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energy
 DocType: Opportunity,Opportunity From,Opportunity Fra
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Månedslønn uttalelse.
 DocType: Item Group,Website Specifications,Nettstedet Spesifikasjoner
-apps/erpnext/erpnext/utilities/doctype/address/address.py +104,There is an error in your Address Template {0},Det er en feil i adresse Mal {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}: Fra {0} av typen {1}
+apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},Det er en feil i adresse Mal {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Fra {0} av typen {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Rad {0}: Omregningsfaktor er obligatorisk
 DocType: Employee,A+,A +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Flere Pris regler eksisterer med samme kriteriene, kan du løse konflikten ved å prioritere. Pris Regler: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +369,Cannot deactivate or cancel BOM as it is linked with other BOMs,Kan ikke deaktivere eller kansellere BOM som det er forbundet med andre stykklister
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Flere Pris regler eksisterer med samme kriteriene, kan du løse konflikten ved å prioritere. Pris Regler: {0}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,Kan ikke deaktivere eller kansellere BOM som det er forbundet med andre stykklister
 DocType: Opportunity,Maintenance,Vedlikehold
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +206,Purchase Receipt number required for Item {0},Kvitteringen antall som kreves for Element {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Receipt number required for Item {0},Kvitteringen antall som kreves for Element {0}
 DocType: Item Attribute Value,Item Attribute Value,Sak data Verdi
 apps/erpnext/erpnext/config/selling.py +148,Sales campaigns.,Salgskampanjer.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +42,Make Timesheet,Gjør Timeregistrering
@@ -733,7 +764,7 @@
 8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
 9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.","Standard skatt mal som kan brukes på alle salgstransaksjoner. Denne malen kan inneholde liste over skatte hoder og også andre utgifter / inntekter hoder som "Shipping", "Forsikring", "Håndtering" osv #### Note Skattesatsen du definerer her vil være standard skattesats for alle ** Elementer **. Hvis det er ** Elementer ** som har forskjellige priser, må de legges i ** Sak Skatt ** bord i ** Sak ** mester. #### Beskrivelse av kolonner 1. Beregning Type: - Dette kan være på ** Net Total ** (som er summen av grunnbeløpet). - ** På Forrige Row Total / Beløp ** (for kumulative skatter eller avgifter). Hvis du velger dette alternativet, vil skatten bli brukt som en prosentandel av forrige rad (i skattetabellen) eller en total. - ** Faktisk ** (som nevnt). 2. Account Head: Konto hovedbok der denne skatten vil bli bokført 3. Cost Center: Hvis skatt / avgift er en inntekt (som frakt) eller utgifter det må bestilles mot et kostnadssted. 4. Beskrivelse: Beskrivelse av skatt (som vil bli skrevet ut i fakturaer / sitater). 5. Ranger: skattesats. 6. Beløp: Skatt beløp. 7. Totalt: Akkumulert total til dette punktet. 8. Angi Row: Dersom basert på "Forrige Row Total" du kan velge radnummeret som vil bli tatt som en base for denne beregningen (standard er den forrige rad). 9. Er dette inklusiv i Basic Rate ?: Hvis du sjekke dette, betyr det at denne avgiften ikke vil bli vist under elementet bordet, men vil inngå i grunnbeløpet i din viktigste elementet tabellen. Dette er nyttig når du vil gi en flat pris (inklusive alle avgifter) pris til kundene."
 DocType: Employee,Bank A/C No.,Bank A / C No.
-DocType: GL Entry,Project,Prosjekt
+DocType: Budget,Project,Prosjekt
 DocType: Quality Inspection Reading,Reading 7,Reading 7
 DocType: Address,Personal,Personlig
 DocType: Expense Claim Detail,Expense Claim Type,Expense krav Type
@@ -745,45 +776,50 @@
 DocType: Account,Liability,Ansvar
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +61,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanksjonert Beløpet kan ikke være større enn krav Beløp i Rad {0}.
 DocType: Company,Default Cost of Goods Sold Account,Standard varekostnader konto
-apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,Prisliste ikke valgt
+apps/erpnext/erpnext/stock/get_item_details.py +274,Price List not selected,Prisliste ikke valgt
 DocType: Employee,Family Background,Familiebakgrunn
 DocType: Request for Quotation Supplier,Send Email,Send E-Post
 apps/erpnext/erpnext/stock/doctype/item/item.py +204,Warning: Invalid Attachment {0},Advarsel: Ugyldig Vedlegg {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +710,No Permission,Ingen tillatelse
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +731,No Permission,Ingen tillatelse
 DocType: Company,Default Bank Account,Standard Bank Account
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Hvis du vil filtrere basert på partiet, velger partiet Skriv inn først"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'Oppdater Stock' kan ikke kontrolleres fordi elementene ikke er levert via {0}
+DocType: Vehicle,Acquisition Date,Innkjøpsdato
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Elementer med høyere weightage vil bli vist høyere
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bankavstemming Detalj
-apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} må fremlegges
+apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} må fremlegges
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Ingen ansatte funnet
 DocType: Supplier Quotation,Stopped,Stoppet
 DocType: Item,If subcontracted to a vendor,Dersom underleverandør til en leverandør
 DocType: SMS Center,All Customer Contact,All Kundekontakt
 apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Last opp lagersaldo via csv.
 DocType: Warehouse,Tree Details,Tree Informasjon
+DocType: Training Event,Event Status,Hendelses Status
 ,Support Analytics,Støtte Analytics
 DocType: Item,Website Warehouse,Nettsted Warehouse
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimum Fakturert beløp
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +107,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Kostnadssted {2} ikke tilhører selskapet {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +84,{0} {1}: Account {2} cannot be a Group,{0} {1}: Account {2} kan ikke være en gruppe
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +64,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Sak Row {idx}: {doctype} {DOCNAME} finnes ikke i oven {doctype} tabellen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +259,Timesheet {0} is already completed or cancelled,Timeregistrering {0} er allerede gjennomført eller kansellert
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timeregistrering {0} er allerede gjennomført eller kansellert
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Dagen i måneden som auto faktura vil bli generert for eksempel 05, 28 osv"
 DocType: Asset,Opening Accumulated Depreciation,Åpning akkumulerte avskrivninger
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Score må være mindre enn eller lik 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Program Påmelding Tool
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,C-Form poster
 apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,Kunde og leverandør
+DocType: Student Batch Instructor,Student Batch Instructor,Student Batch Instruktør
 DocType: Email Digest,Email Digest Settings,E-post Digest Innstillinger
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Støtte henvendelser fra kunder.
 DocType: HR Settings,Retirement Age,Pensjonsalder
 DocType: Bin,Moving Average Rate,Moving Gjennomsnittlig pris
 DocType: Production Planning Tool,Select Items,Velg Items
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Bill {1} dated {2},{0} mot Bill {1} datert {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +359,{0} against Bill {1} dated {2},{0} mot Bill {1} datert {2}
 apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Kursplan
 DocType: Maintenance Visit,Completion Status,Completion Status
 DocType: HR Settings,Enter retirement age in years,Skriv inn pensjonsalder i år
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +230,Target Warehouse,Target Warehouse
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Target Warehouse
 DocType: Cheque Print Template,Starting location from left edge,Starter plassering fra venstre kant
 DocType: Item,Allow over delivery or receipt upto this percent,Tillat løpet levering eller mottak opp denne prosent
 DocType: Stock Entry,STE-,an- drogene
@@ -797,7 +833,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +82,{0} {1} status is {2},{0} {1} status er {2}
 DocType: Shopping Cart Settings,Enable Checkout,aktiver kassen
 apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Bestilling til betaling
-apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +37,Projected Qty,Anslått Antall
+apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Anslått Antall
 DocType: Sales Invoice,Payment Due Date,Betalingsfrist
 apps/erpnext/erpnext/stock/doctype/item/item.js +278,Item Variant {0} already exists with same attributes,Sak Variant {0} finnes allerede med samme attributtene
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',"Opening"
@@ -806,6 +842,8 @@
 DocType: Expense Claim,Expenses,Utgifter
 DocType: Item Variant Attribute,Item Variant Attribute,Sak Variant Egenskap
 ,Purchase Receipt Trends,Kvitteringen Trender
+DocType: Process Payroll,Bimonthly,annenhver måned
+DocType: Vehicle Service,Brake Pad,Bremsekloss
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Forskning Og Utvikling
 ,Amount to Bill,Beløp til Bill
 DocType: Company,Registration Details,Registrering Detaljer
@@ -818,10 +856,11 @@
 DocType: Production Planning Tool,Only Obtain Raw Materials,Bare Skaffe råstoffer
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Medarbeidersamtaler.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Aktivering av «Bruk for handlekurven", som Handlevogn er aktivert, og det bør være minst en skatteregel for Handlekurv"
-apps/erpnext/erpnext/controllers/accounts_controller.py +343,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Betaling Entry {0} er knyttet mot Bestill {1}, sjekk om det bør trekkes som forskudd i denne fakturaen."
+apps/erpnext/erpnext/controllers/accounts_controller.py +353,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Betaling Entry {0} er knyttet mot Bestill {1}, sjekk om det bør trekkes som forskudd i denne fakturaen."
 DocType: Sales Invoice Item,Stock Details,Stock Detaljer
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Prosjektet Verdi
 apps/erpnext/erpnext/config/selling.py +307,Point-of-Sale,Utsalgssted
+DocType: Vehicle Log,Odometer Reading,Kilometerteller Reading
 apps/erpnext/erpnext/accounts/doctype/account/account.py +119,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Saldo allerede i Credit, har du ikke lov til å sette "Balance må være 'som' debet '"
 DocType: Account,Balance must be,Balansen må være
 DocType: Hub Settings,Publish Pricing,Publiser Priser
@@ -840,23 +879,22 @@
 DocType: Supplier Quotation,Is Subcontracted,Er underleverandør
 DocType: Item Attribute,Item Attribute Values,Sak attributtverdier
 DocType: Examination Result,Examination Result,Sensur
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +735,Purchase Receipt,Kvitteringen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +743,Purchase Receipt,Kvitteringen
 ,Received Items To Be Billed,Mottatte elementer å bli fakturert
 DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +267,Currency exchange rate master.,Valutakursen mester.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +170,Reference Doctype must be one of {0},Referanse DOCTYPE må være en av {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +283,Unable to find Time Slot in the next {0} days for Operation {1},Å finne tidsluke i de neste {0} dager for Operation klarer {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},Referanse DOCTYPE må være en av {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +286,Unable to find Time Slot in the next {0} days for Operation {1},Å finne tidsluke i de neste {0} dager for Operation klarer {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan materiale for sub-assemblies
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Salgs Partnere og Territory
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be active,BOM {0} må være aktiv
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +492,BOM {0} must be active,BOM {0} må være aktiv
 DocType: Journal Entry,Depreciation Entry,avskrivninger Entry
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Velg dokumenttypen først
-apps/erpnext/erpnext/templates/generators/item.html +68,Goto Cart,Goto vognen
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Avbryt Material Besøk {0} før den sletter denne Maintenance Visit
 DocType: Salary Slip,Leave Encashment Amount,La Encashment Beløp
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Serial No {0} tilhører ikke Element {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Påkrevd antall
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +217,Warehouses with existing transaction can not be converted to ledger.,Næringslokaler med eksisterende transaksjon kan ikke konverteres til hovedbok.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +218,Warehouses with existing transaction can not be converted to ledger.,Næringslokaler med eksisterende transaksjon kan ikke konverteres til hovedbok.
 DocType: Bank Reconciliation,Total Amount,Totalbeløp
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internett Publisering
 DocType: Production Planning Tool,Production Orders,Produksjonsordrer
@@ -869,14 +907,14 @@
 DocType: Supplier,Default Payable Accounts,Standard Leverandørgjeld
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Ansatt {0} er ikke aktiv eller ikke eksisterer
 DocType: Fee Structure,Components,komponenter
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},Fyll inn Asset kategori i Element {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +614,Item Variants {0} updated,Sak Varianter {0} oppdatert
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +236,Please enter Asset Category in Item {0},Fyll inn Asset kategori i Element {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,Sak Varianter {0} oppdatert
 DocType: Quality Inspection Reading,Reading 6,Reading 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +854,Cannot {0} {1} {2} without any negative outstanding invoice,Kan ikke {0} {1} {2} uten noen negativ utestående faktura
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,Cannot {0} {1} {2} without any negative outstanding invoice,Kan ikke {0} {1} {2} uten noen negativ utestående faktura
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Fakturaen Advance
 DocType: Address,Shop,Butikk
 DocType: Hub Settings,Sync Now,Synkroniser nå
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +172,Row {0}: Credit entry can not be linked with a {1},Rad {0}: Credit oppføring kan ikke være knyttet til en {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +188,Row {0}: Credit entry can not be linked with a {1},Rad {0}: Credit oppføring kan ikke være knyttet til en {1}
 apps/erpnext/erpnext/config/accounts.py +210,Define budget for a financial year.,Definer budsjett for et regnskapsår.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Standard Bank / minibank konto vil automatisk bli oppdatert i POS faktura når denne modusen er valgt.
 DocType: Lead,LEAD-,LEDE-
@@ -887,30 +925,31 @@
 DocType: Item,Is Purchase Item,Er Purchase Element
 DocType: Asset,Purchase Invoice,Fakturaen
 DocType: Stock Ledger Entry,Voucher Detail No,Kupong Detail Ingen
-apps/erpnext/erpnext/accounts/page/pos/pos.js +710,New Sales Invoice,Ny salgsfaktura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,New Sales Invoice,Ny salgsfaktura
 DocType: Stock Entry,Total Outgoing Value,Total Utgående verdi
 apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Åpningsdato og sluttdato skal være innenfor samme regnskapsår
 DocType: Lead,Request for Information,Spør etter informasjon
-apps/erpnext/erpnext/accounts/page/pos/pos.js +728,Sync Offline Invoices,Synkroniser Offline Fakturaer
+apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,Synkroniser Offline Fakturaer
 DocType: Payment Request,Paid,Betalt
 DocType: Program Fee,Program Fee,program Fee
 DocType: Salary Slip,Total in words,Totalt i ord
 DocType: Material Request Item,Lead Time Date,Lead Tid Dato
 DocType: Guardian,Guardian Name,Guardian navn
 DocType: Cheque Print Template,Has Print Format,Har Print Format
-apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,er obligatorisk. Kanskje Valutaveksling posten ikke er skapt for
+apps/erpnext/erpnext/accounts/page/pos/pos.js +72, is mandatory. Maybe Currency Exchange record is not created for ,er obligatorisk. Kanskje Valutaveksling posten ikke er skapt for
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +103,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Vennligst oppgi serienummer for varen {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +613,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","For 'Produkt Bundle' elementer, Warehouse, serienummer og Batch Ingen vil bli vurdert fra "Pakkeliste" bord. Hvis Warehouse og Batch Ingen er lik for alle pakking elementer for noen "Product Bundle 'elementet, kan disse verdiene legges inn i hoved Sak bordet, vil verdiene bli kopiert til" Pakkeliste "bord."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +638,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","For 'Produkt Bundle' elementer, Warehouse, serienummer og Batch Ingen vil bli vurdert fra "Pakkeliste" bord. Hvis Warehouse og Batch Ingen er lik for alle pakking elementer for noen "Product Bundle 'elementet, kan disse verdiene legges inn i hoved Sak bordet, vil verdiene bli kopiert til" Pakkeliste "bord."
 DocType: Job Opening,Publish on website,Publiser på nettstedet
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Forsendelser til kunder.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +609,Supplier Invoice Date cannot be greater than Posting Date,Leverandør Fakturadato kan ikke være større enn konteringsdato
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +615,Supplier Invoice Date cannot be greater than Posting Date,Leverandør Fakturadato kan ikke være større enn konteringsdato
 DocType: Purchase Invoice Item,Purchase Order Item,Innkjøpsordre Element
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,Indirekte inntekt
+DocType: Student Attendance Tool,Student Attendance Tool,Student Oppmøte Tool
 DocType: Cheque Print Template,Date Settings,Dato Innstillinger
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Varians
 ,Company Name,Selskapsnavn
 DocType: SMS Center,Total Message(s),Total melding (er)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +789,Select Item for Transfer,Velg elementet for Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +797,Select Item for Transfer,Velg elementet for Transfer
 DocType: Purchase Invoice,Additional Discount Percentage,Ekstra rabatt Prosent
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Vis en liste over alle hjelpevideoer
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Velg kontoen leder av banken der sjekken ble avsatt.
@@ -918,12 +957,13 @@
 DocType: Pricing Rule,Max Qty,Max Antall
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
 						Please enter a valid Invoice","Rad {0}: Faktura {1} er ugyldig, kan det bli kansellert / finnes ikke. \ Vennligst skriv inn en gyldig faktura"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Rad {0}: Betaling mot Salg / innkjøpsordre skal alltid merkes som forskudd
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Rad {0}: Betaling mot Salg / innkjøpsordre skal alltid merkes som forskudd
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kjemisk
+DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Standard Bank / minibank konto vil bli automatisk oppdatert i Lønn bilagsregistrering når denne modusen er valgt.
 apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
                     Please check intervals {0} and {1} and try again",Intervallene for Grade Kode {0} overlapper med karakteren intervaller for andre karakterer. Vennligst sjekk intervaller {0} og {1} og prøv på nytt
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +694,All items have already been transferred for this Production Order.,Alle elementene er allerede blitt overført til denne produksjonsordre.
-DocType: Process Payroll,Select Payroll Year and Month,Velg Lønn år og måned
+DocType: BOM,Raw Material Cost(Company Currency),Raw Material Cost (Selskap Valuta)
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Alle elementene er allerede blitt overført til denne produksjonsordre.
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Meter,Måler
 DocType: Workstation,Electricity Cost,Elektrisitet Cost
 DocType: HR Settings,Don't send Employee Birthday Reminders,Ikke send Employee bursdagspåminnelser
@@ -932,27 +972,27 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Overført
 apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,Last opp din brevhode og logo. (Du kan redigere dem senere).
 DocType: Timesheet Detail,Bill,Regning
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date is entered as past date,Neste avskrivningsdato legges inn som siste dato
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Neste avskrivningsdato legges inn som siste dato
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +167,White,Hvit
 DocType: SMS Center,All Lead (Open),All Lead (Open)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +222,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Rad {0}: Antall ikke tilgjengelig for {4} i lageret {1} ved å legge tidspunktet for innreise ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Få utbetalt forskudd
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Make ,Gjøre
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +718,Make ,Gjøre
 DocType: Student Admission,Admission Start Date,Opptak Startdato
 DocType: Journal Entry,Total Amount in Words,Totalbeløp i Words
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Det var en feil. En mulig årsak kan være at du ikke har lagret skjemaet. Ta kontakt support@erpnext.com hvis problemet vedvarer.
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Handlekurv
-apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Ordretype må være en av {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},Ordretype må være en av {0}
 DocType: Lead,Next Contact Date,Neste Kontakt Dato
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Antall åpne
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +421,Please enter Account for Change Amount,Vennligst oppgi konto for Change Beløp
-DocType: Student Batch,Student Batch Name,Student Batch Name
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Please enter Account for Change Amount,Vennligst oppgi konto for Change Beløp
+DocType: Program Enrollment,Student Batch Name,Student Batch Name
 DocType: Holiday List,Holiday List Name,Holiday Listenavn
-apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,Schedule Course
+apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Schedule Course
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Aksjeopsjoner
 DocType: Journal Entry Account,Expense Claim,Expense krav
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +212,Do you really want to restore this scrapped asset?,Har du virkelig ønsker å gjenopprette dette skrotet ressurs?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,Qty for {0},Antall for {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Har du virkelig ønsker å gjenopprette dette skrotet ressurs?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},Antall for {0}
 DocType: Leave Application,Leave Application,La Application
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,La Allocation Tool
 DocType: Leave Block List,Leave Block List Dates,La Block List Datoer
@@ -963,16 +1003,16 @@
 DocType: Purchase Invoice,Cash/Bank Account,Cash / Bank Account
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Fjernet elementer med ingen endring i mengde eller verdi.
 DocType: Delivery Note,Delivery To,Levering Å
-apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Attributt tabellen er obligatorisk
+apps/erpnext/erpnext/stock/doctype/item/item.py +641,Attribute table is mandatory,Attributt tabellen er obligatorisk
 DocType: Production Planning Tool,Get Sales Orders,Få salgsordrer
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} kan ikke være negativ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +65,{0} can not be negative,{0} kan ikke være negativ
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,Velg en Student
 apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,Rabatt
 DocType: Asset,Total Number of Depreciations,Totalt antall Avskrivninger
 DocType: Workstation,Wages,Lønn
 DocType: Project,Internal,Intern
 DocType: Task,Urgent,Haster
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +141,Please specify a valid Row ID for row {0} in table {1},Vennligst oppgi en gyldig Row ID for rad {0} i tabellen {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +149,Please specify a valid Row ID for row {0} in table {1},Vennligst oppgi en gyldig Row ID for rad {0} i tabellen {1}
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Gå til skrivebordet og begynne å bruke ERPNext
 DocType: Item,Manufacturer,Produsent
 DocType: Landed Cost Item,Purchase Receipt Item,Kvitteringen Element
@@ -993,26 +1033,29 @@
 DocType: BOM Operation,Operation,Operasjon
 DocType: Lead,Organization Name,Organization Name
 DocType: Tax Rule,Shipping State,Shipping State
+,Projected Quantity as Source,Anslått Antall som kilde
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +62,Item must be added using 'Get Items from Purchase Receipts' button,Elementet må legges til med "Get Elementer fra innkjøps Receipts 'knappen
 DocType: Employee,A-,EN-
+DocType: Production Planning Tool,Include non-stock items,Inkluder ikke-lager
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Salgs Utgifter
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Standard Kjøpe
 DocType: GL Entry,Against,Against
 DocType: Item,Default Selling Cost Center,Standard Selling kostnadssted
 DocType: Sales Partner,Implementation Partner,Gjennomføring Partner
-apps/erpnext/erpnext/controllers/selling_controller.py +232,Sales Order {0} is {1},Salgsordre {0} er {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},Salgsordre {0} er {1}
 DocType: Opportunity,Contact Info,Kontaktinfo
 apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,Making Stock Entries
 DocType: Packing Slip,Net Weight UOM,Vekt målenheter
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} resultater
 DocType: Item,Default Supplier,Standard Leverandør
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Over Produksjon Fradrag Prosent
 DocType: Shipping Rule Condition,Shipping Rule Condition,Shipping Rule Tilstand
 DocType: Holiday List,Get Weekly Off Dates,Få Ukentlig Off Datoer
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Sluttdato kan ikke være mindre enn startdato
 DocType: Sales Person,Select company name first.,Velg firmanavn først.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Sitater mottatt fra leverandører.
-apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Til {0} | {1} {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},Til {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Gjennomsnittsalder
 DocType: Opportunity,Your sales person who will contact the customer in future,Din selger som vil ta kontakt med kunden i fremtiden
 apps/erpnext/erpnext/public/js/setup_wizard.js +261,List a few of your suppliers. They could be organizations or individuals.,Liste noen av dine leverandører. De kan være organisasjoner eller enkeltpersoner.
@@ -1020,15 +1063,14 @@
 DocType: Company,Default Currency,Standard Valuta
 DocType: Contact,Enter designation of this Contact,Angi utpeking av denne kontakten
 DocType: Expense Claim,From Employee,Fra Employee
-apps/erpnext/erpnext/controllers/accounts_controller.py +403,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Advarsel: System vil ikke sjekke billing siden beløpet for varen {0} i {1} er null
+apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Advarsel: System vil ikke sjekke billing siden beløpet for varen {0} i {1} er null
 DocType: Journal Entry,Make Difference Entry,Gjør forskjell Entry
 DocType: Upload Attendance,Attendance From Date,Oppmøte Fra dato
 DocType: Appraisal Template Goal,Key Performance Area,Key Performance-området
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Transport
 apps/erpnext/erpnext/controllers/item_variant.py +63,Invalid Attribute,Ugyldig Egenskap
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,og år:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,{0} {1} must be submitted,{0} {1} må sendes
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +145,Quantity must be less than or equal to {0},Antall må være mindre enn eller lik {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} må sendes
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Antall må være mindre enn eller lik {0}
 DocType: SMS Center,Total Characters,Totalt tegn
 apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},Vennligst velg BOM i BOM felt for Element {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Faktura Detalj
@@ -1042,23 +1084,23 @@
 ,Ordered Items To Be Billed,Bestilte varer til å bli fakturert
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +39,From Range has to be less than To Range,Fra Range må være mindre enn til kolleksjonen
 DocType: Global Defaults,Global Defaults,Global Defaults
-apps/erpnext/erpnext/projects/doctype/project/project.py +153,Project Collaboration Invitation,Prosjekt Samarbeid Invitasjon
+apps/erpnext/erpnext/projects/doctype/project/project.py +178,Project Collaboration Invitation,Prosjekt Samarbeid Invitasjon
 DocType: Salary Slip,Deductions,Fradrag
 DocType: Leave Allocation,LAL/,LAL /
 apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,start-år
 DocType: Purchase Invoice,Start date of current invoice's period,Startdato for nåværende fakturaperiode
 DocType: Salary Slip,Leave Without Pay,La Uten Pay
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Kapasitetsplanlegging Error
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,Capacity Planning Error,Kapasitetsplanlegging Error
 ,Trial Balance for Party,Trial Balance for partiet
 DocType: Lead,Consultant,Konsulent
 DocType: Salary Slip,Earnings,Inntjeningen
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Finished Item {0} must be entered for Manufacture type entry,Ferdig Element {0} må angis for Produksjon typen oppføring
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,Ferdig Element {0} må angis for Produksjon typen oppføring
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Åpning Regnskap Balanse
 DocType: Sales Invoice Advance,Sales Invoice Advance,Salg Faktura Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +500,Nothing to request,Ingenting å be om
-apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','Faktisk startdato' ikke kan være større enn "Actual End Date '
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +503,Nothing to request,Ingenting å be om
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},En annen Budsjett record '{0} finnes allerede mot {1} {2} for regnskapsåret {3}
+apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date','Faktisk startdato' ikke kan være større enn "Actual End Date '
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Ledelse
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +55,Either debit or credit amount is required for {0},Enten debet- eller kredittbeløpet er nødvendig for {0}
 DocType: Cheque Print Template,Payer Settings,Payer Innstillinger
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Dette vil bli lagt til Element Code of varianten. For eksempel, hvis din forkortelsen er "SM", og elementet kode er "T-SHIRT", elementet koden til variant vil være "T-SHIRT-SM""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Nettolønn (i ord) vil være synlig når du lagrer Lønn Slip.
@@ -1069,22 +1111,22 @@
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +181,{0} valid serial nos for Item {1},{0} gyldig serie nos for Element {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Elementkode kan ikke endres for Serial No.
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,POS Profile {0} already created for user: {1} and company {2},POS profil {0} allerede opprettet for user: {1} og selskapet {2}
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +24,POS Profile {0} already created for user: {1} and company {2},POS profil {0} allerede opprettet for user: {1} og selskapet {2}
 DocType: Purchase Order Item,UOM Conversion Factor,Målenheter Omregningsfaktor
 DocType: Stock Settings,Default Item Group,Standard varegruppe
 DocType: Grading Structure,Grading System Name,Grading System Name
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Leverandør database.
 DocType: Payment Reconciliation Payment,Reference_name,Reference_name
 DocType: Account,Balance Sheet,Balanse
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +679,Cost Center For Item with Item Code ',Koste Center For Element med Element kode '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1550,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Betaling Mode er ikke konfigurert. Kontroller, om kontoen er satt på modus for betalinger eller på POS-profil."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Koste Center For Element med Element kode '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Betaling Mode er ikke konfigurert. Kontroller, om kontoen er satt på modus for betalinger eller på POS-profil."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Din selger vil få en påminnelse på denne datoen for å kontakte kunden
-apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,"Further accounts can be made under Groups, but entries can be made against non-Groups","Ytterligere kontoer kan gjøres under grupper, men oppføringene kan gjøres mot ikke-grupper"
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Ytterligere kontoer kan gjøres under grupper, men oppføringene kan gjøres mot ikke-grupper"
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Gjeld
 DocType: Course,Course Intro,kurs Intro
 DocType: Account,Warehouse,Warehouse
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +156,Stock Entry {0} created,Stock Entry {0} er opprettet
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,Stock Entry {0} er opprettet
 apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Avvist Antall kan ikke legges inn i innkjøpsliste
 ,Purchase Order Items To Be Billed,Purchase Order Elementer som skal faktureres
 DocType: Purchase Invoice Item,Net Rate,Net Rate
@@ -1096,34 +1138,38 @@
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-skjemaet er ikke aktuelt for faktura: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,Avstemte Betalingsopplysninger
 DocType: Global Defaults,Current Fiscal Year,Værende regnskapsår
+DocType: Purchase Order,Group same items,Gruppe samme elementene
 DocType: Global Defaults,Disable Rounded Total,Deaktiver Avrundet Total
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +418,'Entries' cannot be empty,'Innlegg' kan ikke være tomt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,'Innlegg' kan ikke være tomt
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicate rad {0} med samme {1}
 ,Trial Balance,Balanse Trial
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Fiscal Year {0} not found,Regnskapsåret {0} ikke funnet
-apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,Sette opp ansatte
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,Regnskapsåret {0} ikke funnet
+apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,Sette opp ansatte
 DocType: Sales Order,SO-,SÅ-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Please select prefix first,Vennligst velg først prefiks
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,Vennligst velg først prefiks
 DocType: Employee,O-,O-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,Forskning
 DocType: Maintenance Visit Purpose,Work Done,Arbeidet Som Er Gjort
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Vennligst oppgi minst ett attributt i Attributter tabellen
 DocType: Announcement,All Students,alle studenter
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a non-stock item,Element {0} må være et ikke-lagervare
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Element {0} må være et ikke-lagervare
 DocType: Contact,User ID,Bruker-ID
-apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +57,View Ledger,Vis Ledger
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,View Ledger,Vis Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Tidligste
 apps/erpnext/erpnext/stock/doctype/item/item.py +506,"An Item Group exists with same name, please change the item name or rename the item group","En varegruppe eksisterer med samme navn, må du endre elementnavnet eller endre navn varegruppen"
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +437,Rest Of The World,Resten Av Verden
+apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Student Mobile No.
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +472,Rest Of The World,Resten Av Verden
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,Element {0} kan ikke ha Batch
 ,Budget Variance Report,Budsjett Avvik Rapporter
 DocType: Salary Slip,Gross Pay,Brutto Lønn
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +114,Row {0}: Activity Type is mandatory.,Rad {0}: Aktivitetstype er obligatorisk.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,Rad {0}: Aktivitetstype er obligatorisk.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,Utbytte betalt
+DocType: Task,depends_on_tasks,depends_on_tasks
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,Regnskap Ledger
 DocType: Stock Reconciliation,Difference Amount,Forskjellen Beløp
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Retained Earnings,Opptjent egenkapital
-DocType: BOM Item,Item Description,Element Beskrivelse
+DocType: Vehicle Log,Service Detail,tjenesten Detalj
+DocType: BOM,Item Description,Element Beskrivelse
 DocType: Student Sibling,Student Sibling,student Søsken
 DocType: Purchase Invoice,Is Recurring,Er Recurring
 DocType: Purchase Invoice,Supplied Items,Leveringen
@@ -1134,7 +1180,7 @@
 DocType: Opportunity Item,Opportunity Item,Opportunity Element
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,Midlertidig Åpning
 ,Employee Leave Balance,Ansatt La Balance
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Balance for Account {0} must always be {1},Balanse for konto {0} må alltid være {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +143,Balance for Account {0} must always be {1},Balanse for konto {0} må alltid være {1}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},Verdsettelse Rate kreves for varen i rad {0}
 DocType: Address,Address Type,Adressetype
 apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,Eksempel: Masters i informatikk
@@ -1142,33 +1188,36 @@
 DocType: GL Entry,Against Voucher,Mot Voucher
 DocType: Item,Default Buying Cost Center,Standard Kjøpe kostnadssted
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","For å få det beste ut av ERPNext, anbefaler vi at du tar litt tid og se på disse hjelpevideoer."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,til
+apps/erpnext/erpnext/accounts/page/pos/pos.js +73, to ,til
 DocType: Item,Lead Time in days,Lead Tid i dager
 ,Accounts Payable Summary,Leverandørgjeld Sammendrag
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +199,Not authorized to edit frozen Account {0},Ikke autorisert til å redigere fryst kontoen {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},Utbetaling av lønn fra {0} til {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,Not authorized to edit frozen Account {0},Ikke autorisert til å redigere fryst kontoen {0}
 DocType: Journal Entry,Get Outstanding Invoices,Få utestående fakturaer
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Salgsordre {0} er ikke gyldig
-apps/erpnext/erpnext/setup/doctype/company/company.py +185,"Sorry, companies cannot be merged","Sorry, kan selskapene ikke fusjoneres"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Salgsordre {0} er ikke gyldig
+apps/erpnext/erpnext/setup/doctype/company/company.py +195,"Sorry, companies cannot be merged","Sorry, kan selskapene ikke fusjoneres"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Den totale Issue / Transfer mengde {0} i Material Request {1} \ kan ikke være større enn ønsket antall {2} for Element {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,Liten
 DocType: Employee,Employee Number,Ansatt Number
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Tilfellet Nei (e) allerede er i bruk. Prøv fra sak nr {0}
+DocType: Project,% Completed,% Fullført
 ,Invoiced Amount (Exculsive Tax),Fakturert beløp (exculsive Tax)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Sak 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,Konto hodet {0} opprettet
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Grønn
 DocType: Supplier,SUPP-,leve-
+DocType: Training Event,Training Event,trening Hendelses
 DocType: Item,Auto re-order,Auto re-order
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Oppnådd Total
 DocType: Employee,Place of Issue,Utstedelsessted
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Kontrakts
 DocType: Email Digest,Add Quote,Legg Sitat
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +503,UOM coversion factor required for UOM: {0} in Item: {1},Målenheter coversion faktor nødvendig for målenheter: {0} i Sak: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},Målenheter coversion faktor nødvendig for målenheter: {0} i Sak: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Indirekte kostnader
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,Row {0}: Qty is mandatory,Rad {0}: Antall er obligatorisk
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Landbruk
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +713,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,Dine produkter eller tjenester
 DocType: Mode of Payment,Mode of Payment,Modus for betaling
 apps/erpnext/erpnext/stock/doctype/item/item.py +178,Website Image should be a public file or website URL,Website Bilde bør være en offentlig fil eller nettside URL
@@ -1176,6 +1225,7 @@
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Dette er en rot varegruppe og kan ikke redigeres.
 DocType: Journal Entry Account,Purchase Order,Bestilling
+DocType: Vehicle,Fuel UOM,drivstoff målenheter
 DocType: Warehouse,Warehouse Contact Info,Warehouse Kontaktinfo
 DocType: Payment Entry,Write Off Difference Amount,Skriv Off differansebeløpet
 DocType: Purchase Invoice,Recurring Type,Gjentakende Type
@@ -1185,18 +1235,20 @@
 DocType: Email Digest,Annual Income,Årsinntekt
 DocType: Serial No,Serial No Details,Serie ingen opplysninger
 DocType: Purchase Invoice Item,Item Tax Rate,Sak Skattesats
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,"For {0}, only credit accounts can be linked against another debit entry",For {0} kan bare kredittkontoer kobles mot en annen belastning oppføring
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Delivery Note {0} is not submitted,Levering Note {0} er ikke innsendt
-apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,Elementet {0} må være en underleverandør Element
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"For {0}, only credit accounts can be linked against another debit entry",For {0} kan bare kredittkontoer kobles mot en annen belastning oppføring
+apps/erpnext/erpnext/projects/doctype/project/project.py +64,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Summen av alle oppgave vekter bør være 1. Juster vekter av alle prosjektoppgaver tilsvar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +533,Delivery Note {0} is not submitted,Levering Note {0} er ikke innsendt
+apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sub-contracted Item,Elementet {0} må være en underleverandør Element
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Capital Equipments
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Prising Rule først valgt basert på "Apply On-feltet, som kan være varen, varegruppe eller Brand."
 DocType: Hub Settings,Seller Website,Selger Hjemmeside
 DocType: Item,ITEM-,PUNKT-
-apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Totalt bevilget prosent for salgsteam skal være 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Produksjonsordrestatus er {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,Totalt bevilget prosent for salgsteam skal være 100
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},Produksjonsordrestatus er {0}
 DocType: Appraisal Goal,Goal,Mål
+apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,Student batch Strength
 DocType: Sales Invoice Item,Edit Description,Rediger Beskrivelse
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +723,For Supplier,For Leverandør
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,For Leverandør
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Stille Kontotype hjelper i å velge denne kontoen i transaksjoner.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (Selskap Valuta)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Opprett Print Format
@@ -1213,10 +1265,10 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,{0} items in progress,{0} elementer i fremgang
 DocType: Workstation,Workstation Name,Arbeidsstasjon Name
 DocType: Grade Interval,Grade Code,grade Kode
+DocType: POS Item Group,POS Item Group,POS Varegruppe
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-post Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},BOM {0} tilhører ikke Element {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +498,BOM {0} does not belong to Item {1},BOM {0} tilhører ikke Element {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Deafault warehouse is required for selected item,Deafault lageret er nødvendig for valgt element
 DocType: Salary Slip,Bank Account No.,Bank Account No.
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Dette er nummeret på den siste laget transaksjonen med dette prefikset
 DocType: Quality Inspection Reading,Reading 8,Reading 8
@@ -1231,7 +1283,7 @@
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Vennligst velg et selskap
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,Privilege La
 DocType: Purchase Invoice,Supplier Invoice Date,Leverandør Fakturadato
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Du må aktivere Handlevogn
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +87,You need to enable Shopping Cart,Du må aktivere Handlevogn
 DocType: Payment Entry,Writeoff,writeoff
 DocType: Appraisal Template Goal,Appraisal Template Goal,Appraisal Mal Goal
 DocType: Salary Component,Earning,Tjene
@@ -1239,12 +1291,12 @@
 ,BOM Browser,BOM Nettleser
 DocType: Purchase Taxes and Charges,Add or Deduct,Legge til eller trekke fra
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Overlappende vilkår funnet mellom:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +174,Against Journal Entry {0} is already adjusted against some other voucher,Mot Journal Entry {0} er allerede justert mot en annen kupong
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Against Journal Entry {0} is already adjusted against some other voucher,Mot Journal Entry {0} er allerede justert mot en annen kupong
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Total ordreverdi
-apps/erpnext/erpnext/demo/setup/setup_data.py +301,Food,Mat
+apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,Mat
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Aldring Range 3
 DocType: Maintenance Schedule Item,No of Visits,Ingen av besøk
-apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.js +103,Mark Attendence,Mark frammøte
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,Mark frammøte
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuta ifølge kursen konto må være {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Summen av poeng for alle mål bør være 100. Det er {0}
 DocType: Project,Start and End Dates,Start- og sluttdato
@@ -1256,7 +1308,7 @@
 DocType: Purchase Invoice Item,Accounting,Regnskap
 DocType: Employee,EMP/,EMP /
 DocType: Asset,Depreciation Schedules,avskrivninger tidsplaner
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be outside leave allocation period,Tegningsperioden kan ikke være utenfor permisjon tildeling periode
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,Tegningsperioden kan ikke være utenfor permisjon tildeling periode
 DocType: Activity Cost,Projects,Prosjekter
 DocType: Payment Request,Transaction Currency,transaksjonsvaluta
 apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Fra {0} | {1} {2}
@@ -1269,33 +1321,35 @@
 DocType: Supplier,Name and Type,Navn og Type
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +29,Approval Status must be 'Approved' or 'Rejected',Godkjenningsstatus må være "Godkjent" eller "Avvist"
 DocType: Purchase Invoice,Contact Person,Kontaktperson
-apps/erpnext/erpnext/projects/doctype/task/task.py +35,'Expected Start Date' can not be greater than 'Expected End Date','Tiltredelse' ikke kan være større enn "Forventet sluttdato
-DocType: Scheduling Tool,Course End Date,Kurs Sluttdato
+apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date','Tiltredelse' ikke kan være større enn "Forventet sluttdato
+DocType: Course Scheduling Tool,Course End Date,Kurs Sluttdato
 DocType: Holiday List,Holidays,Ferier
 DocType: Sales Order Item,Planned Quantity,Planlagt Antall
 DocType: Purchase Invoice Item,Item Tax Amount,Sak Skattebeløp
 DocType: Item,Maintain Stock,Oppretthold Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Arkiv Innlegg allerede opprettet for produksjonsordre
+DocType: Employee,Prefered Email,foretrukne e-post
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Netto endring i Fixed Asset
 DocType: Leave Control Panel,Leave blank if considered for all designations,La stå tom hvis vurderes for alle betegnelser
-apps/erpnext/erpnext/controllers/accounts_controller.py +623,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge of type 'Actual' i rad {0} kan ikke inkluderes i Element Ranger
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +239,Max: {0},Max: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge of type 'Actual' i rad {0} kan ikke inkluderes i Element Ranger
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Fra Datetime
 DocType: Email Digest,For Company,For selskapet
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Kommunikasjonsloggen.
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +153,"Request for Quotation is disabled to access from portal, for more check portal settings.",Forespørsel om prisanslag er deaktivert tilgang fra portal for flere sjekkportalinnstillingene.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.",Forespørsel om prisanslag er deaktivert tilgang fra portal for flere sjekkportalinnstillingene.
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,Kjøpe Beløp
 DocType: Sales Invoice,Shipping Address Name,Leveringsadresse Navn
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Konto
 DocType: Material Request,Terms and Conditions Content,Betingelser innhold
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +546,cannot be greater than 100,kan ikke være større enn 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is not a stock Item,Element {0} er ikke en lagervare
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +571,cannot be greater than 100,kan ikke være større enn 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,Element {0} er ikke en lagervare
 DocType: Maintenance Visit,Unscheduled,Ikke planlagt
 DocType: Employee,Owned,Eies
 DocType: Salary Detail,Depends on Leave Without Pay,Avhenger La Uten Pay
 DocType: Pricing Rule,"Higher the number, higher the priority","Høyere tallet er, høyere prioritet"
 ,Purchase Invoice Trends,Fakturaen Trender
 DocType: Employee,Better Prospects,Bedre utsikter
+DocType: Vehicle,License Plate,Bilskilt
 DocType: Appraisal,Goals,Mål
 DocType: Warranty Claim,Warranty / AMC Status,Garanti / AMC Status
 ,Accounts Browser,Kontoer Browser
@@ -1308,7 +1362,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,Negative Antall er ikke tillatt
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Tax detalj tabell hentet fra elementet Hoved som en streng, og som er lagret på dette feltet. Brukes for skatter og avgifter"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +152,Employee cannot report to himself.,Arbeidstaker kan ikke rapportere til seg selv.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Arbeidstaker kan ikke rapportere til seg selv.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Hvis kontoen er fryst, er oppføringer lov til begrensede brukere."
 DocType: Email Digest,Bank Balance,Bank Balanse
 apps/erpnext/erpnext/accounts/party.py +234,Accounting Entry for {0}: {1} can only be made in currency: {2},Regnskap Entry for {0}: {1} kan bare gjøres i valuta: {2}
@@ -1318,16 +1372,22 @@
 DocType: Rename Tool,Type of document to rename.,Type dokument for å endre navn.
 apps/erpnext/erpnext/public/js/setup_wizard.js +302,We buy this Item,Vi kjøper denne varen
 DocType: Address,Billing,Billing
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Kunden er nødvendig mot fordringer kontoen {2}
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Totale skatter og avgifter (Selskapet valuta)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Vis unclosed regnskapsårets P & L balanserer
 DocType: Shipping Rule,Shipping Account,Shipping konto
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} is inactive,{0} {1}: Account {2} er inaktiv
 DocType: Quality Inspection,Readings,Readings
 DocType: Stock Entry,Total Additional Costs,Samlede merkostnader
+DocType: Course Schedule,SH,SH
+DocType: BOM,Scrap Material Cost(Company Currency),Skrap Material Cost (Selskap Valuta)
 apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,Sub Assemblies
 DocType: Asset,Asset Name,Asset Name
+DocType: Project,Task Weight,Task Vekt
 DocType: Shipping Rule Condition,To Value,I Value
 DocType: Asset Movement,Stock Manager,Stock manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},Kilde lageret er obligatorisk for rad {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +713,Packing Slip,Pakkseddel
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +745,Packing Slip,Pakkseddel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Kontor Leie
 apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,Oppsett SMS gateway-innstillinger
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import mislyktes!
@@ -1342,6 +1402,7 @@
 DocType: Notification Control,Expense Claim Rejected,Expense krav Avvist
 DocType: Item Attribute,Item Attribute,Sak Egenskap
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Regjeringen
+apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Expense krav {0} finnes allerede for Vehicle Log
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Institute Name
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,Element Varianter
 DocType: Company,Services,Tjenester
@@ -1353,7 +1414,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +236,Asset Category is mandatory for Fixed Asset item,Asset Kategori er obligatorisk for Fixed Asset element
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Ingen poster ble funnet i Payment tabellen
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Denne {0} konflikter med {1} for {2} {3}
-DocType: Course Schedule,Students HTML,studenter HTML
+DocType: Student Attendance Tool,Students HTML,studenter HTML
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Financial Year Start Date,Regnskapsår Startdato
 DocType: POS Profile,Apply Discount,Bruk rabatt
 DocType: Employee External Work History,Total Experience,Total Experience
@@ -1380,7 +1441,7 @@
 DocType: Purchase Invoice,Select Shipping Address,Velg leveringsadresse
 DocType: Leave Block List,Block Holidays on important days.,Block Ferie på viktige dager.
 ,Accounts Receivable Summary,Kundefordringer Sammendrag
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +185,Please set User ID field in an Employee record to set Employee Role,Vennligst angi bruker-ID-feltet i en Employee rekord å sette Employee Rolle
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +183,Please set User ID field in an Employee record to set Employee Role,Vennligst angi bruker-ID-feltet i en Employee rekord å sette Employee Rolle
 DocType: UOM,UOM Name,Målenheter Name
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,Bidrag Beløp
 DocType: Purchase Invoice,Shipping Address,Sendingsadresse
@@ -1392,13 +1453,13 @@
 DocType: Program Enrollment Tool,Program Enrollments,program~~POS=TRUNC påmeldinger
 DocType: Sales Invoice Item,Brand Name,Merkenavn
 DocType: Purchase Receipt,Transporter Details,Transporter Detaljer
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1777,Default warehouse is required for selected item,Standardlager er nødvendig til den valgte artikkelen
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,Eske
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Organisasjonen
 DocType: Budget,Monthly Distribution,Månedlig Distribution
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Mottaker-listen er tom. Opprett Receiver Liste
 DocType: Production Plan Sales Order,Production Plan Sales Order,Produksjonsplan Salgsordre
 DocType: Sales Partner,Sales Partner Target,Sales Partner Target
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Regnskap Entry for {0} kan bare gjøres i valuta: {1}
 DocType: Pricing Rule,Pricing Rule,Prising Rule
 DocType: Budget,Action if Annual Budget Exceeded,Tiltak hvis Årlig budsjett Skredet
 apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Materialet Request til innkjøpsordre
@@ -1412,40 +1473,40 @@
 DocType: C-Form,III,III
 apps/erpnext/erpnext/config/stock.py +294,Opening Stock Balance,Åpning Stock Balance
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +51,{0} must appear only once,{0} må vises bare en gang
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +344,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Ikke lov til å overfør mer {0} enn {1} mot innkjøpsordre {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +359,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Ikke lov til å overfør mer {0} enn {1} mot innkjøpsordre {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Etterlater Avsatt Vellykket for {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Ingenting å pakke
 DocType: Shipping Rule Condition,From Value,Fra Verdi
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +550,Manufacturing Quantity is mandatory,Manufacturing Antall er obligatorisk
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,Manufacturing Antall er obligatorisk
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Hvis det er merket, vil hjemmesiden være standard Varegruppe for nettstedet"
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Krav på bekostning av selskapet.
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +71,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Row # {0}: Clearance date {1} kan ikke være før Cheque Dato {2}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Row # {0}: Clearance date {1} kan ikke være før Cheque Dato {2}
 DocType: Company,Default Holiday List,Standard Holiday List
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +186,Row {0}: From Time and To Time of {1} is overlapping with {2},Rad {0}: Fra tid og klokkeslett {1} er overlappende med {2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +184,Row {0}: From Time and To Time of {1} is overlapping with {2},Rad {0}: Fra tid og klokkeslett {1} er overlappende med {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +142,Stock Liabilities,Aksje Gjeld
 DocType: Purchase Invoice,Supplier Warehouse,Leverandør Warehouse
 DocType: Opportunity,Contact Mobile No,Kontakt Mobile No
 ,Material Requests for which Supplier Quotations are not created,Materielle Forespørsler som Leverandør Sitater ikke er opprettet
 DocType: Student Group,Set 0 for no limit,Sett 0 for ingen begrensning
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +137,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Dagen (e) der du søker om permisjon er helligdager. Du trenger ikke søke om permisjon.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Dagen (e) der du søker om permisjon er helligdager. Du trenger ikke søke om permisjon.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Sende Betaling Email
 apps/erpnext/erpnext/config/selling.py +206,Other Reports,andre rapporter
 DocType: Dependent Task,Dependent Task,Avhengig Task
 apps/erpnext/erpnext/stock/doctype/item/item.py +411,Conversion factor for default Unit of Measure must be 1 in row {0},Omregningsfaktor for standard Enhet må være en i rad {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,Leave of type {0} cannot be longer than {1},Permisjon av typen {0} kan ikke være lengre enn {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +199,Leave of type {0} cannot be longer than {1},Permisjon av typen {0} kan ikke være lengre enn {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Prøv å planlegge operasjoner for X dager i forveien.
 DocType: HR Settings,Stop Birthday Reminders,Stop bursdagspåminnelser
 DocType: SMS Center,Receiver List,Mottaker List
-apps/erpnext/erpnext/accounts/page/pos/pos.js +910,Search Item,Søk Element
+apps/erpnext/erpnext/accounts/page/pos/pos.js +989,Search Item,Søk Element
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Forbrukes Beløp
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +97,Net Change in Cash,Netto endring i kontanter
 apps/erpnext/erpnext/stock/doctype/item/item.py +406,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Enhet {0} har blitt lagt inn mer enn én gang i omregningsfaktor tabell
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +550,Already completed,allerede fullført
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +570,Already completed,allerede fullført
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,Payment Request already exists {0},Betaling Request allerede eksisterer {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Cost of Utstedte Items
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Quantity must not be more than {0},Antall må ikke være mer enn {0}
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +76,Previous Financial Year is not closed,Foregående regnskapsår er ikke stengt
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +246,Quantity must not be more than {0},Antall må ikke være mer enn {0}
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +107,Previous Financial Year is not closed,Foregående regnskapsår er ikke stengt
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),Alder (dager)
 DocType: Quotation Item,Quotation Item,Sitat Element
 DocType: Account,Account Name,Brukernavn
@@ -1453,12 +1514,12 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serial No {0} mengde {1} kan ikke være en brøkdel
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Leverandør Type mester.
 DocType: Purchase Order Item,Supplier Part Number,Leverandør delenummer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +98,Conversion rate cannot be 0 or 1,Konverteringsfrekvens kan ikke være 0 eller 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Conversion rate cannot be 0 or 1,Konverteringsfrekvens kan ikke være 0 eller 1
 DocType: Sales Invoice,Reference Document,Reference Document
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +185,{0} {1} is cancelled or stopped,{0} {1} avbrytes eller stoppes
 DocType: Accounts Settings,Credit Controller,Credit Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Vehicle Publiseringsdato
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +221,Purchase Receipt {0} is not submitted,Kvitteringen {0} er ikke innsendt
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +222,Purchase Receipt {0} is not submitted,Kvitteringen {0} er ikke innsendt
 DocType: Company,Default Payable Account,Standard Betales konto
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Innstillinger for online shopping cart som skipsregler, prisliste etc."
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% Fakturert
@@ -1470,33 +1531,38 @@
 DocType: Journal Entry Account,Debit in Company Currency,Debet i selskapet Valuta
 DocType: BOM Item,BOM Item,BOM Element
 DocType: Appraisal,For Employee,For Employee
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Row {0}: Advance against Supplier must be debit,Rad {0}: Advance mot Leverandøren skal belaste
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Row {0}: Advance against Supplier must be debit,Rad {0}: Advance mot Leverandøren skal belaste
 DocType: Company,Default Values,Standardverdier
 DocType: Expense Claim,Total Amount Reimbursed,Totalbeløp Refusjon
+apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Dette er basert på loggene mot denne bilen. Se tidslinjen nedenfor for detaljer
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Samle inn
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,Against Supplier Invoice {0} dated {1},Mot Leverandør Faktura {0} datert {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +81,Against Supplier Invoice {0} dated {1},Mot Leverandør Faktura {0} datert {1}
 DocType: Customer,Default Price List,Standard Prisliste
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +225,Asset Movement record {0} created,Asset Movement rekord {0} er opprettet
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +229,Asset Movement record {0} created,Asset Movement rekord {0} er opprettet
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Du kan ikke slette regnskapsår {0}. Regnskapsåret {0} er satt som standard i Globale innstillinger
 DocType: Journal Entry,Entry Type,Entry Type
 ,Customer Credit Balance,Customer Credit Balance
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,Netto endring i leverandørgjeld
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Kunden nødvendig for 'Customerwise Discount'
 apps/erpnext/erpnext/config/accounts.py +142,Update bank payment dates with journals.,Oppdatere bankbetalings datoer med tidsskrifter.
-apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +20,Pricing,Priser
+apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Priser
 DocType: Quotation,Term Details,Term Detaljer
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,Kan ikke registrere mer enn {0} studentene på denne studentgruppen.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} må være større enn 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Kapasitetsplanlegging For (dager)
-apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +9,Procurement,innkjøp
+apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,innkjøp
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,Ingen av elementene har noen endring i mengde eller verdi.
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +32,Warranty Claim,Garantikrav
 ,Lead Details,Lead Detaljer
+DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,Sluttdato for gjeldende faktura periode
 DocType: Pricing Rule,Applicable For,Aktuelt For
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,Vennligst sett Lønn Frequency først
+DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Oppheve koblingen Betaling ved kansellering av faktura
 DocType: Bank Reconciliation,From Date,Fra Dato
+apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Nåværende Kilometerstand inngått bør være større enn første Vehicle Teller {0}
 DocType: Shipping Rule Country,Shipping Rule Country,Shipping Rule Land
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +9,Leave and Attendance,La og oppmøte
+apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,La og oppmøte
 DocType: Maintenance Visit,Partially Completed,Delvis Fullført
 DocType: Leave Type,Include holidays within leaves as leaves,Inkluder hellig innen blader som løv
 DocType: Sales Invoice,Packed Items,Lunsj Items
@@ -1505,7 +1571,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total','Total'
 DocType: Shopping Cart Settings,Enable Shopping Cart,Aktiver Handlevogn
 DocType: Employee,Permanent Address,Permanent Adresse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Advance betalt mot {0} {1} kan ikke være større \ enn Totalsum {2}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Velg elementet kode
 DocType: Territory,Territory Manager,Distriktssjef
@@ -1515,27 +1581,30 @@
 DocType: Selling Settings,Selling Settings,Selge Innstillinger
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online auksjoner
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Vennligst oppgi enten Mengde eller Verdivurdering Rate eller begge deler
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,Oppfyllelse
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Company, Måned og regnskapsåret er obligatorisk"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +14,Fulfillment,Oppfyllelse
+apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Vis i handlekurven
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Markedsføringskostnader
 ,Item Shortage Report,Sak Mangel Rapporter
 apps/erpnext/erpnext/stock/doctype/item/item.js +232,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vekt er nevnt, \ nVennligst nevne "Weight målenheter" også"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materialet Request brukes til å gjøre dette lager Entry
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +66,Next Depreciation Date is mandatory for new asset,Neste Avskrivninger dato er obligatorisk for ny aktiva
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Neste Avskrivninger dato er obligatorisk for ny aktiva
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Enkelt enhet av et element.
 DocType: Fee Category,Fee Category,Fee Kategori
 ,Student Fee Collection,Student Fee Collection
+apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,Student Batch eller Student Group er obligatorisk
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Gjør regnskap Entry For Hver Stock Movement
 DocType: Leave Allocation,Total Leaves Allocated,Totalt Leaves Avsatt
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +154,Warehouse required at Row No {0},Warehouse kreves ved Row Nei {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +155,Warehouse required at Row No {0},Warehouse kreves ved Row Nei {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +78,Please enter valid Financial Year Start and End Dates,Fyll inn gyldig Regnskapsår start- og sluttdato
 DocType: Employee,Date Of Retirement,Pensjoneringstidspunktet
 DocType: Upload Attendance,Get Template,Få Mal
 DocType: Address,Postal,Postal
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,ERPNext Setup Complete!
+DocType: Vehicle,Doors,dører
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Item,Weightage,Weightage
 DocType: Packing Slip,PS-,PS
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +126,A Customer Group exists with same name please change the Customer name or rename the Customer Group,En kundegruppe eksisterer med samme navn kan du endre Kundens navn eller endre navn på Kundegruppe
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Det kreves kostnadssted for 'resultat' konto {2}. Sett opp en standardkostnadssted for selskapet.
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +129,A Customer Group exists with same name please change the Customer name or rename the Customer Group,En kundegruppe eksisterer med samme navn kan du endre Kundens navn eller endre navn på Kundegruppe
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Ny kontakt
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Reading 2
@@ -1545,14 +1614,14 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Hvis dette elementet har varianter, så det kan ikke velges i salgsordrer etc."
 DocType: Lead,Next Contact By,Neste Kontakt Av
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +223,Quantity required for Item {0} in row {1},Mengden som kreves for Element {0} i rad {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},Mengden som kreves for Element {0} i rad {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +110,Warehouse {0} can not be deleted as quantity exists for Item {1},Warehouse {0} kan ikke slettes som kvantitet finnes for Element {1}
 DocType: Quotation,Order Type,Ordretype
 DocType: Purchase Invoice,Notification Email Address,Varsling e-postadresse
 ,Item-wise Sales Register,Element-messig Sales Register
 DocType: Asset,Gross Purchase Amount,Bruttobeløpet
 DocType: Asset,Depreciation Method,avskrivningsmetode
-apps/erpnext/erpnext/accounts/page/pos/pos.js +686,Offline,offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +682,Offline,offline
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Er dette inklusiv i Basic Rate?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Total Target
 DocType: Program Course,Required,Må
@@ -1562,8 +1631,9 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Avstemming JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,For mange kolonner. Eksportere rapporten og skrive den ut ved hjelp av et regnearkprogram.
 DocType: Purchase Invoice Item,Batch No,Batch No
+apps/erpnext/erpnext/setup/utils.py +107,Unable to find exchange rate for {0} to {1} for key date {2},å finne valutakursen for klarer {0} til {1} for viktig dato {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Tillat flere salgsordrer mot kundens innkjøpsordre
-apps/erpnext/erpnext/setup/doctype/company/company.py +164,Main,Hoved
+apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,Hoved
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Still prefiks for nummerering serien på dine transaksjoner
 DocType: Employee Attendance Tool,Employees HTML,ansatte HTML
@@ -1572,20 +1642,20 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity Fra-feltet er obligatorisk
 DocType: Email Digest,Annual Expenses,årlige utgifter
 DocType: Item,Variants,Varianter
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +852,Make Purchase Order,Gjør innkjøpsordre
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +876,Make Purchase Order,Gjør innkjøpsordre
 DocType: SMS Center,Send To,Send Til
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,There is not enough leave balance for Leave Type {0},Det er ikke nok permisjon balanse for La Type {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +150,There is not enough leave balance for Leave Type {0},Det er ikke nok permisjon balanse for La Type {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Bevilget beløp
 DocType: Sales Team,Contribution to Net Total,Bidrag til Net Total
 DocType: Sales Invoice Item,Customer's Item Code,Kundens Elementkode
 DocType: Stock Reconciliation,Stock Reconciliation,Stock Avstemming
 DocType: Territory,Territory Name,Territorium Name
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +173,Work-in-Progress Warehouse is required before Submit,Work-in-progress Warehouse er nødvendig før Send
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,Work-in-Progress Warehouse is required before Submit,Work-in-progress Warehouse er nødvendig før Send
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Kandidat til en jobb.
 DocType: Purchase Order Item,Warehouse and Reference,Warehouse og Reference
 DocType: Supplier,Statutory info and other general information about your Supplier,Lovfestet info og annen generell informasjon om din Leverandør
-apps/erpnext/erpnext/hooks.py +95,Addresses,Adresser
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,Against Journal Entry {0} does not have any unmatched {1} entry,Mot Journal Entry {0} har ikke noen enestående {1} oppføring
+apps/erpnext/erpnext/hooks.py +94,Addresses,Adresser
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,Against Journal Entry {0} does not have any unmatched {1} entry,Mot Journal Entry {0} har ikke noen enestående {1} oppføring
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,medarbeidersamtaler
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplisere serie Ingen kom inn for Element {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,En forutsetning for en Shipping Rule
@@ -1594,18 +1664,20 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +151,Please set filter based on Item or Warehouse,Vennligst sette filter basert på varen eller Warehouse
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Nettovekten av denne pakken. (Automatisk beregnet som summen av nettovekt elementer)
 DocType: Sales Order,To Deliver and Bill,Å levere og Bill
+DocType: Student Batch,Instructors,instruktører
 DocType: GL Entry,Credit Amount in Account Currency,Credit beløp på kontoen Valuta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} must be submitted,BOM {0} må sendes
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,BOM {0} må sendes
 DocType: Authorization Control,Authorization Control,Autorisasjon kontroll
 apps/erpnext/erpnext/controllers/buying_controller.py +300,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Avvist Warehouse er obligatorisk mot avvist Element {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Payment,Betaling
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +718,Payment,Betaling
 DocType: Production Order Operation,Actual Time and Cost,Faktisk leveringstid og pris
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Materialet Request av maksimal {0} kan gjøres for Element {1} mot Salgsordre {2}
 DocType: Employee,Salutation,Hilsen
 DocType: Course,Course Abbreviation,Kurs forkortelse
+DocType: Student Leave Application,Student Leave Application,Student La Application
 DocType: Item,Will also apply for variants,Vil også gjelde for varianter
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","Asset kan ikke avbestilles, som det allerede er {0}"
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Samlet arbeidstid må ikke være større enn maks arbeidstid {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +146,"Asset cannot be cancelled, as it is already {0}","Asset kan ikke avbestilles, som det allerede er {0}"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +40,Total working hours should not be greater than max working hours {0},Samlet arbeidstid må ikke være større enn maks arbeidstid {0}
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Bundle elementer på salgstidspunktet.
 DocType: Quotation Item,Actual Qty,Selve Antall
 DocType: Sales Invoice Item,References,Referanser
@@ -1617,6 +1689,7 @@
 DocType: Asset Movement,Asset Movement,Asset Movement
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Element {0} er ikke en serie Element
 DocType: SMS Center,Create Receiver List,Lag Receiver List
+DocType: Vehicle,Wheels,hjul
 DocType: Packing Slip,To Package No.,Å pakke No.
 DocType: Production Planning Tool,Material Requests,material~~POS=TRUNC Forespørsler
 DocType: Warranty Claim,Issue Date,Utgivelsesdato
@@ -1630,7 +1703,7 @@
 ,Sales Invoice Trends,Salgsfaktura Trender
 DocType: Leave Application,Apply / Approve Leaves,Påfør / Godkjenn Løv
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Til
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +134,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Kan referere rad bare hvis belastningen typen er 'On Forrige Row beløp "eller" Forrige Row Totals
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +142,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Kan referere rad bare hvis belastningen typen er 'On Forrige Row beløp "eller" Forrige Row Totals
 DocType: Sales Order Item,Delivery Warehouse,Levering Warehouse
 DocType: Stock Settings,Allowance Percent,Fradrag Prosent
 DocType: SMS Settings,Message Parameter,Melding Parameter
@@ -1640,26 +1713,29 @@
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Få elementer fra innkjøps Receipts
 DocType: Serial No,Creation Date,Dato opprettet
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Element {0} forekommer flere ganger i Prisliste {1}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Selling må sjekkes, hvis dette gjelder for er valgt som {0}"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +38,"Selling must be checked, if Applicable For is selected as {0}","Selling må sjekkes, hvis dette gjelder for er valgt som {0}"
 DocType: Production Plan Material Request,Material Request Date,Materiale Request Dato
 DocType: Purchase Order Item,Supplier Quotation Item,Leverandør sitat Element
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Deaktiverer etableringen av tids logger mot produksjonsordrer. Driften skal ikke spores mot produksjonsordre
 DocType: Student,Student Mobile Number,Student Mobilnummer
 DocType: Item,Has Variants,Har Varianter
+apps/erpnext/erpnext/public/js/utils.js +167,You have already selected items from {0} {1},Du har allerede valgt elementer fra {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Navn på Monthly Distribution
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
-apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Vennligst oppgi Standardvaluta i selskapet Master og Global Defaults
+apps/erpnext/erpnext/setup/utils.py +15,Please specify Default Currency in Company Master and Global Defaults,Vennligst oppgi Standardvaluta i selskapet Master og Global Defaults
 DocType: Purchase Invoice,Recurring Invoice,Tilbakevendende Faktura
 apps/erpnext/erpnext/config/learn.py +268,Managing Projects,Managing Projects
 DocType: Supplier,Supplier of Goods or Services.,Leverandør av varer eller tjenester.
 DocType: Budget,Fiscal Year,Regnskapsår
+DocType: Vehicle Log,Fuel Price,Fuel Pris
 DocType: Budget,Budget,Budsjett
 apps/erpnext/erpnext/stock/doctype/item/item.py +233,Fixed Asset Item must be a non-stock item.,Fast Asset varen må være et ikke-lagervare.
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +44,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budsjettet kan ikke overdras mot {0}, som det er ikke en inntekt eller kostnad konto"
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +49,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budsjettet kan ikke overdras mot {0}, som det er ikke en inntekt eller kostnad konto"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Oppnås
 DocType: Student Admission,Application Form Route,Søknadsskjema Rute
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Territorium / Customer
 apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,f.eks 5
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,La Type {0} kan ikke tildeles siden det er permisjon uten lønn
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Rad {0}: Nummerert mengden {1} må være mindre enn eller lik fakturere utestående beløp {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,I Ord vil være synlig når du lagrer salgsfaktura.
 DocType: Item,Is Sales Item,Er Sales Element
@@ -1670,30 +1746,30 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +292,A Product or Service,Et produkt eller tjeneste
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +28,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Begrepet Startdato kan ikke være tidligere enn året startdato av studieåret som begrepet er knyttet (studieåret {}). Korriger datoene, og prøv igjen."
 DocType: Naming Series,Current Value,Nåværende Verdi
-apps/erpnext/erpnext/controllers/accounts_controller.py +238,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Flere regnskapsårene finnes for datoen {0}. Vennligst satt selskapet i regnskapsåret
+apps/erpnext/erpnext/controllers/accounts_controller.py +248,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Flere regnskapsårene finnes for datoen {0}. Vennligst satt selskapet i regnskapsåret
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} opprettet
 DocType: Delivery Note Item,Against Sales Order,Mot Salgsordre
 ,Serial No Status,Serial No Status
 DocType: Payment Entry Reference,Outstanding,Utestående
 ,Daily Timesheet Summary,Daglig Timeregistrering Oppsummering
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +443,Item table can not be blank,Sak bordet kan ikke være tomt
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,Item table can not be blank,Sak bordet kan ikke være tomt
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Rad {0}: Slik stiller {1} periodisitet, forskjellen mellom fra og til dato \ må være større enn eller lik {2}"
-apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +5,This is based on stock movement. See {0} for details,Dette er basert på lagerbevegelse. Se {0} for detaljer
+apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Dette er basert på lagerbevegelse. Se {0} for detaljer
 DocType: Pricing Rule,Selling,Selling
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +344,Amount {0} {1} deducted against {2},Mengden {0} {1} trukket mot {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Mengden {0} {1} trukket mot {2}
 DocType: Employee,Salary Information,Lønn Informasjon
 DocType: Sales Person,Name and Employee ID,Navn og Employee ID
 apps/erpnext/erpnext/accounts/party.py +296,Due Date cannot be before Posting Date,Due Date kan ikke være før konteringsdato
 DocType: Website Item Group,Website Item Group,Website varegruppe
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +147,Duties and Taxes,Skatter og avgifter
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,Skriv inn Reference dato
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,Please enter Reference date,Skriv inn Reference dato
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} oppføringer betalings kan ikke bli filtrert av {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabell for element som vil bli vist på nettsiden
 DocType: Purchase Order Item Supplied,Supplied Qty,Medfølgende Antall
 DocType: Purchase Order Item,Material Request Item,Materialet Request Element
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Tree of varegrupper.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,Kan ikke se rad tall større enn eller lik gjeldende rad nummer for denne debiteringstype
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,Kan ikke se rad tall større enn eller lik gjeldende rad nummer for denne debiteringstype
 DocType: Asset,Sold,selges
 ,Item-wise Purchase History,Element-messig Purchase History
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,Red,Rød
@@ -1709,7 +1785,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Investeringer
 DocType: Issue,Resolution Details,Oppløsning Detaljer
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Avsetninger
-DocType: Quality Inspection Reading,Acceptance Criteria,Akseptkriterier
+DocType: Item Quality Inspection Parameter,Acceptance Criteria,Akseptkriterier
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Fyll inn Material forespørsler i tabellen over
 DocType: Item Attribute,Attribute Name,Attributt navn
 DocType: Item Group,Show In Website,Show I Website
@@ -1717,6 +1793,7 @@
 DocType: Task,Expected Time (in hours),Forventet tid (i timer)
 DocType: Item Reorder,Check in (group),Sjekk inn (gruppe)
 ,Qty to Order,Antall å bestille
+DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","Kontoen hodet etter forpliktelse eller et egenkapital, der gevinst / tap vil bli bokført"
 apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,Gantt diagram av alle oppgaver.
 DocType: Opportunity,Mins to First Response,Minutter til First Response
 DocType: Pricing Rule,Margin Type,margin Type
@@ -1725,7 +1802,7 @@
 DocType: Holiday List,Clear Table,Clear Table
 DocType: C-Form Invoice Detail,Invoice No,Faktura Nei
 DocType: Room,Room Name,Room Name
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","La ikke kan brukes / kansellert før {0}, som permisjon balanse har allerede vært carry-sendt i fremtiden permisjon tildeling posten {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","La ikke kan brukes / kansellert før {0}, som permisjon balanse har allerede vært carry-sendt i fremtiden permisjon tildeling posten {1}"
 DocType: Activity Cost,Costing Rate,Costing Rate
 ,Customer Addresses And Contacts,Kunde Adresser og kontakter
 DocType: Discussion,Discussion,Diskusjon
@@ -1743,23 +1820,25 @@
 DocType: Item,Has Batch No,Har Batch No
 apps/erpnext/erpnext/public/js/utils.js +114,Annual Billing: {0},Årlig Billing: {0}
 DocType: Delivery Note,Excise Page Number,Vesenet Page Number
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +107,"Company, From Date and To Date is mandatory","Company, Fra dato og Til dato er obligatorisk"
 DocType: Asset,Purchase Date,Kjøpsdato
 DocType: Employee,Personal Details,Personlig Informasjon
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +182,Please set 'Asset Depreciation Cost Center' in Company {0},Vennligst sett 'Asset Avskrivninger kostnadssted "i selskapet {0}
 ,Maintenance Schedules,Vedlikeholdsplaner
 DocType: Task,Actual End Date (via Time Sheet),Faktisk Sluttdato (via Timeregistrering)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +339,Amount {0} {1} against {2} {3},Mengden {0} {1} mot {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Mengden {0} {1} mot {2} {3}
 ,Quotation Trends,Anførsels Trender
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},Varegruppe ikke nevnt i punkt master for elementet {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Receivable account,Uttak fra kontoen må være en fordring konto
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,Item Group not mentioned in item master for item {0},Varegruppe ikke nevnt i punkt master for elementet {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,Uttak fra kontoen må være en fordring konto
 DocType: Shipping Rule Condition,Shipping Amount,Fraktbeløp
 ,Pending Amount,Avventer Beløp
 DocType: Purchase Invoice Item,Conversion Factor,Omregningsfaktor
 DocType: Purchase Order,Delivered,Levert
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,Expected value after useful life must be greater than or equal to {0},Forventet verdi etter levetid må være større enn eller lik {0}
+,Vehicle Expenses,Vehicle Utgifter
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +141,Expected value after useful life must be greater than or equal to {0},Forventet verdi etter levetid må være større enn eller lik {0}
 DocType: Purchase Receipt,Vehicle Number,Vehicle Number
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Datoen som tilbakevendende faktura vil bli stoppe
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +93,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Totalt bevilget blader {0} kan ikke være mindre enn allerede godkjente blader {1} for perioden
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Totalt bevilget blader {0} kan ikke være mindre enn allerede godkjente blader {1} for perioden
 DocType: Journal Entry,Accounts Receivable,Kundefordringer
 ,Supplier-Wise Sales Analytics,Leverandør-Wise Salgs Analytics
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,Skriv inn beløpet som betales
@@ -1774,15 +1853,15 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Expense Claim is pending approval. Only the Expense Approver can update status.,Expense krav venter på godkjenning. Bare den Expense Godkjenner kan oppdatere status.
 DocType: Email Digest,New Expenses,nye Utgifter
 DocType: Purchase Invoice,Additional Discount Amount,Ekstra rabatt Beløp
-apps/erpnext/erpnext/controllers/accounts_controller.py +527,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",Row # {0}: Antall må være en som elementet er et anleggsmiddel. Bruk egen rad for flere stk.
+apps/erpnext/erpnext/controllers/accounts_controller.py +537,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",Row # {0}: Antall må være en som elementet er et anleggsmiddel. Bruk egen rad for flere stk.
 DocType: Leave Block List Allow,Leave Block List Allow,La Block List Tillat
-apps/erpnext/erpnext/setup/doctype/company/company.py +249,Abbr can not be blank or space,Abbr kan ikke være tomt eller plass
+apps/erpnext/erpnext/setup/doctype/company/company.py +259,Abbr can not be blank or space,Abbr kan ikke være tomt eller plass
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Gruppe til Non-gruppe
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Total Actual
 DocType: Student Siblings,Student Siblings,student Søsken
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,Enhet
-apps/erpnext/erpnext/stock/get_item_details.py +123,Please specify Company,Vennligst oppgi selskapet
+apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,Vennligst oppgi selskapet
 ,Customer Acquisition and Loyalty,Kunden Oppkjøp og Loyalty
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Warehouse hvor du opprettholder lager avviste elementer
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Din regnskapsår avsluttes på
@@ -1792,33 +1871,33 @@
 DocType: Issue,Support,Support
 ,BOM Search,BOM Søk
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Lukking (Åpning + Totals)
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Vennligst oppgi valuta i selskapet
+DocType: Vehicle,Fuel Type,drivstoff
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Vennligst oppgi valuta i selskapet
 DocType: Workstation,Wages per hour,Lønn per time
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +50,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Stock balanse i Batch {0} vil bli negativ {1} for Element {2} på Warehouse {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Følgende materiale Requests har vært reist automatisk basert på element re-order nivå
 DocType: Email Digest,Pending Sales Orders,Avventer salgsordrer
-apps/erpnext/erpnext/controllers/accounts_controller.py +275,Account {0} is invalid. Account Currency must be {1},Konto {0} er ugyldig. Account Valuta må være {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +285,Account {0} is invalid. Account Currency must be {1},Konto {0} er ugyldig. Account Valuta må være {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Målenheter Omregningsfaktor er nødvendig i rad {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +969,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Reference Document Type må være en av salgsordre, salgsfaktura eller bilagsregistrering"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Reference Document Type må være en av salgsordre, salgsfaktura eller bilagsregistrering"
 DocType: Salary Component,Deduction,Fradrag
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +111,Row {0}: From Time and To Time is mandatory.,Rad {0}: Fra tid og Tid er obligatorisk.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +109,Row {0}: From Time and To Time is mandatory.,Rad {0}: Fra tid og Tid er obligatorisk.
 DocType: Stock Reconciliation Item,Amount Difference,beløp Difference
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},Varen Pris lagt for {0} i Prisliste {1}
+apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},Varen Pris lagt for {0} i Prisliste {1}
 DocType: Address Template,Address Template,Adresse Mal
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +7,Please enter Employee Id of this sales person,Skriv inn Employee Id av denne salgs person
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Skriv inn Employee Id av denne salgs person
 DocType: Territory,Classification of Customers by region,Klassifisering av kunder etter region
-DocType: Project,% Tasks Completed,% Oppgaver Fullført
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Forskjellen Beløpet må være null
 DocType: Project,Gross Margin,Bruttomargin
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,Please enter Production Item first,Skriv inn Produksjon varen først
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Beregnet kontoutskrift balanse
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,deaktivert bruker
-apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,Sitat
+DocType: Lead,Quotation,Sitat
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Total Fradrag
 DocType: Maintenance Visit,Maintenance User,Vedlikehold Bruker
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,Kostnad Oppdatert
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,Kostnad Oppdatert
 DocType: Employee,Date of Birth,Fødselsdato
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,Item {0} has already been returned,Element {0} er allerede returnert
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Regnskapsår ** representerer et regnskapsår. Alle regnskapspostene og andre store transaksjoner spores mot ** regnskapsår **.
@@ -1831,7 +1910,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,Job Description,Stillingsbeskrivelse
 DocType: Student Applicant,Applied,Tatt i bruk
 DocType: Purchase Order Item,Qty as per Stock UOM,Antall pr Stock målenheter
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Spesialtegn unntatt "-" ".", "#", og "/" ikke tillatt i navngi serie"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Spesialtegn unntatt "-" ".", "#", og "/" ikke tillatt i navngi serie"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Hold orden på salgskampanjer. Hold styr på Leads, Sitater, Salgsordre etc fra kampanjer for å måle avkastning på investeringen."
 DocType: Expense Claim,Approver,Godkjenner
 ,SO Qty,SO Antall
@@ -1840,19 +1919,20 @@
 DocType: Request for Quotation,Manufacturing Manager,Produksjonssjef
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},Serial No {0} er under garanti opptil {1}
 apps/erpnext/erpnext/config/stock.py +153,Split Delivery Note into packages.,Split følgeseddel i pakker.
-apps/erpnext/erpnext/hooks.py +81,Shipments,Forsendelser
+apps/erpnext/erpnext/hooks.py +80,Shipments,Forsendelser
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Totalt tildelte beløp (Selskap Valuta)
 DocType: Purchase Order Item,To be delivered to customer,Som skal leveres til kunde
+DocType: BOM,Scrap Material Cost,Skrap Material Cost
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serial No {0} tilhører ikke noen Warehouse
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +154,Row # ,Row #
 DocType: Purchase Invoice,In Words (Company Currency),I Words (Company Valuta)
 DocType: Asset,Supplier,Leverandør
-apps/erpnext/erpnext/public/js/utils.js +167,Get From,Få Fra
+apps/erpnext/erpnext/public/js/utils.js +194,Get From,Få Fra
 DocType: C-Form,Quarter,Quarter
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,Diverse utgifter
 DocType: Global Defaults,Default Company,Standard selskapet
-apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Kostnad eller Difference konto er obligatorisk for Element {0} som det påvirker samlede børsverdi
-apps/erpnext/erpnext/controllers/accounts_controller.py +419,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Kan ikke overbill for Element {0} i rad {1} mer enn {2}. Å tillate billing, vennligst sett på lager Innstillinger"
+apps/erpnext/erpnext/controllers/stock_controller.py +183,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Kostnad eller Difference konto er obligatorisk for Element {0} som det påvirker samlede børsverdi
+apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Kan ikke overbill for Element {0} i rad {1} mer enn {2}. Å tillate billing, vennligst sett på lager Innstillinger"
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Bank Name
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Above
@@ -1860,8 +1940,9 @@
 DocType: Email Digest,Note: Email will not be sent to disabled users,Merk: E-post vil ikke bli sendt til funksjonshemmede brukere
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,Velg Company ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,La stå tom hvis vurderes for alle avdelinger
-apps/erpnext/erpnext/config/hr.py +171,"Types of employment (permanent, contract, intern etc.).","Typer arbeid (fast, kontrakt, lærling etc.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,{0} is mandatory for Item {1},{0} er obligatorisk for Element {1}
+apps/erpnext/erpnext/config/hr.py +182,"Types of employment (permanent, contract, intern etc.).","Typer arbeid (fast, kontrakt, lærling etc.)."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,{0} is mandatory for Item {1},{0} er obligatorisk for Element {1}
+DocType: Process Payroll,Fortnightly,hver fjortende dag
 DocType: Currency Exchange,From Currency,Fra Valuta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vennligst velg avsatt beløp, fakturatype og fakturanummer i minst én rad"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Kostnad for nye kjøp
@@ -1872,28 +1953,31 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +65,Cannot find a matching Item. Please select some other value for {0}.,Kan ikke finne en matchende element. Vennligst velg en annen verdi for {0}.
 DocType: POS Profile,Taxes and Charges,Skatter og avgifter
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Et produkt eller en tjeneste som er kjøpt, solgt eller holdes på lager."
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +138,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Kan ikke velge charge type som 'On Forrige Row beløp "eller" On Forrige Row Totals for første rad
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Kan ikke velge charge type som 'On Forrige Row beløp "eller" On Forrige Row Totals for første rad
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Barn Varen bør ikke være et produkt Bundle. Vennligst fjern element `{0}` og lagre
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Banking
+DocType: Vehicle Service,Service Item,tjenesten Element
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Vennligst klikk på "Generer Schedule 'for å få timeplanen
-apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +53,There were errors while deleting following schedules:,Det var feil under sletting av følgende planer:
+apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,There were errors while deleting following schedules:,Det var feil under sletting av følgende planer:
 DocType: Bin,Ordered Quantity,Bestilte Antall
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,"e.g. ""Build tools for builders""",f.eks "Bygg verktøy for utbyggere"
-DocType: Quality Inspection,In Process,Igang
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Regnskap Entry for {2} kan bare gjøres i valuta: {3}
+DocType: Production Order,In Process,Igang
 DocType: Authorization Rule,Itemwise Discount,Itemwise Rabatt
 apps/erpnext/erpnext/config/accounts.py +69,Tree of financial accounts.,Tre av finansregnskap.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,{0} against Sales Order {1},{0} mot Salgsordre {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +351,{0} against Sales Order {1},{0} mot Salgsordre {1}
 DocType: Account,Fixed Asset,Fast Asset
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Serialisert Lager
 DocType: Activity Type,Default Billing Rate,Standard Billing pris
 DocType: Sales Invoice,Total Billing Amount,Total Billing Beløp
+apps/erpnext/erpnext/hr/doctype/daily_work_summary_settings/daily_work_summary_settings.py +17,There must be a default incoming Email Account enabled for this to work. Please setup a default incoming Email Account (POP/IMAP) and try again.,Det må være en standard innkommende e-postkonto aktivert for at dette skal fungere. Vennligst sette opp en standard innkommende e-postkonto (POP / IMAP) og prøv igjen.
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,Fordring konto
-apps/erpnext/erpnext/controllers/accounts_controller.py +549,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} er allerede {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +559,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} er allerede {2}
 DocType: Quotation Item,Stock Balance,Stock Balance
 apps/erpnext/erpnext/config/selling.py +302,Sales Order to Payment,Salgsordre til betaling
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,administrerende direktør
 DocType: Expense Claim Detail,Expense Claim Detail,Expense krav Detalj
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +809,Please select correct account,Velg riktig konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +835,Please select correct account,Velg riktig konto
 DocType: Item,Weight UOM,Vekt målenheter
 DocType: Salary Structure Employee,Salary Structure Employee,Lønn Struktur Employee
 DocType: Employee,Blood Group,Blodgruppe
@@ -1910,10 +1994,11 @@
 DocType: Employee,Contact Details,Kontaktinformasjon
 DocType: C-Form,Received Date,Mottatt dato
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Hvis du har opprettet en standard mal i salgs skatter og avgifter mal, velger du ett og klikk på knappen under."
+DocType: BOM Scrap Item,Basic Amount (Company Currency),Grunnbeløpet (Selskap Valuta)
 DocType: Student,Guardians,Voktere
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,Vennligst oppgi et land for denne Shipping Regel eller sjekk Worldwide Shipping
 DocType: Stock Entry,Total Incoming Value,Total Innkommende Verdi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +321,Debit To is required,Debet Å kreves
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Debet Å kreves
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Kjøp Prisliste
 DocType: Offer Letter Term,Offer Term,Tilbudet Term
 DocType: Quality Inspection,Quality Manager,Quality Manager
@@ -1925,15 +2010,17 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Tilbudsbrev
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Generere Material Requests (MRP) og produksjonsordrer.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,Total Fakturert Amt
+DocType: BOM,Conversion Rate,konverterings~~POS=TRUNC
 DocType: Timesheet Detail,To Time,Til Time
 DocType: Authorization Rule,Approving Role (above authorized value),Godkjenne Role (ovenfor autorisert verdi)
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Credit To account must be a Payable account,Kreditt til kontoen må være en Betales konto
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +241,BOM recursion: {0} cannot be parent or child of {2},BOM rekursjon: {0} kan ikke være forelder eller barn av {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,Kreditt til kontoen må være en Betales konto
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},BOM rekursjon: {0} kan ikke være forelder eller barn av {2}
 DocType: Production Order Operation,Completed Qty,Fullført Antall
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry",For {0} kan bare belastning kontoer knyttes opp mot en annen kreditt oppføring
-apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,Prisliste {0} er deaktivert
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +123,Row {0}: Completed Qty cannot be more than {1} for operation {2},Rad {0}: Fullført Antall kan ikke være mer enn {1} for drift {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,"For {0}, only debit accounts can be linked against another credit entry",For {0} kan bare belastning kontoer knyttes opp mot en annen kreditt oppføring
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Prisliste {0} er deaktivert
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},Rad {0}: Fullført Antall kan ikke være mer enn {1} for drift {2}
 DocType: Manufacturing Settings,Allow Overtime,Tillat Overtid
+DocType: Training Event Employee,Training Event Employee,Trening Hendelses Employee
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} serienumre som kreves for Element {1}. Du har gitt {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Nåværende Verdivurdering Rate
 DocType: Item,Customer Item Codes,Kunden element Codes
@@ -1942,21 +2029,21 @@
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Ny adresse
 DocType: Quality Inspection,Sample Size,Sample Size
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Receipt Document,Fyll inn Kvittering Document
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +379,All items have already been invoiced,Alle elementene er allerede blitt fakturert
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +375,All items have already been invoiced,Alle elementene er allerede blitt fakturert
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Vennligst oppgi en gyldig "Fra sak nr '
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,Ytterligere kostnadsbærere kan gjøres under Grupper men oppføringene kan gjøres mot ikke-grupper
 DocType: Project,External,Ekstern
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Brukere og tillatelser
+DocType: Vehicle Log,VLOG.,Vlog.
 DocType: Branch,Branch,Branch
 DocType: Guardian,Mobile Number,Mobilnummer
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Trykking og merkevarebygging
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Ingen lønn slip funnet for måned:
 DocType: Bin,Actual Quantity,Selve Antall
 DocType: Shipping Rule,example: Next Day Shipping,Eksempel: Neste Day Shipping
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} ikke funnet
-DocType: Student Batch,Student Batch,student Batch
+apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,student Batch
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Dine kunder
-apps/erpnext/erpnext/projects/doctype/project/project.py +141,You have been invited to collaborate on the project: {0},Du har blitt invitert til å samarbeide om prosjektet: {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},Du har blitt invitert til å samarbeide om prosjektet: {0}
 DocType: Leave Block List Date,Block Date,Block Dato
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Søk nå
 DocType: Sales Order,Not Delivered,Ikke levert
@@ -1970,7 +2057,7 @@
 DocType: Timesheet Detail,Costing Amount,Costing Beløp
 DocType: Student Admission,Application Fee,Påmeldingsavgift
 DocType: Process Payroll,Submit Salary Slip,Send Lønn Slip
-apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,Maxiumm rabatt for Element {0} er {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,Maxiumm rabatt for Element {0} er {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Import i Bulk
 DocType: Sales Partner,Address & Contacts,Adresse og Kontakt
 DocType: SMS Log,Sender Name,Avsender Navn
@@ -1978,6 +2065,7 @@
 DocType: SMS Log,Sent To,Sendt til
 DocType: Payment Request,Make Sales Invoice,Gjør Sales Faktura
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,programvare
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Neste Kontakt Datoen kan ikke være i fortiden
 DocType: Company,For Reference Only.,For referanse.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Ugyldig {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
@@ -1988,28 +2076,28 @@
 DocType: Employee,Employment Details,Sysselsetting Detaljer
 DocType: Employee,New Workplace,Nye arbeidsplassen
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Sett som Stengt
-apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},Ingen Element med Barcode {0}
+apps/erpnext/erpnext/stock/get_item_details.py +112,No Item with Barcode {0},Ingen Element med Barcode {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Sak nr kan ikke være 0
 DocType: Item,Show a slideshow at the top of the page,Vis en lysbildeserie på toppen av siden
 apps/erpnext/erpnext/stock/doctype/item/item.py +134,Stores,Butikker
 DocType: Serial No,Delivery Time,Leveringstid
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Aldring Based On
 DocType: Item,End of Life,Slutten av livet
-apps/erpnext/erpnext/demo/setup/setup_data.py +304,Travel,Reise
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,No active or default Salary Structure found for employee {0} for the given dates,Ingen aktive eller standard Lønn Struktur funnet for arbeidstaker {0} for den gitte datoer
+apps/erpnext/erpnext/demo/setup/setup_data.py +319,Travel,Reise
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,Ingen aktive eller standard Lønn Struktur funnet for arbeidstaker {0} for den gitte datoer
 DocType: Leave Block List,Allow Users,Gi brukere
 DocType: Purchase Order,Customer Mobile No,Kunden Mobile No
 DocType: Sales Invoice,Recurring,Gjentakende
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Spor separat inntekter og kostnader for produkt vertikaler eller divisjoner.
 DocType: Rename Tool,Rename Tool,Rename Tool
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Oppdater Cost
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,Oppdater Cost
 DocType: Item Reorder,Item Reorder,Sak Omgjøre
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +53,Show Salary Slip,Vis Lønn Slip
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,Transfer Material,Transfer Material
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,Vis Lønn Slip
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +733,Transfer Material,Transfer Material
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Spesifiser drift, driftskostnadene og gi en unik Operation nei til driften."
-apps/erpnext/erpnext/controllers/status_updater.py +166,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Dette dokumentet er over grensen av {0} {1} for elementet {4}. Er du gjør en annen {3} mot samme {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +914,Please set recurring after saving,Vennligst sett gjentakende etter lagring
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +703,Select change amount account,Velg endring mengde konto
+apps/erpnext/erpnext/controllers/status_updater.py +188,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Dette dokumentet er over grensen av {0} {1} for elementet {4}. Er du gjør en annen {3} mot samme {2}?
+apps/erpnext/erpnext/public/js/controllers/transaction.js +955,Please set recurring after saving,Vennligst sett gjentakende etter lagring
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,Velg endring mengde konto
 DocType: Purchase Invoice,Price List Currency,Prisliste Valuta
 DocType: Naming Series,User must always select,Brukeren må alltid velge
 DocType: Stock Settings,Allow Negative Stock,Tillat Negative Stock
@@ -2020,32 +2108,33 @@
 DocType: Budget Account,Budget Account,budsjett konto
 DocType: Quality Inspection,Verified By,Verified by
 DocType: Address,Subsidiary,Datterselskap
-apps/erpnext/erpnext/setup/doctype/company/company.py +64,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Kan ikke endre selskapets standardvaluta, fordi det er eksisterende transaksjoner. Transaksjoner må avbestilles å endre valgt valuta."
+apps/erpnext/erpnext/setup/doctype/company/company.py +65,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Kan ikke endre selskapets standardvaluta, fordi det er eksisterende transaksjoner. Transaksjoner må avbestilles å endre valgt valuta."
 DocType: Grade Interval,Grade Description,grade Beskrivelse
-DocType: Quality Inspection,Purchase Receipt No,Kvitteringen Nei
+DocType: Stock Entry,Purchase Receipt No,Kvitteringen Nei
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Earnest Penger
 DocType: Process Payroll,Create Salary Slip,Lag Lønn Slip
-apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +33,Traceability,Sporbarhet
+apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,Sporbarhet
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Source of Funds (Liabilities),Source of Funds (Gjeld)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Antall på rad {0} ({1}) må være det samme som produsert mengde {2}
-DocType: Appraisal,Employee,Ansatt
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Antall på rad {0} ({1}) må være det samme som produsert mengde {2}
+DocType: Vehicle,Employee,Ansatt
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Inviter som User
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} er fullt fakturert
-DocType: Workstation Working Hour,End Time,Sluttid
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} er fullt fakturert
+DocType: Training Event,End Time,Sluttid
 DocType: Payment Entry,Payment Deductions or Loss,Betalings fradrag eller tap
-apps/erpnext/erpnext/config/schools.py +104,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standard kontraktsvilkår for salg eller kjøp.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Grupper etter Voucher
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,salgs~~POS=TRUNC
 DocType: Student Batch Student,Student Batch Student,Student Batch Student
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},Vennligst angi standardkonto i Lønn Component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Nødvendig På
 DocType: Rename Tool,File to Rename,Filen til Rename
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Vennligst velg BOM for Element i Rad {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchse Order number required for Item {0},Purchse Bestill antall som kreves for Element {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},Purchse Bestill antall som kreves for Element {0}
 apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},Spesifisert BOM {0} finnes ikke for Element {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +199,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Vedlikeholdsplan {0} må avbestilles før den avbryter denne salgsordre
 DocType: Notification Control,Expense Claim Approved,Expense krav Godkjent
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +309,Salary Slip of employee {0} already created for this period,Lønn Slip av ansattes {0} som allerede er opprettet for denne perioden
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,Lønn Slip av ansattes {0} som allerede er opprettet for denne perioden
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,Pharmaceutical
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Kostnad for kjøpte varer
 DocType: Selling Settings,Sales Order Required,Salgsordre Påkrevd
@@ -2061,25 +2150,25 @@
 DocType: Upload Attendance,Attendance To Date,Oppmøte To Date
 DocType: Warranty Claim,Raised By,Raised By
 DocType: Payment Gateway Account,Payment Account,Betaling konto
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +793,Please specify Company to proceed,Vennligst oppgi selskapet å fortsette
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +801,Please specify Company to proceed,Vennligst oppgi selskapet å fortsette
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,Netto endring i kundefordringer
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,Kompenserende Off
-DocType: Quality Inspection Reading,Accepted,Akseptert
+DocType: Offer Letter,Accepted,Akseptert
 DocType: SG Creation Tool Course,Student Group Name,Student Gruppenavn
 apps/erpnext/erpnext/setup/doctype/company/company.js +46,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Sørg for at du virkelig ønsker å slette alle transaksjoner for dette selskapet. Dine stamdata vil forbli som det er. Denne handlingen kan ikke angres.
 DocType: Room,Room Number,Romnummer
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Ugyldig referanse {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +162,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) kan ikke være større enn planlagt quanitity ({2}) i produksjonsordre {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) kan ikke være større enn planlagt quanitity ({2}) i produksjonsordre {3}
 DocType: Shipping Rule,Shipping Rule Label,Shipping Rule Etikett
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,bruker~~POS=TRUNC
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Raw Materials cannot be blank.,Råvare kan ikke være blank.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +441,"Could not update stock, invoice contains drop shipping item.","Kunne ikke oppdatere lager, inneholder faktura slippe frakt element."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Quick Journal Entry,Hurtig Journal Entry
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +103,You can not change rate if BOM mentioned agianst any item,Du kan ikke endre prisen dersom BOM nevnt agianst ethvert element
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +237,Raw Materials cannot be blank.,Råvare kan ikke være blank.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,"Could not update stock, invoice contains drop shipping item.","Kunne ikke oppdatere lager, inneholder faktura slippe frakt element."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Hurtig Journal Entry
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,Du kan ikke endre prisen dersom BOM nevnt agianst ethvert element
 DocType: Employee,Previous Work Experience,Tidligere arbeidserfaring
 DocType: Stock Entry,For Quantity,For Antall
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Skriv inn Planned Antall for Element {0} på rad {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1} ikke er sendt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} ikke er sendt
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Forespørsler om elementer.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Separat produksjonsordre vil bli opprettet for hvert ferdige godt element.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0} må være negativ i retur dokument
@@ -2090,14 +2179,14 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Vennligst lagre dokumentet før du genererer vedlikeholdsplan
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Prosjekt Status
 DocType: UOM,Check this to disallow fractions. (for Nos),Sjekk dette for å forby fraksjoner. (For Nos)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +398,The following Production Orders were created:,Følgende produksjonsordrer ble opprettet:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +400,The following Production Orders were created:,Følgende produksjonsordrer ble opprettet:
 DocType: Student Admission,Naming Series (for Student Applicant),Naming Series (Student søkeren)
 DocType: Delivery Note,Transporter Name,Transporter Name
 DocType: Authorization Rule,Authorized Value,Autorisert Verdi
 DocType: Contact,Enter department to which this Contact belongs,Tast avdeling som denne kontakten tilhører
 ,Minutes to First Response for Opportunity,Minutter til First Response for Opportunity
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,Total Fraværende
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +747,Item or Warehouse for row {0} does not match Material Request,Element eller Warehouse for rad {0} samsvarer ikke Material Request
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +785,Item or Warehouse for row {0} does not match Material Request,Element eller Warehouse for rad {0} samsvarer ikke Material Request
 apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,Måleenhet
 DocType: Fiscal Year,Year End Date,År Sluttdato
 DocType: Task Depends On,Task Depends On,Task Avhenger
@@ -2107,15 +2196,17 @@
 DocType: Operation,Default Workstation,Standard arbeidsstasjon
 DocType: Notification Control,Expense Claim Approved Message,Expense krav Godkjent melding
 DocType: Payment Entry,Deductions or Loss,Fradrag eller tap
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1} er stengt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} er stengt
 DocType: Email Digest,How frequently?,Hvor ofte?
 DocType: Purchase Receipt,Get Current Stock,Få Current Stock
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Tree of Bill of Materials
 DocType: Student,Joining Date,Bli med dato
 ,Employees working on a holiday,Arbeidstakere som arbeider på ferie
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Mark Present
+DocType: Project,% Complete Method,% Komplett Method
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Vedlikehold startdato kan ikke være før leveringsdato for Serial No {0}
 DocType: Production Order,Actual End Date,Selve sluttdato
+DocType: BOM,Operating Cost (Company Currency),Driftskostnader (Selskap Valuta)
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),Gjelder til (Role)
 DocType: Stock Entry,Purpose,Formålet
@@ -2127,14 +2218,15 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Godkjenne Brukeren kan ikke være det samme som bruker regelen gjelder for
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Basic Rate (som per Stock målenheter)
 DocType: SMS Log,No of Requested SMS,Ingen av Spurt SMS
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,La Uten Pay ikke samsvarer med godkjente La Søknad poster
 DocType: Campaign,Campaign-.####,Kampanje -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Neste skritt
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +695,Please supply the specified items at the best possible rates,Vennligst oppgi de angitte elementene på de best mulige priser
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +703,Please supply the specified items at the best possible rates,Vennligst oppgi de angitte elementene på de best mulige priser
 apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,slutt År
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Kontraktssluttdato må være større enn tidspunktet for inntreden
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,Kontraktssluttdato må være større enn tidspunktet for inntreden
 DocType: Delivery Note,DN-,DN-
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,En tredjepart distributør / forhandler / kommisjonær / agent / forhandler som selger selskaper produkter for en kommisjon.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,{0} against Purchase Order {1},{0} mot innkjøpsordre {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +363,{0} against Purchase Order {1},{0} mot innkjøpsordre {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Skriv inn statiske webadresseparametere her (F.eks. Avsender = ERPNext, brukernavn = ERPNext, passord = 1234 etc.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} ikke i noen aktiv regnskapsåret. For mer informasjon sjekk {2}.
 DocType: Task,Actual Start Date (via Time Sheet),Faktisk startdato (via Timeregistrering)
@@ -2163,12 +2255,13 @@
 10. Add or Deduct: Whether you want to add or deduct the tax.","Standard skatt mal som kan brukes på alle kjøpstransaksjoner. Denne malen kan inneholde liste over skatte hoder og også andre utgifter hoder som "Shipping", "Forsikring", "Håndtering" osv #### Note Skattesatsen du definerer her vil være standard skattesats for alle ** Items * *. Hvis det er ** Elementer ** som har forskjellige priser, må de legges i ** Sak Skatt ** bord i ** Sak ** mester. #### Beskrivelse av kolonner 1. Beregning Type: - Dette kan være på ** Net Total ** (som er summen av grunnbeløpet). - ** På Forrige Row Total / Beløp ** (for kumulative skatter eller avgifter). Hvis du velger dette alternativet, vil skatten bli brukt som en prosentandel av forrige rad (i skattetabellen) eller en total. - ** Faktisk ** (som nevnt). 2. Account Head: Konto hovedbok der denne skatten vil bli bokført 3. Cost Center: Hvis skatt / avgift er en inntekt (som frakt) eller utgifter det må bestilles mot et kostnadssted. 4. Beskrivelse: Beskrivelse av skatt (som vil bli skrevet ut i fakturaer / sitater). 5. Ranger: skattesats. 6. Beløp: Skatt beløp. 7. Totalt: Akkumulert total til dette punktet. 8. Angi Row: Dersom basert på "Forrige Row Total" du kan velge radnummeret som vil bli tatt som en base for denne beregningen (standard er den forrige rad). 9. Vurdere Skatte eller Charge for: I denne delen kan du angi om skatt / avgift er kun for verdivurdering (ikke en del av total) eller bare for total (ikke tilføre verdi til elementet) eller for begge. 10. legge til eller trekke: Enten du ønsker å legge til eller trekke skatt."
 DocType: Homepage,Homepage,hjemmeside
 DocType: Purchase Receipt Item,Recd Quantity,Recd Antall
-apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +54,Fee Records Created - {0},Fee Records Laget - {0}
+apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,Fee Records Created - {0},Fee Records Laget - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Kategori konto
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Kan ikke produsere mer Element {0} enn Salgsordre kvantitet {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +505,Stock Entry {0} is not submitted,Stock Entry {0} er ikke innsendt
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},Kan ikke produsere mer Element {0} enn Salgsordre kvantitet {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,Stock Entry {0} er ikke innsendt
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / minibank konto
 DocType: Tax Rule,Billing City,Fakturering By
+DocType: Asset,Manual,Håndbok
 DocType: Salary Component Account,Salary Component Account,Lønn Component konto
 DocType: Global Defaults,Hide Currency Symbol,Skjule Valutasymbol
 apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","f.eks Bank, Cash, Kredittkort"
@@ -2182,7 +2275,7 @@
 DocType: Salary Detail,Amount based on formula,Beløp basert på formelen
 DocType: Purchase Invoice,Currency and Price List,Valuta og prisliste
 DocType: Opportunity,Customer / Lead Name,Kunde / Lead navn
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,Clearance Date not mentioned,Klaring Dato ikke nevnt
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +96,Clearance Date not mentioned,Klaring Dato ikke nevnt
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Produksjon
 DocType: Guardian,Occupation,Okkupasjon
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +62,Row {0}:Start Date must be before End Date,Rad {0}: Startdato må være før sluttdato
@@ -2191,20 +2284,21 @@
 DocType: Installation Note Item,Installed Qty,Installert antall
 DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,trening Resultat
 DocType: Purchase Invoice,Is Paid,er betalt
 DocType: Salary Structure,Total Earning,Total Tjene
 DocType: Purchase Receipt,Time at which materials were received,Tidspunktet for når materialene ble mottatt
 DocType: Stock Ledger Entry,Outgoing Rate,Utgående Rate
-apps/erpnext/erpnext/config/hr.py +176,Organization branch master.,Organisering gren mester.
-apps/erpnext/erpnext/controllers/accounts_controller.py +276, or ,eller
+apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,Organisering gren mester.
+apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,eller
 DocType: Sales Order,Billing Status,Billing Status
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Melde om et problem
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Utility Utgifter
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Above
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +206,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Bilagsregistrering {1} har ikke konto {2} eller allerede matchet mot en annen kupong
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Bilagsregistrering {1} har ikke konto {2} eller allerede matchet mot en annen kupong
 DocType: Buying Settings,Default Buying Price List,Standard Kjøpe Prisliste
 DocType: Process Payroll,Salary Slip Based on Timesheet,Lønn Slip Basert på Timeregistrering
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +93,No employee for the above selected criteria OR salary slip already created,Ingen ansatte for de oven valgte kriterier ELLER lønn slip allerede opprettet
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +111,No employee for the above selected criteria OR salary slip already created,Ingen ansatte for de oven valgte kriterier ELLER lønn slip allerede opprettet
 DocType: Notification Control,Sales Order Message,Salgsordre Message
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Sett standardverdier som Company, Valuta, værende regnskapsår, etc."
 DocType: Payment Entry,Payment Type,Betalings Type
@@ -2222,7 +2316,7 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,Handlevogn Innstillinger
 DocType: Journal Entry,Accounting Entries,Regnskaps Entries
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},Duplisere Entry. Vennligst sjekk Authorization Rule {0}
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +26,Global POS Profile {0} already created for company {1},Globalt POS profil {0} allerede opprettet for selskap {1}
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Globalt POS profil {0} allerede opprettet for selskap {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Erstatte varen / BOM i alle stykklister
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +56,Receipt document must be submitted,Kvittering dokumentet må sendes
@@ -2232,20 +2326,22 @@
 DocType: Product Bundle,Parent Item,Parent Element
 DocType: Account,Account Type,Kontotype
 DocType: Delivery Note,DN-RET-,DN-RET-
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +118,Leave Type {0} cannot be carry-forwarded,La Type {0} kan ikke bære-videre
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,La Type {0} kan ikke bære-videre
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Leverandør> Leverandør Type
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Vedlikeholdsplan genereres ikke for alle elementene. Vennligst klikk på "Generer Schedule '
 ,To Produce,Å Produsere
 apps/erpnext/erpnext/config/hr.py +93,Payroll,lønn
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +163,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","For rad {0} i {1}. For å inkludere {2} i Element rate, rader {3} må også inkluderes"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","For rad {0} i {1}. For å inkludere {2} i Element rate, rader {3} må også inkluderes"
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikasjon av pakken for levering (for print)
 DocType: Bin,Reserved Quantity,Reservert Antall
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,Ingen legges Lønn Slip funnet
 DocType: Landed Cost Voucher,Purchase Receipt Items,Kvitteringen Items
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Tilpasse Forms
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,Avskrivningsbeløpet i perioden
-apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,Disabled template must not be default template,Funksjonshemmede malen må ikke være standardmal
+apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Funksjonshemmede malen må ikke være standardmal
 DocType: Account,Income Account,Inntekt konto
 DocType: Payment Request,Amount in customer's currency,Beløp i kundens valuta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +742,Delivery,Levering
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +773,Delivery,Levering
 DocType: Stock Reconciliation Item,Current Qty,Nåværende Antall
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Se "Rate Of materialer basert på" i Costing Seksjon
 DocType: Appraisal Goal,Key Responsibility Area,Key Ansvar Område
@@ -2267,20 +2363,24 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Hvis valgt Pricing Rule er laget for 'Pris', det vil overskrive Prisliste. Priser Rule prisen er den endelige prisen, så ingen ytterligere rabatt bør påføres. Derfor, i transaksjoner som Salgsordre, innkjøpsordre osv, det vil bli hentet i "Valuta-feltet, heller enn" Prisliste Valuta-feltet."
 apps/erpnext/erpnext/config/selling.py +164,Track Leads by Industry Type.,Spor Leads etter bransje Type.
 DocType: Item Supplier,Item Supplier,Sak Leverandør
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +397,Please enter Item Code to get batch no,Skriv inn Element kode for å få batch no
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +764,Please select a value for {0} quotation_to {1},Velg en verdi for {0} quotation_to {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +422,Please enter Item Code to get batch no,Skriv inn Element kode for å få batch no
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +788,Please select a value for {0} quotation_to {1},Velg en verdi for {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Alle adresser.
 DocType: Company,Stock Settings,Aksje Innstillinger
 apps/erpnext/erpnext/accounts/doctype/account/account.py +224,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sammenslåing er bare mulig hvis følgende egenskaper er samme i begge postene. Er Group, Root Type, Company"
+DocType: Vehicle,Electric,Elektrisk
+DocType: Task,% Progress,% Progress
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Gain/Loss on Asset Disposal,Gevinst / Tap på Asset Avhending
+DocType: Training Event,Will send an email about the event to employees with status 'Open',Vil sende en e-post om hendelsen til ansatte med status 'Open'
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Administrere kunde Gruppe treet.
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,New kostnadssted Navn
 DocType: Leave Control Panel,Leave Control Panel,La Kontrollpanel
+DocType: Project,Task Completion,Task Fullføring
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,Ikke på lager
 DocType: Appraisal,HR User,HR User
 DocType: Purchase Invoice,Taxes and Charges Deducted,Skatter og avgifter fratrukket
-apps/erpnext/erpnext/hooks.py +109,Issues,Problemer
+apps/erpnext/erpnext/hooks.py +108,Issues,Problemer
 apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},Status må være en av {0}
 DocType: Sales Invoice,Debit To,Debet Å
 DocType: Delivery Note,Required only for sample item.,Kreves bare for prøve element.
@@ -2295,17 +2395,18 @@
 DocType: Bank Reconciliation Detail,Cheque Number,Sjekk Antall
 ,Sales Browser,Salg Browser
 DocType: Journal Entry,Total Credit,Total Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +508,Warning: Another {0} # {1} exists against stock entry {2},Advarsel: Another {0} # {1} finnes mot aksje oppføring {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +525,Warning: Another {0} # {1} exists against stock entry {2},Advarsel: Another {0} # {1} finnes mot aksje oppføring {2}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,Lokal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Utlån (Eiendeler)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Skyldnere
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,Stor
 DocType: Homepage Featured Product,Homepage Featured Product,Hjemmeside Aktuelle produkter
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,New Warehouse navn
-apps/erpnext/erpnext/accounts/report/financial_statements.py +224,Total {0} ({1}),Totalt {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +221,Total {0} ({1}),Totalt {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Territorium
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Vennligst oppgi ingen av besøk som kreves
 DocType: Stock Settings,Default Valuation Method,Standard verdsettelsesmetode
+DocType: Vehicle Log,Fuel Qty,drivstoff Antall
 DocType: Production Order Operation,Planned Start Time,Planlagt Starttid
 DocType: Assessment,Assessment,Assessment
 DocType: Payment Entry Reference,Allocated,Avsatt
@@ -2320,7 +2421,7 @@
 DocType: Price List,Price List Master,Prisliste Master
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Alle salgstransaksjoner kan være merket mot flere ** Salgs Personer ** slik at du kan stille inn og overvåke mål.
 ,S.O. No.,SO No.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +150,Please create Customer from Lead {0},Opprett Customer fra Lead {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Opprett Customer fra Lead {0}
 DocType: Price List,Applicable for Countries,Gjelder for Land
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +38,Student Group Name is mandatory in row {0},Student Gruppenavn er obligatorisk i rad {0}
 DocType: Homepage,Products to be shown on website homepage,Produkter som skal vises på nettstedet hjemmeside
@@ -2346,11 +2447,11 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.","Standardvilkårene som kan legges til salg og kjøp. Eksempler: 1. Gyldighet av tilbudet. 1. Betalingsvilkår (på forhånd, på kreditt, del forhånd etc). 1. Hva er ekstra (eller skal betales av kunden). 1. Sikkerhet / bruk advarsel. 1. Garanti om noen. 1. Returrett. 1. Vilkår for frakt, hvis aktuelt. 1. Måter adressering tvister, erstatning, ansvar, etc. 1. Adresse og kontakt med din bedrift."
 DocType: Attendance,Leave Type,La Type
-apps/erpnext/erpnext/controllers/stock_controller.py +173,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Expense / Difference konto ({0}) må være en "resultatet" konto
+apps/erpnext/erpnext/controllers/stock_controller.py +189,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Expense / Difference konto ({0}) må være en "resultatet" konto
 DocType: Account,Accounts User,Regnskap User
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +90,Name error: {0},Navn feil: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,Name error: {0},Navn feil: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Mangel
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +181,{0} {1} does not associated with {2} {3},{0} {1} ikke er knyttet til {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} ikke er knyttet til {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Oppmøte for arbeidstaker {0} er allerede merket
 DocType: Packing Slip,If more than one package of the same type (for print),Hvis mer enn en pakke av samme type (for print)
 DocType: Warehouse,Parent Warehouse,Parent Warehouse
@@ -2359,7 +2460,7 @@
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Utestående Beløp
 DocType: Project Task,Working,Arbeids
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Stock Queue (FIFO)
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +38,{0} does not belong to Company {1},{0} ikke tilhører selskapet {1}
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +39,{0} does not belong to Company {1},{0} ikke tilhører selskapet {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,Koste så på
 DocType: Account,Round Off,Avrunde
 ,Requested Qty,Spurt Antall
@@ -2370,10 +2471,10 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Kostnader vil bli fordelt forholdsmessig basert på element stk eller beløp, som per ditt valg"
 DocType: Maintenance Visit,Purposes,Formål
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Atleast one item should be entered with negative quantity in return document,Atleast ett element bør legges inn med negativt antall i retur dokument
-apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operation {0} lenger enn noen tilgjengelige arbeidstimer i arbeidsstasjonen {1}, bryte ned driften i flere operasjoner"
+apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operation {0} lenger enn noen tilgjengelige arbeidstimer i arbeidsstasjonen {1}, bryte ned driften i flere operasjoner"
 ,Requested,Spurt
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +83,No Remarks,Nei Anmerkninger
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Forfalt
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,No Remarks,Nei Anmerkninger
+DocType: Purchase Invoice,Overdue,Forfalt
 DocType: Account,Stock Received But Not Billed,"Stock mottatt, men ikke fakturert"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +87,Root Account must be a group,Root-kontoen må være en gruppe
 DocType: Fees,FEE.,AVGIFT.
@@ -2381,26 +2482,27 @@
 DocType: Item,Total Projected Qty,Samlet forventet Antall
 DocType: Monthly Distribution,Distribution Name,Distribusjon Name
 DocType: Course,Course Code,Kurskode
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Quality Inspection required for Item {0},Quality Inspection nødvendig for Element {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +287,Quality Inspection required for Item {0},Quality Inspection nødvendig for Element {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Hastigheten som kundens valuta er konvertert til selskapets hovedvaluta
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Netto Rate (Selskap Valuta)
 DocType: Salary Detail,Condition and Formula Help,Tilstand og Formula Hjelp
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Administrer Territory treet.
 DocType: Journal Entry Account,Sales Invoice,Salg Faktura
 DocType: Journal Entry Account,Party Balance,Fest Balance
-apps/erpnext/erpnext/accounts/page/pos/pos.js +464,Please select Apply Discount On,Vennligst velg Bruk rabatt på
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +95,Salary Slip Created,Lønn Slip Laget
+apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,Vennligst velg Bruk rabatt på
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,Lønn Slip Laget
 DocType: Company,Default Receivable Account,Standard fordringer konto
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Lag Bank Entry for den totale lønn for de ovenfor valgte kriterier
 DocType: Stock Entry,Material Transfer for Manufacture,Material Transfer for Produksjon
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Rabattprosenten kan brukes enten mot en prisliste eller for alle Prisliste.
 DocType: Purchase Invoice,Half-yearly,Halvårs
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +387,Accounting Entry for Stock,Regnskap Entry for Stock
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +391,Accounting Entry for Stock,Regnskap Entry for Stock
+DocType: Vehicle Service,Engine Oil,Motorolje
 DocType: Sales Invoice,Sales Team1,Salg TEAM1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Item {0} does not exist,Element {0} finnes ikke
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Element {0} finnes ikke
 DocType: Attendance Tool Student,Attendance Tool Student,Oppmøte Tool Student
 DocType: Sales Invoice,Customer Address,Kunde Adresse
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +120,Row {0}: Completed Qty must be greater than zero.,Rad {0}: Fullført Antall må være større enn null.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,Rad {0}: Fullført Antall må være større enn null.
 DocType: Purchase Invoice,Apply Additional Discount On,Påfør Ytterligere rabatt på
 DocType: Account,Root Type,Root Type
 DocType: Item,FIFO,FIFO
@@ -2412,17 +2514,21 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Target warehouse is mandatory for row {0},Target lageret er obligatorisk for rad {0}
 DocType: Cheque Print Template,Primary Settings,primære Innstillinger
 DocType: Purchase Invoice,Select Supplier Address,Velg Leverandør Adresse
-DocType: Quality Inspection,Quality Inspection,Quality Inspection
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Legg Medarbeidere
+DocType: Purchase Invoice Item,Quality Inspection,Quality Inspection
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Extra Small
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +690,Warning: Material Requested Qty is less than Minimum Order Qty,Advarsel: Material Requested Antall er mindre enn Minimum Antall
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Account {0} is frozen,Konto {0} er frosset
+DocType: Company,Standard Template,standard Template
+DocType: Training Event,Theory,Teori
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +704,Warning: Material Requested Qty is less than Minimum Order Qty,Advarsel: Material Requested Antall er mindre enn Minimum Antall
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +207,Account {0} is frozen,Konto {0} er frosset
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Legal Entity / Datterselskap med en egen konto tilhørighet til organisasjonen.
 DocType: Payment Request,Mute Email,Demp Email
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Mat, drikke og tobakk"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +609,Can only make payment against unbilled {0},Kan bare gjøre betaling mot fakturert {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Kommisjon kan ikke være større enn 100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},Kan bare gjøre betaling mot fakturert {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,Kommisjon kan ikke være større enn 100
 DocType: Stock Entry,Subcontract,Underentrepriser
 apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,Fyll inn {0} først
+apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +64,No replies from,Ingen svar fra
 DocType: Production Order Operation,Actual End Time,Faktisk Sluttid
 DocType: Production Planning Tool,Download Materials Required,Last ned Materialer som er nødvendige
 DocType: Item,Manufacturer Part Number,Produsentens varenummer
@@ -2432,24 +2538,27 @@
 DocType: Account,Expense Account,Expense konto
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Programvare
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Farge
-DocType: Maintenance Visit,Scheduled,Planlagt
+DocType: Training Event,Scheduled,Planlagt
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Forespørsel om kostnadsoverslag.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Vennligst velg Element der "Er Stock Item" er "Nei" og "Er Sales Item" er "Ja", og det er ingen andre Product Bundle"
 DocType: Student Log,Academic,akademisk
-apps/erpnext/erpnext/controllers/accounts_controller.py +472,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Total forhånd ({0}) mot Bestill {1} kan ikke være større enn totalsummen ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +482,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Total forhånd ({0}) mot Bestill {1} kan ikke være større enn totalsummen ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Velg Månedlig Distribusjon til ujevnt fordele målene gjennom måneder.
 DocType: Purchase Invoice Item,Valuation Rate,Verdivurdering Rate
 DocType: Stock Reconciliation,SR/,SR /
-apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,Prisliste Valuta ikke valgt
+DocType: Vehicle,Diesel,diesel
+apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,Prisliste Valuta ikke valgt
 DocType: Assessment,Results,resultater
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +175,Employee {0} has already applied for {1} between {2} and {3},Ansatt {0} har allerede søkt om {1} mellom {2} og {3}
+,Student Monthly Attendance Sheet,Student Månedlig Oppmøte Sheet
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},Ansatt {0} har allerede søkt om {1} mellom {2} og {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Prosjekt startdato
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Inntil
 DocType: Rename Tool,Rename Log,Rename Logg
 DocType: Maintenance Visit Purpose,Against Document No,Mot Dokument nr
+DocType: BOM,Scrap,skrap
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Administrer Salgs Partners.
 DocType: Quality Inspection,Inspection Type,Inspeksjon Type
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +231,Warehouses with existing transaction can not be converted to group.,Næringslokaler med eksisterende transaksjon kan ikke konverteres til gruppen.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,Næringslokaler med eksisterende transaksjon kan ikke konverteres til gruppen.
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},Vennligst velg {0}
 DocType: C-Form,C-Form No,C-Form Nei
 DocType: BOM,Exploded_items,Exploded_items
@@ -2461,6 +2570,7 @@
 DocType: Purchase Order Item,Returned Qty,Returnerte Stk
 DocType: Employee,Exit,Utgang
 apps/erpnext/erpnext/accounts/doctype/account/account.py +159,Root Type is mandatory,Root Type er obligatorisk
+DocType: BOM,Total Cost(Company Currency),Totalkostnad (Selskap Valuta)
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serial No {0} opprettet
 DocType: Homepage,Company Description for website homepage,Selskapet beskrivelse for nettstedet hjemmeside
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","For det lettere for kunder, kan disse kodene brukes i trykte formater som regningene og leveringssedlene"
@@ -2468,47 +2578,51 @@
 DocType: Employee,You can enter any date manually,Du kan legge inn noen dato manuelt
 DocType: Asset Category Account,Depreciation Expense Account,Avskrivninger konto
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Prøvetid
-apps/erpnext/erpnext/hooks.py +111,Announcements,Kunngjøringer
+apps/erpnext/erpnext/hooks.py +110,Announcements,Kunngjøringer
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Bare bladnoder er tillatt i transaksjonen
 DocType: Expense Claim,Expense Approver,Expense Godkjenner
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +109,Row {0}: Advance against Customer must be credit,Rad {0}: Advance mot Kunden må være kreditt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Advance against Customer must be credit,Rad {0}: Advance mot Kunden må være kreditt
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,Non-gruppe til gruppe
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Kvitteringen Sak Leveres
 DocType: Payment Entry,Pay,Betale
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Til Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
-apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +51,Course Schedules deleted:,Kurstider slettet:
+apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,Kurstider slettet:
 apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,Logger for å opprettholde sms leveringsstatus
 DocType: Accounts Settings,Make Payment via Journal Entry,Utfør betaling via bilagsregistrering
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,Trykt på
+DocType: Item,Inspection Required before Delivery,Inspeksjon Påkrevd før Levering
+DocType: Item,Inspection Required before Purchase,Inspeksjon Påkrevd før kjøp
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Ventende Aktiviteter
 DocType: Payment Gateway,Gateway,Inngangsport
 DocType: Fee Component,Fees Category,avgifter Kategori
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Skriv inn lindrende dato.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,Skriv inn lindrende dato.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,Only Leave Applications with status 'Approved' can be submitted,Kun La Applikasjoner med status "Godkjent" kan sendes inn
-apps/erpnext/erpnext/utilities/doctype/address/address.py +26,Address Title is mandatory.,Adresse Tittel er obligatorisk.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,Kun La Applikasjoner med status "Godkjent" kan sendes inn
+apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,Adresse Tittel er obligatorisk.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Skriv inn navnet på kampanjen hvis kilden til henvendelsen er kampanje
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Avis Publishers
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Velg regnskapsår
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Omgjøre nivå
+DocType: Company,Chart Of Accounts Template,Konto Mal
 DocType: Attendance,Attendance Date,Oppmøte Dato
-apps/erpnext/erpnext/stock/get_item_details.py +258,Item Price updated for {0} in Price List {1},Sak Pris oppdateres for {0} i prislisten {1}
+apps/erpnext/erpnext/stock/get_item_details.py +257,Item Price updated for {0} in Price List {1},Sak Pris oppdateres for {0} i prislisten {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Lønn breakup basert på opptjening og fradrag.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Konto med barnet noder kan ikke konverteres til Ledger
 DocType: Address,Preferred Shipping Address,Foretrukne leveringsadresse
 DocType: Purchase Invoice Item,Accepted Warehouse,Akseptert Warehouse
 DocType: Bank Reconciliation Detail,Posting Date,Publiseringsdato
 DocType: Item,Valuation Method,Verdsettelsesmetode
-apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},Å finne kursen for {0} klarer {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Mark Half Day
 DocType: Sales Invoice,Sales Team,Sales Team
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Duplicate entry
 DocType: Program Enrollment Tool,Get Students,Få Studenter
 DocType: Serial No,Under Warranty,Under Garanti
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +484,[Error],[Error]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +507,[Error],[Error]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,I Ord vil være synlig når du lagrer kundeordre.
 ,Employee Birthday,Ansatt Bursdag
-apps/erpnext/erpnext/controllers/status_updater.py +175,Limit Crossed,Limit Krysset
+DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Student Batch Oppmøte Tool
+apps/erpnext/erpnext/controllers/status_updater.py +197,Limit Crossed,Limit Krysset
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +38,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Et semester med denne 'Academic Year' {0} og "Term Name {1} finnes allerede. Vennligst endre disse oppføringene og prøv igjen.
 DocType: UOM,Must be Whole Number,Må være hele tall
@@ -2523,6 +2637,7 @@
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Materialet Overført for Produksjon
 DocType: Expense Claim,"A user with ""Expense Approver"" role",En bruker med "Expense Godkjenner" rolle
 DocType: Landed Cost Item,Receipt Document Type,Kvittering dokumenttype
+DocType: Daily Work Summary Settings,Select Companies,Velg selskaper
 ,Issued Items Against Production Order,Utstedte gjenstander mot produksjonsordre
 DocType: Pricing Rule,Purchase Manager,Innkjøpssjef
 DocType: Target Detail,Target Detail,Target Detalj
@@ -2530,26 +2645,27 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% Av materialer fakturert mot denne kundeordre
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Periode Closing Entry
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Kostnadssted med eksisterende transaksjoner kan ikke konverteres til gruppen
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Amount {0} {1} {2} {3},Mengden {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},Mengden {0} {1} {2} {3}
 DocType: Account,Depreciation,Avskrivninger
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Leverandør (er)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Employee Oppmøte Tool
 DocType: Supplier,Credit Limit,Kredittgrense
 DocType: Production Plan Sales Order,Salse Order Date,Salse Ordredato
 DocType: Salary Component,Salary Component,lønn Component
-apps/erpnext/erpnext/accounts/utils.py +449,Payment Entries {0} are un-linked,Betalings Innlegg {0} er un-linked
+apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,Betalings Innlegg {0} er un-linked
 DocType: GL Entry,Voucher No,Kupong Ingen
 DocType: Leave Allocation,Leave Allocation,La Allocation
 DocType: Payment Request,Recipient Message And Payment Details,Mottakers Message og betalingsinformasjon
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +498,Material Requests {0} created,Materielle Forespørsler {0} er opprettet
+DocType: Training Event,Trainer Email,trener E-post
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,Materielle Forespørsler {0} er opprettet
 DocType: Production Planning Tool,Include sub-contracted raw materials,Inkluder underleverandør råvarer
 apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,Mal av begreper eller kontrakt.
 DocType: Purchase Invoice,Address and Contact,Adresse og Kontakt
 DocType: Cheque Print Template,Is Account Payable,Er konto Betales
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +260,Stock cannot be updated against Purchase Receipt {0},Stock kan ikke oppdateres mot Kjøpskvittering {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +261,Stock cannot be updated against Purchase Receipt {0},Stock kan ikke oppdateres mot Kjøpskvittering {0}
 DocType: Supplier,Last Day of the Next Month,Siste dag av neste måned
 DocType: Employee,Feedback,Tilbakemelding
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Permisjon kan ikke tildeles før {0}, som permisjon balanse har allerede vært carry-sendt i fremtiden permisjon tildeling posten {1}"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Permisjon kan ikke tildeles før {0}, som permisjon balanse har allerede vært carry-sendt i fremtiden permisjon tildeling posten {1}"
 apps/erpnext/erpnext/accounts/party.py +305,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Merk: På grunn / Reference Date stiger tillatt kunde kreditt dager med {0} dag (er)
 apps/erpnext/erpnext/schools/doctype/program/program.js +9,Student Applicant,student Søker
 DocType: Asset Category Account,Accumulated Depreciation Account,Akkumulerte avskrivninger konto
@@ -2558,11 +2674,10 @@
 DocType: Item,Reorder level based on Warehouse,Omgjøre nivå basert på Warehouse
 DocType: Activity Cost,Billing Rate,Billing Rate
 ,Qty to Deliver,Antall å levere
-DocType: Monthly Distribution Percentage,Month,Måned
 ,Stock Analytics,Aksje Analytics
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +373,Operations cannot be left blank,Operasjoner kan ikke være tomt
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,Operasjoner kan ikke være tomt
 DocType: Maintenance Visit Purpose,Against Document Detail No,Mot Document Detail Nei
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +72,Party Type is mandatory,Partiet Type er obligatorisk
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,Partiet Type er obligatorisk
 DocType: Quality Inspection,Outgoing,Utgående
 DocType: Material Request,Requested For,Spurt For
 DocType: Quotation Item,Against Doctype,Mot Doctype
@@ -2572,7 +2687,8 @@
 ,Is Primary Address,Er Hovedadresse
 DocType: Production Order,Work-in-Progress Warehouse,Work-in-progress Warehouse
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,Asset {0} må fremlegges
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},Reference # {0} datert {1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},Oppmøte Record {0} finnes mot Student {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},Reference # {0} datert {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,Avskrivninger Slått på grunn av salg av eiendeler
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Administrer Adresser
 DocType: Asset,Item Code,Sak Kode
@@ -2580,15 +2696,15 @@
 DocType: Serial No,Warranty / AMC Details,Garanti / AMC Detaljer
 DocType: Journal Entry,User Remark,Bruker Remark
 DocType: Lead,Market Segment,Markedssegment
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +859,Paid Amount cannot be greater than total negative outstanding amount {0},Betalt Beløpet kan ikke være større enn total negativ utestående beløp {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +850,Paid Amount cannot be greater than total negative outstanding amount {0},Betalt Beløpet kan ikke være større enn total negativ utestående beløp {0}
 DocType: Employee Internal Work History,Employee Internal Work History,Ansatt Intern Work History
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +233,Closing (Dr),Lukking (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +235,Closing (Dr),Lukking (Dr)
 DocType: Cheque Print Template,Cheque Size,sjekk Size
 DocType: Contact,Passive,Passiv
-apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.js +49,View attendance,Vis oppmøte
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serial No {0} ikke på lager
 apps/erpnext/erpnext/config/selling.py +159,Tax template for selling transactions.,Skatt mal for å selge transaksjoner.
 DocType: Sales Invoice,Write Off Outstanding Amount,Skriv Av utestående beløp
+DocType: Student Batch Creation Tool,Student Batch Creation Tool,Student Batch Creation Tool
 DocType: Account,Accounts Manager,Accounts Manager
 DocType: Stock Settings,Default Stock UOM,Standard Stock målenheter
 DocType: Asset,Number of Depreciations Booked,Antall Avskrivninger bestilt
@@ -2596,45 +2712,45 @@
 DocType: Production Planning Tool,Create Material Requests,Opprett Material Forespørsler
 DocType: Employee Education,School/University,Skole / universitet
 DocType: Payment Request,Reference Details,Referanse Detaljer
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +57,Expected Value After Useful Life must be less than Gross Purchase Amount,Forventet verdi Etter Nyttig Livet må være mindre enn Bruttobeløpet
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Forventet verdi Etter Nyttig Livet må være mindre enn Bruttobeløpet
 DocType: Sales Invoice Item,Available Qty at Warehouse,Tilgjengelig Antall på Warehouse
 ,Billed Amount,Fakturert beløp
 DocType: Asset,Double Declining Balance,Dobbel degressiv
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Closed order cannot be cancelled. Unclose to cancel.,Stengt for kan ikke avbestilles. Unclose å avbryte.
 DocType: Student Guardian,Father,Far
-apps/erpnext/erpnext/controllers/accounts_controller.py +558,'Update Stock' cannot be checked for fixed asset sale,'Oppdater Stock "kan ikke kontrolleres for driftsmiddel salg
+apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,'Oppdater Stock "kan ikke kontrolleres for driftsmiddel salg
 DocType: Bank Reconciliation,Bank Reconciliation,Bankavstemming
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Få oppdateringer
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Account {2} ikke tilhører selskapet {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Materialet Request {0} blir kansellert eller stoppet
 apps/erpnext/erpnext/public/js/setup_wizard.js +313,Add a few sample records,Legg et par eksempler på poster
-apps/erpnext/erpnext/config/hr.py +243,Leave Management,La Ledelse
+apps/erpnext/erpnext/config/hr.py +258,Leave Management,La Ledelse
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupper etter Account
 DocType: Sales Order,Fully Delivered,Fullt Leveres
 DocType: Lead,Lower Income,Lavere inntekt
-DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Kontoen hodet etter Ansvar, hvor gevinst / tap vil bli bokført"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},Kilden og målet lageret kan ikke være det samme for rad {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Forskjellen konto må være en eiendel / forpliktelse type konto, siden dette Stock Forsoning er en åpning Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +82,Purchase Order number required for Item {0},Innkjøpsordrenummeret som kreves for Element {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,Purchase Order number required for Item {0},Innkjøpsordrenummeret som kreves for Element {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"Fra dato" må være etter 'To Date'
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Kan ikke endre status som student {0} er knyttet til studentens søknad {1}
-DocType: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.",Liste over ansatte som har "Lønn Slip Basert på Timeregistrering" er aktivert i lønn struktur.
 DocType: Asset,Fully Depreciated,fullt avskrevet
 ,Stock Projected Qty,Lager Antall projiserte
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,Customer {0} does not belong to project {1},Kunden {0} ikke hører til prosjektet {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,Customer {0} does not belong to project {1},Kunden {0} ikke hører til prosjektet {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Merket Oppmøte HTML
 DocType: Sales Order,Customer's Purchase Order,Kundens innkjøpsordre
 apps/erpnext/erpnext/config/stock.py +107,Serial No and Batch,Serial No og Batch
 DocType: Warranty Claim,From Company,Fra Company
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +75,Please set Number of Depreciations Booked,Vennligst sett Antall Avskrivninger bestilt
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Vennligst sett Antall Avskrivninger bestilt
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Verdi eller Stk
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +400,Productions Orders cannot be raised for:,Productions Bestillinger kan ikke heves for:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,Productions Bestillinger kan ikke heves for:
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,Minutt
 DocType: Purchase Invoice,Purchase Taxes and Charges,Kjøpe skatter og avgifter
 ,Qty to Receive,Antall å motta
 DocType: Leave Block List,Leave Block List Allowed,La Block List tillatt
+apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Expense krav for Vehicle Logg {0}
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,alle Næringslokaler
 DocType: Sales Partner,Retailer,Forhandler
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Credit To account must be a Balance Sheet account,Kreditt til kontoen må være en balansekonto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +106,Credit To account must be a Balance Sheet account,Kreditt til kontoen må være en balansekonto
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Alle Leverandør Typer
 DocType: Global Defaults,Disable In Words,Deaktiver I Ord
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,Elementkode er obligatorisk fordi varen ikke blir automatisk nummerert
@@ -2644,23 +2760,23 @@
 DocType: Production Order,PRO-,PRO-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Bank Overdraft Account,Kassekreditt konto
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Gjør Lønn Slip
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Bla BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,Bla BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Secured Loans,Sikret lån
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Vennligst sett Avskrivninger relatert kontoer i Asset Kategori {0} eller selskapet {1}
 DocType: Academic Term,Academic Year,Studieår
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Opening Balance Equity,Åpningsbalanse Equity
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Appraisal
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +136,Email sent to supplier {0},E-post sendt til leverandøren {0}
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},E-post sendt til leverandøren {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Dato gjentas
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Autorisert signatur
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,Leave approver must be one of {0},La godkjenner må være en av {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Leave approver must be one of {0},La godkjenner må være en av {0}
 DocType: Hub Settings,Seller Email,Selger Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Total anskaffelseskost (via fakturaen)
-DocType: Workstation Working Hour,Start Time,Starttid
+DocType: Training Event,Start Time,Starttid
 DocType: Item Price,Bulk Import Help,Bulk Import Hjelp
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +257,Select Quantity,Velg Antall
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,Velg Antall
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Godkjenne Role kan ikke være det samme som rollen regelen gjelder for
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Melde deg ut av denne e-post Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Melding Sendt
@@ -2678,9 +2794,8 @@
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,Kostnad for ulike aktiviteter
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"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 +149,Source and target warehouse must be different,Kilde og mål lageret må være annerledes
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Kilde og mål lageret må være annerledes
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},Ikke lov til å oppdatere lagertransaksjoner eldre enn {0}
-DocType: Item,Inspection Required,Inspeksjon påkrevd
 DocType: Purchase Invoice Item,PR Detail,PR Detalj
 DocType: Sales Order,Fully Billed,Fullt Fakturert
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Kontanter
@@ -2690,7 +2805,9 @@
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Brukere med denne rollen har lov til å sette frosne kontoer og lage / endre regnskapspostene mot frosne kontoer
 DocType: Serial No,Is Cancelled,Er Avlyst
 DocType: Journal Entry,Bill Date,Bill Dato
+apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","Tjenesten varen, type, frekvens og utgiftene beløp kreves"
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Selv om det er flere Prising regler med høyest prioritet, deretter følgende interne prioriteringer til grunn:"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +86,Do you really want to Submit all Salary Slip from {0} to {1},Har du virkelig ønsker å sende alle Lønn Slip fra {0} til {1}
 DocType: Cheque Print Template,Cheque Height,sjekk Høyde
 DocType: Sales Invoice Item,Total Margin,Total Margin
 DocType: Supplier,Supplier Details,Leverandør Detaljer
@@ -2699,9 +2816,11 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Fra verdien må være mindre enn til verdien i rad {0}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Sjekk alt
+DocType: Vehicle Log,Invoice Ref,faktura~~POS=TRUNC Ref
 DocType: Sales Order,Recurring Order,Gjentakende Bestill
 DocType: Company,Default Income Account,Standard Inntekt konto
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Kunden Group / Kunde
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),Unclosed regnskapsårene Profit / Loss (Credit)
 DocType: Sales Invoice,Time Sheets,timelister
 DocType: Payment Gateway Account,Default Payment Request Message,Standard betalingsforespørsel Message
 DocType: Item Group,Check this if you want to show in website,Sjekk dette hvis du vil vise på nettstedet
@@ -2709,19 +2828,19 @@
 ,Welcome to ERPNext,Velkommen til ERPNext
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Føre til prisanslag
 DocType: Lead,From Customer,Fra Customer
-apps/erpnext/erpnext/demo/setup/setup_data.py +300,Calls,Samtaler
+apps/erpnext/erpnext/demo/setup/setup_data.py +315,Calls,Samtaler
 DocType: Project,Total Costing Amount (via Time Logs),Total koster Beløp (via Time Logger)
 DocType: Purchase Order Item Supplied,Stock UOM,Stock målenheter
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,Purchase Order {0} is not submitted,Purchase Order {0} ikke er sendt
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,Purchase Order {0} ikke er sendt
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,Prosjekterte
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial No {0} tilhører ikke Warehouse {1}
-apps/erpnext/erpnext/controllers/status_updater.py +139,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Merk: Systemet vil ikke sjekke over-levering og over-booking for Element {0} som mengde eller beløpet er 0
+apps/erpnext/erpnext/controllers/status_updater.py +161,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Merk: Systemet vil ikke sjekke over-levering og over-booking for Element {0} som mengde eller beløpet er 0
 DocType: Notification Control,Quotation Message,Sitat Message
 DocType: Issue,Opening Date,Åpningsdato
-apps/erpnext/erpnext/schools/api.py +57,Attendance has been marked successfully.,Oppmøte er merket med hell.
+apps/erpnext/erpnext/schools/api.py +66,Attendance has been marked successfully.,Oppmøte er merket med hell.
 DocType: Journal Entry,Remark,Bemerkning
 DocType: Purchase Receipt Item,Rate and Amount,Rate og Beløp
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +139,Account Type for {0} must be {1},Kontotype for {0} må være {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},Kontotype for {0} må være {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Blader og Holiday
 DocType: Sales Order,Not Billed,Ikke Fakturert
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Both Warehouse must belong to same Company,Både Warehouse må tilhøre samme selskapet
@@ -2732,17 +2851,17 @@
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Rabattbeløp
 DocType: Purchase Invoice,Return Against Purchase Invoice,Tilbake mot fakturaen
 DocType: Item,Warranty Period (in days),Garantiperioden (i dager)
-apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +40,Acutal qty in stock,Acutal stk på lager
+apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,Acutal stk på lager
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Net Cash from Operations,Netto kontantstrøm fra driften
 apps/erpnext/erpnext/public/js/setup_wizard.js +225,e.g. VAT,reskontroførsel
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Sak 4
 DocType: Student Admission,Admission End Date,Opptak Sluttdato
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +20,Sub-contracting,Underleverandører
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,Underleverandører
 DocType: Journal Entry Account,Journal Entry Account,Journal Entry konto
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,student Gruppe
 DocType: Shopping Cart Settings,Quotation Series,Sitat Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Et element eksisterer med samme navn ({0}), må du endre navn varegruppen eller endre navn på elementet"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1193,Please select customer,Velg kunde
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,Velg kunde
 DocType: C-Form,I,Jeg
 DocType: Company,Asset Depreciation Cost Center,Asset Avskrivninger kostnadssted
 DocType: Sales Order Item,Sales Order Date,Salgsordre Dato
@@ -2750,12 +2869,13 @@
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Hvis det er merket, vil alle barn i hver produksjon element inkluderes i materialet forespørsler."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,Warehouse {0}: Selskapet er obligatorisk
 ,Payment Period Based On Invoice Date,Betaling perioden basert på Fakturadato
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Mangler valutakurser for {0}
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Mangler valutakurser for {0}
 DocType: Assessment,Examiner,Examiner
 DocType: Student,Siblings,søsken
 DocType: Journal Entry,Stock Entry,Stock Entry
 DocType: Payment Entry,Payment References,Betalings Referanser
 DocType: C-Form,C-FORM-,C-form-
+DocType: Vehicle,Insurance Details,forsikring Detaljer
 DocType: Account,Payable,Betales
 apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),Skyldnere ({0})
 DocType: Pricing Rule,Margin,Margin
@@ -2764,22 +2884,23 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Gross Profit %,Bruttofortjeneste%
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Klaring Dato
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +60,Gross Purchase Amount is mandatory,Bruttobeløpet er obligatorisk
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Bruttobeløpet er obligatorisk
 DocType: Lead,Address Desc,Adresse Desc
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +75,Party is mandatory,Party er obligatorisk
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Party er obligatorisk
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,emne Name
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Minst én av de selge eller kjøpe må velges
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +34,Atleast one of the Selling or Buying must be selected,Minst én av de selge eller kjøpe må velges
 DocType: Grading Structure,Grade Intervals,Vurder intervaller
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Velg formålet med virksomheten.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Hvor fabrikasjonsvirksomhet gjennomføres.
 DocType: Asset Movement,Source Warehouse,Kilde Warehouse
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup > Settings > Naming Series,Vennligst sett Naming Series for {0} via Oppsett> Innstillinger> Naming Series
 DocType: Installation Note,Installation Date,Installasjonsdato
-apps/erpnext/erpnext/controllers/accounts_controller.py +537,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} ikke tilhører selskapet {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +547,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} ikke tilhører selskapet {2}
 DocType: Employee,Confirmation Date,Bekreftelse Dato
 DocType: C-Form,Total Invoiced Amount,Total Fakturert beløp
 DocType: Account,Sales User,Salg User
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Min Antall kan ikke være større enn Max Antall
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +47,Min Qty can not be greater than Max Qty,Min Antall kan ikke være større enn Max Antall
 DocType: Account,Accumulated Depreciation,akkumulerte avskrivninger
 DocType: Stock Entry,Customer or Supplier Details,Kunde eller leverandør Detaljer
 DocType: Lead,Lead Owner,Lead Eier
@@ -2790,15 +2911,15 @@
 DocType: Customer,CUST-,CUST-
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,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/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,Lønn Slip ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Pensjoneringstidspunktet må være større enn tidspunktet for inntreden
-apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +49,There were errors while scheduling course on :,Det var feil mens scheduling kurs på:
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date Of Retirement must be greater than Date of Joining,Pensjoneringstidspunktet må være større enn tidspunktet for inntreden
+apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +51,There were errors while scheduling course on :,Det var feil mens scheduling kurs på:
 DocType: Sales Invoice,Against Income Account,Mot Inntekt konto
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Leveres
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Element {0}: Bestilte qty {1} kan ikke være mindre enn minimum ordreantall {2} (definert i punkt).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Månedlig Distribution Prosent
 DocType: Territory,Territory Targets,Terri Targets
 DocType: Delivery Note,Transporter Info,Transporter Info
-apps/erpnext/erpnext/accounts/utils.py +456,Please set default {0} in Company {1},Vennligst sett standard {0} i selskapet {1}
+apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},Vennligst sett standard {0} i selskapet {1}
 DocType: Cheque Print Template,Starting position from top edge,Startposisjon fra øverste kant
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +29,Same supplier has been entered multiple times,Samme leverandør er angitt flere ganger
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,Brutto gevinst / tap
@@ -2807,13 +2928,13 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Brevark for utskriftsmaler.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titler for utskriftsmaler f.eks Proforma Faktura.
 DocType: Student Guardian,Student Guardian,student Guardian
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,Verdsettelse typen kostnader kan ikke merket som Inclusive
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,Verdsettelse typen kostnader kan ikke merket som Inclusive
 DocType: POS Profile,Update Stock,Oppdater Stock
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Ulik målenheter for elementer vil føre til feil (Total) Netto vekt verdi. Sørg for at nettovekt av hvert element er i samme målenheter.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 DocType: Asset,Journal Entry for Scrap,Bilagsregistrering for Scrap
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Kan trekke elementer fra følgeseddel
-apps/erpnext/erpnext/accounts/utils.py +426,Journal Entries {0} are un-linked,Journal Entries {0} er un-linked
+apps/erpnext/erpnext/accounts/utils.py +432,Journal Entries {0} are un-linked,Journal Entries {0} er un-linked
 apps/erpnext/erpnext/config/crm.py +74,"Record of all communications of type email, phone, chat, visit, etc.","Registrering av all kommunikasjon av typen e-post, telefon, chat, besøk, etc."
 DocType: Manufacturer,Manufacturers used in Items,Produsenter som brukes i Items
 apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,Vennligst oppgi Round Off Cost Center i selskapet
@@ -2833,7 +2954,7 @@
 DocType: Company,Exchange Gain / Loss Account,Valutagevinst / tap-konto
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Medarbeider og oppmøte
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +72,Purpose must be one of {0},Hensikten må være en av {0}
-apps/erpnext/erpnext/utilities/doctype/address/address.py +79,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Fjern referanse av kunde, leverandør, salg partner og bly, som det er et selskap adresse"
+apps/erpnext/erpnext/utilities/doctype/address/address.py +83,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Fjern referanse av kunde, leverandør, salg partner og bly, som det er et selskap adresse"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,Fill the form and save it,Fyll ut skjemaet og lagre det
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Last ned en rapport som inneholder alle råvarer med deres nyeste inventar status
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community Forum
@@ -2853,49 +2974,53 @@
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Systemet bruker (innlogging) ID. Hvis satt, vil det bli standard for alle HR-skjemaer."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Fra {1}
 DocType: Task,depends_on,kommer an på
-apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +24,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Navn på ny konto. Merk: Vennligst ikke opprette kontoer for kunder og leverandører
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Navn på ny konto. Merk: Vennligst ikke opprette kontoer for kunder og leverandører
 DocType: BOM Replace Tool,BOM Replace Tool,BOM Erstatt Tool
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Country klok standardadresse Maler
 DocType: Sales Order Item,Supplier delivers to Customer,Leverandør leverer til kunden
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / post / {0}) er utsolgt
 apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,Neste dato må være større enn konteringsdato
-apps/erpnext/erpnext/public/js/controllers/transaction.js +841,Show tax break-up,Vis skatt break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +878,Show tax break-up,Vis skatt break-up
 apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},Due / Reference Datoen kan ikke være etter {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Data import og eksport
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Aksjeoppføringer finnes mot Warehouse {0}, dermed kan du ikke re-tildele eller endre den"
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +29,No students Found,Ingen studenter Funnet
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Faktura Publiseringsdato
-apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +24,Sell,Selge
+apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,Selge
 DocType: Sales Invoice,Rounded Total,Avrundet Total
 DocType: Product Bundle,List items that form the package.,Listeelementer som danner pakken.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Prosentvis Tildeling skal være lik 100%
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +534,Please select Posting Date before selecting Party,Vennligst velg Publiseringsdato før du velger Partiet
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +513,Please select Posting Date before selecting Party,Vennligst velg Publiseringsdato før du velger Partiet
 DocType: Serial No,Out of AMC,Ut av AMC
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +80,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Antall Avskrivninger reservert kan ikke være større enn Totalt antall Avskrivninger
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Antall Avskrivninger reservert kan ikke være større enn Totalt antall Avskrivninger
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +35,Make Maintenance Visit,Gjør Vedlikehold Visit
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +195,Please contact to the user who have Sales Master Manager {0} role,Ta kontakt for brukeren som har salgs Master manager {0} rolle
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,Please contact to the user who have Sales Master Manager {0} role,Ta kontakt for brukeren som har salgs Master manager {0} rolle
 DocType: Company,Default Cash Account,Standard Cash konto
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Company (ikke kunde eller leverandør) mester.
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +5,This is based on the attendance of this Student,Dette er basert på tilstedeværelse av denne Student
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +165,Add more items or open full form,Legg til flere elementer eller åpne full form
+apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Dette er basert på tilstedeværelse av denne Student
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Legg til flere elementer eller åpne full form
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,Please enter 'Expected Delivery Date',Skriv inn "Forventet Leveringsdato '
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Levering Merknader {0} må avbestilles før den avbryter denne salgsordre
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +75,Paid amount + Write Off Amount can not be greater than Grand Total,Innbetalt beløp + avskrive Beløpet kan ikke være større enn Totalsum
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +76,Paid amount + Write Off Amount can not be greater than Grand Total,Innbetalt beløp + avskrive Beløpet kan ikke være større enn Totalsum
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} er ikke en gyldig batchnummer for varen {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Note: There is not enough leave balance for Leave Type {0},Merk: Det er ikke nok permisjon balanse for La Type {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,Note: There is not enough leave balance for Leave Type {0},Merk: Det er ikke nok permisjon balanse for La Type {0}
+DocType: Training Event,Seminar,Seminar
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program innmeldingsavgift
 DocType: Item,Supplier Items,Leverandør Items
 DocType: Opportunity,Opportunity Type,Opportunity Type
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,Nytt firma
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Transaksjoner kan bare slettes av skaperen av selskapet
 apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Feil antall hovedbok Entries funnet. Du kan ha valgt feil konto i transaksjonen.
+DocType: Employee,Prefered Contact Email,Foretrukket Kontakt E-post
 DocType: Cheque Print Template,Cheque Width,sjekk Bredde
+DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Validere salgspris for varen mot Purchase Rate Verdivurdering Ranger
 DocType: Program,Fee Schedule,Prisliste
 DocType: Hub Settings,Publish Availability,Publiser Tilgjengelighet
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Fødselsdato kan ikke være større enn i dag.
+DocType: Company,Create Chart Of Accounts Based On,Opprett kontoplan basert på
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,Fødselsdato kan ikke være større enn i dag.
 ,Stock Ageing,Stock Ageing
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,Tids skjema
-apps/erpnext/erpnext/controllers/accounts_controller.py +231,{0} '{1}' is disabled,{0} {1} er deaktivert
+apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} {1} er deaktivert
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Sett som Åpen
 DocType: Cheque Print Template,Scanned Cheque,skannede Cheque
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Send automatisk e-poster til Kontakter på Sende transaksjoner.
@@ -2904,38 +3029,37 @@
 DocType: Purchase Order,Customer Contact Email,Kundekontakt E-post
 DocType: Warranty Claim,Item and Warranty Details,Element og Garanti Detaljer
 DocType: Sales Team,Contribution (%),Bidrag (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +78,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Merk: Betaling Entry vil ikke bli laget siden "Cash eller bankkontoen ble ikke spesifisert
+apps/erpnext/erpnext/controllers/accounts_controller.py +83,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Merk: Betaling Entry vil ikke bli laget siden "Cash eller bankkontoen ble ikke spesifisert
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Responsibilities,Ansvarsområder
 DocType: Expense Claim Account,Expense Claim Account,Expense krav konto
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,Mal
 DocType: Sales Person,Sales Person Name,Sales Person Name
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Skriv inn atleast en faktura i tabellen
 apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Legg til brukere
-DocType: Pricing Rule,Item Group,Varegruppe
+DocType: POS Item Group,Item Group,Varegruppe
 DocType: Item,Safety Stock,Safety Stock
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Sak Kode> Element Group> Brand
+apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Progress% for en oppgave kan ikke være mer enn 100.
 DocType: Stock Reconciliation Item,Before reconciliation,Før avstemming
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Til {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Skatter og avgifter legges (Company Valuta)
 apps/erpnext/erpnext/stock/doctype/item/item.py +442,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Sak Skatte Rad {0} må ha konto for type skatt eller inntekt eller kostnad eller Charge
 DocType: Sales Order,Partly Billed,Delvis Fakturert
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} must be a Fixed Asset Item,Element {0} må være et driftsmiddel element
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Element {0} må være et driftsmiddel element
 DocType: Item,Default BOM,Standard BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Please re-type company name to confirm,Vennligst re-type firmanavn for å bekrefte
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +67,Total Outstanding Amt,Total Outstanding Amt
 DocType: Journal Entry,Printing Settings,Utskriftsinnstillinger
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},Total debet må være lik samlet kreditt. Forskjellen er {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},Total debet må være lik samlet kreditt. Forskjellen er {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotive
+DocType: Vehicle,Insurance Company,Forsikringsselskap
 DocType: Asset Category Account,Fixed Asset Account,Fast Asset konto
-DocType: Salary Structure Employee,Variable,variabel
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,variabel
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,From Delivery Note,Fra følgeseddel
-DocType: POS Profile,Allow Partial Payment,Tillat delbetaling
 DocType: Timesheet Detail,From Time,Fra Time
 DocType: Notification Control,Custom Message,Standard melding
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment Banking
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,Cash or Bank Account is mandatory for making payment entry,Kontanter eller bankkontoen er obligatorisk for å gjøre betaling oppføring
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +72,Cash or Bank Account is mandatory for making payment entry,Kontanter eller bankkontoen er obligatorisk for å gjøre betaling oppføring
 DocType: Purchase Invoice,Price List Exchange Rate,Prisliste Exchange Rate
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Customer> Kunde Group> Territory
 DocType: Purchase Invoice Item,Rate,Rate
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Intern
 DocType: Stock Entry,From BOM,Fra BOM
@@ -2945,34 +3069,33 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',Vennligst klikk på "Generer Schedule '
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,To Date skal være det samme som Fra Dato for Half Day permisjon
 apps/erpnext/erpnext/config/stock.py +185,"e.g. Kg, Unit, Nos, m","f.eks Kg, Unit, Nos, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,Reference No is mandatory if you entered Reference Date,Referansenummer er obligatorisk hvis du skrev Reference Date
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,Referansenummer er obligatorisk hvis du skrev Reference Date
 DocType: Bank Reconciliation Detail,Payment Document,betaling Document
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Dato Bli må være større enn fødselsdato
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,Dato Bli må være større enn fødselsdato
 DocType: Salary Slip,Salary Structure,Lønn Struktur
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Flyselskap
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +723,Issue Material,Issue Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +737,Issue Material,Issue Material
 DocType: Material Request Item,For Warehouse,For Warehouse
 DocType: Employee,Offer Date,Tilbudet Dato
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Sitater
-apps/erpnext/erpnext/accounts/page/pos/pos.js +665,You are in offline mode. You will not be able to reload until you have network.,Du er i frakoblet modus. Du vil ikke være i stand til å laste før du har nettverk.
-DocType: Hub Settings,Access Token,Tilgang Token
+apps/erpnext/erpnext/accounts/page/pos/pos.js +661,You are in offline mode. You will not be able to reload until you have network.,Du er i frakoblet modus. Du vil ikke være i stand til å laste før du har nettverk.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +31,No Student Groups created.,Ingen studentgrupper opprettet.
 DocType: Purchase Invoice Item,Serial No,Serial No
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Skriv inn maintaince detaljer Første
 DocType: Purchase Invoice,Print Language,Print Språk
 DocType: Salary Slip,Total Working Hours,Samlet arbeidstid
 DocType: Stock Entry,Including items for sub assemblies,Inkludert elementer for sub samlinger
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1125,Enter value must be positive,Oppgi verdien skal være positiv
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1207,Enter value must be positive,Oppgi verdien skal være positiv
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,Alle Territories
 DocType: Purchase Invoice,Items,Elementer
-apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,Student is already enrolled.,Student er allerede registrert.
+apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +25,Student is already enrolled.,Student er allerede registrert.
 DocType: Fiscal Year,Year Name,År Navn
 DocType: Process Payroll,Process Payroll,Process Lønn
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +233,There are more holidays than working days this month.,Det er mer ferie enn virkedager denne måneden.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,Det er mer ferie enn virkedager denne måneden.
 DocType: Product Bundle Item,Product Bundle Item,Produktet Bundle Element
 DocType: Sales Partner,Sales Partner Name,Sales Partner Name
-apps/erpnext/erpnext/hooks.py +104,Request for Quotations,Forespørsel om Sitater
+apps/erpnext/erpnext/hooks.py +103,Request for Quotations,Forespørsel om Sitater
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maksimal Fakturert beløp
 apps/erpnext/erpnext/config/selling.py +23,Customers,kunder
 DocType: Student Sibling,Institution,institusjon
@@ -2980,7 +3103,7 @@
 DocType: Issue,Opening Time,Åpning Tid
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Fra og Til dato kreves
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Verdipapirer og råvarebørser
-apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard Enhet for Variant {0} må være samme som i malen {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +634,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard Enhet for Variant {0} må være samme som i malen {1}
 DocType: Shipping Rule,Calculate Based On,Beregn basert på
 DocType: Delivery Note Item,From Warehouse,Fra Warehouse
 DocType: Assessment,Supervisor Name,Supervisor Name
@@ -2997,17 +3120,21 @@
 DocType: Journal Entry,Print Heading,Print Overskrift
 DocType: Maintenance Schedule,Maintenance Manager,Vedlikeholdsbehandling
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Totalt kan ikke være null
+DocType: Training Event Employee,Attended,Deltok
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,'Dager siden siste Bestill "må være større enn eller lik null
+DocType: Process Payroll,Payroll Frequency,lønn Frequency
 DocType: Asset,Amended From,Endret Fra
 apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,Råmateriale
 DocType: Leave Application,Follow via Email,Følg via e-post
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plants and Machineries,Planter og Machineries
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Skattebeløp Etter Rabattbeløp
+DocType: Daily Work Summary Settings,Daily Work Summary Settings,Daglige arbeid Oppsummering Innstillinger
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},Valuta av prislisten {0} er ikke lik med den valgte valutaen {1}
 DocType: Payment Entry,Internal Transfer,Internal Transfer
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,Child account exists for this account. You can not delete this account.,Barnekonto som finnes for denne kontoen. Du kan ikke slette denne kontoen.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Enten målet stk eller mål beløpet er obligatorisk
-apps/erpnext/erpnext/stock/get_item_details.py +486,No default BOM exists for Item {0},Ingen standard BOM finnes for Element {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +326,Please select Posting Date first,Vennligst velg Publiseringsdato først
+apps/erpnext/erpnext/stock/get_item_details.py +500,No default BOM exists for Item {0},Ingen standard BOM finnes for Element {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,Vennligst velg Publiseringsdato først
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Åpningsdato bør være før påmeldingsfristens utløp
 DocType: Leave Control Panel,Carry Forward,Fremføring
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Kostnadssted med eksisterende transaksjoner kan ikke konverteres til Ledger
@@ -3015,9 +3142,10 @@
 ,Produced,Produsert
 DocType: Item,Item Code for Suppliers,Sak Kode for leverandører
 DocType: Issue,Raised By (Email),Raised By (e-post)
+DocType: Training Event,Trainer Name,trener Name
 DocType: Mode of Payment,General,Generelt
 apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,Fest Brev
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +338,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Kan ikke trekke når kategorien er for verdsetting "eller" Verdsettelse og Totals
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Kan ikke trekke når kategorien er for verdsetting "eller" Verdsettelse og Totals
 apps/erpnext/erpnext/public/js/setup_wizard.js +217,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","List dine skatte hoder (f.eks merverdiavgift, toll etc, de bør ha unike navn) og deres standardsatser. Dette vil skape en standard mal, som du kan redigere og legge til mer senere."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial Nos Nødvendig for Serialisert Element {0}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Match Betalinger med Fakturaer
@@ -3038,61 +3166,62 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Hour,Time
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Serialisert Element {0} kan ikke oppdateres \ bruker Stock Avstemming
-DocType: Scheduling Tool,Day,Dag
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,New Serial No kan ikke ha Warehouse. Warehouse må settes av Stock Entry eller Kjøpskvittering
 DocType: Lead,Lead Type,Lead Type
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +129,You are not authorized to approve leaves on Block Dates,Du er ikke autorisert til å godkjenne blader på Block Datoer
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,You are not authorized to approve leaves on Block Dates,Du er ikke autorisert til å godkjenne blader på Block Datoer
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,All these items have already been invoiced,Alle disse elementene er allerede blitt fakturert
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Kan godkjennes av {0}
 DocType: Item,Default Material Request Type,Standard Material Request Type
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,Ukjent
 DocType: Shipping Rule,Shipping Rule Conditions,Frakt Regel betingelser
 DocType: BOM Replace Tool,The new BOM after replacement,Den nye BOM etter utskiftning
-apps/erpnext/erpnext/accounts/page/pos/pos.js +634,Point of Sale,Utsalgssted
+apps/erpnext/erpnext/accounts/page/pos/pos.js +631,Point of Sale,Utsalgssted
 DocType: Payment Entry,Received Amount,mottatt beløp
 DocType: Payment Entry,Party Name,partiet~~POS=HEADCOMP Name
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Lag full mengde, ignorerer mengde allerede er i ordre"
 DocType: Account,Tax,Skatte
+apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,ikke Merket
 DocType: Production Planning Tool,Production Planning Tool,Produksjonsplanlegging Tool
 DocType: Quality Inspection,Report Date,Rapporter Date
 DocType: Student,Middle Name,Mellomnavn
 DocType: C-Form,Invoices,Fakturaer
 DocType: Job Opening,Job Title,Jobbtittel
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,Gram
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +375,Quantity to Manufacture must be greater than 0.,Antall å Manufacture må være større enn 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,Antall å Manufacture må være større enn 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Besøk rapport for vedlikehold samtale.
 DocType: Stock Entry,Update Rate and Availability,Oppdateringsfrekvens og tilgjengelighet
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Prosentvis du har lov til å motta eller levere mer mot antall bestilte produkter. For eksempel: Hvis du har bestilt 100 enheter. og din Fradrag er 10% så du har lov til å motta 110 enheter.
-DocType: POS Profile,Customer Group,Kundegruppe
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Expense account is mandatory for item {0},Utgiftskonto er obligatorisk for elementet {0}
+DocType: POS Customer Group,Customer Group,Kundegruppe
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Expense account is mandatory for item {0},Utgiftskonto er obligatorisk for elementet {0}
 DocType: Item,Website Description,Website Beskrivelse
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,Netto endring i egenkapital
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +145,Please cancel Purchase Invoice {0} first,Vennligst avbryte fakturaen {0} først
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,Vennligst avbryte fakturaen {0} først
 DocType: Serial No,AMC Expiry Date,AMC Utløpsdato
 ,Sales Register,Salg Register
+DocType: Daily Work Summary Settings Company,Send Emails At,Send e-post til
 DocType: Quotation,Quotation Lost Reason,Sitat av Lost Reason
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Ingen standard Adressemal funnet. Opprett en ny fra Oppsett> Trykking og merkevarebygging> Adressemal.
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,Velg Domene
 DocType: Address,Plant,Plant
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Transaction reference no {0} dated {1},Transaksjonsreferanse ikke {0} datert {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},Transaksjonsreferanse ikke {0} datert {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Det er ingenting å redigere.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Oppsummering for denne måneden og ventende aktiviteter
 DocType: Customer Group,Customer Group Name,Kundegruppenavn
 apps/erpnext/erpnext/public/js/financial_statements.js +54,Cash Flow Statement,Kontantstrømoppstilling
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Please remove this Invoice {0} from C-Form {1},Vennligst fjern denne Faktura {0} fra C-Form {1}
+apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,Tillatelse
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Please remove this Invoice {0} from C-Form {1},Vennligst fjern denne Faktura {0} fra C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Vennligst velg bære frem hvis du også vil ha med forrige regnskapsår balanse later til dette regnskapsåret
 DocType: GL Entry,Against Voucher Type,Mot Voucher Type
 DocType: Item,Attributes,Egenskaper
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +623,Get Items,Få Items
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,Please enter Write Off Account,Skriv inn avskrive konto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +631,Get Items,Få Items
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,Please enter Write Off Account,Skriv inn avskrive konto
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Siste Order Date
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +41,Account {0} does not belongs to company {1},Konto {0} ikke tilhører selskapet {1}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +46,Account {0} does not belongs to company {1},Konto {0} ikke tilhører selskapet {1}
 DocType: Student,Guardian Details,Guardian Detaljer
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Oppmøte for flere ansatte
+DocType: Vehicle,Chassis No,chassis Nei
 DocType: Payment Request,Initiated,Initiert
 DocType: Production Order,Planned Start Date,Planlagt startdato
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,Customer is required against Receivable account {0},Kunden er nødvendig mot fordringer konto {0}
 DocType: Serial No,Creation Document Type,Creation dokumenttype
 DocType: Leave Type,Is Encash,Er encash
 DocType: Purchase Invoice,Mobile No,Mobile No
@@ -3106,23 +3235,25 @@
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Parent Element {0} må ikke være en lagervare
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Alle produkter eller tjenester.
 DocType: Supplier Quotation,Supplier Address,Leverandør Adresse
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +651,Row {0}# Account must be of type 'Fixed Asset',Rad {0} # konto må være av typen "Fixed Asset '
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +120,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} budsjettet for kontoen {1} mot {2} {3} er {4}. Det vil overstige ved {5}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +657,Row {0}# Account must be of type 'Fixed Asset',Rad {0} # konto må være av typen "Fixed Asset '
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Ut Antall
 apps/erpnext/erpnext/config/accounts.py +278,Rules to calculate shipping amount for a sale,Regler for å beregne frakt beløp for et salg
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +50,Series is mandatory,Serien er obligatorisk
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +52,Series is mandatory,Serien er obligatorisk
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finansielle Tjenester
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Typer aktiviteter for Tid Logger
 DocType: Tax Rule,Sales,Salgs
 DocType: Stock Entry Detail,Basic Amount,Grunnbeløp
+DocType: Training Event,Exam,Eksamen
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},Warehouse nødvendig for lager Element {0}
 DocType: Leave Allocation,Unused leaves,Ubrukte blader
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +146,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
 DocType: Tax Rule,Billing State,Billing State
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +254,Transfer,Transfer
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +190,{0} {1} does not associated with Party Account {2},{0} {1} ikke forbundet med Party-konto {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +796,Fetch exploded BOM (including sub-assemblies),Hente eksploderte BOM (inkludert underenheter)
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Transfer
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} ikke forbundet med Party-konto {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +810,Fetch exploded BOM (including sub-assemblies),Hente eksploderte BOM (inkludert underenheter)
 DocType: Authorization Rule,Applicable To (Employee),Gjelder til (Employee)
-apps/erpnext/erpnext/controllers/accounts_controller.py +118,Due Date is mandatory,Due Date er obligatorisk
+apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,Due Date er obligatorisk
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Økning for Egenskap {0} kan ikke være 0
 DocType: Journal Entry,Pay To / Recd From,Betal Til / recd From
 DocType: Naming Series,Setup Series,Oppsett Series
@@ -3132,26 +3263,28 @@
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Kjøps Kvitteringer
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Hvordan Pricing Rule er brukt?
-DocType: Quality Inspection,Delivery Note No,Levering Note Nei
+DocType: Stock Entry,Delivery Note No,Levering Note Nei
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","Hvis det er merket, bare kjøpe materielle forespørsler for endelig råvarer vil bli inkludert i materialet forespørsler. Ellers vil material Forespørsler om ordnede elementer opprettes"
 DocType: Cheque Print Template,Message to show,Melding for visning
 DocType: Company,Retail,Retail
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,Kunden {0} finnes ikke
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,Kunden {0} finnes ikke
 DocType: Attendance,Absent,Fraværende
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,Produktet Bundle
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Invalid reference {1},Rad {0}: Ugyldig referanse {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,Produktet Bundle
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},Rad {0}: Ugyldig referanse {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Kjøpe skatter og avgifter Mal
 DocType: Upload Attendance,Download Template,Last ned Mal
 DocType: Timesheet,TS-,TS-
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Enten debet- eller kredittbeløpet er nødvendig for {2}
 DocType: GL Entry,Remarks,Bemerkninger
 DocType: Payment Entry,Account Paid From,Konto betalt fra
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Raw Material Elementkode
 DocType: Journal Entry,Write Off Based On,Skriv Off basert på
 DocType: Stock Settings,Show Barcode Field,Vis strekkodefelt
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +708,Send Supplier Emails,Send Leverandør e-post
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Lønn allerede behandlet for perioden mellom {0} og {1}, La søknadsperioden kan ikke være mellom denne datoperioden."
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,Send Leverandør e-post
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Lønn allerede behandlet for perioden mellom {0} og {1}, La søknadsperioden kan ikke være mellom denne datoperioden."
 apps/erpnext/erpnext/config/stock.py +122,Installation record for a Serial No.,Installasjon rekord for en Serial No.
 DocType: Guardian Interest,Guardian Interest,Guardian Rente
+apps/erpnext/erpnext/config/hr.py +153,Training,Opplæring
 DocType: Timesheet,Employee Detail,Medarbeider Detalj
 apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,Neste Date dag og gjenta på dag i måneden må være lik
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Vennligst oppgi en
@@ -3160,12 +3293,11 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Fremfor
 apps/erpnext/erpnext/controllers/item_variant.py +172,Invalid attribute {0} {1},Ugyldig egenskap {0} {1}
 DocType: Salary Slip,Earning & Deduction,Tjene & Fradrag
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} cannot be a Group,Konto {0} kan ikke være en gruppe
-apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,Optional. This setting will be used to filter in various transactions.,Valgfritt. Denne innstillingen vil bli brukt for å filtrere i forskjellige transaksjoner.
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Valgfritt. Denne innstillingen vil bli brukt for å filtrere i forskjellige transaksjoner.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negative Verdivurdering Rate er ikke tillatt
 DocType: Holiday List,Weekly Off,Ukentlig Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","For eksempel 2012, 2012-13"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),Foreløpig Profit / Loss (Credit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +87,Provisional Profit / Loss (Credit),Foreløpig Profit / Loss (Credit)
 DocType: Sales Invoice,Return Against Sales Invoice,Tilbake Mot Salg Faktura
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Sak 5
 DocType: Serial No,Creation Time,Creation Tid
@@ -3175,24 +3307,26 @@
 DocType: Production Order Item,Production Order Item,Produksjonsordre Element
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Ingen rekord funnet
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,Kostnad for kasserte Asset
-apps/erpnext/erpnext/controllers/stock_controller.py +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Kostnadssted er obligatorisk for Element {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +605,Get Items from Product Bundle,Få Elementer fra Produkt Bundle
+apps/erpnext/erpnext/controllers/stock_controller.py +192,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Kostnadssted er obligatorisk for Element {2}
+DocType: Vehicle,Policy No,Regler Nei
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +613,Get Items from Product Bundle,Få Elementer fra Produkt Bundle
 DocType: Asset,Straight Line,Rett linje
 DocType: Project User,Project User,prosjekt Bruker
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +83,Account {0} is inactive,Konto {0} er inaktiv
 DocType: GL Entry,Is Advance,Er Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Oppmøte Fra Dato og oppmøte To Date er obligatorisk
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,Skriv inn 'Er underleverandør' som Ja eller Nei
 DocType: Sales Team,Contact No.,Kontaktnummer.
 DocType: Bank Reconciliation,Payment Entries,Betalings Entries
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +71,'Profit and Loss' type account {0} not allowed in Opening Entry,"Resultat 'type konto {0} ikke tillatt i Åpning Entry
+DocType: Production Order,Scrap Warehouse,skrap Warehouse
 DocType: Program Enrollment Tool,Get Students From,Få studenter fra
 DocType: Hub Settings,Seller Country,Selger Land
 apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Publiser Elementer på nettstedet
 DocType: Authorization Rule,Authorization Rule,Autorisasjon Rule
 DocType: Sales Invoice,Terms and Conditions Details,Vilkår og betingelser Detaljer
-apps/erpnext/erpnext/templates/generators/item.html +86,Specifications,Spesifikasjoner
+apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Spesifikasjoner
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Salgs skatter og avgifter Mal
+apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},Ingen lønn slip funnet for måneden {0} og år {1}
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),Total (Credit)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Klær og tilbehør
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Antall Bestill
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Banner som vil vises på toppen av listen over produkter.
@@ -3204,9 +3338,9 @@
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Commission on Sales,Provisjon på salg
 DocType: Offer Letter Term,Value / Description,Verdi / beskrivelse
-apps/erpnext/erpnext/controllers/accounts_controller.py +561,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} kan ikke sendes inn, er det allerede {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} kan ikke sendes inn, er det allerede {2}"
 DocType: Tax Rule,Billing Country,Fakturering Land
-DocType: Production Order,Expected Delivery Date,Forventet Leveringsdato
+DocType: Purchase Order Item,Expected Delivery Date,Forventet Leveringsdato
 apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debet- og kredittkort ikke lik for {0} # {1}. Forskjellen er {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Underholdning Utgifter
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +192,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Salg Faktura {0} må slettes før den sletter denne salgsordre
@@ -3215,6 +3349,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Ugyldig kvantum spesifisert for elementet {0}. Antall må være større enn 0.
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Søknader om permisjon.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +202,Account with existing transaction can not be deleted,Konto med eksisterende transaksjon kan ikke slettes
+DocType: Vehicle,Last Carbon Check,Siste Carbon Sjekk
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Rettshjelp
 DocType: Purchase Invoice,Posting Time,Postering Tid
 DocType: Timesheet,% Amount Billed,% Mengde Fakturert
@@ -3222,7 +3357,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Telephone Expenses,Telefon Utgifter
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Sjekk dette hvis du vil tvinge brukeren til å velge en serie før du lagrer. Det blir ingen standard hvis du sjekke dette.
-apps/erpnext/erpnext/stock/get_item_details.py +117,No Item with Serial No {0},Ingen Element med Serial No {0}
+apps/erpnext/erpnext/stock/get_item_details.py +116,No Item with Serial No {0},Ingen Element med Serial No {0}
 DocType: Email Digest,Open Notifications,Åpne Påminnelser
 DocType: Payment Entry,Difference Amount (Company Currency),Forskjell Beløp (Selskap Valuta)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,Direkte kostnader
@@ -3231,7 +3366,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Ny kunde Revenue
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,Reiseutgifter
 DocType: Maintenance Visit,Breakdown,Sammenbrudd
-apps/erpnext/erpnext/controllers/accounts_controller.py +637,Account: {0} with currency: {1} can not be selected,Konto: {0} med valuta: {1} kan ikke velges
+apps/erpnext/erpnext/controllers/accounts_controller.py +683,Account: {0} with currency: {1} can not be selected,Konto: {0} med valuta: {1} kan ikke velges
 DocType: Bank Reconciliation Detail,Cheque Date,Sjekk Dato
 apps/erpnext/erpnext/accounts/doctype/account/account.py +54,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Parent konto {1} ikke tilhører selskapet: {2}
 DocType: Program Enrollment Tool,Student Applicants,student Søkere
@@ -3242,7 +3377,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,Prøvetid
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,lønn Components
 DocType: Program Enrollment Tool,New Academic Year,Nytt studieår
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Payment of salary for the month {0} and year {1},Utbetaling av lønn for måneden {0} og år {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto innsats Prisliste rente hvis mangler
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Totalt innbetalt beløp
 DocType: Production Order Item,Transferred Qty,Overført Antall
@@ -3253,7 +3387,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,Vi selger denne vare
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +68,Supplier Id,Leverandør Id
 DocType: Payment Request,Payment Gateway Details,Betaling Gateway Detaljer
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +212,Quantity should be greater than 0,Mengden skal være større enn 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,Mengden skal være større enn 0
 DocType: Journal Entry,Cash Entry,Cash Entry
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Ordnede noder kan bare opprettes under 'Gruppe' type noder
 DocType: Academic Year,Academic Year Name,Akademisk År Navn
@@ -3263,7 +3397,7 @@
 DocType: Payment Entry,PE-,PE
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +115,Please set default account in Expense Claim Type {0},Vennligst angi standardkonto i Expense krav Type {0}
 DocType: Assessment Result,Student Name,Student navn
-apps/erpnext/erpnext/hooks.py +113,Assessment Schedule,Assessment Schedule
+apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,Assessment Schedule
 DocType: Brand,Item Manager,Sak manager
 DocType: Buying Settings,Default Supplier Type,Standard Leverandør Type
 DocType: Production Order,Total Operating Cost,Total driftskostnader
@@ -3271,28 +3405,28 @@
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Alle kontakter.
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Company Abbreviation,Firma Forkortelse
 DocType: GL Entry,Party Type,Partiet Type
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,Raw material cannot be same as main Item,Råstoff kan ikke være det samme som hoved Element
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +81,Raw material cannot be same as main Item,Råstoff kan ikke være det samme som hoved Element
 DocType: Item Attribute Value,Abbreviation,Forkortelse
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +166,Payment Entry already exists,Betaling Entry finnes allerede
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Ikke authroized siden {0} overskrider grensene
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Lønn mal mester.
 DocType: Leave Type,Max Days Leave Allowed,Max Dager La tillatt
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Still skatteregel for shopping cart
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,Still skatteregel for shopping cart
 DocType: Purchase Invoice,Taxes and Charges Added,Skatter og avgifter legges
 ,Sales Funnel,Sales trakt
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +25,Abbreviation is mandatory,Forkortelsen er obligatorisk
+apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,Forkortelsen er obligatorisk
+DocType: Project,Task Progress,Task Progress
 ,Qty to Transfer,Antall overføre
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Sitater for å Leads eller kunder.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rolle tillatt å redigere frossen lager
 ,Territory Target Variance Item Group-Wise,Territorium Target Avviks varegruppe-Wise
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Alle kundegrupper
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +81,Accumulated Monthly,akkumulert pr måned
-apps/erpnext/erpnext/controllers/accounts_controller.py +598,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} er obligatorisk. Kanskje Valutaveksling posten ikke er skapt for {1} til {2}.
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,akkumulert pr måned
+apps/erpnext/erpnext/controllers/accounts_controller.py +644,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} er obligatorisk. Kanskje Valutaveksling posten ikke er skapt for {1} til {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +38,Tax Template is mandatory.,Skatt Mal er obligatorisk.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Konto {0}: Parent konto {1} finnes ikke
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Prisliste Rate (Selskap Valuta)
 DocType: Products Settings,Products Settings,Produkter Innstillinger
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +188,Please set Naming Series for {0} via Setup > Settings > Naming Series,Vennligst sett Naming Series for {0} via Oppsett> Innstillinger> Naming Series
 DocType: Account,Temporary,Midlertidig
 DocType: Address,Preferred Billing Address,Foretrukne faktureringsadresse
 DocType: Program,Courses,kurs
@@ -3310,7 +3444,7 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Sak Wise Skatt Detalj
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,Institute forkortelse
 ,Item-wise Price List Rate,Element-messig Prisliste Ranger
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +838,Supplier Quotation,Leverandør sitat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +846,Supplier Quotation,Leverandør sitat
 DocType: Quotation,In Words will be visible once you save the Quotation.,I Ord vil være synlig når du lagrer Tilbud.
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,samle gebyrer
 DocType: Attendance,ATT-,ATT-
@@ -3326,13 +3460,14 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Total Variance
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Hvis aktivert, vil systemet starte regnskapspostene for inventar automatisk."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Brokerage
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,Oppmøte for arbeidstaker {0} er allerede markert for denne dagen
 DocType: Address,Postal Code,postnummer
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",Minutter Oppdatert via 'Time Logg'
 DocType: Customer,From Lead,Fra Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Bestillinger frigitt for produksjon.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Velg regnskapsår ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +509,POS Profile required to make POS Entry,POS Profile nødvendig å foreta POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +512,POS Profile required to make POS Entry,POS Profile nødvendig å foreta POS Entry
 DocType: Program Enrollment Tool,Enroll Students,Meld Studenter
 DocType: Hub Settings,Name Token,Navn Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard Selling
@@ -3340,7 +3475,7 @@
 DocType: Serial No,Out of Warranty,Ut av Garanti
 DocType: BOM Replace Tool,Replace,Erstatt
 DocType: Production Order,Unstopped,lukkes
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Invoice {1},{0} mot Sales Faktura {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,{0} against Sales Invoice {1},{0} mot Sales Faktura {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Prosjektnavn
 DocType: Supplier,Mention if non-standard receivable account,Nevn hvis ikke-standard fordring konto
@@ -3352,19 +3487,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Skattefordel
 DocType: BOM Item,BOM No,BOM Nei
 DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +133,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} ikke har konto {1} eller allerede matchet mot andre verdikupong
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} ikke har konto {1} eller allerede matchet mot andre verdikupong
 DocType: Item,Moving Average,Glidende gjennomsnitt
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM som vil bli erstattet
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,elektronisk utstyr
 DocType: Account,Debit,Debet
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Bladene skal avsettes i multipler av 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,"Bladene skal avsettes i multipler av 0,5"
 DocType: Production Order,Operation Cost,Operation Cost
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Last opp oppmøte fra en CSV-fil
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup > Numbering Series,Vennligst oppsett nummerering serie for Oppmøte via Setup> Numbering Series
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Enestående Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Sette mål varegruppe-messig for Sales Person.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Freeze Aksjer Eldre enn [dager]
-apps/erpnext/erpnext/controllers/accounts_controller.py +531,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Asset er obligatorisk for anleggsmiddel kjøp / salg
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Asset er obligatorisk for anleggsmiddel kjøp / salg
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Hvis to eller flere Prising Reglene er funnet basert på de ovennevnte forhold, er Priority brukt. Prioritet er et tall mellom 0 og 20, mens standardverdi er null (blank). Høyere tall betyr at det vil ha forrang dersom det er flere Prising regler med samme betingelser."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Fiscal Year: {0} ikke eksisterer
 DocType: Currency Exchange,To Currency,Å Valuta
@@ -3381,9 +3515,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Customer Feedback
 DocType: Account,Expense,Expense
-apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address","Selskapet er obligatorisk, så det er et selskap adresse"
+apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"Company is mandatory, as it is your company address","Selskapet er obligatorisk, så det er et selskap adresse"
 DocType: Item Attribute,From Range,Fra Range
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Syntax error in formula or condition: {0},Syntaksfeil i formelen eller tilstand: {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Syntax error in formula or condition: {0},Syntaksfeil i formelen eller tilstand: {0}
+DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Daglig arbeid Oppsummering Innstillinger selskapet
 apps/erpnext/erpnext/stock/utils.py +99,Item {0} ignored since it is not a stock item,Element {0} ignorert siden det ikke er en lagervare
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +34,Submit this Production Order for further processing.,Send dette produksjonsordre for videre behandling.
@@ -3398,14 +3533,15 @@
 DocType: Stock Entry Detail,Additional Cost,Tilleggs Cost
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,Regnskapsårets slutt Dato
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Kan ikke filtrere basert på Voucher Nei, hvis gruppert etter Voucher"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Make Supplier Quotation,Gjør Leverandør sitat
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +737,Make Supplier Quotation,Gjør Leverandør sitat
 DocType: Quality Inspection,Incoming,Innkommende
 DocType: BOM,Materials Required (Exploded),Materialer som er nødvendige (Exploded)
 apps/erpnext/erpnext/public/js/setup_wizard.js +185,"Add users to your organization, other than yourself","Legge til brukere i organisasjonen, annet enn deg selv"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,Publiseringsdato kan ikke være fremtidig dato
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Serial No {1} samsvarer ikke med {2} {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,Casual La
 DocType: Batch,Batch ID,Batch ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},Merk: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},Merk: {0}
 ,Delivery Note Trends,Levering Note Trender
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Denne ukens oppsummering
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Konto: {0} kan bare oppdateres via lagertransaksjoner
@@ -3423,6 +3559,7 @@
 DocType: Employee,History In Company,Historie I selskapet
 apps/erpnext/erpnext/config/learn.py +112,Newsletters,Nyhetsbrev
 DocType: Address,Shipping,Shipping
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,Bank Transaksjons Reference
 DocType: Stock Ledger Entry,Stock Ledger Entry,Stock Ledger Entry
 DocType: Department,Leave Block List,La Block List
 DocType: Customer,Tax ID,Skatt ID
@@ -3430,6 +3567,7 @@
 DocType: Accounts Settings,Accounts Settings,Regnskap Innstillinger
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,Vedta
 DocType: Customer,Sales Partner and Commission,Sales Partner og Kommisjonen
+,Project Quantity,prosjekt Antall
 DocType: Opportunity,To Discuss,Å Diskutere
 apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} enheter av {1} trengs i {2} for å fullføre denne transaksjonen.
 DocType: SMS Settings,SMS Settings,SMS-innstillinger
@@ -3439,7 +3577,7 @@
 DocType: Account,Auditor,Revisor
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,{0} elementer produsert
 DocType: Cheque Print Template,Distance from top edge,Avstand fra øvre kant
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Return
+DocType: Purchase Invoice,Return,Return
 DocType: Production Order Operation,Production Order Operation,Produksjon Bestill Operation
 DocType: Pricing Rule,Disable,Deaktiver
 DocType: Project Task,Pending Review,Avventer omtale
@@ -3447,11 +3585,13 @@
 DocType: Task,Total Expense Claim (via Expense Claim),Total Expense krav (via Expense krav)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +70,Customer Id,Kunde-ID
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Mark Fraværende
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Rad {0}: valuta BOM # {1} bør være lik den valgte valutaen {2}
 DocType: Journal Entry Account,Exchange Rate,Vekslingskurs
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +527,Sales Order {0} is not submitted,Salgsordre {0} er ikke innsendt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Sales Order {0} is not submitted,Salgsordre {0} er ikke innsendt
 DocType: Homepage,Tag Line,tag Linje
 DocType: Fee Component,Fee Component,Fee Component
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +836,Add items from,Legg elementer fra
+DocType: Vehicle,Fleet Management,Flåtestyring
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Add items from,Legg elementer fra
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +97,Warehouse {0}: Parent account {1} does not bolong to the company {2},Warehouse {0}: Parent konto {1} ikke BOLONG til selskapet {2}
 DocType: Cheque Print Template,Regular,Regelmessig
 DocType: BOM,Last Purchase Rate,Siste Purchase Rate
@@ -3459,7 +3599,7 @@
 DocType: Project Task,Task ID,Task ID
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +87,Stock cannot exist for Item {0} since has variants,Stock kan ikke eksistere for Element {0} siden har varianter
 ,Sales Person-wise Transaction Summary,Transaksjons Oppsummering Sales Person-messig
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +60,Cost Center is required for 'Profit and Loss' account {0}. Please set up a default Cost Center for the Company.,Kostnadssted er nødvendig for 'resultat' konto {0}. Sett opp en standardkostnadssted for selskapet.
+DocType: Training Event,Contact Number,Kontakt nummer
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,Warehouse {0} finnes ikke
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registrer For ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Månedlig Distribusjonsprosent
@@ -3470,13 +3610,14 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,Skriv inn url parameter for mottaker nos
 DocType: Payment Entry,Paid Amount,Innbetalt beløp
 DocType: Assessment,Supervisor,Supervisor
-apps/erpnext/erpnext/accounts/page/pos/pos.js +692,Online,på nett
+apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,på nett
 ,Available Stock for Packing Items,Tilgjengelig på lager for pakk gjenstander
 DocType: Item Variant,Item Variant,Sak Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,Sette dette Adressemal som standard så er det ingen andre standard
+DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Element
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo allerede i debet, har du ikke lov til å sette "Balance må være 'som' Credit '"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Kvalitetsstyring
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} has been disabled,Element {0} har blitt deaktivert
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Element {0} har blitt deaktivert
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Skriv inn antall for Element {0}
 DocType: Employee External Work History,Employee External Work History,Ansatt Ekstern Work History
 DocType: Tax Rule,Purchase,Kjøp
@@ -3486,19 +3627,23 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +20,Cost Centers,Kostnadssteder
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Hastigheten som leverandørens valuta er konvertert til selskapets hovedvaluta
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: timings konflikter med rad {1}
+DocType: Training Event Employee,Invited,invitert
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,Flere aktive Lønn Structures funnet for arbeidstaker {0} for den gitte datoer
 DocType: Opportunity,Next Contact,Neste Kontakt
 apps/erpnext/erpnext/config/accounts.py +272,Setup Gateway accounts.,Oppsett Gateway kontoer.
 DocType: Employee,Employment Type,Type stilling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Anleggsmidler
 DocType: Payment Entry,Set Exchange Gain / Loss,Sett valutagevinst / tap
 ,Cash Flow,Cash Flow
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +88,Application period cannot be across two alocation records,Tegningsperioden kan ikke være over to alocation poster
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +90,Application period cannot be across two alocation records,Tegningsperioden kan ikke være over to alocation poster
 DocType: Item Group,Default Expense Account,Standard kostnadskonto
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,Student Batch eller kursplanen er obligatorisk
 DocType: Student,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Varsel (dager)
 DocType: Tax Rule,Sales Tax Template,Merverdiavgift Mal
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1544,Select items to save the invoice,Velg elementer for å lagre fakturaen
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,Velg elementer for å lagre fakturaen
 DocType: Employee,Encashment Date,Encashment Dato
+DocType: Training Event,Internet,Internett
 DocType: Account,Stock Adjustment,Stock Adjustment
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Standard Aktivitet Kostnad finnes for Aktivitetstype - {0}
 DocType: Production Order,Planned Operating Cost,Planlagt driftskostnader
@@ -3523,6 +3668,7 @@
 DocType: BOM Replace Tool,Current BOM,Nåværende BOM
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Legg Serial No
 apps/erpnext/erpnext/config/support.py +22,Warranty,Garanti
+DocType: Purchase Invoice,Debit Note Issued,Debitnota Utstedt
 DocType: Production Order,Warehouses,Næringslokaler
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationary,Print og Stasjonær
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} eiendelen kan ikke overføres
@@ -3536,27 +3682,28 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,Prosjektleder
 ,Quoted Item Comparison,Sitert Element Sammenligning
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Dispatch
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Maks rabatt tillatt for element: {0} er {1}%
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,Maks rabatt tillatt for element: {0} er {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,Net Asset verdi som på
 DocType: Account,Receivable,Fordring
 DocType: Grade Interval,From Score,fra Score
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Ikke lov til å endre Leverandør som innkjøpsordre allerede eksisterer
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rollen som får lov til å sende transaksjoner som overstiger kredittgrenser fastsatt.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +832,"Master data syncing, it might take some time","Master data synkronisering, kan det ta litt tid"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +897,"Master data syncing, it might take some time","Master data synkronisering, kan det ta litt tid"
 DocType: Item,Material Issue,Material Issue
 DocType: Hub Settings,Seller Description,Selger Beskrivelse
 DocType: Employee Education,Qualification,Kvalifisering
 DocType: Item Price,Item Price,Sak Pris
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Såpe og vaskemiddel
+apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +39,From Time cannot be greater than To Time.,Fra tid kan ikke være større enn til annen.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Bestilt
 DocType: Salary Detail,Component,Komponent
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +70,Opening Accumulated Depreciation must be less than equal to {0},Åpning akkumulerte avskrivninger må være mindre enn eller lik {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Åpning akkumulerte avskrivninger må være mindre enn eller lik {0}
 DocType: Warehouse,Warehouse Name,Warehouse Name
 DocType: Naming Series,Select Transaction,Velg Transaksjons
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Skriv inn Godkjenne Rolle eller Godkjenne User
 DocType: Journal Entry,Write Off Entry,Skriv Off Entry
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +94,Error in formula or condition,Feil i formelen eller tilstand
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,Feil i formelen eller tilstand
 DocType: BOM,Rate Of Materials Based On,Valuta materialer basert på
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Støtte Analtyics
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +141,Uncheck all,Fjern haken ved alle
@@ -3565,9 +3712,11 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},To Date bør være innenfor regnskapsåret. Antar To Date = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Her kan du opprettholde høyde, vekt, allergier, medisinske bekymringer etc"
 DocType: Leave Block List,Applies to Company,Gjelder Selskapet
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +198,Cannot cancel because submitted Stock Entry {0} exists,Kan ikke avbryte fordi innsendt Stock Entry {0} finnes
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +199,Cannot cancel because submitted Stock Entry {0} exists,Kan ikke avbryte fordi innsendt Stock Entry {0} finnes
+DocType: Vehicle,Vehicle,Kjøretøy
 DocType: Purchase Invoice,In Words,I Words
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Today is {0}'s birthday!,I dag er {0} s bursdag!
+DocType: POS Profile,Item Groups,varegruppene
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,I dag er {0} s bursdag!
 DocType: Production Planning Tool,Material Request For Warehouse,Materialet Request For Warehouse
 DocType: Sales Order Item,For Production,For Production
 DocType: Payment Request,payment_url,payment_url
@@ -3575,50 +3724,55 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,Din regnskapsår begynner på
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Asset Avskrivninger og Balanserer
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +322,Amount {0} {1} transferred from {2} to {3},Mengden {0} {1} overført fra {2} til {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},Mengden {0} {1} overført fra {2} til {3}
 DocType: Sales Invoice,Get Advances Received,Få Fremskritt mottatt
 DocType: Email Digest,Add/Remove Recipients,Legg til / fjern Mottakere
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +437,Transaction not allowed against stopped Production Order {0},Transaksjonen ikke lov mot stoppet Produksjonsordre {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,Transaction not allowed against stopped Production Order {0},Transaksjonen ikke lov mot stoppet Produksjonsordre {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","For å sette dette regnskapsåret som standard, klikk på "Angi som standard '"
-apps/erpnext/erpnext/projects/doctype/project/project.py +143,Join,Bli med
+apps/erpnext/erpnext/projects/doctype/project/project.py +168,Join,Bli med
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Mangel Antall
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Sak variant {0} finnes med samme attributtene
+apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item variant {0} exists with same attributes,Sak variant {0} finnes med samme attributtene
 DocType: Leave Application,LAP/,RUNDE/
 DocType: Salary Slip,Salary Slip,Lønn Slip
+DocType: Lead,Lost Quotation,mistet sitat
 DocType: Pricing Rule,Margin Rate or Amount,Margin Rate Beløp
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'To Date' er påkrevd
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generere pakksedler for pakker som skal leveres. Brukes til å varsle pakke nummer, innholdet i pakken og vekten."
 DocType: Sales Invoice Item,Sales Order Item,Salgsordre Element
 DocType: Salary Slip,Payment Days,Betalings Days
 DocType: Customer,Dormant,Sovende
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +215,Warehouses with child nodes cannot be converted to ledger,Næringslokaler med barn noder kan ikke konverteres til Ledger
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,Næringslokaler med barn noder kan ikke konverteres til Ledger
 DocType: BOM,Manage cost of operations,Administrer driftskostnader
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Når noen av de merkede transaksjonene "Skrevet", en e-pop-up automatisk åpnet for å sende en e-post til den tilhørende "Kontakt" i at transaksjonen med transaksjonen som et vedlegg. Brukeren kan eller ikke kan sende e-posten."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globale innstillinger
 DocType: Employee Education,Employee Education,Ansatt Utdanning
-apps/erpnext/erpnext/public/js/controllers/transaction.js +857,It is needed to fetch Item Details.,Det er nødvendig å hente Element detaljer.
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Duplicate varegruppe funnet i varegruppen bordet
+apps/erpnext/erpnext/public/js/controllers/transaction.js +894,It is needed to fetch Item Details.,Det er nødvendig å hente Element detaljer.
 DocType: Salary Slip,Net Pay,Netto Lønn
 DocType: Account,Account,Konto
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serial No {0} er allerede mottatt
 ,Requested Items To Be Transferred,Etterspør elementene som skal overføres
+DocType: Vehicle Log,Vehicle Log,Vehicle Log
+apps/erpnext/erpnext/controllers/stock_controller.py +81,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Warehouse {0} er ikke knyttet til noen konto, kan du opprette / knytte tilsvarende (Asset) står for lageret."
 DocType: Purchase Invoice,Recurring Id,Gjentakende Id
 DocType: Customer,Sales Team Details,Salgsteam Detaljer
 DocType: Expense Claim,Total Claimed Amount,Total Hevdet Beløp
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potensielle muligheter for å selge.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,Invalid {0},Ugyldig {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +206,Invalid {0},Ugyldig {0}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,Sykefravær
 DocType: Email Digest,Email Digest,E-post Digest
 DocType: Delivery Note,Billing Address Name,Billing Address Navn
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Varehus
 DocType: Warehouse,PIN,PIN
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base Endre Beløp (Selskap Valuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +314,No accounting entries for the following warehouses,Ingen regnskapspostene for følgende varehus
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +310,No accounting entries for the following warehouses,Ingen regnskapspostene for følgende varehus
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Lagre dokumentet først.
 DocType: Account,Chargeable,Avgift
 DocType: Company,Change Abbreviation,Endre Forkortelse
 DocType: Expense Claim Detail,Expense Date,Expense Dato
 DocType: Item,Max Discount (%),Max Rabatt (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Siste ordrebeløp
+DocType: Daily Work Summary,Email Sent To,E-post sendt Å
 DocType: Budget,Warn,Advare
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Eventuelle andre bemerkninger, bemerkelsesverdig innsats som bør gå i postene."
 DocType: BOM,Manufacturing User,Manufacturing User
@@ -3638,8 +3792,8 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email id must be unique, already exists for {0}","E-id må være unikt, finnes allerede for {0}"
 ,Itemwise Recommended Reorder Level,Itemwise Anbefalt Omgjøre nivå
 DocType: Salary Detail,Salary Detail,lønn Detalj
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +953,Please select {0} first,Vennligst velg {0} først
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +757,Batch {0} of Item {1} has expired.,Batch {0} av Element {1} er utløpt.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +944,Please select {0} first,Vennligst velg {0} først
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,Batch {0} av Element {1} er utløpt.
 DocType: Sales Invoice,Commission,Kommisjon
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Timeregistrering for produksjon.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,delsum
@@ -3666,7 +3820,7 @@
 DocType: Stock Entry Detail,Actual Qty (at source/target),Faktiske antall (ved kilden / target)
 DocType: Item Customer Detail,Ref Code,Ref Kode
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Medarbeider poster.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Please set Next Depreciation Date,Vennligst sett Neste Avskrivninger Dato
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Please set Next Depreciation Date,Vennligst sett Neste Avskrivninger Dato
 DocType: HR Settings,Payroll Settings,Lønn Innstillinger
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Matche ikke bundet fakturaer og betalinger.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Legg inn bestilling
@@ -3676,16 +3830,16 @@
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,Velg merke ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Akkumulerte avskrivninger som på
 DocType: Sales Invoice,C-Form Applicable,C-Form Gjelder
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +380,Operation Time must be greater than 0 for Operation {0},Operation Tid må være større enn 0 for operasjon {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +383,Operation Time must be greater than 0 for Operation {0},Operation Tid må være større enn 0 for operasjon {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Warehouse is mandatory,Warehouse er obligatorisk
 DocType: Supplier,Address and Contacts,Adresse og Kontakt
 DocType: UOM Conversion Detail,UOM Conversion Detail,Målenheter Conversion Detalj
 apps/erpnext/erpnext/public/js/setup_wizard.js +167,Keep it web friendly 900px (w) by 100px (h),Hold det web vennlig 900px (w) ved 100px (h)
 DocType: Program,Program Abbreviation,program forkortelse
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Production Order cannot be raised against a Item Template,Produksjonsordre kan ikke heves mot et elementmal
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +371,Production Order cannot be raised against a Item Template,Produksjonsordre kan ikke heves mot et elementmal
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,Kostnader er oppdatert i Purchase Mottak mot hvert element
 DocType: Warranty Claim,Resolved By,Løst Av
-DocType: Appraisal,Start Date,Startdato
+DocType: Vehicle,Start Date,Startdato
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Bevilge blader for en periode.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Sjekker og Innskudd feil ryddet
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: You can not assign itself as parent account,Konto {0}: Du kan ikke tildele seg selv som forelder konto
@@ -3707,13 +3861,16 @@
 DocType: Workstation,Operating Costs,Driftskostnader
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Tiltak hvis Snø Månedlig budsjett Skredet
 DocType: Purchase Invoice,Submit on creation,Send inn på skapelse
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +435,Currency for {0} must be {1},Valuta for {0} må være {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},Valuta for {0} må være {1}
 DocType: Asset,Disposal Date,Deponering Dato
+DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-post vil bli sendt til alle aktive ansatte i selskapet ved den gitte timen, hvis de ikke har ferie. Oppsummering av svarene vil bli sendt ved midnatt."
 DocType: Employee Leave Approver,Employee Leave Approver,Ansatt La Godkjenner
 apps/erpnext/erpnext/stock/doctype/item/item.py +495,Row {0}: An Reorder entry already exists for this warehouse {1},Rad {0}: En Omgjøre oppføring finnes allerede for dette lageret {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.","Kan ikke erklære som tapt, fordi tilbudet er gjort."
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","Kan ikke erklære som tapt, fordi tilbudet er gjort."
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,trening Tilbakemelding
+DocType: Vehicle Log,Make Expense Claim,Gjør Expense krav
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Kjøp Master manager
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +434,Production Order {0} must be submitted,Produksjonsordre {0} må sendes
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,Production Order {0} must be submitted,Produksjonsordre {0} må sendes
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Vennligst velg startdato og sluttdato for Element {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,Course is mandatory in row {0},Kurset er obligatorisk i rad {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Til dags dato kan ikke være før fra dato
@@ -3723,13 +3880,14 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Plan Kostnadssteder
 ,Requested Items To Be Ordered,Etterspør Elementer bestilles
 DocType: Price List,Price List Name,Prisliste Name
+apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},Daglig arbeid Summary for {0}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,Totals
 DocType: BOM,Manufacturing,Manufacturing
 ,Ordered Items To Be Delivered,Bestilte varer som skal leveres
 DocType: Account,Income,Inntekt
 DocType: Industry Type,Industry Type,Industry Type
 apps/erpnext/erpnext/templates/includes/cart.js +141,Something went wrong!,Noe gikk galt!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +120,Warning: Leave application contains following block dates,Advarsel: La programmet inneholder følgende blokk datoer
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,Warning: Leave application contains following block dates,Advarsel: La programmet inneholder følgende blokk datoer
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,Salg Faktura {0} er allerede innsendt
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Regnskapsåret {0} finnes ikke
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Ferdigstillelse Dato
@@ -3738,12 +3896,12 @@
 DocType: Fee Structure,Student Category,student Kategori
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,Obligatorisk feild - Få studenter fra
 DocType: Announcement,Student,Student
-apps/erpnext/erpnext/config/hr.py +181,Organization unit (department) master.,Organisasjonsenhet (departement) mester.
+apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,Organisasjonsenhet (departement) mester.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Skriv inn et gyldig mobil nos
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Skriv inn meldingen før du sender
 DocType: Email Digest,Pending Quotations,Avventer Sitater
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,Point-of-Sale Profile
-apps/erpnext/erpnext/accounts/page/pos/pos.js +781,All records are synced.,Alle poster er synkronisert.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,Alle poster er synkronisert.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Oppdater SMS-innstillinger
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,Usikret lån
 DocType: Cost Center,Cost Center Name,Kostnadssteds Name
@@ -3755,29 +3913,29 @@
 DocType: Purchase Receipt Item,Received and Accepted,Mottatt og akseptert
 ,Serial No Service Contract Expiry,Serial No Service kontraktsutløp
 DocType: Item,Unit of Measure Conversion,Måleenhet Conversion
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,You cannot credit and debit same account at the same time,Du kan ikke kreditt- og debet samme konto samtidig
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +288,You cannot credit and debit same account at the same time,Du kan ikke kreditt- og debet samme konto samtidig
 DocType: Naming Series,Help HTML,Hjelp HTML
 DocType: Student Group Creation Tool,Student Group Creation Tool,Student Gruppe Creation Tool
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Total weightage tilordnet skal være 100%. Det er {0}
 DocType: Address,Name of person or organization that this address belongs to.,Navn på person eller organisasjon som denne adressen tilhører.
 apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,Dine Leverandører
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,Kan ikke settes som tapt som Salgsordre er gjort.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +55,Cannot set as Lost as Sales Order is made.,Kan ikke settes som tapt som Salgsordre er gjort.
 DocType: Request for Quotation Item,Supplier Part No,Leverandør varenummer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Kan ikke trekke når kategorien er for verdsetting 'eller' Vaulation og Total '
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Received From,Mottatt fra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Kan ikke trekke når kategorien er for verdsetting 'eller' Vaulation og Total '
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Mottatt fra
 DocType: Lead,Converted,Omregnet
 DocType: Item,Has Serial No,Har Serial No
 DocType: Employee,Date of Issue,Utstedelsesdato
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: Fra {0} for {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},Row # {0}: Sett Leverandør for elementet {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +117,Row {0}: Hours value must be greater than zero.,Rad {0}: Timer verdien må være større enn null.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,Rad {0}: Timer verdien må være større enn null.
 apps/erpnext/erpnext/stock/doctype/item/item.py +171,Website Image {0} attached to Item {1} cannot be found,Website Bilde {0} festet til Element {1} kan ikke finnes
 DocType: Issue,Content Type,Innholdstype
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Datamaskin
 DocType: Item,List this Item in multiple groups on the website.,Liste denne vare i flere grupper på nettstedet.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +175,{0} {1} does not exist,{0} {1} finnes ikke
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,Please check Multi Currency option to allow accounts with other currency,Vennligst sjekk Multi Valuta alternativet for å tillate kontoer med andre valuta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +72,Item: {0} does not exist in the system,Sak: {0} finnes ikke i systemet
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} finnes ikke
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,Vennligst sjekk Multi Valuta alternativet for å tillate kontoer med andre valuta
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,Item: {0} does not exist in the system,Sak: {0} finnes ikke i systemet
 apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,Du er ikke autorisert til å sette Frozen verdi
 DocType: Payment Reconciliation,Get Unreconciled Entries,Få avstemte Entries
 DocType: Payment Reconciliation,From Invoice Date,Fra Fakturadato
@@ -3793,17 +3951,18 @@
 apps/erpnext/erpnext/config/stock.py +163,Update additional costs to calculate landed cost of items,Oppdater ekstra kostnader for å beregne inntakskost annonser
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,Elektrisk
 DocType: Stock Entry,Total Value Difference (Out - In),Total verdi Difference (ut -)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,Row {0}: Exchange Rate is mandatory,Rad {0}: Exchange Rate er obligatorisk
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +335,Row {0}: Exchange Rate is mandatory,Rad {0}: Exchange Rate er obligatorisk
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Bruker-ID ikke satt for Employee {0}
+DocType: Vehicle,Vehicle Value,Vehicle Verdi
 DocType: Stock Entry,Default Source Warehouse,Standardkilde Warehouse
 DocType: Item,Customer Code,Kunden Kode
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,Birthday Reminder for {0},Bursdag Påminnelse for {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,Birthday Reminder for {0},Bursdag Påminnelse for {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dager siden siste Bestill
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To account must be a Balance Sheet account,Uttak fra kontoen må være en balansekonto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Uttak fra kontoen må være en balansekonto
 DocType: Buying Settings,Naming Series,Navngi Series
 DocType: Leave Block List,Leave Block List Name,La Block List Name
+apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Forsikring Startdatoen må være mindre enn Forsikring Sluttdato
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Aksje Eiendeler
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Har du virkelig ønsker å sende all lønn slip for måneden {0} og år {1}
 DocType: Timesheet,Production Detail,produksjon Detail
 DocType: Target Detail,Target Qty,Target Antall
 DocType: Shopping Cart Settings,Checkout Settings,Kasse Innstillinger
@@ -3811,23 +3970,28 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Levering Note {0} må ikke sendes inn
 DocType: Notification Control,Sales Invoice Message,Salgsfaktura Message
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Lukke konto {0} må være av typen Ansvar / Egenkapital
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +313,Salary Slip of employee {0} already created for time sheet {1},Lønn Slip av ansattes {0} allerede opprettet for timeregistrering {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +308,Salary Slip of employee {0} already created for time sheet {1},Lønn Slip av ansattes {0} allerede opprettet for timeregistrering {1}
+DocType: Vehicle Log,Odometer,Kilometerteller
 DocType: Sales Order Item,Ordered Qty,Bestilte Antall
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} is disabled,Element {0} er deaktivert
+apps/erpnext/erpnext/stock/doctype/item/item.py +679,Item {0} is disabled,Element {0} er deaktivert
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Opp
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +809,BOM does not contain any stock item,BOM inneholder ikke lagervare
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,BOM does not contain any stock item,BOM inneholder ikke lagervare
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Period From and Period To dates mandatory for recurring {0},Periode Fra og perioden Til dato obligatoriske for gjentakende {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Prosjektet aktivitet / oppgave.
+DocType: Vehicle Log,Refuelling Details,Fylle drivstoff Detaljer
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generere lønnsslipper
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Kjøper må sjekkes, hvis dette gjelder for er valgt som {0}"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,Neste Kontakt By kan ikke være det samme som Lead e-id
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"Buying must be checked, if Applicable For is selected as {0}","Kjøper må sjekkes, hvis dette gjelder for er valgt som {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Rabatt må være mindre enn 100
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup > Numbering Series,Vennligst oppsett nummerering serie for Oppmøte via Setup> Numbering Series
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Last purchase rate not found,Siste kjøp sats ikke funnet
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Skriv Off Beløp (Selskap Valuta)
 DocType: Sales Invoice Timesheet,Billing Hours,fakturerings~~POS=TRUNC Timer
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +470,Default BOM for {0} not found,Standard BOM for {0} ikke funnet
 apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Row # {0}: Vennligst sett omgjøring kvantitet
 DocType: Fees,Program Enrollment,program Påmelding
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landed Cost Voucher
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +62,Please set {0},Vennligst sett {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},Vennligst sett {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Gjenta på dag i måneden
 DocType: Employee,Health Details,Helse Detaljer
 DocType: Offer Letter,Offer Letter Terms,Tilby Letter Vilkår
@@ -3853,16 +4017,16 @@
 DocType: SG Creation Tool Course,Max Strength,Max Strength
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM erstattet
 ,Sales Analytics,Salgs Analytics
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +113,Available {0},Tilgjengelig {0}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},Tilgjengelig {0}
 DocType: Manufacturing Settings,Manufacturing Settings,Produksjons Innstillinger
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Sette opp e-post
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Please enter default currency in Company Master,Skriv inn standardvaluta i selskapet Master
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +97,Please enter default currency in Company Master,Skriv inn standardvaluta i selskapet Master
 DocType: Stock Entry Detail,Stock Entry Detail,Stock Entry Detail
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Daglige påminnelser
 DocType: Products Settings,Home Page is Products,Hjemme side er produkter
 ,Asset Depreciation Ledger,Asset Avskrivninger Ledger
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},Skatteregel Konflikter med {0}
-apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +23,New Account Name,New Account Name
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,New Account Name
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Råvare Leveres Cost
 DocType: Selling Settings,Settings for Selling Module,Innstillinger for å selge Module
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Kundeservice
@@ -3870,24 +4034,25 @@
 DocType: Item Customer Detail,Item Customer Detail,Sak Customer Detalj
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Tilbudet kandidat en jobb.
 DocType: Notification Control,Prompt for Email on Submission of,Spør for E-post om innsending av
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +83,Total allocated leaves are more than days in the period,Totalt tildelte bladene er mer enn dager i perioden
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves are more than days in the period,Totalt tildelte bladene er mer enn dager i perioden
 DocType: Pricing Rule,Percentage,Prosentdel
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,Elementet {0} må være en lagervare
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Standard Work In Progress Warehouse
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1594,Total nos of serial no is not equal to quantity.,Totalt nos av serienummer er ikke lik mengde.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,Totalt nos av serienummer er ikke lik mengde.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,Standardinnstillingene for regnskapsmessige transaksjoner.
 DocType: Maintenance Visit,MV,MV
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Forventet Datoen kan ikke være før Material Request Dato
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Feil: Ikke en gyldig id?
 DocType: Naming Series,Update Series Number,Update-serien Nummer
 DocType: Account,Equity,Egenkapital
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: 'Resultat' type konto {2} ikke tillatt i Åpning Entry
 DocType: Sales Order,Printing Details,Utskrift Detaljer
 DocType: Task,Closing Date,Avslutningsdato
 DocType: Sales Order Item,Produced Quantity,Produsert Antall
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,Ingeniør
 DocType: Journal Entry,Total Amount Currency,Totalbeløp Valuta
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Søk Sub Assemblies
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +398,Item Code required at Row No {0},Elementkode kreves ved Row Nei {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +401,Item Code required at Row No {0},Elementkode kreves ved Row Nei {0}
 DocType: Sales Partner,Partner Type,Partner Type
 DocType: Purchase Taxes and Charges,Actual,Faktiske
 DocType: Authorization Rule,Customerwise Discount,Customerwise Rabatt
@@ -3907,7 +4072,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,Deltid
 DocType: Employee,Applicable Holiday List,Gjelder Holiday List
 DocType: Employee,Cheque,Cheque
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +57,Series Updated,Serien Oppdatert
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,Series Updated,Serien Oppdatert
 apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Rapporter Type er obligatorisk
 DocType: Item,Serial Number Series,Serienummer Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Warehouse er obligatorisk for lager Element {0} i rad {1}
@@ -3916,19 +4081,18 @@
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Notering av varen i flere grupper
 DocType: Grade Interval,Grade Interval,grade Intervall
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +88,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Regnskapsår Startdato og regnskapsår sluttdato er allerede satt i regnskapsåret {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +87,Clearance Date updated,Lagersalg oppdatert
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +94,Clearance Date updated,Lagersalg oppdatert
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Vellykket Forsonet
 DocType: Request for Quotation Supplier,Download PDF,Last ned PDF
 DocType: Production Order,Planned End Date,Planlagt sluttdato
 apps/erpnext/erpnext/config/stock.py +179,Where items are stored.,Hvor varene er lagret.
-DocType: Tax Rule,Validity,Gyldighet
 DocType: Request for Quotation,Supplier Detail,Leverandør Detalj
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Fakturert beløp
 DocType: Attendance,Attendance,Oppmøte
 DocType: BOM,Materials,Materialer
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Hvis ikke sjekket, vil listen må legges til hver avdeling hvor det må brukes."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Kilde og Target Warehouse kan ikke være det samme
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +518,Posting date and posting time is mandatory,Konteringsdato og legger tid er obligatorisk
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +534,Posting date and posting time is mandatory,Konteringsdato og legger tid er obligatorisk
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Skatt mal for å kjøpe transaksjoner.
 ,Item Prices,Varepriser
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,I Ord vil være synlig når du lagrer innkjøpsordre.
@@ -3941,30 +4105,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,Target warehouse in row {0} must be same as Production Order,Target lager i rad {0} må være samme som produksjonsordre
 apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,Varslings E-postadresser som ikke er spesifisert for gjentakende% s
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Valuta kan ikke endres etter at oppføringer ved hjelp av en annen valuta
+DocType: Vehicle Service,Clutch Plate,clutch Plate
 DocType: Company,Round Off Account,Rund av konto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +91,Administrative Expenses,Administrative utgifter
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Parent Kundegruppe
+DocType: Vehicle Service,Change,Endre
 DocType: Purchase Invoice,Contact Email,Kontakt Epost
 DocType: Appraisal Goal,Score Earned,Resultat tjent
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,Oppsigelsestid
 DocType: Asset Category,Asset Category Name,Asset Category Name
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Dette er en rot territorium og kan ikke redigeres.
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +4,New Sales Person Name,New Sales Person navn
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,New Sales Person navn
 DocType: Packing Slip,Gross Weight UOM,Bruttovekt målenheter
 DocType: Delivery Note Item,Against Sales Invoice,Mot Salg Faktura
 DocType: Bin,Reserved Qty for Production,Reservert Antall for produksjon
 DocType: Asset,Frequency of Depreciation (Months),Frekvens av Avskrivninger (måneder)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Credit Account,Credit konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Credit konto
 DocType: Landed Cost Item,Landed Cost Item,Landed Cost Element
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Vis nullverdier
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Antall element oppnådd etter produksjon / nedpakking fra gitte mengder råvarer
 apps/erpnext/erpnext/public/js/setup_wizard.js +315,Setup a simple website for my organization,Oppsett en enkel nettside for min organisasjon
 DocType: Payment Reconciliation,Receivable / Payable Account,Fordringer / gjeld konto
 DocType: Delivery Note Item,Against Sales Order Item,Mot kundeordreposisjon
-apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Vennligst oppgi data Verdi for attributtet {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +653,Please specify Attribute Value for attribute {0},Vennligst oppgi data Verdi for attributtet {0}
 DocType: Item,Default Warehouse,Standard Warehouse
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,Budget cannot be assigned against Group Account {0},Budsjettet kan ikke overdras mot gruppekonto {0}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +44,Budget cannot be assigned against Group Account {0},Budsjettet kan ikke overdras mot gruppekonto {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Skriv inn forelder kostnadssted
 DocType: Delivery Note,Print Without Amount,Skriv ut Uten Beløp
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,avskrivninger Dato
@@ -3981,12 +4147,13 @@
 DocType: Stock Entry,As per Stock UOM,Pr Stock målenheter
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Ikke utløpt
 DocType: Student Log,Achievement,Oppnåelse
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Sak Kode> Element Group> Brand
 DocType: Journal Entry,Total Debit,Total debet
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Standardferdigvarelageret
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,Sales Person
 DocType: SMS Parameter,SMS Parameter,SMS Parameter
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Budsjett og kostnadssted
-DocType: Maintenance Schedule Item,Half Yearly,Halvårlig
+DocType: Vehicle Service,Half Yearly,Halvårlig
 DocType: Lead,Blog Subscriber,Blogg Subscriber
 DocType: Guardian,Alternate Number,Alternativ nummer
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Lage regler for å begrense transaksjoner basert på verdier.
@@ -3994,14 +4161,14 @@
 DocType: Purchase Invoice,Total Advance,Total Advance
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,"Begrepet Sluttdatoen kan ikke være tidligere enn Term startdato. Korriger datoene, og prøv igjen."
 DocType: Stock Reconciliation Item,Quantity Difference,Antall Difference
-apps/erpnext/erpnext/config/hr.py +253,Processing Payroll,Processing Lønn
+apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,Processing Lønn
 DocType: Opportunity Item,Basic Rate,Basic Rate
 DocType: GL Entry,Credit Amount,Credit Beløp
 DocType: Cheque Print Template,Signatory Position,Signataren plassering
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,Sett som tapte
 DocType: Timesheet,Total Billable Hours,Totalt fakturerbare timer
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Betaling Kvittering Note
-apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +5,This is based on transactions against this Customer. See timeline below for details,Dette er basert på transaksjoner mot denne kunden. Se tidslinjen nedenfor for detaljer
+apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Dette er basert på transaksjoner mot denne kunden. Se tidslinjen nedenfor for detaljer
 DocType: Supplier,Credit Days Based On,Kreditt Days Based On
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +161,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Rad {0}: Avsatt beløp {1} må være mindre enn eller lik Betaling Entry mengden {2}
 DocType: Tax Rule,Tax Rule,Skatt Rule
@@ -4011,10 +4178,10 @@
 ,Items To Be Requested,Elementer å bli forespurt
 DocType: Purchase Order,Get Last Purchase Rate,Få siste kjøp Ranger
 DocType: Company,Company Info,Selskap Info
-apps/erpnext/erpnext/accounts/page/pos/pos.js +930,Select or add new customer,Velg eller legg til ny kunde
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1009,Select or add new customer,Velg eller legg til ny kunde
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Anvendelse av midler (aktiva)
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +5,This is based on the attendance of this Employee,Dette er basert på tilstedeværelse av denne Employee
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +453,Debit Account,Debet konto
+apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Dette er basert på tilstedeværelse av denne Employee
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Debet konto
 DocType: Fiscal Year,Year Start Date,År Startdato
 DocType: Attendance,Employee Name,Ansattes Navn
 DocType: Sales Invoice,Rounded Total (Company Currency),Avrundet Total (Selskap Valuta)
@@ -4023,43 +4190,43 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +218,{0} {1} has been modified. Please refresh.,{0} {1} har blitt endret. Vennligst oppdater.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Stoppe brukere fra å gjøre La Applications på følgende dager.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,kjøpesummen
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +208,Supplier Quotation {0} created,Leverandør sitat {0} er opprettet
-apps/erpnext/erpnext/accounts/report/financial_statements.py +90,End Year cannot be before Start Year,Slutt År kan ikke være før start År
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +209,Supplier Quotation {0} created,Leverandør sitat {0} er opprettet
+apps/erpnext/erpnext/accounts/report/financial_statements.py +87,End Year cannot be before Start Year,Slutt År kan ikke være før start År
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Employee Benefits,Ytelser til ansatte
 DocType: Sales Invoice,Is POS,Er POS
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},Pakket mengde må være lik mengde for Element {0} i rad {1}
 DocType: Production Order,Manufactured Qty,Produsert Antall
 DocType: Purchase Receipt Item,Accepted Quantity,Akseptert Antall
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +232,Please set a default Holiday List for Employee {0} or Company {1},Vennligst angi en standard Holiday Liste for Employee {0} eller selskapet {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,Please set a default Holiday List for Employee {0} or Company {1},Vennligst angi en standard Holiday Liste for Employee {0} eller selskapet {1}
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} ikke eksisterer
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Regninger hevet til kundene.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Prosjekt Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +500,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Nei {0}: Beløpet kan ikke være større enn utestående beløpet mot Expense krav {1}. Avventer Beløp er {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +517,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Nei {0}: Beløpet kan ikke være større enn utestående beløpet mot Expense krav {1}. Avventer Beløp er {2}
 DocType: Maintenance Schedule,Schedule,Tidsplan
 DocType: Account,Parent Account,Parent konto
 DocType: Quality Inspection Reading,Reading 3,Reading 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Kupong Type
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1008,Price List not found or disabled,Prisliste ikke funnet eller deaktivert
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1087,Price List not found or disabled,Prisliste ikke funnet eller deaktivert
 DocType: Expense Claim,Approved,Godkjent
 DocType: Pricing Rule,Price,Pris
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +256,Employee relieved on {0} must be set as 'Left',Ansatt lettet på {0} må være angitt som "venstre"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +250,Employee relieved on {0} must be set as 'Left',Ansatt lettet på {0} må være angitt som "venstre"
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",Velge "Ja" vil gi en unik identitet til hver enhet av dette elementet som kan sees i Serial No mester.
 DocType: Guardian,Guardian,Guardian
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Appraisal {0} skapt for Employee {1} i den gitte datointervall
 DocType: Employee,Education,Utdanning
 DocType: Selling Settings,Campaign Naming By,Kampanje Naming Av
 DocType: Employee,Current Address Is,Gjeldende adresse Er
-apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,"Optional. Sets company's default currency, if not specified.","Valgfritt. Setter selskapets standardvaluta, hvis ikke spesifisert."
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Valgfritt. Setter selskapets standardvaluta, hvis ikke spesifisert."
 DocType: Address,Office,Kontor
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Regnskap posteringer.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Tilgjengelig Antall på From Warehouse
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +266,Please select Employee Record first.,Vennligst velg Employee Record først.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +276,Please select Employee Record first.,Vennligst velg Employee Record først.
 DocType: POS Profile,Account for Change Amount,Konto for Change Beløp
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +190,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Rad {0}: Party / Account samsvarer ikke med {1} / {2} i {3} {4}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Rad {0}: Party / Account samsvarer ikke med {1} / {2} i {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,Skriv inn Expense konto
 DocType: Account,Stock,Lager
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +976,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Reference Document Type må være en av innkjøpsordre, faktura eller bilagsregistrering"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Reference Document Type må være en av innkjøpsordre, faktura eller bilagsregistrering"
 DocType: Employee,Current Address,Nåværende Adresse
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Hvis elementet er en variant av et annet element da beskrivelse, image, priser, avgifter osv vil bli satt fra malen uten eksplisitt spesifisert"
 DocType: Serial No,Purchase / Manufacture Details,Kjøp / Produksjon Detaljer
@@ -4069,7 +4236,6 @@
 DocType: Sales Order,Track this Sales Order against any Project,Spor dette Salgsordre mot ethvert prosjekt
 DocType: Sales Invoice Item,Discount and Margin,Rabatt og Margin
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Pull salgsordrer (pending å levere) basert på kriteriene ovenfor
-DocType: Attendance,Half Day,Halv Dag
 DocType: Pricing Rule,Min Qty,Min Antall
 DocType: Asset Movement,Transaction Date,Transaksjonsdato
 DocType: Production Plan Item,Planned Qty,Planlagt Antall
@@ -4078,11 +4244,13 @@
 DocType: Stock Entry,Default Target Warehouse,Standard Target Warehouse
 DocType: Purchase Invoice,Net Total (Company Currency),Net Total (Selskap Valuta)
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.py +14,The Year End Date cannot be earlier than the Year Start Date. Please correct the dates and try again.,"Året Sluttdatoen kan ikke være tidligere enn året startdato. Korriger datoene, og prøv igjen."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Rad {0}: Party Type og Party gjelder bare mot fordringer / gjeld konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Rad {0}: Party Type og Party gjelder bare mot fordringer / gjeld konto
 DocType: Notification Control,Purchase Receipt Message,Kvitteringen Message
+DocType: BOM,Scrap Items,skrap Items
 DocType: Production Order,Actual Start Date,Faktisk startdato
 DocType: Sales Order,% of materials delivered against this Sales Order,% Av materialer leveres mot denne kundeordre
 apps/erpnext/erpnext/config/stock.py +12,Record item movement.,Record element bevegelse.
+DocType: Training Event Employee,Withdrawn,Tilbaketrukket
 DocType: Hub Settings,Hub Settings,Hub-innstillinger
 DocType: Project,Gross Margin %,Bruttomargin%
 DocType: BOM,With Operations,Med Operations
@@ -4093,12 +4261,13 @@
 DocType: BOM Operation,BOM Operation,BOM Operation
 DocType: Purchase Taxes and Charges,On Previous Row Amount,På Forrige Row Beløp
 DocType: Student,Home Address,Hjemmeadresse
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +227,Transfer Asset,Transfer Asset
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Transfer Asset
 DocType: POS Profile,POS Profile,POS Profile
+DocType: Training Event,Event Name,Aktivitetsnavn
 apps/erpnext/erpnext/config/schools.py +33,Admission,Adgang
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Innleggelser for {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","Sesong for å sette budsjetter, mål etc."
-apps/erpnext/erpnext/stock/get_item_details.py +129,"Item {0} is a template, please select one of its variants","Element {0} er en mal, kan du velge en av variantene"
+apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Element {0} er en mal, kan du velge en av variantene"
 DocType: Asset,Asset Category,Asset Kategori
 apps/erpnext/erpnext/public/js/setup_wizard.js +202,Purchaser,Kjøper
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Nettolønn kan ikke være negativ
@@ -4106,7 +4275,7 @@
 DocType: Assessment,Room,Rom
 DocType: Purchase Order,Advance Paid,Advance Betalt
 DocType: Item,Item Tax,Sak Skatte
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Material to Supplier,Materiale til Leverandør
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +752,Material to Supplier,Materiale til Leverandør
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Vesenet Faktura
 DocType: Expense Claim,Employees Email Id,Ansatte Email Id
 DocType: Employee Attendance Tool,Marked Attendance,merket Oppmøte
@@ -4124,12 +4293,13 @@
 DocType: Employee Education,Major/Optional Subjects,Store / valgfrie emner
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Skriv inn skatter og avgifter
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
+DocType: Training Event,Attendees,Deltakere
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Her kan du opprettholde familie informasjon som navn og okkupasjon av foreldre, ektefelle og barn"
 DocType: Academic Term,Term End Date,Term Sluttdato
 DocType: Hub Settings,Seller Name,Selger Navn
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Skatter og avgifter fratrukket (Company Valuta)
 DocType: Item Group,General Settings,Generelle Innstillinger
-apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +19,From Currency and To Currency cannot be same,Fra Valuta og til valuta kan ikke være det samme
+apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,Fra Valuta og til valuta kan ikke være det samme
 DocType: Stock Entry,Repack,Pakk
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Du må Lagre skjemaet før du fortsetter
 DocType: Item Attribute,Numeric Values,Numeriske verdier
@@ -4137,9 +4307,10 @@
 DocType: Customer,Commission Rate,Kommisjon
 apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,Gjør Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Block permisjon applikasjoner ved avdelingen.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +118,"Payment Type must be one of Receive, Pay and Internal Transfer","Betalingstype må være en av Motta, Lønn og Internal Transfer"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Betalingstype må være en av Motta, Lønn og Internal Transfer"
 apps/erpnext/erpnext/config/selling.py +169,Analytics,Analytics
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Handlevognen er tom
+DocType: Vehicle,Model,Modell
 DocType: Production Order,Actual Operating Cost,Faktiske driftskostnader
 DocType: Payment Entry,Cheque/Reference No,Sjekk / referansenummer
 apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,Root kan ikke redigeres.
@@ -4149,38 +4320,43 @@
 DocType: Packing Slip,Package Weight Details,Pakken vektdetaljer
 DocType: Payment Gateway Account,Payment Gateway Account,Betaling Gateway konto
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Etter betaling ferdigstillelse omdirigere brukeren til valgt side.
+DocType: Company,Existing Company,eksisterende selskapet
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,Vennligst velg en csv-fil
 DocType: Purchase Order,To Receive and Bill,Å motta og Bill
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Utvalgte produkter
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,Designer
 apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,Betingelser Mal
 DocType: Serial No,Delivery Details,Levering Detaljer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +472,Cost Center is required in row {0} in Taxes table for type {1},Kostnadssted er nødvendig i rad {0} i skatter tabell for typen {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +476,Cost Center is required in row {0} in Taxes table for type {1},Kostnadssted er nødvendig i rad {0} i skatter tabell for typen {1}
 DocType: Program,Program Code,programkode
+DocType: Terms and Conditions,Terms and Conditions Help,Betingelser Hjelp
 ,Item-wise Purchase Register,Element-messig Purchase Register
 DocType: Batch,Expiry Date,Utløpsdato
 ,Supplier Addresses and Contacts,Leverandør Adresser og kontakter
 ,accounts-browser,kontoer-browser
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +334,Please select Category first,Vennligst første velg kategori
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,Vennligst første velg kategori
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Prosjektet mester.
-apps/erpnext/erpnext/controllers/status_updater.py +174,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Å tillate overfakturering eller over-bestilling, oppdatere "Fradrag" på lager Innstillinger eller elementet."
+apps/erpnext/erpnext/controllers/status_updater.py +196,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Å tillate overfakturering eller over-bestilling, oppdatere "Fradrag" på lager Innstillinger eller elementet."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Ikke viser noen symbol som $ etc ved siden av valutaer.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425, (Half Day),(Halv Dag)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +435, (Half Day),(Halv Dag)
 DocType: Supplier,Credit Days,Kreditt Days
+DocType: Student Batch Creation Tool,Make Student Batch,Gjør Student Batch
 DocType: Leave Type,Is Carry Forward,Er fremføring
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +711,Get Items from BOM,Få Elementer fra BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +725,Get Items from BOM,Få Elementer fra BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Ledetid Days
-apps/erpnext/erpnext/controllers/accounts_controller.py +552,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: konteringsdato må være det samme som kjøpsdato {1} av eiendelen {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +562,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: konteringsdato må være det samme som kjøpsdato {1} av eiendelen {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Fyll inn salgsordrer i tabellen ovenfor
 ,Stock Summary,Stock oppsummering
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,Overfør en eiendel fra en lagerbygning til en annen
+DocType: Vehicle,Petrol,Bensin
 apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,Bill of Materials
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Rad {0}: Party Type og Party er nødvendig for fordringer / gjeld kontoen {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Rad {0}: Party Type og Party er nødvendig for fordringer / gjeld kontoen {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref Dato
 DocType: Employee,Reason for Leaving,Grunn til å forlate
+DocType: BOM Operation,Operating Cost(Company Currency),Driftskostnader (Selskap Valuta)
 DocType: Expense Claim Detail,Sanctioned Amount,Sanksjonert Beløp
 DocType: GL Entry,Is Opening,Er Åpnings
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,Row {0}: Debit entry can not be linked with a {1},Rad {0}: Debet oppføring kan ikke være knyttet til en {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Debit entry can not be linked with a {1},Rad {0}: Debet oppføring kan ikke være knyttet til en {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account {0} does not exist,Konto {0} finnes ikke
 DocType: Account,Cash,Kontanter
 DocType: Employee,Short biography for website and other publications.,Kort biografi for hjemmeside og andre publikasjoner.