fix: Merge branch 'develop' into healthcare_refactor
diff --git a/erpnext/translations/no.csv b/erpnext/translations/no.csv
index 497a364..5235c11 100644
--- a/erpnext/translations/no.csv
+++ b/erpnext/translations/no.csv
@@ -168,12 +168,11 @@
DocType: Work Order Operation,Work In Progress,Arbeid På Går
DocType: Leave Control Panel,Branch (optional),Gren (valgfritt)
apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py,Please select date,Vennligst velg dato
-DocType: Item Price,Minimum Qty ,Minimum antall
+apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,Minimum Qty ,Minimum antall
apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,BOM recursion: {0} cannot be child of {1},Rekursjon for BOM: {0} kan ikke være barn av {1}
DocType: Finance Book,Finance Book,Finansbok
DocType: Patient Encounter,HLC-ENC-.YYYY.-,HLC-ENC-.YYYY.-
DocType: Appointment Booking Settings,Holiday List,Holiday List
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,The parent account {0} does not exists,Foreldrekontoen {0} eksisterer ikke
apps/erpnext/erpnext/config/quality_management.py,Review and Action,Gjennomgang og handling
apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},Denne ansatte har allerede en logg med samme tidsstempel. {0}
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Accountant
@@ -245,7 +244,6 @@
DocType: Exchange Rate Revaluation Account,Gain/Loss,Gevinst / tap
DocType: Crop,Perennial,Flerårig
DocType: Program,Is Published,Publiseres
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show Delivery Notes,Vis leveringsmerknader
apps/erpnext/erpnext/controllers/status_updater.py,"To allow over billing, update ""Over Billing Allowance"" in Accounts Settings or the Item.","For å tillate overfakturering, oppdater "Over Billing Allowance" i Kontoinnstillinger eller elementet."
DocType: Patient Appointment,Procedure,Fremgangsmåte
DocType: Accounts Settings,Use Custom Cash Flow Format,Bruk tilpasset kontantstrømformat
@@ -989,7 +987,6 @@
DocType: Patient,Risk Factors,Risikofaktorer
DocType: Patient,Occupational Hazards and Environmental Factors,Arbeidsfare og miljøfaktorer
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,Lageroppføringer allerede opprettet for arbeidsordre
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code > Item Group > Brand,Varekode> Varegruppe> Merke
apps/erpnext/erpnext/templates/pages/cart.html,See past orders,Se tidligere bestillinger
apps/erpnext/erpnext/public/js/hub/pages/Selling.vue,{0} conversations,{0} samtaler
DocType: Vital Signs,Respiratory rate,Respirasjonsfrekvens
@@ -1148,7 +1145,6 @@
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,Det oppsto en feil under oppdateringsprosessen
DocType: Restaurant Reservation,Restaurant Reservation,Restaurantreservasjon
apps/erpnext/erpnext/public/js/hub/Sidebar.vue,Your Items,Varene dine
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier > Supplier Type,Leverandør> Leverandørtype
apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Proposal Writing,Forslaget Writing
DocType: Payment Entry Deduction,Payment Entry Deduction,Betaling Entry Fradrag
DocType: Service Level Priority,Service Level Priority,Servicenivåprioritet
@@ -1451,7 +1447,6 @@
apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,Please select Company and Posting Date to getting entries,Vennligst velg Company og Posting Date for å få oppføringer
DocType: Asset,Maintenance,Vedlikehold
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js,Get from Patient Encounter,Få fra Patient Encounter
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -> {1}) not found for item: {2},UOM konverteringsfaktor ({0} -> {1}) ikke funnet for varen: {2}
DocType: Subscriber,Subscriber,abonnent
DocType: Item Attribute Value,Item Attribute Value,Sak data Verdi
apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,Currency Exchange must be applicable for Buying or for Selling.,Valutaveksling må gjelde for kjøp eller salg.
@@ -1953,7 +1948,6 @@
DocType: Purchase Invoice,Is Return (Debit Note),Er retur (Debit Note)
DocType: Workstation,Wages,Lønn
DocType: Asset Maintenance,Maintenance Manager Name,Vedlikeholdsansvarlig navn
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,Transactions against the company already exist! ,Transaksjoner mot selskapet eksisterer allerede!
apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Ber om nettsted
DocType: Agriculture Task,Urgent,Haster
apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Fetching records......,Henter poster ......
@@ -2656,7 +2650,6 @@
apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,The Payment Term at row {0} is possibly a duplicate.,Betalingsperioden i rad {0} er muligens en duplikat.
apps/erpnext/erpnext/public/js/setup_wizard.js,Agriculture (beta),Jordbruk (beta)
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Packing Slip,Pakkseddel
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup > Settings > Naming Series,Angi Naming Series for {0} via Setup> Settings> Naming Series
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Office Rent,Kontor Leie
apps/erpnext/erpnext/config/settings.py,Setup SMS gateway settings,Oppsett SMS gateway-innstillinger
DocType: Disease,Common Name,Vanlig navn
@@ -2823,7 +2816,6 @@
apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py,Leaves Allocated Successfully for {0},Etterlater Avsatt Vellykket for {0}
apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,No Items to pack,Ingenting å pakke
apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py,Only .csv and .xlsx files are supported currently,Bare .csv- og .xlsx-filer støttes for øyeblikket
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource > HR Settings,Sett inn ansattes navnsystem i menneskelige ressurser> HR-innstillinger
DocType: Shipping Rule Condition,From Value,Fra Verdi
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Manufacturing Quantity is mandatory,Manufacturing Antall er obligatorisk
DocType: Loan,Repayment Method,tilbakebetaling Method
@@ -4079,7 +4071,6 @@
apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Nødvendig På
DocType: HR Settings,"If checked, hides and disables Rounded Total field in Salary Slips","Hvis det er merket, skjuler og deaktiverer du avrundet totalfelt i lønnsslipper"
DocType: Woocommerce Settings,This is the default offset (days) for the Delivery Date in Sales Orders. The fallback offset is 7 days from the order placement date.,Dette er standard forskyvningen (dager) for leveringsdatoen i salgsordrer. Tilbakeførsel er 7 dager fra bestillingsdato.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup > Numbering Series,Angi nummereringsserier for Oppmøte via Oppsett> Nummereringsserier
DocType: Rename Tool,File to Rename,Filen til Rename
apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,Please select BOM for Item in Row {0},Vennligst velg BOM for Element i Rad {0}
apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Fetch Subscription Updates,Hent abonnementsoppdateringer
@@ -4686,7 +4677,6 @@
DocType: Cash Flow Mapping,Is Finance Cost,Er finansieringskostnad
apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,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)
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education > Education Settings,Vennligst konfigurer Instruktør Namning System i Utdanning> Utdanningsinnstillinger
apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Please set default customer in Restaurant Settings,Vennligst sett standardkunden i Restaurantinnstillinger
,Salary Register,lønn Register
DocType: Company,Default warehouse for Sales Return,Standard lager for salgsavkastning
@@ -4959,7 +4949,6 @@
apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Pending Activities,Ventende Aktiviteter
apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test_list.js,Create Lab Test,Lag Lab Test
DocType: Patient Appointment,Reminded,minnet
-DocType: Homepage Section,Cards,kort
apps/erpnext/erpnext/public/js/setup_wizard.js,View Chart of Accounts,Se diagram over kontoer
DocType: Chapter Member,Chapter Member,Kapittelmedlem
DocType: Material Request Plan Item,Minimum Order Quantity,Minimum antall
@@ -4977,7 +4966,7 @@
apps/erpnext/erpnext/hr/utils.py,Future dates not allowed,Fremtidige datoer ikke tillatt
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,Forventet leveringsdato bør være etter salgsordre
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,Reorder Level,Omgjøre nivå
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Chart Of Accounts Template,Konto Mal
+DocType: Company,Chart Of Accounts Template,Konto Mal
DocType: Attendance,Attendance Date,Oppmøte Dato
apps/erpnext/erpnext/assets/doctype/asset/asset.py,Update stock must be enable for the purchase invoice {0},Oppdateringslager må være aktivert for kjøpsfakturaen {0}
apps/erpnext/erpnext/stock/get_item_details.py,Item Price updated for {0} in Price List {1},Sak Pris oppdateres for {0} i prislisten {1}
@@ -5546,8 +5535,6 @@
apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Del Ledger
apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Sales Invoice {0} created,Salgsfaktura {0} opprettet
DocType: Employee,Confirmation Date,Bekreftelse Dato
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
- to cancel this document","Slett ansatt <a href=""#Form/Employee/{0}"">{0}</a> \ for å avbryte dette dokumentet"
DocType: Inpatient Occupancy,Check Out,Sjekk ut
DocType: C-Form,Total Invoiced Amount,Total Fakturert beløp
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Min Qty can not be greater than Max Qty,Min Antall kan ikke være større enn Max Antall
@@ -5756,7 +5743,6 @@
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: Fee Schedule,Fee Schedule,Prisliste
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Column Labels : ,Kolonnetiketter:
DocType: Bank Transaction,Settled,Bosatte seg
apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Cess,Cess
DocType: Quality Feedback,Parameters,parametere
@@ -6441,6 +6427,7 @@
DocType: Salary Component,Formula,Formel
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serial #
DocType: Material Request Plan Item,Required Quantity,Nødvendig mengde
+DocType: Cash Flow Mapping Template,Template Name,Malnavn
DocType: Lab Test Template,Lab Test Template,Lab Test Template
apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Regnskapsperioden overlapper med {0}
apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,Salgskonto
@@ -6501,7 +6488,7 @@
DocType: Bank Reconciliation Detail,Cheque Date,Sjekk Dato
apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Parent konto {1} ikke tilhører selskapet: {2}
apps/erpnext/erpnext/setup/doctype/company/company.js,Successfully deleted all transactions related to this company!,Slettet alle transaksjoner knyttet til dette selskapet!
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,As on Date,Som på dato
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,As on Date,Som på dato
DocType: Additional Salary,HR,HR
DocType: Course Enrollment,Enrollment Date,påmelding Dato
DocType: Healthcare Settings,Out Patient SMS Alerts,Ut Patient SMS Alerts
@@ -6567,7 +6554,6 @@
DocType: Course Content,Quiz,quiz
DocType: Subscription,Trial Period End Date,Prøveperiode Sluttdato
apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py,Not authroized since {0} exceeds limits,Ikke authroized siden {0} overskrider grensene
-apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Start entering data from here : ,Begynn å legge inn data herfra:
DocType: Serial No,Asset Status,Asset Status
DocType: Sales Invoice,Over Dimensional Cargo (ODC),Over dimensjonell last (ODC)
DocType: Restaurant Order Entry,Restaurant Table,Restaurantbord
@@ -6794,7 +6780,6 @@
DocType: Contract,Party User,Festbruker
apps/erpnext/erpnext/controllers/buying_controller.py,Assets not created for <b>{0}</b>. You will have to create asset manually.,Eiendeler ikke opprettet for <b>{0}</b> . Du må opprette aktiva manuelt.
apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',Vennligst sett Company filter blank hvis Group By er 'Company'
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer > Customer Group > Territory,Kunde> Kundegruppe> Territorium
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Publiseringsdato kan ikke være fremtidig dato
apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Serial No {1} samsvarer ikke med {2} {3}
DocType: Loan Repayment,Interest Payable,Betalbar rente
@@ -7029,7 +7014,6 @@
apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py,Average Rate,Gjennomsnittlig rente
DocType: Appointment,Appointment With,Avtale med
apps/erpnext/erpnext/controllers/accounts_controller.py,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Totalt betalingsbeløp i betalingsplan må være lik Grand / Rounded Total
-apps/erpnext/erpnext/hr/doctype/attendance/attendance_list.js,Mark attendance as <b></b>,Merk oppmøte som <b></b>
apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate","Kunden gitt varen" kan ikke ha verdsettelsesgrad
DocType: Subscription Plan Detail,Plan,Plan
apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,Kontoutskrift balanse pr hovedbok
@@ -7723,7 +7707,6 @@
apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},Maksimal ytelsesbeløp for ansatt {0} overstiger {1}
apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total allocated leaves are more than days in the period,Totalt tildelte bladene er mer enn dager i perioden
DocType: Linked Soil Analysis,Linked Soil Analysis,Koblet jordanalyse
-DocType: Pricing Rule,Percentage,Prosentdel
apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,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/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Schedules for {0} overlaps, do you want to proceed after skiping overlaped slots ?","Tidsplaner for {0} overlapper, vil du fortsette etter å ha hoppet over overlapte spor?"