New Languages added:

       	frappe/translations/am.csv
       	frappe/translations/en-US.csv
       	frappe/translations/en.csv
       	frappe/translations/es-AR.csv
       	frappe/translations/es-CL.csv
       	frappe/translations/es-GT.csv
       	frappe/translations/es-MX.csv
       	frappe/translations/es-NI.csv
       	frappe/translations/fr-CA.csv
       	frappe/translations/ku.csv
       	frappe/translations/lo.csv
       	frappe/translations/lt.csv
       	frappe/translations/ps.csv
       	frappe/translations/rw.csv
       	frappe/translations/sr-SP.csv
diff --git a/erpnext/translations/fi.csv b/erpnext/translations/fi.csv
index 93a5799..0b40b99 100644
--- a/erpnext/translations/fi.csv
+++ b/erpnext/translations/fi.csv
@@ -18,20 +18,21 @@
 DocType: Sales Partner,Dealer,jakaja
 DocType: Employee,Rented,Vuokrattu
 DocType: Purchase Order,PO-,PO-
+apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,Aloita vuosi {0} ei löytynyt.
 DocType: POS Profile,Applicable for User,Sovelletaan Käyttäjä
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +187,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Pysäytetty Tuotantotilaus ei voi peruuttaa, Unstop se ensin peruuttaa"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +449,Error: {0} > {1},Virhe: {0}> {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Pysäytetty Tuotantotilaus ei voi peruuttaa, Unstop se ensin peruuttaa"
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,Haluatko todella romuttaa tämän omaisuuden?
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,Valitse Oletus toimittaja
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},valuuttahinnasto vaaditaan {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* lasketaan tapahtumassa
 DocType: Address,County,Lääni
 DocType: Purchase Order,Customer Contact,Asiakaspalvelu Yhteystiedot
-apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +15,Mandatory feild - Program,Pakolliset feild - Ohjelma
+apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,Pakolliset feild - Ohjelma
 DocType: Job Applicant,Job Applicant,Työnhakija
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +5,This is based on transactions against this Supplier. See timeline below for details,Tämä perustuu liiketoimien vastaan toimittaja. Katso aikajana lisätietoja alla
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,ei enempää tuloksia
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Oikeudellinen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +130,Actual type tax cannot be included in Item rate in row {0},todellista veroa ei voi sisällyttää tuotteen tasoon rivillä {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +158,Actual type tax cannot be included in Item rate in row {0},todellista veroa ei voi sisällyttää tuotteen tasoon rivillä {0}
 DocType: C-Form,Customer,asiakas
 DocType: Purchase Receipt Item,Required By,pyytäjä
 DocType: Delivery Note,Return Against Delivery Note,palautus kohdistettuna lähetteeseen
@@ -39,7 +40,7 @@
 DocType: Purchase Order,% Billed,% laskutettu
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),valuutta taso on oltava sama kuin {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,asiakkaan nimi
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +124,Bank account cannot be named as {0},Pankkitilin ei voida nimetty {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,Bank account cannot be named as {0},Pankkitilin ei voida nimetty {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"pään, (tai ryhmän), kohdistetut kirjanpidon kirjaukset tehdään ja tase säilytetään"
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +180,Outstanding for {0} cannot be less than zero ({1}),odottavat {0} ei voi olla alle nolla ({1})
 DocType: Manufacturing Settings,Default 10 mins,oletus 10 min
@@ -52,16 +53,16 @@
 ,Purchase Order Items To Be Received,Ostotilaus eriä olevan vastaanotettu
 DocType: SMS Center,All Supplier Contact,kaikki toimittajan yhteystiedot
 DocType: Quality Inspection Reading,Parameter,parametri
-apps/erpnext/erpnext/projects/doctype/project/project.py +52,Expected End Date can not be less than Expected Start Date,odotettu päättymispäivä ei voi olla pienempi kuin odotettu aloituspäivä
+apps/erpnext/erpnext/projects/doctype/project/project.py +54,Expected End Date can not be less than Expected Start Date,odotettu päättymispäivä ei voi olla pienempi kuin odotettu aloituspäivä
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,rivi # {0}: taso tulee olla sama kuin {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +229,New Leave Application,uusi poistumissovellus
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +239,New Leave Application,uusi poistumissovellus
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},Läsnäolo Record {0} on olemassa vastaan Opiskelija {1} varten Course aikataulu {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Bank Draft,pankki sekki
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,pankki sekki
 DocType: Mode of Payment Account,Mode of Payment Account,maksutilin tila
 apps/erpnext/erpnext/stock/doctype/item/item.js +52,Show Variants,näytä mallivaihtoehdot
 DocType: Academic Term,Academic Term,Academic Term
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,materiaali
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +584,Quantity,Määrä
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,Määrä
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,-Taulukon voi olla tyhjä.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Loans (Liabilities),lainat (vastattavat)
 DocType: Employee Education,Year of Passing,vuoden syöttö
@@ -73,14 +74,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,terveydenhuolto
 DocType: Purchase Invoice,Monthly,Kuukausittain
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Viivästyminen (päivää)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +718,Invoice,lasku
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +771,Invoice,lasku
 DocType: Maintenance Schedule Item,Periodicity,jaksotus
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Verovuoden {0} vaaditaan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,puolustus
-DocType: Company,Abbr,lyhenteet
+DocType: Salary Component,Abbr,lyhenteet
 DocType: Appraisal Goal,Score (0-5),pisteet (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +198,Row {0}: {1} {2} does not match with {3},rivi {0}: {1} {2} ei täsmää {3} kanssa
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Rivi # {0}:
+DocType: Timesheet,Total Costing Amount,Yhteensä Kustannuslaskenta Määrä
 DocType: Delivery Note,Vehicle No,ajoneuvon nro
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +127,Please select Price List,Ole hyvä ja valitse hinnasto
 DocType: Production Order Operation,Work In Progress,työnalla
@@ -91,7 +93,7 @@
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +47,Course Schedules created:,Kurssin aikataulut luotu:
 apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},Uusi {0}: # {1}
 ,Sales Partners Commission,myyntikumppanit provisio
-apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Lyhenne voi olla enintään 5 merkkiä
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +22,Abbreviation cannot have more than 5 characters,Lyhenne voi olla enintään 5 merkkiä
 DocType: Payment Request,Payment Request,Maksupyyntö
 DocType: Asset,Value After Depreciation,Arvo jälkeen Poistot
 DocType: Employee,O+,O +
@@ -102,6 +104,7 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Liitä .csv-tiedoston, jossa on kaksi saraketta, toinen vanha nimi ja yksi uusi nimi"
 DocType: Packed Item,Parent Detail docname,Parent Detail docname
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,Kg,Kg
+DocType: Student Log,Log,log
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Avaaminen ja työn.
 DocType: Item Attribute,Increment,Lisäys
 apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,Valitse Varasto ...
@@ -109,9 +112,9 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Sama yhtiö on merkitty enemmän kuin kerran
 DocType: Employee,Married,Naimisissa
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Ei saa {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +536,Get items from,Saamaan kohteita
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,Stock cannot be updated against Delivery Note {0},varastoa ei voi päivittää lähetettä vastaan {0}
-apps/erpnext/erpnext/templates/pages/home.py +23,Product {0},Tuotteen {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +589,Get items from,Saamaan kohteita
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},varastoa ei voi päivittää lähetettä vastaan {0}
+apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Tuotteen {0}
 DocType: Payment Reconciliation,Reconcile,yhteensovitus
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,päivittäistavara
 DocType: Quality Inspection Reading,Reading 1,Reading 1
@@ -119,7 +122,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,eläkerahastot
 DocType: SMS Center,All Sales Person,kaikki myyjät
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** Kuukauden Distribution ** auttaa jakamaan budjetti / Target kuukausissa jos olet kausiluonteisuutta oman yrityksen.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Salary Structure Missing,Palkka rakenne Puuttuvat
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +156,Salary Structure Missing,Palkka rakenne Puuttuvat
 DocType: Lead,Person Name,henkilönimi
 DocType: Sales Invoice Item,Sales Invoice Item,"myyntilasku, tuote"
 DocType: Account,Credit,kredit
@@ -128,7 +131,7 @@
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Stock Raportit
 DocType: Warehouse,Warehouse Detail,Varaston lisätiedot
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,Credit limit has been crossed for customer {0} {1}/{2},asiakkaan luottoraja on ylitetty {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",""Is Fixed Asset" ei voi olla valitsematta, koska Asset kirjaa olemassa vasten kohde"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",""Is Fixed Asset" ei voi olla valitsematta, koska Asset kirjaa olemassa vasten kohde"
 DocType: Tax Rule,Tax Type,Tax Tyyppi
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},sinulla ei ole lupaa lisätä tai päivittää kirjauksia ennen {0}
 DocType: Item,Item Image (if not slideshow),tuotekuva (ellei diaesitys)
@@ -137,12 +140,14 @@
 DocType: SMS Log,SMS Log,tekstiviesti loki
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,toimitettujen tuotteiden kustannukset
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Loma on {0} ei ole välillä Päivästä ja Päivään
+DocType: Student Log,Student Log,Student Log
 DocType: Quality Inspection,Get Specification Details,hae tekniset lisätiedot
 DocType: Lead,Interested,kiinnostunut
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +162,Opening,Aukko
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +165,Opening,Aukko
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},alkaen {0} on {1}
 DocType: Item,Copy From Item Group,kopioi tuoteryhmästä
 DocType: Journal Entry,Opening Entry,avauskirjaus
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Asiakas> Asiakaspalvelu Group> Territory
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Tilin Pay Only
 DocType: Stock Entry,Additional Costs,Lisäkustannukset
 apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Account with existing transaction can not be converted to group.,tilin tapahtumaa ei voi muuntaa ryhmäksi
@@ -170,10 +175,11 @@
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Vedä materiaali Pyyntö tyypin Valmistus perustuu edellä mainitut kriteerit
 DocType: Sales Invoice Item,Delivered By Supplier,Toimitetaan Toimittaja
 DocType: SMS Center,All Contact,kaikki yhteystiedot
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Annual Salary,vuosipalkka
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Annual Salary,vuosipalkka
 DocType: Period Closing Voucher,Closing Fiscal Year,tilikauden sulkeminen
 apps/erpnext/erpnext/accounts/party.py +349,{0} {1} is frozen,{0} {1} on jäädytetty
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,varaston kulut
+apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,End Year {0} ei löytynyt.
 DocType: Journal Entry,Contra Entry,vastakirjaus
 DocType: Journal Entry Account,Credit in Company Currency,Luotto Yritys Valuutta
 DocType: Delivery Note,Installation Status,asennus tila
@@ -184,7 +190,7 @@
 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","lataa mallipohja, täytä tarvittavat tiedot ja liitä muokattu tiedosto, kaikki päivämäärä- ja työntekijäyhdistelmät tulee malliin valitun kauden ja olemassaolevien osallistumistietueiden mukaan"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +451,Item {0} is not active or end of life has been reached,tuote {0} ei ole aktiivinen tai sen elinkaari loppu
-apps/erpnext/erpnext/public/js/setup_wizard.js +339,Example: Basic Mathematics,Esimerkki: Basic Mathematics
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,Esimerkki: Basic Mathematics
 apps/erpnext/erpnext/controllers/accounts_controller.py +614,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","sisällytä verorivi {0} tuotteen tasoon, verot riveillä {1} tulee myös sisällyttää"
 apps/erpnext/erpnext/config/hr.py +166,Settings for HR Module,henkilöstömoduulin asetukset
 DocType: SMS Center,SMS Center,tekstiviesti keskus
@@ -197,7 +203,7 @@
 DocType: Leave Application,Reason,syy
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Tee työntekijä
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,julkaisu
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,Execution,suoritus
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Execution,suoritus
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,toteutetuneiden toimien lisätiedot
 DocType: Serial No,Maintenance Status,"huolto, tila"
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,tuotteet ja hinnoittelu
@@ -205,7 +211,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},alkaen päivä tulee olla tilikaudella olettaen alkaen päivä = {0}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},kustannuspaikka {0} ei kuulu yritykseen {1}
 DocType: Customer,Individual,yksilöllinen
-DocType: Academic Term,Academics User,Academics Käyttäjä
+DocType: Interest,Academics User,Academics Käyttäjä
 DocType: Cheque Print Template,Amount In Figure,Määrä Kuvassa
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,suunnittele huoltokäyntejä
 DocType: SMS Settings,Enter url parameter for message,syötä url parametrin viesti
@@ -220,7 +226,6 @@
 DocType: Purchase Taxes and Charges,Valuation,arvo
 ,Purchase Order Trends,Ostotilaus Trendit
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,kohdistaa poistumisen vuodelle
-DocType: Earning Type,Earning Type,ansio tyyppi
 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,"Jätä tyhjäksi, jos haluat hakea kaikki kursseja valitut lukukaudessa"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,riittämätön Stock
@@ -236,14 +241,14 @@
 DocType: Sales Invoice,Is Opening Entry,on avauskirjaus
 DocType: Customer Group,Mention if non-standard receivable account applicable,maininta ellei sovelletaan saataien perustiliä käytetä
 DocType: Course Schedule,Instructor Name,ohjaaja Name
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +170,For Warehouse is required before Submit,varastoon vaaditaan ennen lähetystä
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,For Warehouse is required before Submit,varastoon vaaditaan ennen lähetystä
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Saatu
 DocType: Sales Partner,Reseller,Jälleenmyyjä
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Anna Company
 DocType: Delivery Note Item,Against Sales Invoice Item,myyntilaskun kohdistus / tuote
 ,Production Orders in Progress,tuotannon tilaukset on käsittelyssä
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,Nettokassavirta Rahoituksen
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1448,"LocalStorage is full , did not save","LocalStoragen on täynnä, ei tallentanut"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,Nettokassavirta Rahoituksen
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1436,"LocalStorage is full , did not save","LocalStoragen on täynnä, ei tallentanut"
 DocType: Lead,Address & Contact,osoitteet ja yhteystiedot
 DocType: Leave Allocation,Add unused leaves from previous allocations,Lisää käyttämättömät lähtee edellisestä määrärahoista
 apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},seuraava toistuva {0} tehdään {1}:n
@@ -256,34 +261,35 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,No description given,ei annettua kuvausta
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Pyydä ostaa.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +5,This is based on the Time Sheets created against this project,Tämä perustuu Time Sheets loi vastaan tämän hankkeen
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +196,Only the selected Leave Approver can submit this Leave Application,vain valtuutettu käyttäjä voi hyväksyä tämän poistumissovelluksen
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Only the selected Leave Approver can submit this Leave Application,vain valtuutettu käyttäjä voi hyväksyä tämän poistumissovelluksen
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Lievittää Date on oltava suurempi kuin päivämäärä Liittymisen
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,Leaves per Year,poistumiset vuodessa
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,poistumiset vuodessa
 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.,"rivi {0}: täppää 'ennakko' kohdistettu tilille {1}, mikäli tämä on ennakkokirjaus"
 apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},Varasto {0} ei kuulu yritykselle {1}
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Ole hyvä setup Työntekijän nimijärjestelmään Human Resource> HR Asetukset
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,litra
 DocType: Task,Total Costing Amount (via Time Sheet),Yhteensä Costing Määrä (via Time Sheet)
 DocType: Item Website Specification,Item Website Specification,tuote verkkosivujen asetukset
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,poistuminen estetty
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item {0} has reached its end of life on {1},tuote {0} on saavuttanut elinkaaren lopun {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +435,Leave Blocked,poistuminen estetty
+apps/erpnext/erpnext/stock/doctype/item/item.py +669,Item {0} has reached its end of life on {1},tuote {0} on saavuttanut elinkaaren lopun {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +95,Bank Entries,Bank merkinnät
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +82,Annual,Vuotuinen
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +83,Annual,Vuotuinen
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,"varaston täsmäytys, tuote"
 DocType: Stock Entry,Sales Invoice No,"myyntilasku, nro"
 DocType: Material Request Item,Min Order Qty,min tilaus yksikkömäärä
+DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Student Group Creation Tool Course
 DocType: Lead,Do Not Contact,älä ota yhteyttä
-apps/erpnext/erpnext/public/js/setup_wizard.js +358,People who teach at your organisation,"Ihmiset, jotka opettavat organisaatiossa"
+apps/erpnext/erpnext/public/js/setup_wizard.js +360,People who teach at your organisation,"Ihmiset, jotka opettavat organisaatiossa"
 DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,uniikki tunnus toistuvan laskutuksen jäljittämiseen muodostetaan lähetettäessä
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,ohjelmistokehittäjä
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Software Developer,ohjelmistokehittäjä
 DocType: Item,Minimum Order Qty,minimi tilaus yksikkömäärä
 DocType: Pricing Rule,Supplier Type,toimittaja tyyppi
 DocType: Scheduling Tool,Course Start Date,Kurssin aloituspäivä
 DocType: Item,Publish in Hub,Julkaista Hub
 ,Terretory,alue
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is cancelled,tuote {0} on peruutettu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,Material Request,materiaalipyyntö
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,tuote {0} on peruutettu
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,materiaalipyyntö
 DocType: Bank Reconciliation,Update Clearance Date,päivitä tilityspäivä
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,Abbreviation already used for another salary component,Lyhenne jo toisen palkanosaa
 DocType: Item,Purchase Details,oston lisätiedot
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},tuotetta {0} ei löydy 'raaka-aineet toimitettu' ostotilaus taulukko {1}
 DocType: Employee,Relation,Suhde
@@ -300,7 +306,7 @@
 DocType: Lead,Mobile No.,Mobile No.
 DocType: Maintenance Schedule,Generate Schedule,muodosta aikataulu
 DocType: Purchase Invoice Item,Expense Head,"kulu, otsikko"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +102,Please select Charge Type first,valitse ensin veloitus tyyppi
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,valitse ensin veloitus tyyppi
 DocType: Student Group Student,Student Group Student,Student Group Student
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Viimeisin
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,luettelon ensimmäinen poistumis hyväksyjä on oletushyväksyjä
@@ -309,14 +315,14 @@
 DocType: Asset,Next Depreciation Date,Seuraava Poistot Date
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Aktiviteetti kustannukset työntekijää kohti
 DocType: Accounts Settings,Settings for Accounts,tilien asetukset
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +614,Supplier Invoice No exists in Purchase Invoice {0},Toimittaja laskun nro olemassa Ostolasku {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},Toimittaja laskun nro olemassa Ostolasku {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,hallitse myyjäpuuta
 DocType: Job Applicant,Cover Letter,Saatekirje
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Erinomainen Sekkejä ja Talletukset tyhjentää
 DocType: Item,Synced With Hub,synkronoi Hub:lla
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,väärä salasana
 DocType: Item,Variant Of,mallista
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +344,Completed Qty can not be greater than 'Qty to Manufacture',"valmiit yksikkömäärä ei voi olla suurempi kuin ""tuotannon määrä"""
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Completed Qty can not be greater than 'Qty to Manufacture',"valmiit yksikkömäärä ei voi olla suurempi kuin ""tuotannon määrä"""
 DocType: Period Closing Voucher,Closing Account Head,tilin otsikon sulkeminen
 DocType: Employee,External Work History,ulkoinen työhistoria
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,kiertoviite vihke
@@ -328,11 +334,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,ilmoita automaattisen materiaalipyynnön luomisesta sähköpostitse
 DocType: Journal Entry,Multi Currency,Multi Valuutta
 DocType: Payment Reconciliation Invoice,Invoice Type,lasku tyyppi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,Delivery Note,lähete
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +806,Delivery Note,lähete
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,verojen perusmääritykset
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Kustannukset Myyty Asset
 apps/erpnext/erpnext/accounts/utils.py +233,Payment Entry has been modified after you pulled it. Please pull it again.,"maksukirjausta on muutettu siirron jälkeen, siirrä se uudelleen"
-apps/erpnext/erpnext/stock/doctype/item/item.py +442,{0} entered twice in Item Tax,{0} vero on kirjattu kahdesti
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,{0} entered twice in Item Tax,{0} vero on kirjattu kahdesti
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,Yhteenveto tällä viikolla ja keskeneräisten toimien
 DocType: Student Applicant,Admitted,Hyväksytty
 DocType: Workstation,Rent Cost,vuokrakustannukset
@@ -351,18 +357,18 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Rivi # {0}: Ostolaskujen ei voi tehdä vastaan olemassaolevan hyödykkeen {1}
 DocType: Item Tax,Tax Rate,vero taso
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} on jo myönnetty Työsuhde {1} kauden {2} ja {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +759,Select Item,valitse tuote
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,valitse tuote
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","tuote: {0} hallinnoidaan eräkohtaisesti, eikä sitä voi päivittää käyttämällä varaston täsmäytystä, käytä varaston kirjausta"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,ostolasku {0} on lähetetty
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Rivi # {0}: Erä on oltava sama kuin {1} {2}
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +47,Convert to non-Group,muunna pois ryhmästä
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,muunna pois ryhmästä
 apps/erpnext/erpnext/config/stock.py +117,Batch (lot) of an Item.,erä (erä-tuote) tuotteesta
 DocType: C-Form Invoice Detail,Invoice Date,laskun päiväys
 DocType: GL Entry,Debit Amount,Debit Määrä
 apps/erpnext/erpnext/accounts/party.py +242,There can only be 1 Account per Company in {0} {1},Ei voi olla vain 1 tilini kohden Yhtiö {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +4,Your email address,Sähköpostiosoitteesi
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +272,Please see attachment,katso liitetiedosto
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +342,Please see attachment,katso liitetiedosto
 DocType: Purchase Order,% Received,% vastaanotettu
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Luo Student Groups
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,määritys on valmis
@@ -388,15 +394,15 @@
 DocType: Salary Slip Timesheet,Working Hours,työaika
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,muuta aloitusta / nykyselle järjestysnumerolle tai olemassa oleville sarjoille
 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.",mikäli useampi hinnoittelu sääntö jatkaa vaikuttamista käyttäjäjiä pyydetään asettamaan prioriteetti manuaalisesti ristiriidan ratkaisemiseksi
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +683,Purchase Return,Osto Return
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +736,Purchase Return,Osto Return
 ,Purchase Register,Osto Rekisteröidy
 DocType: Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,sovellettavat maksut
 DocType: Workstation,Consumable Cost,käytettävät kustannukset
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +192,{0} ({1}) must have role 'Leave Approver',{0} ({1}) tulee olla rooli 'poistumisen hyväksyjä'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +202,{0} ({1}) must have role 'Leave Approver',{0} ({1}) tulee olla rooli 'poistumisen hyväksyjä'
 DocType: Purchase Receipt,Vehicle Date,Ajoneuvo Päivämäärä
-apps/erpnext/erpnext/demo/setup_data.py +346,Medical,Lääketieteellinen
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +142,Reason for losing,häviön syy
+DocType: Student Log,Medical,Lääketieteellinen
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,häviön syy
 apps/erpnext/erpnext/accounts/utils.py +239,Allocated amount can not greater than unadjusted amount,Jaettava määrä ei voi ylittää oikaisematon määrä
 DocType: Announcement,Receiver,Vastaanotin
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},työasema on suljettu seuraavina päivinä lomapäivien {0} mukaan
@@ -404,15 +410,15 @@
 DocType: Employee,Single,yksittäinen
 DocType: Account,Cost of Goods Sold,myydyn tavaran kustannuskset
 DocType: Purchase Invoice,Yearly,Vuosittain
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +229,Please enter Cost Center,syötä kustannuspaikka
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,syötä kustannuspaikka
 DocType: Journal Entry Account,Sales Order,myyntitilaus
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,keskimääräinen myynnin taso
-DocType: Examination,Examiner Name,Tutkijan Name
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,keskimääräinen myynnin taso
+DocType: Assessment,Examiner Name,Tutkijan Name
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},Määrä voi olla murto-osa rivillä {0}
 DocType: Purchase Invoice Item,Quantity and Rate,yksikkömäärä ja taso
 DocType: Delivery Note,% Installed,% asennettu
-apps/erpnext/erpnext/public/js/setup_wizard.js +376,Classrooms/ Laboratories etc where lectures can be scheduled.,"Luokkahuoneet / Laboratories, johon käytetään luentoja voidaan ajoittaa."
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +41,Please enter company name first,Anna yrityksen nimi ensin
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,"Luokkahuoneet / Laboratories, johon käytetään luentoja voidaan ajoittaa."
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Anna yrityksen nimi ensin
 DocType: BOM,Item Desription,tuote selite
 DocType: Purchase Invoice,Supplier Name,toimittajan nimi
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Lue ERPNext Manual
@@ -420,7 +426,7 @@
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automaattisesti Serial nro perustuu FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,tarkista toimittajan laskunumeron yksilöllisyys
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Aloitustapahtumanumero' ei voi olla pienempi 'Päättymistapahtumanumero'
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,nettotulos
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,Non Profit,nettotulos
 DocType: Production Order,Not Started,Ei aloitettu
 DocType: Lead,Channel Partner,välityskumppani
 DocType: Account,Old Parent,Vanha Parent
@@ -430,13 +436,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,yleiset asetukset valmistusprosesseille
 DocType: Accounts Settings,Accounts Frozen Upto,tilit jäädytetty toistaiseksi / asti
 DocType: SMS Log,Sent On,lähetetty
-apps/erpnext/erpnext/stock/doctype/item/item.py +635,Attribute {0} selected multiple times in Attributes Table,Taito {0} valittu useita kertoja määritteet taulukossa
+apps/erpnext/erpnext/stock/doctype/item/item.py +638,Attribute {0} selected multiple times in Attributes Table,Taito {0} valittu useita kertoja määritteet taulukossa
 DocType: HR Settings,Employee record is created using selected field. ,työntekijä tietue luodaan käyttämällä valittua kenttää
 DocType: Sales Order,Not Applicable,ei sovellettu
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,lomien valvonta
 DocType: Request for Quotation Item,Required Date,pyydetty päivä
 DocType: Delivery Note,Billing Address,laskutusosoite
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +809,Please enter Item Code.,syötä tuotekoodi
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,syötä tuotekoodi
 DocType: BOM,Costing,kustannuslaskenta
 DocType: Tax Rule,Billing County,Laskutus County
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",täpättäessä veron arvomäärää pidetään jo sisällettynä tulostetasoon / tulostemäärään
@@ -455,23 +461,24 @@
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Palkanosasta tuntilomakkeen perustuu palkkalistoilla.
 DocType: Sales Order Item,Used for Production Plan,käytetään tuotannon suunnitelmassa
 DocType: Manufacturing Settings,Time Between Operations (in mins),toimintojen välinen aika (minuuteissa)
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +89,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} talousarvion tili {1} vastaan Kustannuspaikka {2} on {3}. Se ylittää {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} talousarvion tili {1} vastaan Kustannuspaikka {2} on {3}. Se ylittää {4}
 DocType: Customer,Buyer of Goods and Services.,ostaja tavarat ja palvelut
 DocType: Journal Entry,Accounts Payable,maksettava tilit
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,Valitut BOMs eivät ole samaa kohdetta
 DocType: Pricing Rule,Valid Upto,voimassa asti
 apps/erpnext/erpnext/public/js/setup_wizard.js +238,List a few of your customers. They could be organizations or individuals.,Luetella muutamia asiakkaisiin. Ne voivat olla organisaatioita tai yksilöitä.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Direct Income,suorat tulot
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account",ei voi suodattaa tileittäin mkäli ryhmitelty tileittäin
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,hallintovirkailija
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account",ei voi suodattaa tileittäin mkäli ryhmitelty tileittäin
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Administrative Officer,hallintovirkailija
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,Acutal Qty {0} / Waiting Qty {1},Acutal Määrä {0} / Waiting Määrä {1}
+DocType: Timesheet Detail,Hrs,hrs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +319,Please select Company,Ole hyvä ja valitse Company
 DocType: Stock Entry,Difference Account,erotili
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,"ei voi sulkea sillä se on toisesta riippuvainen tehtävä {0}, tehtävää ei ole suljettu"
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +380,Please enter Warehouse for which Material Request will be raised,syötä varasto jonne materiaalipyyntö ohjataan
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Please enter Warehouse for which Material Request will be raised,syötä varasto jonne materiaalipyyntö ohjataan
 DocType: Production Order,Additional Operating Cost,lisätoimintokustannukset
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,kosmetiikka
-apps/erpnext/erpnext/stock/doctype/item/item.py +527,"To merge, following properties must be same for both items",seuraavat ominaisuudet tulee olla samat molemmilla tuotteilla jotta ne voi sulauttaa
+apps/erpnext/erpnext/stock/doctype/item/item.py +530,"To merge, following properties must be same for both items",seuraavat ominaisuudet tulee olla samat molemmilla tuotteilla jotta ne voi sulauttaa
 DocType: Shipping Rule,Net Weight,Netto
 DocType: Employee,Emergency Phone,hätänumero
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +28,Buy,Ostaa
@@ -479,14 +486,14 @@
 DocType: Sales Invoice,Offline POS Name,Poissa POS Name
 DocType: Sales Order,To Deliver,toimitukseen
 DocType: Purchase Invoice Item,Item,tuote
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1109,Serial no item cannot be a fraction,Sarjanumero tuote voi olla murto
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1563,Serial no item cannot be a fraction,Sarjanumero tuote voi olla murto
 DocType: Journal Entry,Difference (Dr - Cr),erotus (€ - TV)
 DocType: Account,Profit and Loss,tuloslaskelma
 apps/erpnext/erpnext/config/stock.py +314,Managing Subcontracting,Toimitusjohtaja Alihankinta
 DocType: Project,Project will be accessible on the website to these users,Hanke on nähtävissä sivustolla näille käyttäjille
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"taso, jolla hinnasto valuutta muunnetaan yrityksen käyttämäksi perusvaluutaksi"
-apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},tili {0} ei kuulu yritykselle: {1}
-apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,Lyhenne jo toisen yrityksen
+apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},tili {0} ei kuulu yritykselle: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,Lyhenne jo toisen yrityksen
 DocType: Selling Settings,Default Customer Group,oletus asiakasryhmä
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",mikäli 'pyöristys yhteensä' kenttä on poistettu käytöstä se ei näy missään tapahtumassa
 DocType: BOM,Operating Cost,käyttökustannus
@@ -494,7 +501,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +42,Increment cannot be 0,Lisäys voi olla 0
 DocType: Production Planning Tool,Material Requirement,materiaalitarve
 DocType: Company,Delete Company Transactions,poista yrityksen tapahtumia
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +306,Reference No and Reference Date is mandatory for Bank transaction,Viitenumero ja viitepäivämäärä on pakollinen Pankin myynnin
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +313,Reference No and Reference Date is mandatory for Bank transaction,Viitenumero ja viitepäivämäärä on pakollinen Pankin myynnin
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Lisää / muokkaa veroja ja maksuja
 DocType: Purchase Invoice,Supplier Invoice No,toimittajan laskun nro
 DocType: Territory,For reference,viitteeseen
@@ -505,25 +512,26 @@
 DocType: Installation Note Item,Installation Note Item,asennus huomautus tuote
 DocType: Production Plan Item,Pending Qty,Odottaa Kpl
 DocType: Budget,Ignore,ohita
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Kohta Koodi> Item Group> Brand
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},tekstiviesti lähetetään seuraaviin numeroihin: {0}
-apps/erpnext/erpnext/config/accounts.py +235,Setup cheque dimensions for printing,Setup tarkistaa mitat tulostettavaksi
+apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,Setup tarkistaa mitat tulostettavaksi
 DocType: Salary Slip,Salary Slip Timesheet,Palkka Slip Tuntilomakkeen
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,toimittajan varasto pakollinen alihankinnan ostokuittin
 DocType: Pricing Rule,Valid From,voimassa alkaen
 DocType: Sales Invoice,Total Commission,provisio yhteensä
 DocType: Pricing Rule,Sales Partner,myyntikumppani
 DocType: Buying Settings,Purchase Receipt Required,ostokuitti vaaditaan
-apps/erpnext/erpnext/stock/doctype/item/item.py +125,Valuation Rate is mandatory if Opening Stock entered,"Arvostus Hinta on pakollinen, jos avaaminen Stock tuli"
+apps/erpnext/erpnext/stock/doctype/item/item.py +128,Valuation Rate is mandatory if Opening Stock entered,"Arvostus Hinta on pakollinen, jos avaaminen Stock tuli"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,tietuetta ei löydy laskutaulukosta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +28,Please select Company and Party Type first,valitse ensin yritys ja osapuoli tyyppi
-apps/erpnext/erpnext/config/accounts.py +251,Financial / accounting year.,tili- / kirjanpitokausi
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +9,Accumulated Values,kertyneet Arvot
+apps/erpnext/erpnext/config/accounts.py +257,Financial / accounting year.,tili- / kirjanpitokausi
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,kertyneet Arvot
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",sarjanumeroita ei voi yhdistää
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +664,Make Sales Order,tee myyntitilaus
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +707,Make Sales Order,tee myyntitilaus
 DocType: Project Task,Project Task,Projekti Tehtävä
 ,Lead Id,vihje tunnus
 DocType: C-Form Invoice Detail,Grand Total,kokonaissumma
-DocType: Course,Course,kurssi
+DocType: Assessment,Course,kurssi
 DocType: Timesheet,Payslip,palkkalaskelma
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +38,Fiscal Year Start Date should not be greater than Fiscal Year End Date,tilikauden aloituspäivä tule olla suurempi kuin tilikauden päättymispäivä
 DocType: Issue,Resolution,johtopäätös
@@ -535,7 +543,7 @@
 DocType: Job Applicant,Resume Attachment,Jatka Attachment
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Toista asiakkaat
 DocType: Leave Control Panel,Allocate,Jakaa
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +691,Sales Return,Myynti Return
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +734,Sales Return,Myynti Return
 DocType: Announcement,Posted By,Lähettänyt
 DocType: Item,Delivered by Supplier (Drop Ship),Toimitetaan Toimittaja (Drop Ship)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,tietokanta potentiaalisista asiakkaista
@@ -544,18 +552,19 @@
 DocType: Quotation,Quotation To,tarjoukseen
 DocType: Lead,Middle Income,keskitason tulo
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),Opening (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +792,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.,"Oletus mittayksikkö Tuote {0} ei voi muuttaa suoraan, koska olet jo tehnyt joitakin tapahtuma (s) toisen UOM. Sinun täytyy luoda uusi Tuote käyttää eri Default UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +795,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.,"Oletus mittayksikkö Tuote {0} ei voi muuttaa suoraan, koska olet jo tehnyt joitakin tapahtuma (s) toisen UOM. Sinun täytyy luoda uusi Tuote käyttää eri Default UOM."
 apps/erpnext/erpnext/accounts/utils.py +237,Allocated amount can not be negative,kohdennettu arvomäärä ei voi olla negatiivinen
 DocType: Purchase Order Item,Billed Amt,"laskutettu, pankkipääte"
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"perustettu varasto, minne varastokirjaukset tehdään"
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Myynnin lasku Tuntilomakkeen
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},viitenumero ja viitepäivä vaaditaan{0}
 DocType: Sales Invoice,Customer's Vendor,asiakkaan tosite
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Proposal Writing,Ehdotus Kirjoittaminen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,Ehdotus Kirjoittaminen
 DocType: Payment Entry Deduction,Payment Entry Deduction,Payment Entry Vähennys
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,toinen myyjä {0} on jo olemassa samalla työntekijä tunnuksella
-apps/erpnext/erpnext/config/accounts.py +74,Masters,Masters
-apps/erpnext/erpnext/config/accounts.py +134,Update Bank Transaction Dates,Päivitys Bank Transaction Päivämäärät
+DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests","Jos tämä on valittu, raaka-aineiden kohteita, jotka ovat alihankintaa sisällytetään Materiaaliin pyynnöt"
+apps/erpnext/erpnext/config/accounts.py +80,Masters,Masters
+apps/erpnext/erpnext/config/accounts.py +140,Update Bank Transaction Dates,Päivitys Bank Transaction Päivämäärät
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,aika seuranta
 DocType: Fiscal Year Company,Fiscal Year Company,yrityksen tilikausi
 DocType: Packing Slip Item,DN Detail,DN lisätiedot
@@ -565,7 +574,7 @@
 DocType: Delivery Note,Time at which items were delivered from warehouse,tuotteiden toimitusaika varastosta
 DocType: Sales Invoice,Sales Taxes and Charges,myynnin verot ja maksut
 DocType: Employee,Organization Profile,Organisaatio Profile
-apps/erpnext/erpnext/accounts/page/pos/pos.js +725,View Offline Records,Katso Poissa Records
+apps/erpnext/erpnext/accounts/page/pos/pos.js +733,View Offline Records,Katso Poissa Records
 DocType: Employee,Reason for Resignation,eroamisen syy
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,mallipohja kehityskeskusteluihin
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,"lasku / päiväkirjakirjaus, lisätiedot"
@@ -577,9 +586,9 @@
 DocType: Activity Type,Default Costing Rate,Oletus Kustannuslaskenta Hinta
 DocType: Maintenance Schedule,Maintenance Schedule,huoltoaikataulu
 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.","hinnoittelusääntöjen perusteet suodatetaan asiakkaan, asiakasryhmän, alueen, toimittajan, toimittaja tyypin, myyntikumppanin jne mukaan"
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Nettomuutos Inventory
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Inventory,Nettomuutos Inventory
 DocType: Employee,Passport Number,passin numero
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,hallinta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,hallinta
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,Same item has been entered multiple times.,sama tuote on syötetty monta kertaa
 DocType: SMS Settings,Receiver Parameter,vastaanottoparametri
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'perustaja' ja 'ryhmä' ei voi olla samat
@@ -588,12 +597,12 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter email address,syötä sähköpostiosoite
 DocType: Production Order Operation,In minutes,minuutteina
 DocType: Issue,Resolution Date,johtopäätös päivä
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +295,Timesheet created:,Tuntilomakkeen luotu:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +693,Please set default Cash or Bank account in Mode of Payment {0},valitse oletusmaksutapa kassa- tai pankkitili maksulle {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +299,Timesheet created:,Tuntilomakkeen luotu:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},valitse oletusmaksutapa kassa- tai pankkitili maksulle {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +17,Enroll,kirjoittautua
 DocType: Selling Settings,Customer Naming By,asiakkaan nimennyt
 DocType: Depreciation Schedule,Depreciation Amount,Poistot Määrä
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +51,Convert to Group,muunna ryhmäksi
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,muunna ryhmäksi
 DocType: Activity Cost,Activity Type,aktiviteettimuoto
 DocType: Request for Quotation,For individual supplier,Yksittäisten toimittaja
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,toimitettu arvomäärä
@@ -607,7 +616,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +157,{0}: {1} not found in Invoice Details table,{0}: {1} ei löydy laskun lisätiedot taulukosta
 DocType: Company,Round Off Cost Center,pyöristys kustannuspaikka
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +205,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,huoltokäynti {0} on peruttava ennen myyntitilauksen perumista
-DocType: Material Request,Material Transfer,materiaalisiirto
+DocType: Item,Material Transfer,materiaalisiirto
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +205,Opening (Dr),perustaminen (€)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Kirjoittamisen aikaleima on sen jälkeen {0}
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,kohdistuneet kustannukset verot ja maksut
@@ -615,6 +624,7 @@
 DocType: BOM Operation,Operation Time,Operation Time
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,Suorittaa loppuun
 DocType: Pricing Rule,Sales Manager,myynninhallinta
+DocType: Salary Structure Employee,Base,pohja
 DocType: Journal Entry,Write Off Amount,poiston arvomäärä
 DocType: Journal Entry,Bill No,Bill No
 DocType: Company,Gain/Loss Account on Asset Disposal,Gain / tuloslaskelma Omaisuudenhoitoalan Hävittäminen
@@ -625,13 +635,15 @@
 DocType: Sales Invoice Timesheet,Time Sheet,Kellokortti
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush raaka-aineet perustuvat
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,Please enter item details,syötä tuotten lisätiedot
+DocType: Interest,Interest,Kiinnostaa
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,pre Sales
 DocType: Purchase Receipt,Other Details,muut lisätiedot
 DocType: Account,Accounts,tilit
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Markkinointi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,Markkinointi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,Maksu käyttö on jo luotu
 DocType: Purchase Receipt Item Supplied,Current Stock,nykyinen varasto
 apps/erpnext/erpnext/controllers/accounts_controller.py +538,Row #{0}: Asset {1} does not linked to Item {2},Rivi # {0}: Asset {1} ei liity Tuote {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +21,Preview Salary Slip,Preview Palkka Slip
 DocType: Company,Deafult Cost Center,Oletuskoodi Kustannuspaikka
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,Account {0} has been entered multiple times,Tili {0} on syötetty useita kertoja
 DocType: Account,Expenses Included In Valuation,"kulut, jotka sisältyy arvoon"
@@ -640,7 +652,7 @@
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,Valitse Student Group
 DocType: Email Digest,Next email will be sent on:,Seuraava sähköpostiviesti lähetetään:
 DocType: Offer Letter Term,Offer Letter Term,Tarjoa Kirje Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +614,Item has variants.,tuotteella on useampia malleja
+apps/erpnext/erpnext/stock/doctype/item/item.py +617,Item has variants.,tuotteella on useampia malleja
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,tuotetta {0} ei löydy
 DocType: Bin,Stock Value,varastoarvo
 apps/erpnext/erpnext/accounts/doctype/account/account.py +25,Company {0} does not exist,Yritys {0} ei ole olemassa
@@ -652,7 +664,7 @@
 DocType: Project,Estimated Cost,Kustannusarvio
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,ilmakehä
 DocType: Journal Entry,Credit Card Entry,luottokorttikirjaus
-apps/erpnext/erpnext/config/accounts.py +45,Company and Accounts,Yritys ja tilit
+apps/erpnext/erpnext/config/accounts.py +51,Company and Accounts,Yritys ja tilit
 apps/erpnext/erpnext/config/stock.py +22,Goods received from Suppliers.,tavarat tastaanotettu toimittajilta
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,in Arvo
 DocType: Lead,Campaign Name,Kampanjan nimi
@@ -663,7 +675,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} ei ole varastotuote
 DocType: Mode of Payment Account,Default Account,oletustili
 DocType: Payment Entry,Received Amount (Company Currency),Vastaanotetut Summa (Company valuutta)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,"vihje on annettava, jos tilaisuus on tehty vihjeestä"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +169,Lead must be set if Opportunity is made from Lead,"vihje on annettava, jos tilaisuus on tehty vihjeestä"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Ole hyvä ja valitse viikoittain off päivä
 DocType: Production Order Operation,Planned End Time,Suunnitellut End Time
 ,Sales Person Target Variance Item Group-Wise,"tuoteryhmä työkalu, myyjä ja vaihtelu tavoite"
@@ -726,10 +738,10 @@
 apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,Hinnasto ei valittu
 DocType: Employee,Family Background,taustaperhe
 DocType: Request for Quotation Supplier,Send Email,lähetä sähköposti
-apps/erpnext/erpnext/stock/doctype/item/item.py +201,Warning: Invalid Attachment {0},Varoitus: Virheellinen Liite {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +204,Warning: Invalid Attachment {0},Varoitus: Virheellinen Liite {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +709,No Permission,Ei oikeuksia
 DocType: Company,Default Bank Account,oletus pankkitili
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",valitse osapuoli tyyppi saadaksesi osapuolen mukaisen suodatuksen
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",valitse osapuoli tyyppi saadaksesi osapuolen mukaisen suodatuksen
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"'Päivitä varastosaldo' ei voida käyttä tuotteille, joita ei ole toimitettu {0} kautta"
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,tuotteet joilla on korkeampi painoarvo nätetään ylempänä
@@ -746,12 +758,12 @@
 DocType: Item,Website Warehouse,verkkosivujen varasto
 DocType: Payment Reconciliation,Minimum Invoice Amount,Pienin Laskun summa
 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,Kohta Rivi {idx}: {DOCTYPE} {DOCNAME} ei ole olemassa edellä {DOCTYPE} table
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +234,Timesheet {0} is already completed or cancelled,Tuntilomakkeen {0} on jo suoritettu tai peruutettu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,Tuntilomakkeen {0} on jo suoritettu tai peruutettu
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","kuukauden päivä jolloin automaattinen lasku muodostetaan, esim 05, 28 jne"
 DocType: Asset,Opening Accumulated Depreciation,Avaaminen Kertyneet poistot
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,pisteet on oltava pienempi tai yhtä suuri kuin 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Ohjelma Ilmoittautuminen Tool
-apps/erpnext/erpnext/config/accounts.py +288,C-Form records,C-muoto tietue
+apps/erpnext/erpnext/config/accounts.py +294,C-Form records,C-muoto tietue
 apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,asiakas ja toimittaja
 DocType: Email Digest,Email Digest Settings,sähköpostitiedotteen asetukset
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,asiakkaan tukikyselyt
@@ -761,7 +773,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Bill {1} dated {2},{0} kuittia vastaan {1} päivätty {2}
 apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,kurssin aikataulu
 DocType: Maintenance Visit,Completion Status,katselmus tila
-apps/erpnext/erpnext/schools/doctype/course/course.js +24,Examination,Tarkastus
 DocType: HR Settings,Enter retirement age in years,Anna eläkeikä vuosina
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +229,Target Warehouse,tavoite varasto
 DocType: Cheque Print Template,Starting location from left edge,Alkaen sijainti vasemmasta reunasta
@@ -779,14 +790,13 @@
 apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Ostotilaus to Payment
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +37,Projected Qty,ennustettu yksikkömäärä
 DocType: Sales Invoice,Payment Due Date,maksun eräpäivä
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Kohta Koodi> Item Group> Brand
-apps/erpnext/erpnext/stock/doctype/item/item.js +270,Item Variant {0} already exists with same attributes,Tuote Variant {0} on jo olemassa samoja ominaisuuksia
+apps/erpnext/erpnext/stock/doctype/item/item.js +278,Item Variant {0} already exists with same attributes,Tuote Variant {0} on jo olemassa samoja ominaisuuksia
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening','avautuu'
 DocType: Notification Control,Delivery Note Message,lähetteen vieti
 DocType: Expense Claim,Expenses,kulut
 DocType: Item Variant Attribute,Item Variant Attribute,Tuote Variant Taito
 ,Purchase Receipt Trends,Ostokuitti Trendit
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Tutkimus ja kehitys
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,Tutkimus ja kehitys
 ,Amount to Bill,laskutettava arvomäärä
 DocType: Company,Registration Details,rekisteröinnin lisätiedot
 DocType: Item Reorder,Re-Order Qty,uudelleentilattava yksikkömäärä
@@ -794,6 +804,7 @@
 DocType: Pricing Rule,Price or Discount,Hinta tai Alennus
 DocType: Sales Team,Incentives,kannustimet/bonukset
 DocType: SMS Log,Requested Numbers,vaaditut numerot
+DocType: Production Planning Tool,Only Obtain Raw Materials,Vain Hanki raaka-aineet
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Arviointikertomusta.
 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","Ottaminen "käyttö ostoskorin, kuten Ostoskorissa on käytössä ja siellä pitäisi olla vähintään yksi Tax Rule ostoskoriin"
 apps/erpnext/erpnext/controllers/accounts_controller.py +340,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Maksu Entry {0} on liitetty vastaan Order {1}, tarkistaa, jos se tulee vetää kuin etukäteen tässä laskussa."
@@ -818,12 +829,12 @@
 DocType: Supplier Quotation,Is Subcontracted,on alihankittu
 DocType: Item Attribute,Item Attribute Values,"tuotetuntomerkki, arvot"
 DocType: Examination Result,Examination Result,tutkimustuloksen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +703,Purchase Receipt,Ostokuitti
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +756,Purchase Receipt,Ostokuitti
 ,Received Items To Be Billed,Saivat kohteet laskuttamat
 DocType: Employee,Ms,Ms
-apps/erpnext/erpnext/config/accounts.py +261,Currency exchange rate master.,valuuttataso valvonta
+apps/erpnext/erpnext/config/accounts.py +267,Currency exchange rate master.,valuuttataso valvonta
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +167,Reference Doctype must be one of {0},Viite Doctype on oltava yksi {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +278,Unable to find Time Slot in the next {0} days for Operation {1},aika-aukkoa ei löydy seuraavaan {0} päivän toiminnolle {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +282,Unable to find Time Slot in the next {0} days for Operation {1},aika-aukkoa ei löydy seuraavaan {0} päivän toiminnolle {1}
 DocType: Production Order,Plan material for sub-assemblies,suunnittele materiaalit alituotantoon
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Myynnin Partners ja Territory
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be active,BOM {0} tulee olla aktiivinen
@@ -846,24 +857,26 @@
 DocType: Purchase Receipt,Range,Alue
 DocType: Supplier,Default Payable Accounts,oletus maksettava tilit
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,työntekijä {0} ei ole aktiivinen tai ei ole olemassa
+DocType: Fee Structure,Components,komponentit
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},Syötä Asset Luokka momentille {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +609,Item Variants {0} updated,tuotemallit {0} päivitetty
+apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,tuotemallit {0} päivitetty
 DocType: Quality Inspection Reading,Reading 6,Lukeminen 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +553,Cannot {0} {1} {2} without any negative outstanding invoice,Ei voi {0} {1} {2} ilman negatiivista maksamatta laskun
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +843,Cannot {0} {1} {2} without any negative outstanding invoice,Ei voi {0} {1} {2} ilman negatiivista maksamatta laskun
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,"ostolasku, edistynyt"
 DocType: Address,Shop,osta
 DocType: Hub Settings,Sync Now,synkronoi nyt
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +172,Row {0}: Credit entry can not be linked with a {1},rivi {0}: kredit kirjausta ei voi kohdistaa {1}
-apps/erpnext/erpnext/config/accounts.py +204,Define budget for a financial year.,Määritä budjetti varainhoitovuoden.
+apps/erpnext/erpnext/config/accounts.py +210,Define budget for a financial year.,Määritä budjetti varainhoitovuoden.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"oletuspankki / rahatililleen päivittyy automaattisesti POS laskussa, kun tila on valittuna"
 DocType: Lead,LEAD-,JOHTAA-
 DocType: Employee,Permanent Address Is,pysyvä osoite on
 DocType: Production Order Operation,Operation completed for how many finished goods?,Toiminto suoritettu kuinka monta valmiit tavarat?
 apps/erpnext/erpnext/public/js/setup_wizard.js +162,The Brand,brändi
 DocType: Employee,Exit Interview Details,poistu haastattelun lisätiedoista
+DocType: Item,Is Purchase Item,on ostotuote
 DocType: Asset,Purchase Invoice,ostolasku
 DocType: Stock Ledger Entry,Voucher Detail No,tosite lisätiedot nro
-apps/erpnext/erpnext/accounts/page/pos/pos.js +720,New Sales Invoice,New Sales Lasku
+apps/erpnext/erpnext/accounts/page/pos/pos.js +728,New Sales Invoice,New Sales Lasku
 DocType: Stock Entry,Total Outgoing Value,"kokonaisarvo, lähtevä"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Aukiolopäivä ja Päättymisaika olisi oltava sama Tilikausi
 DocType: Lead,Request for Information,tietopyyntö
@@ -871,26 +884,27 @@
 DocType: Program Fee,Program Fee,Program Fee
 DocType: Salary Slip,Total in words,sanat yhteensä
 DocType: Material Request Item,Lead Time Date,"virtausaika, päiväys"
+DocType: Guardian,Guardian Name,Guardian Name
 DocType: Cheque Print Template,Has Print Format,On Print Format
 apps/erpnext/erpnext/accounts/page/pos/pos.js +86, is mandatory. Maybe Currency Exchange record is not created for ,on pakollinen. Valuutanvaihtotietue on mahdollisesti luomatta
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +109,Row #{0}: Please specify Serial No for Item {1},Rivi # {0}: Ilmoittakaa Sarjanumero alamomentin {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,"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.","tuotteet 'tavarakokonaisuudessa' varasto, sarjanumero ja eränumero pidetään olevan samasta 'pakkausluettelosta' taulukossa, mikäli sarja- ja eränumero on sama kaikille tuotteille tai 'tuotekokonaisuus' tuotteelle, (arvoja voi kirjata tuotteen päätaulukossa), arvot kopioidaan 'pakkausluettelo' taulukkoon"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +619,"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.","tuotteet 'tavarakokonaisuudessa' varasto, sarjanumero ja eränumero pidetään olevan samasta 'pakkausluettelosta' taulukossa, mikäli sarja- ja eränumero on sama kaikille tuotteille tai 'tuotekokonaisuus' tuotteelle, (arvoja voi kirjata tuotteen päätaulukossa), arvot kopioidaan 'pakkausluettelo' taulukkoon"
 DocType: Job Opening,Publish on website,Julkaise verkkosivusto
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,toimitukset asiakkaille
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +594,Supplier Invoice Date cannot be greater than Posting Date,Toimittaja Laskun päiväys ei voi olla suurempi kuin julkaisupäivämäärä
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +606,Supplier Invoice Date cannot be greater than Posting Date,Toimittaja Laskun päiväys ei voi olla suurempi kuin julkaisupäivämäärä
 DocType: Purchase Invoice Item,Purchase Order Item,Ostotilaus Kohde
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,välilliset tulot
 DocType: Cheque Print Template,Date Settings,date Settings
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,vaihtelu
 ,Company Name,Yrityksen nimi
 DocType: SMS Center,Total Message(s),viestit yhteensä
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +757,Select Item for Transfer,talitse siirrettävä tuote
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +810,Select Item for Transfer,talitse siirrettävä tuote
 DocType: Purchase Invoice,Additional Discount Percentage,Muita alennusprosenttia
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Katso luettelo kaikista ohjevideot
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"valitse pankin tilin otsikko, minne shekki/takaus talletetaan"
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,salli käyttäjän muokata hinnaston tasoa tapahtumissa
 DocType: Pricing Rule,Max Qty,max yksikkömäärä
-DocType: Student,Father's Name,Isän nimi
+DocType: Student Applicant,Father's Name,Isän nimi
 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","Rivi {0}: Laskun {1} on virheellinen, se voidaan peruuttaa / ei ole olemassa. \ Anna kelvollinen Lasku"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,rivi {0}: maksu kohdistettuna myynti- / ostotilaukseen tulee aina merkitä ennakkomaksuksi
@@ -905,21 +919,23 @@
 DocType: Item,Inspection Criteria,tarkastuskriteerit
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,siirretty
 apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,lataa kirjeen ylätunniste ja logo. (voit muokata niitä myöhemmin)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,White,valkoinen
+DocType: Timesheet Detail,Bill,Laskuttaa
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,valkoinen
 DocType: SMS Center,All Lead (Open),kaikki vihjeet (avoimet)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Rivi {0}: Määrä ei saatavilla {4} varasto {1} klo lähettämistä tullessa ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,hae maksetut ennakot
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +678,Make ,Tehdä
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Make ,Tehdä
 DocType: Journal Entry,Total Amount in Words,sanat kokonaisarvomäärä
 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.,"tapahui virhe: todennäköinen syy on ettet ole tallentanut lomakketta, mikäli ongelma jatkuu ota yhteyttä sähköpostiin support@erpnext.com"
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Ostoskori
 apps/erpnext/erpnext/controllers/selling_controller.py +154,Order Type must be one of {0},tilaus tyyppi tulee olla {0}:n
 DocType: Lead,Next Contact Date,seuraava yhteydenottopvä
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,avaus yksikkömäärä
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,Anna Account for Change Summa
 DocType: Student Batch,Student Batch Name,Opiskelijan Erä Name
 DocType: Holiday List,Holiday List Name,lomaluettelo nimi
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,aikataulu Course
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Stock Options,"varasto, vaihtoehdot"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,"varasto, vaihtoehdot"
 DocType: Journal Entry Account,Expense Claim,kuluvaatimus
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,Do you really want to restore this scrapped asset?,Haluatko todella palauttaa tämän romuttaa etu?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +237,Qty for {0},yksikkömäärään {0}
@@ -933,7 +949,7 @@
 DocType: Purchase Invoice,Cash/Bank Account,kassa- / pankkitili
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Poistettu kohteita ei muutu määrän tai arvon.
 DocType: Delivery Note,Delivery To,toimitus (lle)
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Attribute table is mandatory,Taito pöytä on pakollinen
+apps/erpnext/erpnext/stock/doctype/item/item.py +635,Attribute table is mandatory,Taito pöytä on pakollinen
 DocType: Production Planning Tool,Get Sales Orders,hae myyntitilaukset
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} ei voi olla negatiivinen
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,Valitse Student
@@ -942,14 +958,14 @@
 DocType: Workstation,Wages,Palkat
 DocType: Project,Internal,sisäinen
 DocType: Task,Urgent,kiireellinen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +113,Please specify a valid Row ID for row {0} in table {1},Määritä kelvollinen Rivi tunnus rivin {0} taulukossa {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +141,Please specify a valid Row ID for row {0} in table {1},Määritä kelvollinen Rivi tunnus rivin {0} taulukossa {1}
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Siirry työpöydälle ja alkaa käyttää ERPNext
 DocType: Item,Manufacturer,Valmistaja
 DocType: Landed Cost Item,Purchase Receipt Item,Ostokuitti Kohde
 DocType: Purchase Receipt,PREC-RET-,PREC-jälkikä-
 DocType: POS Profile,Sales Invoice Payment,Myynnin lasku Payment
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,varattu varastosta myyntitilaukseen / valmiit tuotteet varastoon
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,myynnin arvomäärä
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Selling Amount,myynnin arvomäärä
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,You are the Expense Approver for this record. Please Update the 'Status' and Save,"olet hyväksyjä tälle tietueelle, päivitä 'tila' ja tallenna"
 DocType: Serial No,Creation Document No,asiakirjan luonti nro
 DocType: Issue,Issue,aihe
@@ -983,12 +999,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,€
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,toimittajan tarjous vastaanotettu
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},(lle) {0} | {1} {2}
-DocType: Timesheet,updated via Time Logs,päivitetty aikalokin kautta
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Keskimääräinen ikä
 DocType: Opportunity,Your sales person who will contact the customer in future,"Myyjä, joka ottaa yhteyttä asiakkaaseen tulevaisuudessa"
 apps/erpnext/erpnext/public/js/setup_wizard.js +261,List a few of your suppliers. They could be organizations or individuals.,Luetella muutaman oman toimittajia. Ne voivat olla organisaatioita tai yksilöitä.
 apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,Kaikki tuotteet
-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.,Ei oletus Osoitemallin löydetty. Luo uusi Setup> Tulostus ja Branding> Address Template.
 DocType: Company,Default Currency,oletusvaluutta
 DocType: Contact,Enter designation of this Contact,syötä yhteystiedon nimike
 DocType: Expense Claim,From Employee,työntekijästä
@@ -1015,25 +1029,26 @@
 ,Ordered Items To Be Billed,tilatut laskutettavat tuotteet
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +39,From Range has to be less than To Range,Vuodesta Range on oltava vähemmän kuin laitumelle
 DocType: Global Defaults,Global Defaults,yleiset oletusasetukset
-apps/erpnext/erpnext/projects/doctype/project/project.py +151,Project Collaboration Invitation,Project Collaboration Kutsu
+apps/erpnext/erpnext/projects/doctype/project/project.py +153,Project Collaboration Invitation,Project Collaboration Kutsu
 DocType: Salary Slip,Deductions,vähennykset
+apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,Start Year
 DocType: Purchase Invoice,Start date of current invoice's period,aloituspäivä nykyiselle laskutuskaudelle
 DocType: Salary Slip,Leave Without Pay,"poistu, ilman palkkaa"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +323,Capacity Planning Error,kapasiteetin suunnittelu virhe
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +327,Capacity Planning Error,kapasiteetin suunnittelu virhe
 ,Trial Balance for Party,Koetase Party
 DocType: Lead,Consultant,konsultti
 DocType: Salary Slip,Earnings,ansiot
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +362,Finished Item {0} must be entered for Manufacture type entry,valmiit tuotteet {0} tulee vastaanottaa valmistus tyyppi kirjauksella
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,avaa kirjanpidon tase
 DocType: Sales Invoice Advance,Sales Invoice Advance,"myyntilasku, ennakko"
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +483,Nothing to request,Mitään pyytää
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,Nothing to request,Mitään pyytää
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',Aloituspäivän tarvitsee olla ennen päättymispäivää
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,hallinto
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,hallinto
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},joko debet- tai kredit arvomäärä vaaditaan {0}:lle
 DocType: Cheque Print Template,Payer Settings,maksajan Asetukset
 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""","tämä liitetään mallin tuotenumeroon esim, jos lyhenne on ""SM"" ja tuotekoodi on ""T-PAITA"", mallin tuotekoodi on ""T-PAITA-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"sanat näkyvät, kun tallennat palkkalaskelman, nettomaksu"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,Blue,sininen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Blue,sininen
 DocType: Purchase Invoice,Is Return,on palautus
 DocType: Price List Country,Price List Country,Hinnasto Maa
 apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Aseta Email ID
@@ -1043,12 +1058,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,POS Profile {0} already created for user: {1} and company {2},POS Profiili {0} on jo luotu käyttäjälle: {1} ja yritykselle {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM muuntokerroin
 DocType: Stock Settings,Default Item Group,oletus tuoteryhmä
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1388,Do you really want to submit the invoice?,Haluatko todella lähettää laskun?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,Haluatko todella lähettää laskun?
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,toimittaja tietokanta
 DocType: Payment Reconciliation Payment,Reference_name,Reference_name
 DocType: Account,Balance Sheet,tasekirja
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +642,Cost Center For Item with Item Code ',tuotteen kustannuspaikka tuotekoodilla
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1537,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Maksutila ei ole määritetty. Tarkista, onko tili on asetettu tila maksut tai POS Profile."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +685,Cost Center For Item with Item Code ',tuotteen kustannuspaikka tuotekoodilla
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Maksutila ei ole määritetty. Tarkista, onko tili on asetettu tila maksut tai POS Profile."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,"myyjä, joka saa muistutuksen asiakkaan yhetdenotosta"
 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","lisätilejä voidaan tehdä kohdassa ryhmät, mutta kirjaukset toi suoraan tilille"
 DocType: Lead,Lead,vihje
@@ -1072,24 +1087,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,'Kirjaukset' ei voi olla tyhjä
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},monista rivi {0} sama kuin {1}
 ,Trial Balance,tasekokeilu
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +205,Fiscal Year {0} not found,Verovuoden {0} ei löytynyt
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +214,Fiscal Year {0} not found,Verovuoden {0} ei löytynyt
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,työntekijän perusmääritykset
 DocType: Sales Order,SO-,NIIN-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Ole hyvä ja valitse etuliite ensin
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Research,Tutkimus
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,Tutkimus
 DocType: Maintenance Visit Purpose,Work Done,työ tehty
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Ilmoitathan ainakin yksi määrite Määritteet taulukossa
 DocType: Announcement,All Students,kaikki opiskelijat
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a non-stock item,Kohta {0} on oltava ei-varastotuote
 DocType: Contact,User ID,käyttäjätunnus
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,aikaisintaan
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,"An Item Group exists with same name, please change the item name or rename the item group","samanniminen tuoteryhmä on jo olemassa, vaihda tuotteen nimeä tai nimeä tuoteryhmä uudelleen"
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +433,Rest Of The World,Rest Of The World
+apps/erpnext/erpnext/stock/doctype/item/item.py +504,"An Item Group exists with same name, please change the item name or rename the item group","samanniminen tuoteryhmä on jo olemassa, vaihda tuotteen nimeä tai nimeä tuoteryhmä uudelleen"
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +437,Rest Of The World,Rest Of The World
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,tuote {0} ei voi olla erä
 ,Budget Variance Report,budjettivaihtelu raportti
 DocType: Salary Slip,Gross Pay,bruttomaksu
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +82,Row {0}: Activity Type is mandatory.,Rivi {0}: Toimintalaji on pakollista.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,Rivi {0}: Toimintalaji on pakollista.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,maksetut osingot
 apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Kirjanpito Ledger
 DocType: Stock Reconciliation,Difference Amount,eron arvomäärä
@@ -1104,9 +1119,9 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,tilapäinen avaus
 ,Employee Leave Balance,työntekijän poistumistase
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +131,Balance for Account {0} must always be {1},tilin tase {0} on oltava {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},Arvostus Luokitus vaaditaan Tuote rivillä {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +175,Valuation Rate required for Item in row {0},Arvostus Luokitus vaaditaan Tuote rivillä {0}
 DocType: Address,Address Type,osoitteen tyyppi
-apps/erpnext/erpnext/public/js/setup_wizard.js +321,Example: Masters in Computer Science,Esimerkki: Masters Computer Science
+apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,Esimerkki: Masters Computer Science
 DocType: Purchase Invoice,Rejected Warehouse,Hylätty Warehouse
 DocType: GL Entry,Against Voucher,kuitin kohdistus
 DocType: Item,Default Buying Cost Center,ostojen oletuskustannuspaikka
@@ -1117,45 +1132,45 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},jäädytettyä tiliä {0} ei voi muokata
 DocType: Journal Entry,Get Outstanding Invoices,hae odottavat laskut
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +62,Sales Order {0} is not valid,myyntitilaus {0} ei ole kelvollinen
-apps/erpnext/erpnext/setup/doctype/company/company.py +182,"Sorry, companies cannot be merged",yhtiöitä ei voi yhdistää
+apps/erpnext/erpnext/setup/doctype/company/company.py +185,"Sorry, companies cannot be merged",yhtiöitä ei voi yhdistää
 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}",Yhteensä Issue / Transfer määrä {0} in Material pyyntö {1} \ ei voi olla suurempi kuin pyydetty määrä {2} alamomentin {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Small,pieni
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Small,pieni
 DocType: Employee,Employee Number,työntekijän numero
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},"asianumero/numerot on jo käytössä, aloita asianumerosta {0}"
 ,Invoiced Amount (Exculsive Tax),laskutettu arvomäärä (sisältäen verot)
-DocType: Student,Mother's / Guardian 1 Email ID,Äidin / Guardian 1 -sähköpostitunnus
+DocType: Student Applicant,Mother's / Guardian 1 Email ID,Äidin / Guardian 1 -sähköpostitunnus
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,tuote 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,tilin otsikko {0} luotu
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Green,vihreä
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +160,Green,vihreä
 DocType: Supplier,SUPP-,toimittaja-
 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,"yhteensä, saavutettu"
 DocType: Employee,Place of Issue,aiheen alue
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,sopimus
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Contract,sopimus
 DocType: Email Digest,Add Quote,Lisää Lainaus
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,UOM coversion factor required for UOM: {0} in Item: {1},UOM muuntokerroin vaaditaan UOM {0}:lle tuotteessa: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,välilliset kulut
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +80,Row {0}: Qty is mandatory,rivi {0}: yksikkömäärä vaaditaan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Maatalous
-apps/erpnext/erpnext/accounts/page/pos/pos.js +729,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +737,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,Omat tavarat tai palvelut
 DocType: Mode of Payment,Mode of Payment,maksutapa
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image should be a public file or website URL,Website Kuva pitäisi olla julkinen tiedoston tai verkkosivuston URL-
+apps/erpnext/erpnext/stock/doctype/item/item.py +178,Website Image should be a public file or website URL,Website Kuva pitäisi olla julkinen tiedoston tai verkkosivuston URL-
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,tämä on kantatuoteryhmä eikä sitä voi muokata
 DocType: Journal Entry Account,Purchase Order,Ostotilaus
 DocType: Warehouse,Warehouse Contact Info,Varaston yhteystiedot
 DocType: Payment Entry,Write Off Difference Amount,Kirjoita Off Ero Määrä
 DocType: Purchase Invoice,Recurring Type,toistuva tyyppi
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +275,"{0}: Employee email not found, hence email not sent","{0}: Työntekijä sähköposti ei löytynyt, joten sähköpostiosoitteisiin ei lähetetty"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +345,"{0}: Employee email not found, hence email not sent","{0}: Työntekijä sähköposti ei löytynyt, joten sähköpostiosoitteisiin ei lähetetty"
 DocType: Address,City/Town,kaupunki/kunta
 DocType: Address,Is Your Company Address,Is Your Company Osoite
 DocType: Email Digest,Annual Income,Vuositulot
 DocType: Serial No,Serial No Details,sarjanumeron lisätiedot
 DocType: Purchase Invoice Item,Item Tax Rate,tuotteen verotaso
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,"For {0}, only credit accounts can be linked against another debit entry","{0}, vain kredit tili voidaan kohdistaa debet kirjaukseen"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,Delivery Note {0} is not submitted,lähetettä {0} ei ole lähetetty
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,lähetettä {0} ei ole lähetetty
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,tuote {0} on alihankintatuote
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,käyttöomaisuuspääoma
 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.","hinnoittelusääntö tulee ensin valita  'käytä tässä' kentästä, joka voi olla tuote, tuoteryhmä tai brändi"
@@ -1165,7 +1180,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},tuotannon tilauksen tila on {0}
 DocType: Appraisal Goal,Goal,tavoite
 DocType: Sales Invoice Item,Edit Description,Muokkaa Kuvaus
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +704,For Supplier,toimittajalle
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,toimittajalle
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,tilityypin asetukset auttaa valitsemaan oikean tilin tapahtumaan
 DocType: Purchase Invoice,Grand Total (Company Currency),kokonaissumma (yrityksen valuutta)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Luo Print Format
@@ -1184,7 +1199,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,tiedote:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},BOM {0} ei kuulu tuotteelle {1}
 DocType: Sales Partner,Target Distribution,"toimitus, tavoitteet"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1658,Deafault warehouse is required for selected item,Deafault varasto tarvitaan valitun kohteen
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,Deafault varasto tarvitaan valitun kohteen
 DocType: Salary Slip,Bank Account No.,pankkitilin nro
 DocType: Naming Series,This is the number of the last created transaction with this prefix,viimeinen tapahtuma on tehty tällä numerolla ja tällä etuliitteellä
 DocType: Quality Inspection Reading,Reading 8,Lukeminen 8
@@ -1193,11 +1208,11 @@
 DocType: Purchase Invoice,Taxes and Charges Calculation,verot ja maksut laskelma
 DocType: BOM Operation,Workstation,työasema
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Tarjouspyyntö Toimittaja
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,kova tavara
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Hardware,kova tavara
 DocType: Sales Order,Recurring Upto,Toistuvat Jopa
 DocType: Attendance,HR Manager,henkilöstön hallinta
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Valitse Yritys
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,poistumisoikeus
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,poistumisoikeus
 DocType: Purchase Invoice,Supplier Invoice Date,toimittajan laskun päiväys
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Sinun tulee aktivoida ostoskori
 DocType: Payment Entry,Writeoff,Poistolasku
@@ -1209,7 +1224,7 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Päällekkäiset olosuhteisiin välillä:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +171,Against Journal Entry {0} is already adjusted against some other voucher,päiväkirjan kohdistettu kirjaus {0} on jo säädetty muuhun tositteeseen
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,tilausten arvo yhteensä
-apps/erpnext/erpnext/demo/setup_data.py +345,Food,ruoka
+apps/erpnext/erpnext/demo/setup_data.py +358,Food,ruoka
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,vanhentumisen skaala 3
 DocType: Maintenance Schedule Item,No of Visits,Vierailujen lukumäärä
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.js +103,Mark Attendence,Mark Tapahtumaan
@@ -1224,7 +1239,7 @@
 DocType: Purchase Invoice Item,Accounting,Kirjanpito
 DocType: Employee,EMP/,EMP /
 DocType: Asset,Depreciation Schedules,Poistot aikataulut
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be outside leave allocation period,Hakuaika ei voi ulkona loman jakokauteen
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be outside leave allocation period,Hakuaika ei voi ulkona loman jakokauteen
 DocType: Activity Cost,Projects,Projektit
 DocType: Payment Request,Transaction Currency,valuuttakoodi
 apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},alkaen {0} | {1} {2}
@@ -1233,7 +1248,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,tilikauden alkamis- tai päättymispäivää ei voi muuttaa sen jälkeen kun tilikausi tallennetaan
 DocType: Quotation,Shopping Cart,ostoskori
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Avg Daily Lähtevä
-DocType: Pricing Rule,Campaign,Kampanja
+DocType: POS Profile,Campaign,Kampanja
 DocType: Supplier,Name and Type,Nimi ja Tyyppi
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +29,Approval Status must be 'Approved' or 'Rejected',hyväksynnän tila on 'hyväksytty' tai 'hylätty'
 DocType: Purchase Invoice,Contact Person,yhteyshenkilö
@@ -1244,7 +1259,7 @@
 DocType: Purchase Invoice Item,Item Tax Amount,tuotteen veroarvomäärä
 DocType: Item,Maintain Stock,huolla varastoa
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,varaston kirjaukset on muodostettu tuotannon tilauksesta
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Nettomuutos kiinteä omaisuus
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Nettomuutos kiinteä omaisuus
 DocType: Leave Control Panel,Leave blank if considered for all designations,tyhjä mikäli se pidetään vihtoehtona kaikille nimityksille
 apps/erpnext/erpnext/controllers/accounts_controller.py +620,Charge of type 'Actual' in row {0} cannot be included in Item Rate,maksun tyyppiä 'todellinen' rivillä {0} ei voi sisällyttää tuotearvoon
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,Max: {0},Max: {0}
@@ -1252,12 +1267,12 @@
 DocType: Email Digest,For Company,yritykselle
 apps/erpnext/erpnext/config/support.py +17,Communication log.,viestintä loki
 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.",Tarjouspyyntö on lopetettu pääsy portaalin enemmän tarkistaa portaalin asetuksia.
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,oston arvomäärä
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,oston arvomäärä
 DocType: Sales Invoice,Shipping Address Name,toimitusosoitteen nimi
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,tilikartta
 DocType: Material Request,Terms and Conditions Content,ehdot ja säännöt sisältö
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +509,cannot be greater than 100,ei voi olla suurempi kuin 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +677,Item {0} is not a stock Item,tuote {0} ei ole varastotuote
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +552,cannot be greater than 100,ei voi olla suurempi kuin 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,tuote {0} ei ole varastotuote
 DocType: Maintenance Visit,Unscheduled,ei aikataulutettu
 DocType: Employee,Owned,Omistuksessa
 DocType: Salary Detail,Depends on Leave Without Pay,riippuu poistumisesta ilman palkkaa
@@ -1273,8 +1288,8 @@
 ,Batch-Wise Balance History,"erä työkalu, tasehistoria"
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,To Do - tehtävät luettelo
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Tulosta asetukset päivitetään kunkin painettuna
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,opettelu
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Negatiivinen Määrä ei ole sallittua
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Apprentice,opettelu
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,Negatiivinen Määrä ei ole sallittua
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","verotaulukkotiedot, jotka merkataan ja tallennetään tähän kenttään noudetaan tuote työkalusta, jota käytetään veroihin ja maksuihin"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +152,Employee cannot report to himself.,työntekijä ei voi raportoida itselleen
@@ -1283,7 +1298,7 @@
 apps/erpnext/erpnext/accounts/party.py +234,Accounting Entry for {0}: {1} can only be made in currency: {2},Kirjaus {0}: {1} voidaan tehdä vain valuutassa: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","työprofiili, vaaditut pätevydet jne"
 DocType: Journal Entry Account,Account Balance,tilin tase
-apps/erpnext/erpnext/config/accounts.py +174,Tax Rule for transactions.,Verosääntöön liiketoimia.
+apps/erpnext/erpnext/config/accounts.py +180,Tax Rule for transactions.,Verosääntöön liiketoimia.
 DocType: Rename Tool,Type of document to rename.,asiakirjan tyyppi uudelleenimeä
 apps/erpnext/erpnext/public/js/setup_wizard.js +302,We buy this Item,ostamme tätä tuotetta
 DocType: Address,Billing,Laskutus
@@ -1296,14 +1311,14 @@
 DocType: Shipping Rule Condition,To Value,arvoon
 DocType: Asset Movement,Stock Manager,varastohallinta
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Source warehouse is mandatory for row {0},lähde varasto on pakollinen rivin {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +673,Packing Slip,pakkauslappu
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +719,Packing Slip,pakkauslappu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Toimisto Rent
 apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,tekstiviestin reititinmääritykset
 apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Tarjouspyyntö voi olla pääsy klikkaamalla seuraavaa linkkiä
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,tuonti epäonnistui!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,osoitetta ei ole vielä lisätty
 DocType: Workstation Working Hour,Workstation Working Hour,työaseman työaika
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analyytikko
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Analyst,Analyytikko
 DocType: Item,Inventory,inventaario
 DocType: Item,Sales Details,myynnin lisätiedot
 DocType: Quality Inspection,QI-,Qi
@@ -1311,7 +1326,7 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,yksikkömääränä
 DocType: Notification Control,Expense Claim Rejected,kuluvaatimus hylätty
 DocType: Item Attribute,Item Attribute,tuotetuntomerkki
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,hallinto
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +103,Government,hallinto
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Institute Name
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,tuotemallit
 DocType: Company,Services,palvelut
@@ -1320,7 +1335,7 @@
 DocType: Sales Invoice,Source,lähde
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Näytäsuljetut
 DocType: Leave Type,Is Leave Without Pay,on poistunut ilman palkkaa
-apps/erpnext/erpnext/stock/doctype/item/item.py +233,Asset Category is mandatory for Fixed Asset item,Asset Luokka on pakollinen Käyttöomaisuuden erä
+apps/erpnext/erpnext/stock/doctype/item/item.py +236,Asset Category is mandatory for Fixed Asset item,Asset Luokka on pakollinen Käyttöomaisuuden erä
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,tietuetta ei löydy maksutaulukosta
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Tämä {0} on ristiriidassa {1} ja {2} {3}
 DocType: Course Schedule,Students HTML,opiskelijat HTML
@@ -1328,7 +1343,7 @@
 DocType: POS Profile,Apply Discount,Käytä alennus
 DocType: Employee External Work History,Total Experience,kustannukset yhteensä
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,pakkauslaput peruttu
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Investointien rahavirta
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,Investointien rahavirta
 DocType: Program Course,Program Course,ohjelma Course
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,rahdin ja huolinnan maksut
 DocType: Homepage,Company Tagline for website homepage,Yritys Tunnisterivi for kotisivuillaan
@@ -1338,7 +1353,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,edistynyt haku
 apps/erpnext/erpnext/stock/stock_ledger.py +426,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","ostoarvoa tuotteelle: {0} ei löydy joka vaaditaan (kulu) kirjanpidon kirjauksessa, määritä tuotehinta ostohinnastossa"
 DocType: Maintenance Schedule,Schedules,aikataulut
-DocType: Timesheet Detail,To display value check Billable,Näyttämään arvo check Billable
 DocType: Purchase Invoice Item,Net Amount,netto arvomäärä
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM yksittäisnumero
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),lisäalennuksen arvomäärä (yrityksen valuutta)
@@ -1350,7 +1364,7 @@
 DocType: Purchase Invoice,Select Shipping Address,Valitse toimitusosoite
 DocType: Leave Block List,Block Holidays on important days.,estölomat tärkeinä päivinä
 ,Accounts Receivable Summary,saatava tilien yhteenveto
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +198,Please set User ID field in an Employee record to set Employee Role,kirjoita käyttäjätunnus työntekijä tietue kenttään  valitaksesi työntekijän roolin
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +185,Please set User ID field in an Employee record to set Employee Role,kirjoita käyttäjätunnus työntekijä tietue kenttään  valitaksesi työntekijän roolin
 DocType: UOM,UOM Name,UOM nimi
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,panostuksen arvomäärä
 DocType: Purchase Invoice,Shipping Address,toimitusosoite
@@ -1392,25 +1406,27 @@
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,yrityksen kuluvaatimukset
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +71,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Rivi # {0}: Maavara date {1} ei voi olla ennen Sekki Date {2}
 DocType: Company,Default Holiday List,oletus lomaluettelo
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +162,Row {0}: From Time and To Time of {1} is overlapping with {2},Rivi {0}: From Time ja To aika {1} on päällekkäinen {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +142,Stock Liabilities,varasto vastattavat
 DocType: Purchase Invoice,Supplier Warehouse,toimittajan varasto
 DocType: Opportunity,Contact Mobile No,"yhteystiedot, puhelin"
 ,Material Requests for which Supplier Quotations are not created,materiaalipyynnöt joita ei löydy toimittajan tarjouskyselyistä
 DocType: Student Group,Set 0 for no limit,Aseta 0 ei rajaa
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +120,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Päivä (t), johon haet lupaa ovat vapaapäiviä. Sinun ei tarvitse hakea lupaa."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Päivä (t), johon haet lupaa ovat vapaapäiviä. Sinun ei tarvitse hakea lupaa."
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Lähettää maksu Sähköposti
 apps/erpnext/erpnext/config/selling.py +206,Other Reports,Muut raportit
 DocType: Dependent Task,Dependent Task,riippuvainen tehtävä
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,Conversion factor for default Unit of Measure must be 1 in row {0},muuntokerroin oletus mittayksikkön tulee olla 1 rivillä {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +180,Leave of type {0} cannot be longer than {1},poistumis tyyppi {0} ei voi olla pidempi kuin {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource > HR Settings,Ole hyvä setup Työntekijän nimijärjestelmään Human Resource> HR Asetukset
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,Conversion factor for default Unit of Measure must be 1 in row {0},muuntokerroin oletus mittayksikkön tulee olla 1 rivillä {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,Leave of type {0} cannot be longer than {1},poistumis tyyppi {0} ei voi olla pidempi kuin {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,kokeile suunnitella toimia X päivää etukäteen
 DocType: HR Settings,Stop Birthday Reminders,lopeta syntymäpäivämuistutukset
 DocType: SMS Center,Receiver List,Vastaanotin List
+apps/erpnext/erpnext/accounts/page/pos/pos.js +921,Search Item,haku Tuote
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,käytetty arvomäärä
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Rahavarojen muutos
-DocType: Salary Structure Deduction,Salary Structure Deduction,"palkkarakenne, vähennys"
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Unit of Measure {0} has been entered more than once in Conversion Factor Table,yksikköä {0} on kirjattu useammin kuin kerran muuntokerroin taulukossa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +542,Already completed,jo valmiiksi
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +97,Net Change in Cash,Rahavarojen muutos
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,Unit of Measure {0} has been entered more than once in Conversion Factor Table,yksikköä {0} on kirjattu useammin kuin kerran muuntokerroin taulukossa
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +546,Already completed,jo valmiiksi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},Maksupyyntö on jo olemassa {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,aiheen tuotteiden kustannukset
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +241,Quantity must not be more than {0},Määrä saa olla enintään {0}
@@ -1450,12 +1466,12 @@
 DocType: Payment Reconciliation,Payments,maksut
 DocType: Journal Entry,Entry Type,Entry Tyyppi
 ,Customer Credit Balance,asiakas kredit tase
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Nettomuutos ostovelat
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,Nettomuutos ostovelat
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',asiakkaalla tulee olla 'asiakaskohtainen alennus'
-apps/erpnext/erpnext/config/accounts.py +136,Update bank payment dates with journals.,päivitä pankin maksupäivät päiväkirjojen kanssa
+apps/erpnext/erpnext/config/accounts.py +142,Update bank payment dates with journals.,päivitä pankin maksupäivät päiväkirjojen kanssa
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +20,Pricing,hinnoittelu
 DocType: Quotation,Term Details,ehdon lisätiedot
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,Cannot enroll more than {0} students for this student group.,Ei voi ilmoittautua enintään {0} opiskelijat tälle opiskelijaryhmälle.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,Ei voi ilmoittautua enintään {0} opiskelijat tälle opiskelijaryhmälle.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} on oltava suurempi kuin 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),kapasiteetin suunnittelu (päiville)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +9,Procurement,hankinta
@@ -1472,25 +1488,24 @@
 DocType: Sales Invoice,Packed Items,pakatut tuotteet
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,takuuvaatimus sarjanumerolle
 DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM","korvaa BOM kaikissa muissa BOM:ssa, jossa sitä käytetään, korvaa vanhan BOM linkin, päivittää kustannukset ja muodostaa uuden ""BOM tuote räjäytyksen"" tilaston uutena BOM:na"
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.html +1,'Total','Kaikki yhteensä'
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total','Kaikki yhteensä'
 DocType: Shopping Cart Settings,Enable Shopping Cart,aktivoi ostoskori
 DocType: Employee,Permanent Address,pysyvä osoite
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Maksettu ennakko vastaan {0} {1} ei voi olla suurempi \ kuin Grand Yhteensä {2}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,valitse tuotekoodi
-DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),pienennä vähennystä poistuttaessa ilman palkkaa (LWP)
 DocType: Territory,Territory Manager,aluehallinta
 DocType: Packed Item,To Warehouse (Optional),Varastoon (valinnainen)
 DocType: Payment Entry,Paid Amount (Company Currency),Maksettu määrä (Yrityksen valuutta)
 DocType: Purchase Invoice,Additional Discount,Lisäalennuksen
 DocType: Selling Settings,Selling Settings,myynnin asetukset
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online Auctions
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,"määritä määrä, arvotaso tai molemmat"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,"määritä määrä, arvotaso tai molemmat"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,täyttymys
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","yritys, kuukausi ja tilikausi vaaditaan"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,markkinointikulut
 ,Item Shortage Report,tuotteet vähissä raportti
-apps/erpnext/erpnext/stock/doctype/item/item.js +224,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","paino on mainittu, \ ssa mainitse  ""paino UOM"" myös"
+apps/erpnext/erpnext/stock/doctype/item/item.js +232,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","paino on mainittu, \ ssa mainitse  ""paino UOM"" myös"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,varaston kirjaus materiaalipyynnöstä
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +66,Next Depreciation Date is mandatory for new asset,Seuraava Poistot Date on pakollinen uutta sisältöä
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,tuotteen yksittäisyksikkö
@@ -1503,7 +1518,7 @@
 DocType: Employee,Date Of Retirement,eläkkepäivä
 DocType: Upload Attendance,Get Template,hae mallipohja
 DocType: Address,Postal,Posti-
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,ERPNext Asennus valmis!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,ERPNext Asennus valmis!
 DocType: Item,Weightage,painoarvo
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"saman niminen asiakasryhmä on jo olemassa, vaihda asiakkaan nimi tai nimeä asiakasryhmä uudelleen"
@@ -1524,6 +1539,7 @@
 ,Item-wise Sales Register,"tuote työkalu, myyntirekisteri"
 DocType: Asset,Gross Purchase Amount,Gross Osto Määrä
 DocType: Asset,Depreciation Method,Poistot Menetelmä
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,Poissa
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,kuuluuko tämä vero perustasoon?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,tavoite yhteensä
 DocType: Program Course,Required,Edellytetään
@@ -1531,42 +1547,43 @@
 DocType: Production Plan Material Request,Production Plan Material Request,Tuotanto Plan Materiaali Request
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,tuotannon tilauksia ei ole tehty
 DocType: Stock Reconciliation,Reconciliation JSON,JSON täsmäytys
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.html +1,Too many columns. Export the report and print it using a spreadsheet application.,"liian monta saraketta, vie raportti taulukkolaskentaohjelman ja tulosta se siellä"
+apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,"liian monta saraketta, vie raportti taulukkolaskentaohjelman ja tulosta se siellä"
 DocType: Purchase Invoice Item,Batch No,erän nro
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Salli useat Myyntitilaukset vastaan Asiakkaan Ostotilauksen
-apps/erpnext/erpnext/setup/doctype/company/company.py +161,Main,Tärkein
+apps/erpnext/erpnext/setup/doctype/company/company.py +164,Main,Tärkein
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,malli
 DocType: Naming Series,Set prefix for numbering series on your transactions,aseta sarjojen numeroinnin etuliite tapahtumiin
 DocType: Employee Attendance Tool,Employees HTML,Työntekijät HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Default BOM ({0}) must be active for this item or its template,oletus BOM ({0}) tulee olla aktiivinen tälle tuotteelle tai sen mallipohjalle
+apps/erpnext/erpnext/stock/doctype/item/item.py +425,Default BOM ({0}) must be active for this item or its template,oletus BOM ({0}) tulee olla aktiivinen tälle tuotteelle tai sen mallipohjalle
 DocType: Employee,Leave Encashed?,perintä?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,tilaisuuteen kenttä vaaditaan
 DocType: Item,Variants,mallit
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +815,Make Purchase Order,Tee Ostotilaus
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +858,Make Purchase Order,Tee Ostotilaus
 DocType: SMS Center,Send To,lähetä kenelle
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,There is not enough leave balance for Leave Type {0},jäännöstyypille {0} ei ole tarpeeksi vapaata jäännöstasetta
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,There is not enough leave balance for Leave Type {0},jäännöstyypille {0} ei ole tarpeeksi vapaata jäännöstasetta
 DocType: Payment Reconciliation Payment,Allocated amount,kohdennettu arvomäärä
 DocType: Sales Team,Contribution to Net Total,"panostus, netto yhteensä"
 DocType: Sales Invoice Item,Customer's Item Code,asiakkaan tuotekoodi
 DocType: Stock Reconciliation,Stock Reconciliation,varaston täsmäytys
 DocType: Territory,Territory Name,alue nimi
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +168,Work-in-Progress Warehouse is required before Submit,"työnallaoleva työ, varasto vaaditaan ennen lähetystä"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +172,Work-in-Progress Warehouse is required before Submit,"työnallaoleva työ, varasto vaaditaan ennen lähetystä"
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,työn hakija.
 DocType: Purchase Order Item,Warehouse and Reference,Varasto ja viite
 DocType: Supplier,Statutory info and other general information about your Supplier,toimittajan lakisääteiset- ja muut päätiedot
 apps/erpnext/erpnext/hooks.py +88,Addresses,osoitteet
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Toimittaja> Merkki Tyyppi
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,Against Journal Entry {0} does not have any unmatched {1} entry,päiväkirjaan kohdistus {0} ei täsmäämättömiä {1} kirjauksia
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,Kehityskeskustelut
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},monista tuotteelle kirjattu sarjanumero {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,edellyttää toimitustapaa
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +149,Please set filter based on Item or Warehouse,Aseta suodatin perustuu Tuote tai Varasto
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +151,Please set filter based on Item or Warehouse,Aseta suodatin perustuu Tuote tai Varasto
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),"pakkauksen nettopaino, summa lasketaan automaattisesti tuotteiden nettopainoista"
 DocType: Sales Order,To Deliver and Bill,toimitukseen ja laskutukseen
 DocType: GL Entry,Credit Amount in Account Currency,Luoton määrä Account Valuutta
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} must be submitted,BOM {0} tulee lähettää
 DocType: Authorization Control,Authorization Control,Valtuutus Ohjaus
 apps/erpnext/erpnext/controllers/buying_controller.py +300,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Rivi # {0}: Hylätyt Warehouse on pakollinen vastaan hylätään Tuote {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +678,Payment,Maksu
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Payment,Maksu
 DocType: Production Order Operation,Actual Time and Cost,todellinen aika ja hinta
 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},materiaalipyyntö max {0} voidaan tehdä tuotteelle {1} kohdistettuna myyntitilaukseen {2}
 DocType: Employee,Salutation,titteli/tervehdys
@@ -1574,6 +1591,7 @@
 DocType: Course,Course Abbreviation,Course lyhenne
 DocType: Item,Will also apply for variants,sovelletaan myös muissa malleissa
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","Asset ei voi peruuttaa, koska se on jo {0}"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Yhteensä työaika ei saisi olla suurempi kuin max työaika {0}
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,kokoa tuotteet myyntihetkellä
 DocType: Quotation Item,Actual Qty,todellinen yksikkömäärä
 DocType: Sales Invoice Item,References,Viitteet
@@ -1581,7 +1599,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +284,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","luetteloi tavarat tai palvelut, joita ostat tai myyt, tarkista ensin tuoteryhmä, yksikkö ja muut ominaisuudet kun aloitat"
 DocType: Hub Settings,Hub Node,hubi sidos
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Päällekkäisiä tuotteita on syötetty. Korjaa ja yritä uudelleen.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,kolleega
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Associate,kolleega
 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,tuote {0} ei ole sarjoitettu tuote
 DocType: SMS Center,Create Receiver List,tee vastaanottajalista
@@ -1598,11 +1616,11 @@
 ,Sales Invoice Trends,"myyntilasku, trendit"
 DocType: Leave Application,Apply / Approve Leaves,käytä / hyväksy poistumiset
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Varten
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +106,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',rivi voi viitata edelliseen riviin vain jos maksu tyyppi on 'edellisen rivin arvomäärä' tai 'edellinen rivi yhteensä'
+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',rivi voi viitata edelliseen riviin vain jos maksu tyyppi on 'edellisen rivin arvomäärä' tai 'edellinen rivi yhteensä'
 DocType: Sales Order Item,Delivery Warehouse,toimitus varasto
 DocType: Stock Settings,Allowance Percent,Päästöoikeuden Prosenttia
 DocType: SMS Settings,Message Parameter,viestiparametri
-apps/erpnext/erpnext/config/accounts.py +199,Tree of financial Cost Centers.,Tree taloudellisen kustannuspaikat.
+apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,Tree taloudellisen kustannuspaikat.
 DocType: Serial No,Delivery Document No,Toimitus Document No
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +180,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Aseta 'Gain / tuloslaskelma Omaisuudenhoitoalan hävittämisestä "in Company {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,hae tuotteet ostokuiteista
@@ -1621,13 +1639,15 @@
 DocType: Supplier,Supplier of Goods or Services.,toimittaja tavarat tai palvelut
 DocType: Budget,Fiscal Year,tilikausi
 DocType: Budget,Budget,budjetti
-apps/erpnext/erpnext/stock/doctype/item/item.py +230,Fixed Asset Item must be a non-stock item.,Käyttö- omaisuuserän oltava ei-varastotuote.
+apps/erpnext/erpnext/stock/doctype/item/item.py +233,Fixed Asset Item must be a non-stock item.,Käyttö- omaisuuserän oltava ei-varastotuote.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +44,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Talousarvio ei voi luovuttaa vastaan {0}, koska se ei ole tuottoa tai kulua tili"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,saavutettu
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,alueella / asiakas
 apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,"esim, 5"
 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},rivi {0}: kohdennettavan arvomäärän {1} on oltava pienempi tai yhtä suuri kuin odottava arvomäärä {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"sanat näkyvät, kun tallennat myyntilaskun"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} > {1},Virhe: {0}> {1}
+DocType: Item,Is Sales Item,on myyntituote
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,tuoteryhmäpuu
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,"tuotteelle {0} ei määritetty sarjanumeroita, täppää tuote työkalu"
 DocType: Maintenance Visit,Maintenance Time,"huolto, aika"
@@ -1645,7 +1665,7 @@
 						must be greater than or equal to {2}",rivi {0}: asettaaksesi {1} kausituksen aloitus ja päättymispäivän ero \ tulee olla suurempi tai yhtä suuri kuin {2}
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +5,This is based on stock movement. See {0} for details,Tämä perustuu varastojen kehityksellä. Katso {0} lisätietoja
 DocType: Pricing Rule,Selling,myynti
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +334,Amount {0} {1} deducted against {2},Määrä {0} {1} vähennetään vastaan {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},Määrä {0} {1} vähennetään vastaan {2}
 DocType: Employee,Salary Information,palkkatietoja
 DocType: Sales Person,Name and Employee ID,Nimi ja Työntekijän ID
 apps/erpnext/erpnext/accounts/party.py +296,Due Date cannot be before Posting Date,eräpäivä voi olla ennen lähetyspäivää
@@ -1657,10 +1677,10 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,yksikkömäärä toimitettu
 DocType: Purchase Order Item,Material Request Item,tuote materiaalipyyntö
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,tuoteryhmien puu
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +116,Cannot refer row number greater than or equal to current row number for this Charge type,"rivi ei voi viitata nykyistä suurempaan tai nykyisen rivin numeroon, vaihda maksun tyyppiä"
+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,"rivi ei voi viitata nykyistä suurempaan tai nykyisen rivin numeroon, vaihda maksun tyyppiä"
 DocType: Asset,Sold,myyty
 ,Item-wise Purchase History,"tuote työkalu, ostohistoria"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Red,punainen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Red,punainen
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"klikkaa ""muodosta aikataulu"" ja syötä tuotteen sarjanumero {0}"
 DocType: Account,Frozen,jäädytetty
 ,Open Production Orders,avoimet tuotannon tilausket
@@ -1689,12 +1709,12 @@
 DocType: Holiday List,Clear Table,tyhjennä taulukko
 DocType: C-Form Invoice Detail,Invoice No,laskun nro
 DocType: Room,Room Name,huoneen Name
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +95,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Jätä ei voida soveltaa / peruuttaa ennen {0}, kun loman saldo on jo carry-välitti tulevaisuudessa loman jakamista ennätys {1}"
+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}","Jätä ei voida soveltaa / peruuttaa ennen {0}, kun loman saldo on jo carry-välitti tulevaisuudessa loman jakamista ennätys {1}"
 DocType: Activity Cost,Costing Rate,"kustannuslaskenta, taso"
 ,Customer Addresses And Contacts,Asiakas osoitteet ja Yhteydet
 DocType: Discussion,Discussion,keskustelu
 DocType: Payment Entry,Transaction ID,Transaction ID
-apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory feild - Academic Year,Pakolliset feild - Lukuvuosi
+apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory feild - Academic Year,Pakolliset feild - Lukuvuosi
 DocType: Employee,Resignation Letter Date,Eroaminen Letter Date
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,hinnoittelusäännöt on suodatettu määrän mukaan
 DocType: Task,Total Billing Amount (via Time Sheet),Total Billing Määrä (via Time Sheet)
@@ -1711,10 +1731,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +182,Please set 'Asset Depreciation Cost Center' in Company {0},Aseta "Asset Poistot Kustannuspaikka" in Company {0}
 ,Maintenance Schedules,huoltoaikataulut
 DocType: Task,Actual End Date (via Time Sheet),Todellinen Lopetuspäivä (via kellokortti)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} against {2} {3},Määrä {0} {1} vastaan {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},Määrä {0} {1} vastaan {2} {3}
 ,Quotation Trends,"tarjous, trendit"
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},tuotteen {0} tuoteryhmää ei ole mainittu kohdassa tuote työkalu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +296,Debit To account must be a Receivable account,tilin debet tulee olla saatava tili
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +295,Debit To account must be a Receivable account,tilin debet tulee olla saatava tili
 DocType: Shipping Rule Condition,Shipping Amount,toimituskustannus arvomäärä
 ,Pending Amount,odottaa arvomäärä
 DocType: Purchase Invoice Item,Conversion Factor,muuntokerroin
@@ -1727,6 +1747,7 @@
 ,Supplier-Wise Sales Analytics,"toimittaja työkalu, myyntianalyysi"
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +22,Enter Paid Amount,Anna maksettu summa
 DocType: Address Template,This format is used if country specific format is not found,tätä muotoa käytetään ellei alueelle määriteltyä muotoa löydy
+DocType: Salary Structure,Select employees for current Salary Structure,Valitse työntekijöitä nykyistä Palkkarakenne
 DocType: Production Order,Use Multi-Level BOM,käytä useampi asteista BOM:ia
 DocType: Bank Reconciliation,Include Reconciled Entries,sisällytä täsmätyt kirjaukset
 DocType: Leave Control Panel,Leave blank if considered for all employee types,tyhjä mikäli se pidetään vaihtoehtona  kaikissa työntekijä tyypeissä
@@ -1737,7 +1758,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,lisäalennuksen arvomäärä
 apps/erpnext/erpnext/controllers/accounts_controller.py +524,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Rivi # {0}: Määrä on 1, kun kohde on kiinteän omaisuuden. Käytä erillistä rivi useita kpl."
 DocType: Leave Block List Allow,Leave Block List Allow,"poistu estoluettelo, salli"
-apps/erpnext/erpnext/setup/doctype/company/company.py +246,Abbr can not be blank or space,lyhenne ei voi olla tyhjä tai välilyönti
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Abbr can not be blank or space,lyhenne ei voi olla tyhjä tai välilyönti
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Ryhmä Non-ryhmän
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,urheilu
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,"yhteensä, todellinen"
@@ -1751,7 +1772,7 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,kuluvaatimukset
 DocType: Issue,Support,tuki
 ,BOM Search,BOM haku
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +180,Closing (Opening + Totals),sulku (avaus + summat)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Closing (Opening + Totals),sulku (avaus + summat)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,määritä yrityksen valuutta
 DocType: Workstation,Wages per hour,Tuntipalkat
 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},erän varastotase {0} muuttuu negatiiviseksi {1} tuotteelle {2} varastossa {3}
@@ -1759,9 +1780,9 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},Tili {0} ei kelpaa. Tilin valuutan on oltava {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM muuntokerroin vaaditaan rivillä {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +659,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Rivi # {0}: Reference Document Type on yksi myyntitilaus, myyntilasku tai Päiväkirjakirjaus"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +956,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Rivi # {0}: Reference Document Type on yksi myyntitilaus, myyntilasku tai Päiväkirjakirjaus"
 DocType: Salary Slip,Deduction,vähennys
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +79,Row {0}: From Time and To Time is mandatory.,Rivi {0}: From Time ja Kellonaikatilaan on pakollista.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,Rivi {0}: From Time ja Kellonaikatilaan on pakollista.
 apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},Hinta lisätty {0} ja hinnasto {1}
 DocType: Address Template,Address Template,"osoite, mallipohja"
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +7,Please enter Employee Id of this sales person,syötä työntekijätunnu tälle myyjälle
@@ -1778,15 +1799,14 @@
 DocType: Maintenance Visit,Maintenance User,"huolto, käyttäjä"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,kustannukset päivitetty
 DocType: Employee,Date of Birth,syntymäpäivä
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup > Numbering Series,Ole hyvä setup numerointi sarjan läsnäolevaksi kohdassa Setup> numerointi Series
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,tuote {0} on palautettu
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**tilikausi** kaikki tilikauden kirjanpitoon kirjatut tositteet ja päätapahtumat on jäljitetty **tilikausi**
 DocType: Opportunity,Customer / Lead Address,asiakas / vihje osoite
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid SSL certificate on attachment {0},Varoitus: Virheellinen SSL-varmenteen kiinnittymiseen {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid SSL certificate on attachment {0},Varoitus: Virheellinen SSL-varmenteen kiinnittymiseen {0}
 DocType: Production Order Operation,Actual Operation Time,todellinen toiminta-aika
 DocType: Authorization Rule,Applicable To (User),sovellettavissa (käyttäjä)
 DocType: Purchase Taxes and Charges,Deduct,vähentää
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Job Description,työn kuvaus
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Job Description,työn kuvaus
 DocType: Student Applicant,Applied,soveltava
 DocType: Purchase Order Item,Qty as per Stock UOM,yksikkömäärä / varasto UOM
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","erikoismerkit ""-"", ""#"", ""."" ja ""/"" ei ole sallittuja sarjojen nimeämisessä"
@@ -1802,14 +1822,14 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Yhteensä jaettava määrä (Company valuutta)
 DocType: Purchase Order Item,To be delivered to customer,Toimitetaan asiakkaalle
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Sarjanumero {0} ei kuulu mihinkään Warehouse
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Rivi #
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,Row # ,Rivi #
 DocType: Purchase Invoice,In Words (Company Currency),sanat (yrityksen valuutta)
 DocType: Asset,Supplier,toimittaja
 apps/erpnext/erpnext/public/js/utils.js +156,Get From,"hae, mistä"
 DocType: C-Form,Quarter,Neljännes
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,sekalaiset kulut
 DocType: Global Defaults,Default Company,oletus yritys
-apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,kulu- / erotili vaaditaan tuotteelle {0} sillä se vaikuttaa varastoarvoon
+apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,kulu- / erotili vaaditaan tuotteelle {0} sillä se vaikuttaa varastoarvoon
 apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","tuotetta {0} ei voi ylilaskuttaa, rivillä {1} yli {2}, voit sallia ylilaskutuksen varaston asetuksista"
 DocType: Cheque Print Template,Bank Name,pankin nimi
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-yllä
@@ -1819,18 +1839,18 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,valitse yritys...
 DocType: Leave Control Panel,Leave blank if considered for all departments,tyhjä mikäli se pidetään vaihtoehtona kaikilla osastoilla
 apps/erpnext/erpnext/config/hr.py +171,"Types of employment (permanent, contract, intern etc.).","työsopimuksen tyypit (jatkuva, sopimus, sisäinen jne)"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +341,{0} is mandatory for Item {1},{0} on pakollinen tuotteelle {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +346,{0} is mandatory for Item {1},{0} on pakollinen tuotteelle {1}
 DocType: Currency Exchange,From Currency,valuutasta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","valitse kohdennettava arvomäärä, laskun tyyppi ja laskun numero vähintään yhdelle riville"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Kustannukset New Purchase
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},myyntitilaus vaaditaan tuotteelle {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),taso (yrityksen valuutta)
-apps/erpnext/erpnext/demo/setup_data.py +347,Others,Muut
+apps/erpnext/erpnext/demo/setup_data.py +360,Others,Muut
 DocType: Payment Entry,Unallocated Amount,Kohdistamattomat Määrä
 apps/erpnext/erpnext/templates/includes/product_page.js +65,Cannot find a matching Item. Please select some other value for {0}.,Ei löydä vastaavia Tuote. Valitse jokin muu arvo {0}.
 DocType: POS Profile,Taxes and Charges,verot ja maksut
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","tavara tai palvelu joka ostetaan, myydään tai varastoidaan"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +110,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"ei voi valita maksun tyyppiä, kuten 'edellisen rivin arvomäärä' tai 'edellinen rivi yhteensä' ensimmäiseksi riviksi"
+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,"ei voi valita maksun tyyppiä, kuten 'edellisen rivin arvomäärä' tai 'edellinen rivi yhteensä' ensimmäiseksi riviksi"
 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,Lapsi Tuote ei pitäisi olla tuote Bundle. Poista toiminto `{0}` ja säästä
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,pankkitoiminta
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"klikkaa ""muodosta aikataulu"" saadaksesi aikataulun"
@@ -1839,7 +1859,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,"e.g. ""Build tools for builders""","esim, ""rakenna työkaluja rakentajille"""
 DocType: Quality Inspection,In Process,prosessissa
 DocType: Authorization Rule,Itemwise Discount,"tuote työkalu, alennus"
-apps/erpnext/erpnext/config/accounts.py +63,Tree of financial accounts.,Tree of tilinpäätös.
+apps/erpnext/erpnext/config/accounts.py +69,Tree of financial accounts.,Tree of tilinpäätös.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,{0} against Sales Order {1},{0} myyntitilausta vastaan {1}
 DocType: Account,Fixed Asset,pitkaikaiset vastaavat
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Serialized Inventory
@@ -1849,10 +1869,11 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},Rivi # {0}: Asset {1} on jo {2}
 DocType: Quotation Item,Stock Balance,varastotase
 apps/erpnext/erpnext/config/selling.py +302,Sales Order to Payment,myyntitilauksesta maksuun
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,CEO,toimitusjohtaja
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +79,CEO,toimitusjohtaja
 DocType: Expense Claim Detail,Expense Claim Detail,kuluvaatimus lisätiedot
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +805,Please select correct account,Valitse oikea tili
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,Valitse oikea tili
 DocType: Item,Weight UOM,paino UOM
+DocType: Salary Structure Employee,Salary Structure Employee,Palkka rakenne Työntekijän
 DocType: Employee,Blood Group,Veriryhmä
 DocType: Purchase Invoice Item,Page Break,Sivunvaihto
 DocType: Production Order Operation,Pending,odottaa
@@ -1863,13 +1884,14 @@
 DocType: Fiscal Year,Companies,Yritykset
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,elektroniikka
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,korota materiaalipyyntö kun varastoarvo saavuttaa uuden ostotilauksen tason
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,päätoiminen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Full-time,päätoiminen
+DocType: Salary Structure,Employees,Työntekijät
 DocType: Employee,Contact Details,"yhteystiedot, lisätiedot"
 DocType: C-Form,Received Date,Saivat Date
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.",mikäli olet tehnyt perusmallipohjan myyntiveroille ja maksumallin valitse se ja jatka alla olevalla painikella
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,Ilmoitathan maa tälle toimitus säännön tai tarkistaa Postikuluja
 DocType: Stock Entry,Total Incoming Value,"kokonaisarvo, saapuva"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +290,Debit To is required,Veloituksen tarvitaan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Debit To is required,Veloituksen tarvitaan
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Ostohinta List
 DocType: Offer Letter Term,Offer Term,Tarjous Term
 DocType: Quality Inspection,Quality Manager,laatuhallinta
@@ -1879,7 +1901,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,teknologia
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Tarjoa Kirje
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,muodosta materiaalipyymtö (MRP) ja tuotantotilaus
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.html +1,Total Invoiced Amt,"kokonaislaskutus, pankkipääte"
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,"kokonaislaskutus, pankkipääte"
 DocType: Timesheet Detail,To Time,aikaan
 DocType: Authorization Rule,Approving Role (above authorized value),Hyväksymisestä Rooli (edellä valtuutettu arvo)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Credit To account must be a Payable account,kredit tilin tulee olla maksutili
@@ -1887,12 +1909,14 @@
 DocType: Production Order Operation,Completed Qty,valmiit yksikkömäärä
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry","{0}, vain debet tili voidaan kohdistaa kredit kirjaukseen"
 apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,hinnasto {0} on poistettu käytöstä
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,Row {0}: Completed Qty cannot be more than {1} for operation {2},Rivi {0}: Valmis Määrä voi olla enintään {1} toimimaan {2}
 DocType: Manufacturing Settings,Allow Overtime,Salli Ylityöt
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} sarjanumerot tarvitaan Tuote {1}. Olet antanut {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,nykyinen arvotaso
 DocType: Item,Customer Item Codes,asiakkaan tuotekoodit
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,Exchange voitto / tappio
 DocType: Opportunity,Lost Reason,hävitty syy
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup > Numbering Series,Ole hyvä setup numerointi sarjan läsnäolevaksi kohdassa Setup> numerointi Series
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Uusi osoite
 DocType: Quality Inspection,Sample Size,näytteen koko
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Receipt Document,Anna kuitti Document
@@ -1902,6 +1926,7 @@
 DocType: Project,External,ulkoinen
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,käyttäjät ja käyttöoikeudet
 DocType: Branch,Branch,toimiala
+DocType: Guardian,Mobile Number,Puhelinnumero
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,tulostus ja brändäys
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,palkkalaskelmaa ei löydy kuukaudelle:
 DocType: Bin,Actual Quantity,todellinen määrä
@@ -1909,14 +1934,16 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,sarjanumeroa {0} ei löydy
 DocType: Student Batch,Student Batch,Student Erä
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Omat asiakkaat
-apps/erpnext/erpnext/projects/doctype/project/project.py +139,You have been invited to collaborate on the project: {0},Sinut on kutsuttu yhteistyötä hankkeen: {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +141,You have been invited to collaborate on the project: {0},Sinut on kutsuttu yhteistyötä hankkeen: {0}
 DocType: Leave Block List Date,Block Date,estopäivä
 apps/erpnext/erpnext/templates/generators/job_opening.html +19,Apply Now,Hae nyt
 DocType: Sales Order,Not Delivered,toimittamatta
+DocType: Assessment Group,Assessment Group Code,Assessment Group Code
 ,Bank Clearance Summary,pankin tilitysyhteenveto
 apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","tee ja hallitse (päivä-, viikko- ja kuukausi) sähköpostitiedotteita"
 DocType: Appraisal Goal,Appraisal Goal,arvioinnin tavoite
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,Rakennukset
+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.,Ei oletus Osoitemallin löydetty. Luo uusi Setup> Tulostus ja Branding> Address Template.
 DocType: Fee Structure,Fee Structure,Palkkiojärjestelmä
 DocType: Timesheet Detail,Costing Amount,"kustannuslaskenta, arvomäärä"
 DocType: Process Payroll,Submit Salary Slip,lähetä palkkalaskelma
@@ -1929,7 +1956,7 @@
 DocType: Payment Request,Make Sales Invoice,tee myyntilasku
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,ohjelmistot
 DocType: Company,For Reference Only.,vain viitteeksi
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},virheellinen {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},virheellinen {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-jälkikä-
 DocType: Sales Invoice Advance,Advance Amount,ennakko arvomäärä
 DocType: Manufacturing Settings,Capacity Planning,kapasiteetin suunnittelu
@@ -1941,12 +1968,12 @@
 apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},Ei Item kanssa Barcode {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,asianumero ei voi olla 0
 DocType: Item,Show a slideshow at the top of the page,näytä diaesitys sivun yläreunassa
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Stores,varastoi
+apps/erpnext/erpnext/stock/doctype/item/item.py +134,Stores,varastoi
 DocType: Serial No,Delivery Time,toimitusaika
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,vanhentuminen perustuu
 DocType: Item,End of Life,elinkaaren loppu
-apps/erpnext/erpnext/demo/setup_data.py +348,Travel,matka
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,No active or default Salary Structure found for employee {0} for the given dates,Ei aktiivisia tai oletus Palkkarakenne löytynyt työntekijä {0} varten kyseisenä päivänä
+apps/erpnext/erpnext/demo/setup_data.py +361,Travel,matka
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,No active or default Salary Structure found for employee {0} for the given dates,Ei aktiivisia tai oletus Palkkarakenne löytynyt työntekijä {0} varten kyseisenä päivänä
 DocType: Leave Block List,Allow Users,Salli Käyttäjät
 DocType: Purchase Order,Customer Mobile No,Asiakas Mobile Ei
 DocType: Sales Invoice,Recurring,Toistuva
@@ -1954,26 +1981,27 @@
 DocType: Rename Tool,Rename Tool,Nimeä Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +23,Update Cost,päivitä kustannukset
 DocType: Item Reorder,Item Reorder,tuote tiedostot
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +695,Transfer Material,materiaalisiirto
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,Näytä Palkka Slip
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,materiaalisiirto
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","määritä toiminnot, käyttökustannukset ja anna toiminnoille oma uniikki numero"
 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}?,Tämä asiakirja on yli rajan {0} {1} alkion {4}. Teetkö toisen {3} vasten samalla {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +923,Please set recurring after saving,Määritä toistuva tallentamisen jälkeen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,Valitse muutoksen suuruuden tili
 DocType: Purchase Invoice,Price List Currency,"hinnasto, valuutta"
 DocType: Naming Series,User must always select,käyttäjän tulee aina valita
 DocType: Stock Settings,Allow Negative Stock,salli negatiivinen varastoarvo
 DocType: Installation Note,Installation Note,asennus huomautus
 apps/erpnext/erpnext/public/js/setup_wizard.js +216,Add Taxes,lisää veroja
 DocType: Topic,Topic,Aihe
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,Rahoituksen rahavirta
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,Rahoituksen rahavirta
 DocType: Budget Account,Budget Account,Talousarviotili
 DocType: Quality Inspection,Verified By,vahvistanut
 DocType: Address,Subsidiary,tytäryhtiö
-apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","yrityksen oletusvaluuttaaei voi muuttaa sillä tapahtumia on olemassa, tapahtumat tulee peruuttaa jotta oletusvaluuttaa voi muuttaa"
+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.","yrityksen oletusvaluuttaaei voi muuttaa sillä tapahtumia on olemassa, tapahtumat tulee peruuttaa jotta oletusvaluuttaa voi muuttaa"
 DocType: Quality Inspection,Purchase Receipt No,Ostokuitti No
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,aikaisintaan raha
 DocType: Process Payroll,Create Salary Slip,tee palkkalaskelma
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +33,Traceability,jäljitettävyys
-DocType: Quotation,Custome Name,custome Name
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Source of Funds (Liabilities),rahoituksen lähde (vieras pääoma)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},määrä rivillä {0} ({1}) tulee olla sama kuin valmistettu määrä {2}
 DocType: Appraisal,Employee,työntekijä
@@ -1981,7 +2009,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} on kokonaan laskutettu
 DocType: Workstation Working Hour,End Time,ajan loppu
 DocType: Payment Entry,Payment Deductions or Loss,Maksu vähennykset tai tappio
-apps/erpnext/erpnext/config/schools.py +92,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +100,LMS,LMS
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,"perussopimusehdot, myynti tai osto"
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,tositteen ryhmä
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Sales Pipeline
@@ -1993,8 +2021,8 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},määriteltyä BOM:ia {0} ei löydy tuotteelle {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +199,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,huoltoaikataulu {0} on peruttava ennen myyntitilauksen perumista
 DocType: Notification Control,Expense Claim Approved,kuluvaatimus hyväksytty
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +220,Salary Slip of employee {0} already created for this period,Palkka Slip työntekijöiden {0} on jo luotu tällä kaudella
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Lääkealan
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +297,Salary Slip of employee {0} already created for this period,Palkka Slip työntekijöiden {0} on jo luotu tällä kaudella
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Pharmaceutical,Lääkealan
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,ostettujen tuotteiden kustannukset
 DocType: Selling Settings,Sales Order Required,myyntitilaus vaaditaan
 DocType: Purchase Invoice,Credit To,kredittiin
@@ -2009,18 +2037,19 @@
 DocType: Upload Attendance,Attendance To Date,osallistuminen päivään
 DocType: Warranty Claim,Raised By,Raised By
 DocType: Payment Gateway Account,Payment Account,maksutili
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +761,Please specify Company to proceed,Ilmoitathan Yritys jatkaa
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Nettomuutos Myyntireskontra
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,korvaava on pois
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +814,Please specify Company to proceed,Ilmoitathan Yritys jatkaa
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,Nettomuutos Myyntireskontra
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Compensatory Off,korvaava on pois
 DocType: Quality Inspection Reading,Accepted,hyväksytyt
 DocType: SG Creation Tool Course,Student Group Name,Opiskelijan Group Name
 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.,"haluatko varmasti poistaa kaikki tämän yrityksen tapahtumat, päätyedostosi säilyy silti entisellään, tätä toimintoa ei voi peruuttaa"
 DocType: Room,Room Number,Huoneen numero
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Virheellinen viittaus {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +157,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ei voi olla suurempi arvo kuin suunniteltu tuotantomäärä ({2}) tuotannon tilauksessa {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ei voi olla suurempi arvo kuin suunniteltu tuotantomäärä ({2}) tuotannon tilauksessa {3}
 DocType: Shipping Rule,Shipping Rule Label,toimitus sääntö etiketti
+apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Käyttäjäfoorumi
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Raw Materials cannot be blank.,raaka-aineet ei voi olla tyhjiä
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +403,"Could not update stock, invoice contains drop shipping item.","Ei voinut päivittää hyllyssä, lasku sisältää pudota merenkulku erä."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"Could not update stock, invoice contains drop shipping item.","Ei voinut päivittää hyllyssä, lasku sisältää pudota merenkulku erä."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +460,Quick Journal Entry,Nopea Päiväkirjakirjaus
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,You can not change rate if BOM mentioned agianst any item,"tasoa ei voi muuttaa, jos BOM liitetty johonkin tuotteeseen"
 DocType: Employee,Previous Work Experience,Edellinen Työkokemus
@@ -2047,7 +2076,6 @@
 DocType: Fiscal Year,Year End Date,Vuoden viimeinen päivä
 DocType: Task Depends On,Task Depends On,tehtävä riippuu
 DocType: Lead,Opportunity,tilaisuus
-DocType: Salary Structure Earning,Salary Structure Earning,"palkkarakenne, ansiot"
 ,Completed Production Orders,valmiit tuotannon tilaukset
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,Rivi {0}: For toimittaja {0} email id on lähetettävä sähköpostitse
 DocType: Operation,Default Workstation,oletus työpiste
@@ -2075,7 +2103,8 @@
 DocType: SMS Log,No of Requested SMS,Ei annettu Pyydetty SMS
 DocType: Campaign,Campaign-.####,kampanja -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Seuraavat vaiheet
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +676,Please supply the specified items at the best possible rates,Ole hyvä ja toimittaa erityisiin kohtiin on paras mahdollinen hinnat
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Please supply the specified items at the best possible rates,Ole hyvä ja toimittaa erityisiin kohtiin on paras mahdollinen hinnat
+apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,end Year
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,sopimuksen päättymispäivä tulee olla liittymispäivän jälkeen
 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.,"kolmas osapuoli kuten välittäjä / edustaja / agentti / jälleenmyyjä, joka myy tavaraa yrityksille provisiolla"
@@ -2114,16 +2143,16 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Stock Entry {0} is not submitted,varaston kirjaus {0} ei ole lähetetty
 DocType: Payment Reconciliation,Bank / Cash Account,Pankki-tai Kassatili
 DocType: Tax Rule,Billing City,Laskutus Kaupunki
+DocType: Salary Component Account,Salary Component Account,Palkanosasta Account
 DocType: Global Defaults,Hide Currency Symbol,piilota valuuttasymbooli
-apps/erpnext/erpnext/config/accounts.py +283,"e.g. Bank, Cash, Credit Card","esim, pankki, kassa, luottokortti"
+apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","esim, pankki, kassa, luottokortti"
 DocType: Journal Entry,Credit Note,hyvityslasku
 DocType: Warranty Claim,Service Address,palveluosoite
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,max 100 riviä varaston täsmäytyksessä
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +78,"Salary structure {0} already exist, more than one salary structure for same period is not allowed","Palkkausrakenne {0} on jo olemassa, useampi kuin yksi palkkausrakenne samalla ajanjaksolla ei ole sallittua"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,Huonekaluja ja kalusteet
-DocType: Material Request,Manufacture,Valmistus
+DocType: Item,Manufacture,Valmistus
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,ensin lähete
 DocType: Student Applicant,Application Date,Hakupäivämäärä
+DocType: Salary Detail,Amount based on formula,Laskettu määrä kaavan
 DocType: Purchase Invoice,Currency and Price List,Valuutta ja hinnasto
 DocType: Opportunity,Customer / Lead Name,asiakas / vihje nimi
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,Clearance Date not mentioned,tilityspäivää ei ole mainittu
@@ -2141,12 +2170,13 @@
 apps/erpnext/erpnext/config/hr.py +176,Organization branch master.,"organisaatio, toimiala valvonta"
 apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,tai
 DocType: Sales Order,Billing Status,Laskutus tila
+apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,raportti aihe
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,hyödykekulut
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-yli
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Rivi # {0}: Päiväkirjakirjaus {1} ei ole huomioon {2} tai jo sovitettu toista voucher
 DocType: Buying Settings,Default Buying Price List,"oletus hinnasto, osto"
 DocType: Process Payroll,Salary Slip Based on Timesheet,Palkka Slip Perustuen Tuntilomakkeen
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +81,No employee for the above selected criteria OR salary slip already created,Yksikään työntekijä ei edellä valitut kriteerit TAI palkkakuitin jo luotu
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +90,No employee for the above selected criteria OR salary slip already created,Yksikään työntekijä ei edellä valitut kriteerit TAI palkkakuitin jo luotu
 DocType: Notification Control,Sales Order Message,"myyntitilaus, viesti"
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","aseta oletusarvot kuten yritys, valuutta, kuluvan tilikausi jne"
 DocType: Payment Entry,Payment Type,maksun tyyppi
@@ -2178,7 +2208,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"huoltuaikataulua ei ole luotu kaikille tuotteille, klikkaa ""muodosta aikataulu"""
 ,To Produce,tuotantoon
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Payroll
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +135,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","riviin {0}:ssa {1} sisällytä {2} tuotetasolle, rivit {3} tulee myös sisällyttää"
+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","riviin {0}:ssa {1} sisällytä {2} tuotetasolle, rivit {3} tulee myös sisällyttää"
 DocType: Packing Slip,Identification of the package for the delivery (for print),pakkauksen tunnistus toimitukseen (tulostus)
 DocType: Bin,Reserved Quantity,Varattu Määrä
 DocType: Landed Cost Voucher,Purchase Receipt Items,Ostokuitti Items
@@ -2187,14 +2217,14 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,Disabled template must not be default template,Vammaiset mallia saa olla oletuspohja
 DocType: Account,Income Account,tulotili
 DocType: Payment Request,Amount in customer's currency,Summa asiakkaan valuutassa
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Delivery,Toimitus
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +748,Delivery,Toimitus
 DocType: Stock Reconciliation Item,Current Qty,nykyinen yksikkömäärä
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","katso ""materiaaleihin perustuva arvo"" kustannuslaskenta osiossa"
 DocType: Appraisal Goal,Key Responsibility Area,Key Vastuu Area
 DocType: Payment Entry,Total Allocated Amount,Yhteensä osuutensa
 DocType: Item Reorder,Material Request Type,materiaalipyynnön tyyppi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,Rivi {0}: UOM Muuntokerroin on pakollinen
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.html +1,Ref,Viite
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Viite
 DocType: Budget,Cost Center,kustannuspaikka
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,tosite #
 DocType: Notification Control,Purchase Order Message,Ostotilaus Message
@@ -2204,13 +2234,13 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","hinnoittelu sääntö on tehty tämä korvaa hinnaston / määritä alennus, joka perustuu kriteereihin"
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Varastoa voi muuttaa ainoastaan varaston Kirjauksella / Lähetteellä / Ostokuitilla
 DocType: Employee Education,Class / Percentage,luokka / prosenttia
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,markkinoinnin ja myynnin pää
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Head of Marketing and Sales,markkinoinnin ja myynnin pää
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,tulovero
 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.","mikäli 'hinnalle' on tehty hinnoittelusääntö se korvaa hinnaston, hinnoittelusääntö on lopullinen hinta joten lisäalennusta ei voi antaa, näin myyntitilaus, ostotilaus ym tapahtumaissa tuote sijoittuu paremmin 'arvo' kenttään 'hinnaston arvo' kenttään"
 apps/erpnext/erpnext/config/selling.py +164,Track Leads by Industry Type.,jäljitä vihjeitä toimialan mukaan
 DocType: Item Supplier,Item Supplier,tuote toimittaja
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +360,Please enter Item Code to get batch no,syötä tuotekoodi saadaksesi eränumeron
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +727,Please select a value for {0} quotation_to {1},syötä arvot tarjouksesta {0} tarjoukseen {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,Please enter Item Code to get batch no,syötä tuotekoodi saadaksesi eränumeron
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +770,Please select a value for {0} quotation_to {1},syötä arvot tarjouksesta {0} tarjoukseen {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,kaikki osoitteet
 DocType: Company,Stock Settings,varastoasetukset
 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","yhdistäminen on mahdollista vain, jos seuraavat arvot ovat samoja molemmissa tietueissa, kantatyyppi, ryhmä, viite, yritys"
@@ -2231,30 +2261,31 @@
 apps/erpnext/erpnext/accounts/party.py +345,{0} {1} is disabled,{0} {1} on poistettu käytöstä
 DocType: Supplier,Billing Currency,Laskutus Valuutta
 DocType: Sales Invoice,SINV-RET-,SINV-jälkikä-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +157,Extra Large,erittäin suuri
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,erittäin suuri
 ,Profit and Loss Statement,tuloslaskelma selvitys
 DocType: Bank Reconciliation Detail,Cheque Number,takaus/shekki numero
 ,Sales Browser,myyntiselain
 DocType: Journal Entry,Total Credit,kredit yhteensä
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +507,Warning: Another {0} # {1} exists against stock entry {2},varoitus: toinen varaston kirjausksen kohdistus {0} # {1} on jo olemassa {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Local,Paikallinen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Local,Paikallinen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),lainat ja ennakot (vastaavat)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,velalliset
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Large,Suuri
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Large,Suuri
 DocType: Homepage Featured Product,Homepage Featured Product,Kotisivu Erityistuotteet
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Uusi varasto Name
-apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total {0} ({1}),Yhteensä {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +225,Total {0} ({1}),Yhteensä {0} ({1})
 DocType: C-Form Invoice Detail,Territory,alue
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,vierailujen määrä vaaditaan
 DocType: Stock Settings,Default Valuation Method,oletus arvomenetelmä
 DocType: Production Order Operation,Planned Start Time,Suunnitellut Start Time
+DocType: Assessment,Assessment,Arviointi
 DocType: Payment Entry Reference,Allocated,kohdennettu
-apps/erpnext/erpnext/config/accounts.py +225,Close Balance Sheet and book Profit or Loss.,sulje tase ja tuloslaskelma kirja
+apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,sulje tase ja tuloslaskelma kirja
 DocType: Student Applicant,Application Status,sovellus status
 DocType: Fees,Fees,Maksut
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,määritä valuutan muunnostaso vaihtaaksesi valuutan toiseen
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,tarjous {0} on peruttu
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.html +1,Total Outstanding Amount,odottava arvomäärä yhteensä
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,odottava arvomäärä yhteensä
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,"työntekijä {0} on poissa {1}, ei voi merkitä osallistumista"
 DocType: Sales Partner,Targets,tavoitteet
 DocType: Price List,Price List Master,hinnasto valvonta
@@ -2267,7 +2298,7 @@
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,tämä on kanta-asiakasryhmä eikä sitä voi muokata
 DocType: Employee,AB-,AB-
 DocType: POS Profile,Ignore Pricing Rule,ohita hinnoittelu sääntö
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +92,From Date in Salary Structure cannot be lesser than Employee Joining Date.,päivästä ei voi olla pienempi kuin työntekijän aloituspäivä palkkarakenteessa
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +37,From Date in Salary Structure cannot be lesser than Employee Joining Date.,päivästä ei voi olla pienempi kuin työntekijän aloituspäivä palkkarakenteessa
 DocType: Employee Education,Graduate,valmistunut
 DocType: Leave Block List,Block Days,estopäivää
 DocType: Journal Entry,Excise Entry,aksiisikirjaus
@@ -2286,8 +2317,9 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.","perusehdot, jotka voidaan lisätä myynteihin ja ostoihin esim, 1. tarjouksen voimassaolo 1. maksuehdot (ennakko, luotto, osaennakko jne) 1. lisäkulut (asiakkaan maksettavaksi) 1. turvallisuus / käyttövaroitukset 1. takuuasiat 1. palautusoikeus. 1. toimitusehdot 1. riita-, korvaus- ja vastuuasioiden käsittely jne 1. omat osoite ja yhteystiedot"
 DocType: Attendance,Leave Type,"poistu, tyyppi"
-apps/erpnext/erpnext/controllers/stock_controller.py +172,Expense / Difference account ({0}) must be a 'Profit or Loss' account,kulu- / erotili ({0}) tulee olla 'tuloslaskelma' tili
+apps/erpnext/erpnext/controllers/stock_controller.py +173,Expense / Difference account ({0}) must be a 'Profit or Loss' account,kulu- / erotili ({0}) tulee olla 'tuloslaskelma' tili
 DocType: Account,Accounts User,tilien käyttäjä
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},Nimi error: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Puute
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +178,{0} {1} does not associated with {2} {3},{0} {1} ei liittynyt {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,työntekijän {0} osallistuminen on jo merkitty
@@ -2323,23 +2355,23 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},tuotteelle {0} laatutarkistus
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"taso, jolla asiakkaan valuutta muunnetaan yrityksen käyttämäksi perusvaluutaksi"
 DocType: Purchase Invoice Item,Net Rate (Company Currency),nettotaso (yrityksen valuutta)
+DocType: Salary Detail,Condition and Formula Help,Ehto ja Formula Ohje
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,hallitse aluepuuta
 DocType: Journal Entry Account,Sales Invoice,myyntilasku
 DocType: Journal Entry Account,Party Balance,osatase
 apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,valitse käytä alennusta
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,Salary Slip Created,Palkka Slip Luotu
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,Palkka Slip Luotu
 DocType: Company,Default Receivable Account,oletus saatava tili
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,tee pankkikirjaus maksetusta kokonaispalkasta edellä valituin kriteerein
 DocType: Stock Entry,Material Transfer for Manufacture,materiaalisiirto tuotantoon
 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.,"alennusprosenttia voi soveltaa yhteen, tai useampaan hinnastoon"
 DocType: Purchase Invoice,Half-yearly,puolivuosittain
-apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,tilikautta {0} ei löydy
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,kirjanpidon varaston kirjaus
 DocType: Sales Invoice,Sales Team1,myyntitiimi 1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Item {0} does not exist,tuotetta {0} ei ole olemassa
 DocType: Attendance Tool Student,Attendance Tool Student,Läsnäolo Tool Student
 DocType: Sales Invoice,Customer Address,asiakkaan osoite
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +88,Row {0}: Completed Qty must be greater than zero.,Rivi {0}: Valmis Määrä on oltava suurempi kuin nolla.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +96,Row {0}: Completed Qty must be greater than zero.,Rivi {0}: Valmis Määrä on oltava suurempi kuin nolla.
 DocType: Purchase Invoice,Apply Additional Discount On,käytä lisäalennusta
 DocType: Account,Root Type,kantatyyppi
 DocType: Item,FIFO,FIFO
@@ -2352,16 +2384,16 @@
 DocType: Cheque Print Template,Primary Settings,ensisijainen Asetukset
 DocType: Purchase Invoice,Select Supplier Address,Valitse toimittaja Osoite
 DocType: Quality Inspection,Quality Inspection,laatutarkistus
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Extra Small,erittäin pieni
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +666,Warning: Material Requested Qty is less than Minimum Order Qty,varoitus: pyydetty materiaali yksikkömäärä on pienempi kuin vähimmäis ostotilausmäärä
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,erittäin pieni
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,Warning: Material Requested Qty is less than Minimum Order Qty,varoitus: pyydetty materiaali yksikkömäärä on pienempi kuin vähimmäis ostotilausmäärä
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +194,Account {0} is frozen,tili {0} on jäädytetty
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"juridinen hlö / tytäryhtiö, jolla on erillinen tilikartta kuuluu organisaatioon"
 DocType: Payment Request,Mute Email,Mute Sähköposti
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","ruoka, juoma ja tupakka"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +600,Can only make payment against unbilled {0},Voi vain maksun vastaan laskuttamattomia {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +606,Can only make payment against unbilled {0},Voi vain maksun vastaan laskuttamattomia {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,provisio taso ei voi olla suurempi kuin 100
 DocType: Stock Entry,Subcontract,alihankinta
-apps/erpnext/erpnext/public/js/utils/party.js +145,Please enter {0} first,Kirjoita {0} ensimmäisen
+apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,Kirjoita {0} ensimmäisen
 DocType: Production Order Operation,Actual End Time,todellinen päättymisaika
 DocType: Production Planning Tool,Download Materials Required,lataa tarvittavien materiaalien lista
 DocType: Item,Manufacturer Part Number,valmistajan osanumero
@@ -2370,20 +2402,21 @@
 DocType: SMS Log,No of Sent SMS,Ei annettu Lähetetyt SMS
 DocType: Account,Expense Account,kulutili
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,ohjelmisto
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +160,Colour,väritä
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Colour,väritä
 DocType: Maintenance Visit,Scheduled,aikataulutettu
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Pyydä tarjous.
 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","valitse tuote joka ""varastotuote"", ""numero"" ja ""myyntituote"" valinnat täpätty kohtaan ""kyllä"", tuotteella ole muuta tavarakokonaisuutta"
+DocType: Student Log,Academic,akateeminen
 apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Yhteensä etukäteen ({0}) vastaan Order {1} ei voi olla suurempi kuin Grand Total ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,valitse toimitusten kk jaksotus tehdäksesi kausiluonteiset toimitusttavoitteet
 DocType: Purchase Invoice Item,Valuation Rate,arvotaso
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,"hinnasto, valuutta ole valittu"
-DocType: Examination,Results,tulokset
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +158,Employee {0} has already applied for {1} between {2} and {3},työntekijällä {0} on jo {1} hakemus {2} ja {3} välilltä
+DocType: Assessment,Results,tulokset
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,Employee {0} has already applied for {1} between {2} and {3},työntekijällä {0} on jo {1} hakemus {2} ja {3} välilltä
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekti aloituspäivä
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.html +1,Until,asti
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,asti
 DocType: Rename Tool,Rename Log,Nimeä Log
-DocType: Student,Father's/ Guardian 2 Email ID,Isän / Guardian 2 -sähköpostitunnus
+DocType: Student Applicant,Father's/ Guardian 2 Email ID,Isän / Guardian 2 -sähköpostitunnus
 DocType: Maintenance Visit Purpose,Against Document No,asiakirjan nro kohdistus
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,hallitse myyntikumppaneita
 DocType: Quality Inspection,Inspection Type,tarkistus tyyppi
@@ -2392,7 +2425,7 @@
 DocType: C-Form,C-Form No,C-muoto nro
 DocType: BOM,Exploded_items,räjäytetyt_tuotteet
 DocType: Employee Attendance Tool,Unmarked Attendance,merkitsemätön Läsnäolo
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Tutkija
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Researcher,Tutkija
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Ohjelma Ilmoittautuminen Tool Student
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Nimi tai Sähköposti on pakollinen
 apps/erpnext/erpnext/config/stock.py +158,Incoming quality inspection.,"saapuva, laatuntarkistus"
@@ -2406,7 +2439,7 @@
 DocType: Employee,You can enter any date manually,voit kirjoittaa minkä tahansa päivämäärän manuaalisesti
 DocType: Sales Invoice,Advertisement,mainos
 DocType: Asset Category Account,Depreciation Expense Account,Poistot edustusravintolat
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +174,Probationary Period,Koeaika
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,Koeaika
 apps/erpnext/erpnext/hooks.py +102,Announcements,Ilmoitukset
 DocType: Customer Group,Only leaf nodes are allowed in transaction,vain jatkosidokset ovat sallittuja tapahtumassa
 DocType: Expense Claim,Expense Approver,kulujen hyväksyjä
@@ -2420,10 +2453,10 @@
 apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,Lokit ylläpitämiseksi sms toimituksen tila
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Odottaa Aktiviteetit
 DocType: Payment Gateway,Gateway,Portti
-DocType: Fee Amount,Fees Category,Maksut Luokka
+DocType: Fee Component,Fees Category,Maksut Luokka
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Syötä lievittää päivämäärä.
 apps/erpnext/erpnext/controllers/trends.py +145,Amt,pankkipääte
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,Only Leave Applications with status 'Approved' can be submitted,vain 'hyväksytty' poistumissovellus voidaan lähettää
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,Only Leave Applications with status 'Approved' can be submitted,vain 'hyväksytty' poistumissovellus voidaan lähettää
 apps/erpnext/erpnext/utilities/doctype/address/address.py +26,Address Title is mandatory.,osoiteotsikko on pakollinen.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,syötä kampanjan nimi jos kirjauksen lähde on kampanja
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Newspaper Publishers
@@ -2440,10 +2473,10 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},Ei löydy valuuttakurssin {0} on {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,myyntitiimi
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,monista kirjaus
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,monista kirjaus
 DocType: Program Enrollment Tool,Get Students,Hanki Opiskelijat
 DocType: Serial No,Under Warranty,takuun alla
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +447,[Error],[virhe]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +490,[Error],[virhe]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"sanat näkyvät, kun tallennat myyntitilauksen"
 ,Employee Birthday,työntekijän syntymäpäivä
 apps/erpnext/erpnext/controllers/status_updater.py +175,Limit Crossed,raja Crossed
@@ -2456,6 +2489,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,laskun numero
 DocType: Shopping Cart Settings,Orders,Tilaukset
 DocType: Employee Leave Approver,Leave Approver,poistumis hyväksyjä
+DocType: Assessment Group,Assessment Group Name,Assessment Group Name
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Materiaali Siirretty valmistus
 DocType: Expense Claim,"A user with ""Expense Approver"" role","käyttäjä jolla on ""kulujen hyväksyjä"" rooli"
 DocType: Landed Cost Item,Receipt Document Type,Kuitti Document Type
@@ -2466,7 +2500,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% materiaaleja laskutettu tätä myyntitilausta vastaan
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,kauden sulkukirjaus
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,olemassaolevien tapahtumien kustannuspaikkaa ei voi muuttaa ryhmäksi
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Amount {0} {1} {2} {3},Määrä {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Amount {0} {1} {2} {3},Määrä {0} {1} {2} {3}
 DocType: Account,Depreciation,arvonalennus
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),toimittaja/toimittajat
 DocType: Employee Attendance Tool,Employee Attendance Tool,Työntekijän läsnäolo Tool
@@ -2477,7 +2511,8 @@
 DocType: GL Entry,Voucher No,tosite nro
 DocType: Leave Allocation,Leave Allocation,poistumiskohdistus
 DocType: Payment Request,Recipient Message And Payment Details,Vastaanottaja Message ja maksutiedot
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +481,Material Requests {0} created,materiaalipyynnön tekijä {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +497,Material Requests {0} created,materiaalipyynnön tekijä {0}
+DocType: Production Planning Tool,Include sub-contracted raw materials,Sisällytä alihankintaa raaka
 apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,sopimustaehtojen mallipohja
 DocType: Purchase Invoice,Address and Contact,Osoite ja yhteystiedot
 DocType: Cheque Print Template,Is Account Payable,Onko tili Maksettava
@@ -2503,7 +2538,7 @@
 DocType: Quotation Item,Against Doctype,asiakirjan tyyppi kohdistus
 apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} on peruutettu tai suljettu
 DocType: Delivery Note,Track this Delivery Note against any Project,seuraa tätä lähetettä kohdistettuna projektiin
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Nettokassavirta Investointien
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Cash from Investing,Nettokassavirta Investointien
 ,Is Primary Address,On Ensisijainen osoite
 DocType: Production Order,Work-in-Progress Warehouse,työnalla varasto
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,Asset {0} on toimitettava
@@ -2515,7 +2550,7 @@
 DocType: Serial No,Warranty / AMC Details,takuu / AMC lisätiedot
 DocType: Journal Entry,User Remark,käyttäjä huomautus
 DocType: Lead,Market Segment,Market Segment
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +558,Paid Amount cannot be greater than total negative outstanding amount {0},Maksettu summa ei voi olla suurempi kuin koko negatiivinen jäljellä {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +848,Paid Amount cannot be greater than total negative outstanding amount {0},Maksettu summa ei voi olla suurempi kuin koko negatiivinen jäljellä {0}
 DocType: Employee Internal Work History,Employee Internal Work History,työntekijän sisäinen työhistoria
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +233,Closing (Dr),sulku (dr)
 DocType: Cheque Print Template,Cheque Size,Shekki Koko
@@ -2523,7 +2558,7 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.js +49,View attendance,Katso läsnäolo
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,sarjanumero {0} ei varastossa
 apps/erpnext/erpnext/config/selling.py +159,Tax template for selling transactions.,veromallipohja myyntitapahtumiin
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1351,Write Off Outstanding Amount,poiston odottava arvomäärä
+DocType: Sales Invoice,Write Off Outstanding Amount,poiston odottava arvomäärä
 DocType: Account,Accounts Manager,tilien hallinta
 DocType: Stock Settings,Default Stock UOM,oletus varasto UOM
 DocType: Asset,Number of Depreciations Booked,Lukumäärä Poistot varatut
@@ -2547,14 +2582,14 @@
 DocType: Lead,Lower Income,matala tulo
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","vastattavat päätili, jonne voitto/tappio varataan"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,Source and target warehouse cannot be same for row {0},lähde ja tavoite varasto eivät voi olla samat rivillä {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +242,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","erotilin tulee olla vastaavat/vastattavat tili huomioiden, että varaston täsmäytys vaatii aloituskirjauksen"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","erotilin tulee olla vastaavat/vastattavat tili huomioiden, että varaston täsmäytys vaatii aloituskirjauksen"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +81,Purchase Order number required for Item {0},ostotilauksen numero vaaditaan tuotteelle {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',Aloituspäivän tulee olla ennen päättymispäivää
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +17,Cannot change status as student {0} is linked with student application {1},Ei voida muuttaa asemaa opiskelija {0} liittyy opiskelijavalinta {1}
 DocType: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.","Luettelo työntekijä, joka on "palkkakuitin perusteella Tuntilomakkeen" on käytössä palkkarakenteen."
 DocType: Asset,Fully Depreciated,täydet poistot
 ,Stock Projected Qty,ennustettu varaston yksikkömäärä
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Customer {0} does not belong to project {1},asiakas {0} ei kuulu projektiin {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},asiakas {0} ei kuulu projektiin {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Merkitty Läsnäolo HTML
 DocType: Sales Order,Customer's Purchase Order,Asiakkaan Ostotilaus
 apps/erpnext/erpnext/config/stock.py +107,Serial No and Batch,Sarjanumero ja Erä
@@ -2577,7 +2612,7 @@
 DocType: Sales Order,%  Delivered,% toimitettu
 DocType: Production Order,PRO-,PRO-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Bank Overdraft Account,pankin tilinylitystili
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +47,Make Salary Slip,tee palkkalaskelma
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,tee palkkalaskelma
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +26,Browse BOM,selaa BOM:a
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Secured Loans,taatut lainat
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Aseta poistot liittyvät tilien instrumenttikohtaisilla {0} tai Company {1}
@@ -2589,7 +2624,7 @@
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,päivä toistetaan
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Valtuutettu allekirjoittaja
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +187,Leave approver must be one of {0},poistumis hyväksyjä tulee olla {0}:sta
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,Leave approver must be one of {0},poistumis hyväksyjä tulee olla {0}:sta
 DocType: Hub Settings,Seller Email,myyjä sähköposti
 DocType: Project,Total Purchase Cost (via Purchase Invoice),hankintakustannusten kokonaismäärä (ostolaskuista)
 DocType: Workstation Working Hour,Start Time,aloitusaika
@@ -2606,7 +2641,7 @@
 DocType: Stock Settings,Item Naming By,tuotteen nimeäjä
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},toinen jakson sulkukirjaus {0} on tehty {1} jälkeen
 DocType: Production Order,Material Transferred for Manufacturing,materiaali siirretty tuotantoon
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Tiliä {0} ei löydy
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Tiliä {0} ei löydy
 DocType: Project,Project Type,projekti tyyppi
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,tavoite yksikkömäärä tai tavoite arvomäärä vaaditaan
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,vaihtelevien aktiviteettien kustannukset
@@ -2630,7 +2665,7 @@
 DocType: Expense Claim,Approval Status,hyväksynnän tila
 DocType: Hub Settings,Publish Items to Hub,Julkaise tuotteet Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},arvosta täytyy olla pienempi kuin arvo rivillä {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Wire Transfer,johdotus siirto
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Wire Transfer,johdotus siirto
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Tarkista kaikki
 DocType: Sales Order,Recurring Order,Toistuvat Order
 DocType: Company,Default Income Account,oletus tulotili
@@ -2638,14 +2673,14 @@
 DocType: Sales Invoice,Time Sheets,Time Sheets
 DocType: Payment Gateway Account,Default Payment Request Message,Oletus maksupyyntö Viesti
 DocType: Item Group,Check this if you want to show in website,täppää mikäli haluat näyttää tämän verkkosivuilla
-apps/erpnext/erpnext/config/accounts.py +130,Banking and Payments,Pankit ja maksut
+apps/erpnext/erpnext/config/accounts.py +136,Banking and Payments,Pankit ja maksut
 ,Welcome to ERPNext,tervetuloa ERPNext
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,vihjeestä tarjous
 DocType: Lead,From Customer,asiakkaasta
-apps/erpnext/erpnext/demo/setup_data.py +344,Calls,pyynnöt
+apps/erpnext/erpnext/demo/setup_data.py +357,Calls,pyynnöt
 DocType: Project,Total Costing Amount (via Time Logs),kustannuslaskenta arvomäärä yhteensä (aikaloki)
 DocType: Purchase Order Item Supplied,Stock UOM,varasto UOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +466,"As there are existing transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Koska on olemassa nykyisiä tapahtumia tälle tuotteelle, \ et voi muuttaa arvoja "Has Järjestysnumero", "Has Erä", "Onko Kanta Tuote" ja "Arvostusmenetelmä""
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,Purchase Order {0} is not submitted,ostotilausta {0} ei ole lähetetty
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,ennustus
@@ -2663,12 +2698,12 @@
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,yhteystietoja ei ole lisätty
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,"kohdistetut kustannukset, arvomäärä"
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Laskut esille Toimittajat.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1353,Write Off Account,poistotili
+DocType: POS Profile,Write Off Account,poistotili
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,alennus arvomäärä
 DocType: Purchase Invoice,Return Against Purchase Invoice,"ostolasku, palautuksen kohdistus"
 DocType: Item,Warranty Period (in days),takuuaika (päivinä)
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +40,Acutal qty in stock,Acutal kpl varastossa
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,Liiketoiminnan nettorahavirta
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Net Cash from Operations,Liiketoiminnan nettorahavirta
 apps/erpnext/erpnext/public/js/setup_wizard.js +225,e.g. VAT,"esim, alv"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,tuote 4
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +20,Sub-contracting,Alihankinta
@@ -2676,15 +2711,16 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Student Group
 DocType: Shopping Cart Settings,Quotation Series,"tarjous, sarjat"
 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","samanniminen tuote on jo olemassa ({0}), vaihda tuoteryhmän nimeä tai nimeä tuote uudelleen"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1171,Please select customer,Valitse asiakas
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1190,Please select customer,Valitse asiakas
 DocType: C-Form,I,minä
 DocType: Company,Asset Depreciation Cost Center,Asset Poistot Kustannuspaikka
 DocType: Sales Order Item,Sales Order Date,"myyntitilaus, päivä"
 DocType: Sales Invoice Item,Delivered Qty,toimitettu yksikkömäärä
+DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Jos valittu, kaikki lapset kunkin tuotannon kohde sisällytetään Material pyynnöt."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,Varasto {0}: Yritys on pakollinen
 ,Payment Period Based On Invoice Date,maksuaikaa perustuu laskun päiväykseen
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},valuuttakurssi puuttuu {0}
-DocType: Examination,Examiner,tarkastaja
+DocType: Assessment,Examiner,tarkastaja
 DocType: Journal Entry,Stock Entry,varaston kirjaus
 DocType: Payment Entry,Payment References,maksu Viitteet
 DocType: C-Form,C-FORM-,C-muodostumisesta
@@ -2693,7 +2729,7 @@
 DocType: Pricing Rule,Margin,Marginaali
 DocType: Salary Slip,Arrear Amount,jäännös arvomäärä
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Uudet asiakkaat
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,bruttovoitto %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Gross Profit %,bruttovoitto %
 DocType: Appraisal Goal,Weightage (%),painoarvo (%)
 DocType: Bank Reconciliation Detail,Clearance Date,tilityspäivä
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +60,Gross Purchase Amount is mandatory,Gross Ostoksen kokonaissumma on pakollinen
@@ -2735,7 +2771,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,Yrityksen nimeä ei voi Company
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,kirjeen ylätunniste mallipohjan tulostukseen
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"tuolostus, mallipohjan otsikot esim, proformalaskuun"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +156,Valuation type charges can not marked as Inclusive,arvotyypin maksuja ei voi sisällyttää
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,arvotyypin maksuja ei voi sisällyttää
 DocType: POS Profile,Update Stock,päivitä varasto
 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.,"tuotteiden eri UOM johtaa virheellisiin (kokonais) painoarvon, varmista, että tuotteiden nettopainot on samassa UOM:ssa"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM taso
@@ -2759,12 +2795,10 @@
 ,Stock Ledger,varaston tilikirja
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},Hinta: {0}
 DocType: Company,Exchange Gain / Loss Account,Exchange Gain / tuloslaskelma
-DocType: Salary Slip Deduction,Salary Slip Deduction,"palkkalaskelma, vähennys"
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Työntekijän ja läsnäoloa
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +72,Purpose must be one of {0},Tarkoitus on oltava yksi {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","Poista viittaus asiakkaan, toimittajan, myynti kumppani ja lyijyä, koska se on yrityksen osoite"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,Fill the form and save it,täytä muoto ja tallenna se
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +154,Row {0}: From Time and To Time overlap with existing from and to time,Rivi {0}: From Time ja Kellonaikatilaan päällekkäisyys olemassa olevien välillä ja ajoin
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,"lataa raportti, joka  sisältää kaikki raaka-aineet viimeisimmän varastotaseen mukaan"
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Yhteisön Forum
 DocType: Leave Application,Leave Balance Before Application,poistu taseesta ennen sovellusta
@@ -2772,7 +2806,6 @@
 DocType: Cheque Print Template,Width of amount in word,Leveys määrän sanassa
 DocType: Company,Default Letter Head,oletus kirjeen otsikko
 DocType: Purchase Order,Get Items from Open Material Requests,Saamaan kohteita Open Materiaali pyynnöt
-DocType: Timesheet Detail,Billable,Laskutettava
 DocType: Item,Standard Selling Rate,Standard Myynnin Hinta
 DocType: Account,Rate at which this tax is applied,taso jolla tätä veroa sovelletaan
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,uudellentilattu yksikkömäärä
@@ -2793,7 +2826,7 @@
 apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},erä- / viitepäivä ei voi olla {0} jälkeen
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,tietojen tuonti ja vienti
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Kanta on merkinnät vastaan Varasto {0}, joten et voi uudelleen määrittää tai muuttaa sitä"
-apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +28,No students Found,Ei opiskelijat Todettu
+apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +29,No students Found,Ei opiskelijat Todettu
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Laskun julkaisupäivä
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +24,Sell,Myydä
 DocType: Sales Invoice,Rounded Total,pyöristys yhteensä
@@ -2804,14 +2837,14 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +35,Make Maintenance Visit,tee huoltokäynti
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +162,Please contact to the user who have Sales Master Manager {0} role,"ota yhteyttä käyttäjään, jolla on myynninhallinnan valvojan rooli {0}"
 DocType: Company,Default Cash Account,oletus kassatili
-apps/erpnext/erpnext/config/accounts.py +50,Company (not Customer or Supplier) master.,yrityksen valvonta (ei asiakas tai toimittaja)
+apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,yrityksen valvonta (ei asiakas tai toimittaja)
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +5,This is based on the attendance of this Student,Tämä perustuu läsnäolo tämän Student
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +165,Add more items or open full form,Lisätä kohteita tai avata koko lomakkeen
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,Please enter 'Expected Delivery Date',Anna "Expected Delivery Date"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,lähete {0} tulee perua ennen myyntilauksen perumista
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +75,Paid amount + Write Off Amount can not be greater than Grand Total,maksettu arvomäärä + poistotilin summa ei voi olla suurempi kuin kokonaissumma
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} ei sallittu eränumero tuotteelle {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +128,Note: There is not enough leave balance for Leave Type {0},"huom, jäännöstyypille {0} ei ole tarpeeksi vapaata jäännöstasetta"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +138,Note: There is not enough leave balance for Leave Type {0},"huom, jäännöstyypille {0} ei ole tarpeeksi vapaata jäännöstasetta"
 DocType: Program Enrollment Fee,Program Enrollment Fee,Ohjelma Ilmoittautuminen Fee
 DocType: Item,Supplier Items,toimittajan tuotteet
 DocType: Opportunity,Opportunity Type,tilaisuus tyyppi
@@ -2819,7 +2852,6 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},"kustannuspaikka tarvitsee ""tuloslaskelma"" tilin {0}"
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,vain järjestelmän perustaja voi poistaa tapahtumia
 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.,"löytyi virheellinen määrä päätilikirjan kirjauksia, olet ehkä valinnut väärän tilin tapahtumaan"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Toimittaja> Merkki Tyyppi
 DocType: Cheque Print Template,Cheque Width,Shekki Leveys
 DocType: Program,Fee Schedule,Fee aikataulu
 DocType: Hub Settings,Publish Availability,Julkaise Saatavuus
@@ -2835,7 +2867,7 @@
 DocType: Warranty Claim,Item and Warranty Details,Kohta ja takuu Tietoja
 DocType: Sales Team,Contribution (%),panostus (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,huom: maksukirjausta ei synny sillä 'kassa- tai pankkitiliä' ei ole määritetty
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Responsibilities,Vastuut
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,Vastuut
 DocType: Expense Claim Account,Expense Claim Account,Matkakorvauslomakkeet Account
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,mallipohja
 DocType: Sales Person,Sales Person Name,myyjän nimi
@@ -2846,17 +2878,18 @@
 DocType: Stock Reconciliation Item,Before reconciliation,ennen täsmäytystä
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},(lle) {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),verot ja maksut lisätty (yrityksen valuutta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +439,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"tuotteen vero, rivi {0} veron tyyppi tulee määritellä (tulo, kulu, veloitettava)"
+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,"tuotteen vero, rivi {0} veron tyyppi tulee määritellä (tulo, kulu, veloitettava)"
 DocType: Sales Order,Partly Billed,Osittain Laskutetaan
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} must be a Fixed Asset Item,Kohta {0} on oltava käyttö- omaisuuserän
 DocType: Item,Default BOM,oletus BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Please re-type company name to confirm,kirjoita yrityksen nimi uudelleen vahvistukseksi
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.html +1,Total Outstanding Amt,"odottaa, pankkipääte yhteensä"
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +67,Total Outstanding Amt,"odottaa, pankkipääte yhteensä"
 DocType: Timesheet,Total Hours,tunnit yhteensä
 DocType: Journal Entry,Printing Settings,Asetusten tulostaminen
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},"debet yhteensä tulee olla sama kuin kredit yhteensä, ero on {0}"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotive
 DocType: Asset Category Account,Fixed Asset Account,Kiinteä tasetilille
+DocType: Salary Structure Employee,Variable,muuttuja
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,From Delivery Note,lähetteestä
 DocType: POS Profile,Allow Partial Payment,Salli osamaksun
 DocType: Timesheet Detail,From Time,ajasta
@@ -2865,9 +2898,10 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,Cash or Bank Account is mandatory for making payment entry,kassa tai pankkitili vaaditaan maksujen kirjaukseen
 DocType: Purchase Invoice,Price List Exchange Rate,hinnasto vaihtotaso
 DocType: Purchase Invoice Item,Rate,taso
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,harjoitella
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,harjoitella
 DocType: Stock Entry,From BOM,BOM:sta
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,perustiedot
+DocType: Assessment,Assessment Code,arviointi koodi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,perustiedot
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +97,Stock transactions before {0} are frozen,ennen {0} rekisteröidyt varastotapahtumat on jäädytetty
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"klikkaa ""muodosta aikataulu"""
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,päivä tulee olla sama kuin 1/2 päivä poistumisessa
@@ -2878,11 +2912,11 @@
 DocType: Salary Slip,Salary Structure,palkkarakenne
 DocType: Account,Bank,pankki
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,lentoyhtiö
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +699,Issue Material,materiaali aihe
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +752,Issue Material,materiaali aihe
 DocType: Material Request Item,For Warehouse,varastoon
 DocType: Employee,Offer Date,Ehdota päivää
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Lainaukset
-apps/erpnext/erpnext/accounts/page/pos/pos.js +675,You are in offline mode. You will not be able to reload until you have network.,Olet offline-tilassa. Et voi ladata kunnes olet verkon.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +683,You are in offline mode. You will not be able to reload until you have network.,Olet offline-tilassa. Et voi ladata kunnes olet verkon.
 DocType: Hub Settings,Access Token,Access Token
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +31,No Student Groups created.,Ei opiskelijaryhmille luotu.
 DocType: Purchase Invoice Item,Serial No,sarjanumero
@@ -2890,13 +2924,13 @@
 DocType: Purchase Invoice,Print Language,Tulosta Kieli
 DocType: Salary Slip,Total Working Hours,Kokonaistyöajasta
 DocType: Stock Entry,Including items for sub assemblies,mukaanlukien alikokoonpanon tuotteet
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1100,Enter value must be positive,Anna-arvon on oltava positiivinen
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Kaikki alueet
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1122,Enter value must be positive,Anna-arvon on oltava positiivinen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,Kaikki alueet
 DocType: Purchase Invoice,Items,tuotteet
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,Student is already enrolled.,Opiskelijan on jo ilmoittautunut.
 DocType: Fiscal Year,Year Name,Vuoden nimi
 DocType: Process Payroll,Process Payroll,Process Palkanlaskenta
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +144,There are more holidays than working days this month.,tässä kuussa ei ole lomapäiviä työpäivinä
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,tässä kuussa ei ole lomapäiviä työpäivinä
 DocType: Product Bundle Item,Product Bundle Item,tavarakokonaisuus tuote
 DocType: Sales Partner,Sales Partner Name,myyntikumppani nimi
 apps/erpnext/erpnext/hooks.py +96,Request for Quotations,Pyyntö Lainaukset
@@ -2906,16 +2940,16 @@
 DocType: Issue,Opening Time,Aukeamisaika
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,alkaen- ja päätyen päivä vaaditaan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,arvopaperit & hyödykkeet vaihto
-apps/erpnext/erpnext/stock/doctype/item/item.py +625,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Oletus mittayksikkö Variant "{0}" on oltava sama kuin malli "{1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Oletus mittayksikkö Variant "{0}" on oltava sama kuin malli "{1}"
 DocType: Shipping Rule,Calculate Based On,"laske, perusteet"
 DocType: Delivery Note Item,From Warehouse,Varastosta
-DocType: Examination,Supervisor Name,ohjaaja Name
+DocType: Assessment,Supervisor Name,ohjaaja Name
 DocType: Purchase Taxes and Charges,Valuation and Total,arvo ja summa
 DocType: Tax Rule,Shipping City,Toimitus Kaupunki
 apps/erpnext/erpnext/stock/doctype/item/item.js +62,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"tämä on malli tuotteesta {0} (mallipohja), tuotteen tuntomerkit kopioidaan ellei 'älä kopioi' ole aktivoitu"
 DocType: Account,Purchase User,Osto Käyttäjä
 DocType: Notification Control,Customize the Notification,muokkaa ilmoitusta
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,LIIKETOIMINNAN RAHAVIRTA
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Cash Flow from Operations,LIIKETOIMINNAN RAHAVIRTA
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,"oletus osoite, mallipohjaa ei voi poistaa"
 DocType: Sales Invoice,Shipping Rule,toimitus sääntö
 DocType: Manufacturer,Limited to 12 characters,Rajattu 12 merkkiä
@@ -2923,7 +2957,6 @@
 DocType: Maintenance Schedule,Maintenance Manager,huoltohallinto
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,yhteensä ei voi olla nolla
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,'Päivää edellisestä tilauksesta' on oltava suurempi tai yhtäsuuri kuin nolla
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Aseta Nimeäminen Series {0} kautta Asetukset> Asetukset> nimeäminen Series
 DocType: Asset,Amended From,muutettu mistä
 apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,raaka-aine
 DocType: Leave Application,Follow via Email,seuraa sähköpostitse
@@ -2943,36 +2976,38 @@
 DocType: Issue,Raised By (Email),Raised By (sähköposti)
 DocType: Mode of Payment,General,pää
 apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,Kiinnitä Kirjelomake
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +296,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',vähennystä ei voi tehdä jos kategoria on  'arvo'  tai 'arvo ja summa'
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +338,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',vähennystä ei voi tehdä jos kategoria on  'arvo'  tai 'arvo ja summa'
 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.","luettelo verotapahtumista, kuten (alv, tulli, ym, ne tulee olla uniikkeja nimiä) ja vakioarvoin, tämä luo perusmallipohjan, jota muokata tai lisätä tarpeen mukaan myöhemmin"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},sarjanumero edelyttää sarjoitettua tuotetta {0}
-apps/erpnext/erpnext/config/accounts.py +140,Match Payments with Invoices,Match Maksut Laskut
+apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Match Maksut Laskut
 DocType: Journal Entry,Bank Entry,pankkikirjaus
 DocType: Authorization Rule,Applicable To (Designation),sovellettavissa (nimi)
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,Lisää koriin
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,ryhmän
-apps/erpnext/erpnext/config/accounts.py +256,Enable / disable currencies.,"aktivoi / poista käytöstä, valuutat"
+DocType: Guardian,Interests,etu
+apps/erpnext/erpnext/config/accounts.py +262,Enable / disable currencies.,"aktivoi / poista käytöstä, valuutat"
 DocType: Production Planning Tool,Get Material Request,Get Materiaali Request
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Postal Expenses,postituskulut
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),yhteensä (pankkipääte)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,edustus & vapaa-aika
 DocType: Quality Inspection,Item Serial No,tuote sarjanumero
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,esillä yhteensä
-apps/erpnext/erpnext/config/accounts.py +101,Accounting Statements,tilinpäätöksen
+apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,tilinpäätöksen
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Hour,tunti
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +141,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",sarjanumerollista tuottetta {0} ei voi päivittää varaston täsmäytyksellä
 DocType: Scheduling Tool,Day,Päivä
 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,"uusi sarjanumero voi olla varastossa, sarjanumero muodoruu varaston kirjauksella tai ostokuitilla"
 DocType: Lead,Lead Type,vihjeen tyyppi
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +112,You are not authorized to approve leaves on Block Dates,Sinulla ei ole lupa hyväksyä lehdet Block Päivämäärät
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,You are not authorized to approve leaves on Block Dates,Sinulla ei ole lupa hyväksyä lehdet Block Päivämäärät
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,All these items have already been invoiced,Kaikki nämä asiat on jo laskutettu
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},hyväksyjä on {0}
+DocType: Item,Default Material Request Type,Oletus Materiaali Pyyntötyyppi
 DocType: Student Applicant,AP.,AP.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,Tuntematon
 DocType: Shipping Rule,Shipping Rule Conditions,toimitus sääntö ehdot
 DocType: BOM Replace Tool,The new BOM after replacement,uusi BOM korvauksen jälkeen
-apps/erpnext/erpnext/accounts/page/pos/pos.js +631,Point of Sale,Point of Sale
+apps/erpnext/erpnext/accounts/page/pos/pos.js +639,Point of Sale,Point of Sale
 DocType: Payment Entry,Received Amount,Vastaanotetut Määrä
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Luo täyden määrän, välittämättä määrä jo tilattuihin"
 DocType: Account,Tax,vero
@@ -2982,7 +3017,7 @@
 DocType: C-Form,Invoices,laskut
 DocType: Job Opening,Job Title,Työtehtävä
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,Gramma
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +369,Quantity to Manufacture must be greater than 0.,Määrä Valmistus on oltava suurempi kuin 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +373,Quantity to Manufacture must be greater than 0.,Määrä Valmistus on oltava suurempi kuin 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,käyntiraportti huoltopyynnöille
 DocType: Stock Entry,Update Rate and Availability,Päivitysnopeus ja saatavuus
 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.,"vastaanoton tai toimituksen prosenttiosuus on liian suuri suhteessa tilausmäärään, esim: mikäli 100 yksikköä on tilattu sallittu ylitys on 10% niin sallittu määrä on 110 yksikköä"
@@ -2990,23 +3025,23 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Expense account is mandatory for item {0},kulutili on vaaditaan tuotteelle {0}
 DocType: Item,Website Description,verkkosivujen kuvaus
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,Seuraava Poistot Date on oltava tai sen jälkeen tänään
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Nettomuutos Equity
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,Nettomuutos Equity
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +145,Please cancel Purchase Invoice {0} first,Peruuta Ostolasku {0} ensimmäinen
 DocType: Serial No,AMC Expiry Date,AMC Viimeinen käyttöpäivä
 ,Sales Register,myyntirekisteri
 DocType: Quotation,Quotation Lost Reason,"tarjous hävitty, syy"
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,Valitse Domain
 DocType: Address,Plant,Kasvi
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Transaction reference no {0} dated {1},Transaction viitenumero {0} päivätyn {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +330,Transaction reference no {0} dated {1},Transaction viitenumero {0} päivätyn {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,ei muokattavaa
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,Summary for this month and pending activities,Yhteenveto tässä kuussa ja keskeneräisten toimien
 DocType: Customer Group,Customer Group Name,asiakasryhmän nimi
-apps/erpnext/erpnext/public/js/financial_statements.js +82,Cash Flow Statement,Rahavirtalaskelma
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,Please remove this Invoice {0} from C-Form {1},poista lasku {0} C-kaaviosta {1}
+apps/erpnext/erpnext/public/js/financial_statements.js +54,Cash Flow Statement,Rahavirtalaskelma
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},poista lasku {0} C-kaaviosta {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,valitse jatka eteenpäin mikäli haluat sisällyttää edellisen tilikauden taseen tälle tilikaudelle
 DocType: GL Entry,Against Voucher Type,tositteen tyyppi kohdistus
 DocType: Item,Attributes,tuntomerkkejä
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Get Items,hae tuotteet
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +644,Get Items,hae tuotteet
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,Please enter Write Off Account,syötä poistotili
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Last Order Päivämäärä
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +41,Account {0} does not belongs to company {1},Tili {0} ei kuulu yritykselle {1}
@@ -3022,14 +3057,14 @@
 DocType: Project,Expected End Date,odotettu päättymispäivä
 DocType: Budget Account,Budget Amount,talousarvio Määrä
 DocType: Appraisal Template,Appraisal Template Title,"arviointi, mallipohja otsikko"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +103,Commercial,kaupallinen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,Commercial,kaupallinen
 DocType: Payment Entry,Account Paid To,Tilin Palkallinen
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Parent Kohta {0} ei saa olla Kanta Tuote
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,kaikki tavarat tai palvelut
 DocType: Supplier Quotation,Supplier Address,toimittajan osoite
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +636,Row {0}# Account must be of type 'Fixed Asset',Rivi {0} # Account täytyy olla tyyppiä "Käyttöomaisuuden"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +648,Row {0}# Account must be of type 'Fixed Asset',Rivi {0} # Account täytyy olla tyyppiä "Käyttöomaisuuden"
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,ulkona yksikkömäärä
-apps/erpnext/erpnext/config/accounts.py +272,Rules to calculate shipping amount for a sale,sääntö laskee toimituskustannuksen arvomäärän myyntiin
+apps/erpnext/erpnext/config/accounts.py +278,Rules to calculate shipping amount for a sale,sääntö laskee toimituskustannuksen arvomäärän myyntiin
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +30,Series is mandatory,sarjat ovat pakollisia
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,talouspalvelu
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Toimintamuodot Aika Lokit
@@ -3041,7 +3076,7 @@
 DocType: Tax Rule,Billing State,Laskutus valtion
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,siirto
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{0} {1} does not associated with Party Account {2},{0} {1} ei liittynyt PartyAccount {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +772,Fetch exploded BOM (including sub-assemblies),nouda BOM räjäytys (mukaan lukien alikokoonpanot)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,Fetch exploded BOM (including sub-assemblies),nouda BOM räjäytys (mukaan lukien alikokoonpanot)
 DocType: Authorization Rule,Applicable To (Employee),sovellettavissa (työntekijä)
 apps/erpnext/erpnext/controllers/accounts_controller.py +115,Due Date is mandatory,eräpäivä vaaditaan
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Puuston Taito {0} ei voi olla 0
@@ -3053,11 +3088,12 @@
 DocType: Landed Cost Voucher,Purchase Receipts,Osto Kuitit
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,miten hinnoittelu sääntöä käytetään
 DocType: Quality Inspection,Delivery Note No,lähetteen numero
+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","Jos tämä on valittu, vain ostaa materiaalia pyyntöjen lopullinen aineiden sisällytetään Materiaaliin pyynnöt. Muuten materiaali pyynnöt vanhemman kohteita luodaan"
 DocType: Cheque Print Template,Message to show,Viesti näyttää
 DocType: Company,Retail,Vähittäiskauppa
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +118,Customer {0} does not exist,asiakasta {0} ei ole olemassa
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,asiakasta {0} ei ole olemassa
 DocType: Attendance,Absent,puuttua
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +534,Product Bundle,tavarakokonaisuus
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,tavarakokonaisuus
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Invalid reference {1},Rivi {0}: Virheellinen viittaus {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,oston verojen ja maksujen mallipohja
 DocType: Upload Attendance,Download Template,lataa mallipohja
@@ -3067,8 +3103,10 @@
 DocType: Purchase Order Item Supplied,Raw Material Item Code,raaka-aineen tuotekoodi
 DocType: Journal Entry,Write Off Based On,poisto perustuu
 DocType: Stock Settings,Show Barcode Field,Näytä Viivakoodi Field
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +689,Send Supplier Emails,Lähetä toimittaja Sähköpostit
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +742,Send Supplier Emails,Lähetä toimittaja Sähköpostit
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Palkka jo käsitellä välisenä aikana {0} ja {1}, Jätä hakuaika voi olla välillä tällä aikavälillä."
 apps/erpnext/erpnext/config/stock.py +122,Installation record for a Serial No.,sarjanumeron asennustietue
+DocType: Guardian Interest,Guardian Interest,Guardian Interest
 DocType: Timesheet,Employee Detail,työntekijän Detail
 apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,Seuraava Päivämäärä päivä ja Toista kuukauden päivä on oltava sama
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Ilmoitathan
@@ -3079,7 +3117,7 @@
 DocType: Salary Slip,Earning & Deduction,ansio & vähennys
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,tili {0} ei voi ryhmä
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,Optional. This setting will be used to filter in various transactions.,"valinnainen, asetusta käytetään suodatettaessa eri tapahtumia"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,negatiivinen arvotaso ei ole sallittu
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +107,Negative Valuation Rate is not allowed,negatiivinen arvotaso ei ole sallittu
 DocType: Holiday List,Weekly Off,viikottain pois
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","esim 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),voitto/tappio ote (kredit)
@@ -3092,8 +3130,8 @@
 DocType: Production Order Item,Production Order Item,Tuotantotilaus Tuote
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Tietuetta ei löydy
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,Kustannukset Scrapped Asset
-apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: kustannuspaikka on pakollinen tuotteelle {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +573,Get Items from Product Bundle,Saamaan kohteita Product Bundle
+apps/erpnext/erpnext/controllers/stock_controller.py +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: kustannuspaikka on pakollinen tuotteelle {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,Saamaan kohteita Product Bundle
 DocType: Asset,Straight Line,Suora viiva
 DocType: Project User,Project User,Project Käyttäjä
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,tili {0} ei ole aktiivinen
@@ -3117,6 +3155,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,rooli voi jäädyttää- sekä muokata jäädytettyjä kirjauksia
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,"kustannuspaikasta ei voi siirtää tilikirjaan, sillä kustannuspaikalla on alasidoksia"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,Opening Arvo
+DocType: Salary Detail,Formula,Kaava
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,sarja #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Commission on Sales,provisio myynti
 DocType: Offer Letter Term,Value / Description,arvo / kuvaus
@@ -3155,15 +3194,15 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Kuin Päivämäärä
 DocType: Appraisal,HR,HR
 DocType: Program Enrollment,Enrollment Date,ilmoittautuminen Date
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Koeaika
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Probation,Koeaika
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Palkka Components
 DocType: Program Enrollment Tool,New Academic Year,Uusi Lukuvuosi
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +168,Payment of salary for the month {0} and year {1},palkanmaksu kuukausi {0} vuosi {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},palkanmaksu kuukausi {0} vuosi {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Automaattinen käynnistys Hinnasto korolla, jos puuttuu"
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.html +1,Total Paid Amount,maksettu arvomäärä yhteensä
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,maksettu arvomäärä yhteensä
 DocType: Production Order Item,Transferred Qty,siirretty yksikkömäärä
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Liikkuminen
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Planning,Suunnittelu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Planning,Suunnittelu
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,liitetty
 DocType: Project,Total Billing Amount (via Time Logs),laskutuksen kokomaisarvomäärä (aikaloki)
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,myymme tätä tuotetta
@@ -3176,10 +3215,11 @@
 DocType: Sales Partner,Contact Desc,"yhteystiedot, kuvailu"
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","poistumissyy, kuten vapaa, sairas jne"
 DocType: Email Digest,Send regular summary reports via Email.,lähetä yhteenvetoraportteja säännöllisesti sähköpostitse
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1390,Sales invoice submitted sucessfully.,Myynnin lasku toimitettu onnistuneesti.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,Myynnin lasku toimitettu onnistuneesti.
 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},Aseta oletus tilin Matkakorvauslomakkeet tyyppi {0}
-DocType: Attendance Tool Student,Student Name,Opiskelijan nimi
+DocType: Assessment Result,Student Name,Opiskelijan nimi
+apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,arviointi aikataulu
 DocType: Brand,Item Manager,tuotehallinta
 DocType: Buying Settings,Default Supplier Type,oletus toimittajatyyppi
 DocType: Production Order,Total Operating Cost,käyttökustannukset yhteensä
@@ -3195,12 +3235,12 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Aseta Tax Rule ostoskoriin
 DocType: Purchase Invoice,Taxes and Charges Added,verot ja maksut lisätty
 ,Sales Funnel,myynnin suppilo
-apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,Lyhenne on pakollinen
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +25,Abbreviation is mandatory,Lyhenne on pakollinen
 ,Qty to Transfer,siirrettävä yksikkömäärä
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,noteerauksesta vihjeeksi tai asiakkaaksi
 DocType: Stock Settings,Role Allowed to edit frozen stock,rooli saa muokata jäädytettyä varastoa
 ,Territory Target Variance Item Group-Wise,"aluetavoite vaihtelu, tuoteryhmä työkalu"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,kaikki asiakasryhmät
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Customer Groups,kaikki asiakasryhmät
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,kertyneet Kuukauden
 apps/erpnext/erpnext/controllers/accounts_controller.py +595,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} on pakollinen, voi olla ettei valuutanvaihto tietuetta ei tehty {1}:stä {2}:n."
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +38,Tax Template is mandatory.,Vero malli on pakollinen.
@@ -3211,28 +3251,27 @@
 DocType: Address,Preferred Billing Address,suositeltu laskutusosoite
 DocType: Program,Courses,Kurssit
 DocType: Monthly Distribution Percentage,Percentage Allocation,Prosentti Allocation
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,sihteeri
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Secretary,sihteeri
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Jos poistaa käytöstä, "In Sanat" kentässä ei näy missään kauppa"
 DocType: Serial No,Distinct unit of an Item,tuotteen erillisyksikkö
 DocType: Pricing Rule,Buying,ostaminen
 DocType: HR Settings,Employee Records to be created by,työntekijä tietue on tehtävä
 DocType: POS Profile,Apply Discount On,Levitä alennus
 ,Reqd By Date,Reqd Päivämäärä
-DocType: Salary Slip Earning,Salary Slip Earning,"palkkalaskelma, ansio"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,luotonantajat
+DocType: Assessment,Assessment Name,arviointi Name
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,Rivi # {0}: Sarjanumero on pakollinen
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,"tuote työkalu, verotiedot"
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,Institute lyhenne
 ,Item-wise Price List Rate,"tuote työkalu, hinnasto taso"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +806,Supplier Quotation,toimittajan tarjouskysely
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +859,Supplier Quotation,toimittajan tarjouskysely
 DocType: Quotation,In Words will be visible once you save the Quotation.,"sanat näkyvät, kun tallennat tarjouksen"
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +7,Collect Fees,Kerää maksut
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +451,Barcode {0} already used in Item {1},viivakoodi {0} on jo käytössä tuotteella {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Barcode {0} already used in Item {1},viivakoodi {0} on jo käytössä tuotteella {1}
 DocType: Lead,Add to calendar on this date,lisää kalenteriin (tämä päivä)
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,toimituskustannusten lisäys säännöt
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Tulevat tapahtumat
-DocType: Fee Amount,Fee Amount,Fee Määrä
 DocType: Item,Opening Stock,avaaminen Stock
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,asiakasta velvoitetaan
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} on pakollinen palautukseen
@@ -3249,7 +3288,7 @@
 DocType: Customer,From Lead,vihjeestä
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,tuotantoon luovutetut tilaukset
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,valitse tilikausi ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +443,POS Profile required to make POS Entry,POS profiili vaatii POS kirjauksen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,POS profiili vaatii POS kirjauksen
 DocType: Program Enrollment Tool,Enroll Students,Ilmoittaudu Opiskelijat
 DocType: Hub Settings,Name Token,Name Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,perusmyynti
@@ -3285,7 +3324,6 @@
 DocType: Currency Exchange,To Currency,valuuttakursseihin
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,salli seuraavien käyttäjien hyväksyä poistumissovelluksen estopäivät
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,kuluvaatimus tyypit
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Asiakas> Asiakaspalvelu Group> Territory
 DocType: Item,Taxes,verot
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +301,Paid and Not Delivered,Maksettu ja ei toimiteta
 DocType: Project,Default Cost Center,oletus kustannuspaikka
@@ -3300,6 +3338,7 @@
 DocType: Sales Invoice,Exhibition,näyttely
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address","Yhtiö on pakollista, koska se on yrityksen osoite"
 DocType: Item Attribute,From Range,Alkaen Range
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +81,Syntax error in formula or condition: {0},Syntaksivirhe kaavassa tai tila: {0}
 apps/erpnext/erpnext/stock/utils.py +99,Item {0} ignored since it is not a stock item,tuote {0} ohitetaan sillä se ei ole varastotuote
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +34,Submit this Production Order for further processing.,lähetä tuotannon tilaus eteenpäin
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",kaikki sovellettavat hinnoittelusäännöt tulee poistaa käytöstä ettei hinnoittelusääntöjä käytetä tähän tapahtumaan
@@ -3312,14 +3351,13 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +227,Rate (%),taso (%)
 DocType: Stock Entry Detail,Additional Cost,Muita Kustannukset
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,tilikauden lopetuspäivä
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher",ei voi suodattaa tositenumero pohjalta mikäli tosite on ryhmässä
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,Make Supplier Quotation,tee toimittajan tarjouskysely
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher",ei voi suodattaa tositenumero pohjalta mikäli tosite on ryhmässä
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +763,Make Supplier Quotation,tee toimittajan tarjouskysely
 DocType: Quality Inspection,Incoming,saapuva
 DocType: BOM,Materials Required (Exploded),materiaalitarve (räjäytys)
-DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),pienennä ansiota poistuttaessa ilman palkkaa (LWP)
 apps/erpnext/erpnext/public/js/setup_wizard.js +185,"Add users to your organization, other than yourself",lisää toisia käyttäjiä organisaatiosi
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Row # {0}: Serial No {1} does not match with {2} {3},Rivi # {0}: Sarjanumero {1} ei vastaa {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,tavallinen poistuminen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +42,Casual Leave,tavallinen poistuminen
 DocType: Batch,Batch ID,erän tunnus
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},Huomautus: {0}
 ,Delivery Note Trends,lähete trendit
@@ -3333,8 +3371,8 @@
 DocType: Request for Quotation Item,Request for Quotation Item,Tarjouspyyntö Tuote
 DocType: Purchase Order,To Bill,laskutukseen
 DocType: Material Request,% Ordered,% Järjestetty
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Urakkatyö
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,keskimääräinen ostamisen taso
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Piecework,Urakkatyö
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,keskimääräinen ostamisen taso
 DocType: Task,Actual Time (in Hours),todellinen aika (tunneissa)
 DocType: Employee,History In Company,yrityksen historia
 apps/erpnext/erpnext/config/learn.py +112,Newsletters,Uutiskirjeet
@@ -3350,7 +3388,7 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} yksikköä {1} tarvitaan {2} tapahtuman suorittamiseen.
 DocType: SMS Settings,SMS Settings,tekstiviesti asetukset
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Temporary Accounts,väliaikaiset tilit
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Black,musta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Black,musta
 DocType: BOM Explosion Item,BOM Explosion Item,BOM tuotteen räjäytys
 DocType: Account,Auditor,Tilintarkastaja
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,{0} kohdetta tuotettu
@@ -3364,9 +3402,10 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +69,Customer Id,asiakastunnus
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Mark Absent
 DocType: Journal Entry Account,Exchange Rate,valuutta taso
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Sales Order {0} is not submitted,myyntitilausta {0} ei ole lähetetty
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,myyntitilausta {0} ei ole lähetetty
 DocType: Homepage,Tag Line,Tag Line
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Add items from,Lisää kohteita
+DocType: Fee Component,Fee Component,Fee Component
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,Lisää kohteita
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +97,Warehouse {0}: Parent account {1} does not bolong to the company {2},Varasto {0}: Emotili {1} ei kuulu yritykselle {2}
 DocType: Cheque Print Template,Regular,säännöllinen
 DocType: BOM,Last Purchase Rate,viimeisin ostotaso
@@ -3383,12 +3422,13 @@
 DocType: Employee,Reports to,raportoi
 DocType: SMS Settings,Enter url parameter for receiver nos,syötä url parametrin vastaanottonro
 DocType: Payment Entry,Paid Amount,maksettu arvomäärä
-DocType: Examination,Supervisor,Valvoja
+DocType: Assessment,Supervisor,Valvoja
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,Online,Online
 ,Available Stock for Packing Items,pakattavat tuotteet saatavissa varastosta
 DocType: Item Variant,Item Variant,tuotemalli
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,"tämä osoite mallipohjaa on asetettu oletukseksi, sillä muuta pohjaa ei ole valittu"
 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'","tilin tase on jo dedet, syötetyn arvon tulee olla 'tasapainossa' eli 'krebit'"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,määrähallinta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Quality Management,määrähallinta
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} has been disabled,Kohta {0} on poistettu käytöstä
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Kirjoita kpl määrä Tuote {0}
 DocType: Employee External Work History,Employee External Work History,työntekijän muu työkokemus
@@ -3400,17 +3440,17 @@
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,"taso, jolla toimittajan valuutta muunnetaan yrityksen käyttämäksi perusvaluutaksi"
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Rivi # {0}: ajoitukset ristiriidassa rivin {1}
 DocType: Opportunity,Next Contact,Seuraava Yhteystiedot
-apps/erpnext/erpnext/config/accounts.py +266,Setup Gateway accounts.,Setup Gateway tilejä.
+apps/erpnext/erpnext/config/accounts.py +272,Setup Gateway accounts.,Setup Gateway tilejä.
 DocType: Employee,Employment Type,työsopimus tyyppi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,pitkaikaiset vastaavat
 DocType: Payment Entry,Set Exchange Gain / Loss,Aseta Exchange voitto / tappio
 ,Cash Flow,Kassavirta
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be across two alocation records,Hakuaika ei voi yli kaksi alocation kirjaa
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +88,Application period cannot be across two alocation records,Hakuaika ei voi yli kaksi alocation kirjaa
 DocType: Item Group,Default Expense Account,oletus kulutili
 DocType: Student,Student Email ID,Opiskelijan Sähköposti ID
 DocType: Employee,Notice (days),Ilmoitus (päivää)
 DocType: Tax Rule,Sales Tax Template,Sales Tax Malline
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Select items to save the invoice,Valitse kohteita tallentaa laskun
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,Valitse kohteita tallentaa laskun
 DocType: Employee,Encashment Date,perintä päivä
 DocType: Account,Stock Adjustment,varastonsäätö
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},oletus aktiviteettikustannus aktiviteetin tyypille - {0}
@@ -3446,29 +3486,30 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Varastoa ei voi poistaa, sillä kohdistettuja varaston tilikirjan kirjauksia on olemassa."
 DocType: Company,Distribution,toimitus
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,maksettu arvomäärä
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,projektihallinta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,projektihallinta
 ,Quoted Item Comparison,Noteeratut Kohta Vertailu
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,lähetys
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,lähetys
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max alennus sallittua item: {0} on {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,Substanssi kuin
 DocType: Account,Receivable,saatava
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Rivi # {0}: Ei saa muuttaa Toimittaja kuten ostotilaus on jo olemassa
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,roolilla jolla voi lähettää tapamtumia pääsee luottoraja asetuksiin
 DocType: Sales Invoice,Supplier Reference,toimittajan viite
-DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","täpättynä alikokoonpanon BOM tuotteita pidetään raaka-ainehankinnoissa, muutoin kaikkia alikokoonpanon tuotteita käsitellään yhtenä raaka-aineena"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +827,"Master data syncing, it might take some time","Master data synkronointia, se saattaa kestää jonkin aikaa"
-DocType: Material Request,Material Issue,materiaali aihe
+apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time","Master data synkronointia, se saattaa kestää jonkin aikaa"
+DocType: Item,Material Issue,materiaali aihe
 DocType: Hub Settings,Seller Description,myyjän kuvaus
 DocType: Employee Education,Qualification,Pätevyys
 DocType: Item Price,Item Price,tuote hinta
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,saippua & pesuaine
 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,tilattu
+DocType: Salary Detail,Component,komponentti
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +70,Opening Accumulated Depreciation must be less than equal to {0},Avaaminen Kertyneet poistot on oltava pienempi tai yhtä suuri kuin {0}
 DocType: Warehouse,Warehouse Name,varaston nimi
 DocType: Naming Series,Select Transaction,valitse tapahtuma
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Anna hyväksyminen rooli tai hyväksyminen Käyttäjä
 DocType: Journal Entry,Write Off Entry,poiston kirjaus
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +83,Error in formula or condition,Virhe kaava tai kunnossa
 DocType: BOM,Rate Of Materials Based On,materiaaliarvostelu perustuen
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,tuki Analtyics
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +141,Uncheck all,Poista kaikki
@@ -3477,9 +3518,9 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},"päivä tulee olla tällä tilikaudella, oletettu lopetuspäivä = {0}"
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","tässä voit ylläpitää terveystietoja, pituus, paino, allergiat, lääkkeet jne"
 DocType: Leave Block List,Applies to Company,koskee yritystä
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,Cannot cancel because submitted Stock Entry {0} exists,"ei voi peruuttaa, sillä lähetetty varaston tosite {0} on jo olemassa"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,"ei voi peruuttaa, sillä lähetetty varaston tosite {0} on jo olemassa"
 DocType: Purchase Invoice,In Words,sanat
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +224,Today is {0}'s birthday!,tänään on {0}:n syntymäpäivä
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Today is {0}'s birthday!,tänään on {0}:n syntymäpäivä
 DocType: Production Planning Tool,Material Request For Warehouse,varaston materiaalipyyntö
 DocType: Sales Order Item,For Production,tuotantoon
 DocType: Payment Request,payment_url,payment_url
@@ -3487,14 +3528,14 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,Tilikautesi alkaa
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Asset Poistot ja saldot
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +312,Amount {0} {1} transferred from {2} to {3},Määrä {0} {1} siirretty {2} ja {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},Määrä {0} {1} siirretty {2} ja {3}
 DocType: Sales Invoice,Get Advances Received,hae saadut ennakot
 DocType: Email Digest,Add/Remove Recipients,lisää / poista vastaanottajia
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},tapahtumat tuotannon tilaukseen {0} on estetty
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","asettaaksesi tämän tilikaudenoletukseksi, klikkaa ""aseta oletukseksi"""
-apps/erpnext/erpnext/projects/doctype/project/project.py +141,Join,Liittyä seuraan
+apps/erpnext/erpnext/projects/doctype/project/project.py +143,Join,Liittyä seuraan
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,yksikkömäärä vähissä
-apps/erpnext/erpnext/stock/doctype/item/item.py +649,Item variant {0} exists with same attributes,Tuote variantti {0} ovat olemassa samoja ominaisuuksia
+apps/erpnext/erpnext/stock/doctype/item/item.py +652,Item variant {0} exists with same attributes,Tuote variantti {0} ovat olemassa samoja ominaisuuksia
 DocType: Salary Slip,Salary Slip,palkkalaskelma
 DocType: Pricing Rule,Margin Rate or Amount,Marginaali nopeuteen tai määrään
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Päättymispäivä' on pakollinen
@@ -3517,14 +3558,14 @@
 DocType: Expense Claim,Total Claimed Amount,vaatimukset arvomäärä yhteensä
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,myynnin potentiaalisia tilaisuuksia
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,Invalid {0},Virheellinen {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,sairaspoistuminen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,sairaspoistuminen
 DocType: Email Digest,Email Digest,sähköpostitiedote
 DocType: Delivery Note,Billing Address Name,laskutusosoite nimi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,osasto kaupat
 DocType: Warehouse,PIN,PIN
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base Muuta Summa (Company valuutta)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,ei kirjanpidon kirjauksia seuraaviin varastoihin
-apps/erpnext/erpnext/projects/doctype/project/project.js +96,Save the document first.,tallenna ensimmäinen asiakirja
+apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,tallenna ensimmäinen asiakirja
 DocType: Account,Chargeable,veloitettava
 DocType: Company,Change Abbreviation,muutos lyhennys
 DocType: Expense Claim Detail,Expense Date,"kulu, päivä"
@@ -3537,9 +3578,10 @@
 DocType: Purchase Invoice,Recurring Print Format,toistuvat tulostusmuodot
 DocType: C-Form,Series,sarjat
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,odotettu toimituspäivä ei voi olla ennen ostotilauksen päivää
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Aseta Nimeäminen Series {0} kautta Asetukset> Asetukset> nimeäminen Series
 DocType: Appraisal,Appraisal Template,"arviointi, mallipohja"
 DocType: Item Group,Item Classification,tuote luokittelu
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,myynninkehityshallinta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,myynninkehityshallinta
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,"huoltokäynti, tarkoitus"
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +16,Period,Aika
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +18,General Ledger,päätilikirja
@@ -3549,7 +3591,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email id must be unique, already exists for {0}","sähköpostitunnus tulee olla uniikki, tunnus on jo olemassa {0}"
 ,Itemwise Recommended Reorder Level,"tuote työkalu, uuden ostotilauksen suositusarvo"
 DocType: Salary Detail,Salary Detail,Palkka Detail
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +643,Please select {0} first,Ole hyvä ja valitse {0} Ensimmäinen
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +940,Please select {0} first,Ole hyvä ja valitse {0} Ensimmäinen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,erä {0} tuotteesta {1} on vanhentunut
 DocType: Sales Invoice,Commission,provisio
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Kellokortti valmistukseen.
@@ -3567,13 +3609,12 @@
 {% if email_id %}Email: {{ email_id }}<br>{% endif -%}
 </code></pre>","<h4> Default Template </h4><p> Käyttää <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja templaattimateriaalit</a> ja kaikilla aloilla Address (mukaan lukien omat kentät mahdollinen) on saatavilla </p><pre> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
 DocType: Salary Detail,Default Amount,oletus arvomäärä
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,varastoa ei löydy järjestelmästä
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +92,Warehouse not found in the system,varastoa ei löydy järjestelmästä
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,Tämän kuun Yhteenveto
 DocType: Quality Inspection Reading,Quality Inspection Reading,laarutarkistuksen luku
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,Jäädytä varasto joka on vanhempi kuin % päivää
 DocType: Tax Rule,Purchase Tax Template,Myyntiverovelkojen malli
 ,Project wise Stock Tracking,"projekt työkalu, varastoseuranta"
-DocType: Examination,Exam Code,tentti koodi
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},huoltoaikataulu {0} on olemassa kohdistettuna{0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),todellinen yksikkömäärä (lähde/tavoite)
 DocType: Item Customer Detail,Ref Code,Ref Koodi
@@ -3581,19 +3622,19 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Please set Next Depreciation Date,Määritä Seuraava Poistot Date
 DocType: Payment Gateway,Payment Gateway,Payment Gateway
 DocType: HR Settings,Payroll Settings,palkanlaskennan asetukset
-apps/erpnext/erpnext/config/accounts.py +142,Match non-linked Invoices and Payments.,täsmää linkittämättömät maksut ja laskut
+apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,täsmää linkittämättömät maksut ja laskut
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Tee tilaus
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,kannalla ei voi olla pääkustannuspaikkaa
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,Valitse Merkki ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Kertyneet poistot kuin
 DocType: Sales Invoice,C-Form Applicable,C-muotoa sovelletaan
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +374,Operation Time must be greater than 0 for Operation {0},Toiminta-aika on oltava suurempi kuin 0 Toiminta {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Operation Time must be greater than 0 for Operation {0},Toiminta-aika on oltava suurempi kuin 0 Toiminta {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Warehouse is mandatory,Varasto on pakollinen
 DocType: Supplier,Address and Contacts,Osoite ja yhteystiedot
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM muunto lisätiedot
 apps/erpnext/erpnext/public/js/setup_wizard.js +167,Keep it web friendly 900px (w) by 100px (h),Pidä se web ystävällinen 900px (w) by 100px (h)
 DocType: Program,Program Abbreviation,ohjelma lyhenne
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +363,Production Order cannot be raised against a Item Template,tuotannon tilausta ei voi kohdistaa tuotteen mallipohjaan
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Production Order cannot be raised against a Item Template,tuotannon tilausta ei voi kohdistaa tuotteen mallipohjaan
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,maksut on päivitetty ostokuitilla kondistettuna jokaiseen tuotteeseen
 DocType: Warranty Claim,Resolved By,ratkaissut
 DocType: Appraisal,Start Date,aloituspäivä
@@ -3604,6 +3645,7 @@
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","näytä tämän varaston saatavat ""varastossa"" tai ""ei varastossa"" perusteella"
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),osaluettelo (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Keskimääräinen aika toimittajan toimittamaan
+DocType: Assessment Result,Assessment Result,arviointi tulos
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,tuntia
 DocType: Project,Expected Start Date,odotettu aloituspäivä
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,poista tuote mikäli maksuja ei voi soveltaa siihen
@@ -3616,52 +3658,52 @@
 DocType: Workstation,Operating Costs,käyttökustannukset
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Toiminta jos kuukausikulutus budjetti ylitetty
 DocType: Purchase Invoice,Submit on creation,Jättää ehdotus luomiseen
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +425,Currency for {0} must be {1},Valuutta {0} on {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},Valuutta {0} on {1}
 DocType: Asset,Disposal Date,hävittäminen Date
 DocType: Employee Leave Approver,Employee Leave Approver,työntekijän poistumis hyväksyjä
-apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row {0}: An Reorder entry already exists for this warehouse {1},rivi {0}: uusi tilaus on jo kirjattu tähän varastoon {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +77,"Cannot declare as lost, because Quotation has been made.","ei voida vahvistaa hävityksi, sillä tarjous on tehty"
+apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row {0}: An Reorder entry already exists for this warehouse {1},rivi {0}: uusi tilaus on jo kirjattu tähän varastoon {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.","ei voida vahvistaa hävityksi, sillä tarjous on tehty"
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,"ostojenhallinta, valvonta"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,tuotannon tilaus {0} on lähetettävä
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Ole hyvä ja valitse alkamispäivä ja päättymispäivä Kohta {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,Course is mandatory in row {0},Kurssi on pakollinen rivi {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,päivään ei voi olla ennen aloituspäivää
 DocType: Supplier Quotation Item,Prevdoc DocType,esihallitse asiakirjatyyppi
-apps/erpnext/erpnext/stock/doctype/item/item.js +217,Add / Edit Prices,Lisää / muokkaa hintoja
+apps/erpnext/erpnext/stock/doctype/item/item.js +225,Add / Edit Prices,Lisää / muokkaa hintoja
 DocType: Cheque Print Template,Cheque Print Template,Shekki Print Template
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +35,Chart of Cost Centers,kustannuspaikkakaavio
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,kustannuspaikkakaavio
 ,Requested Items To Be Ordered,tilattavat pyydetyt tuotteet
 DocType: Price List,Price List Name,Hinnasto Name
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +178,Totals,summat
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +181,Totals,summat
 DocType: BOM,Manufacturing,Valmistus
 ,Ordered Items To Be Delivered,toimitettavat tilatut tuotteet
 DocType: Account,Income,tulo
 DocType: Industry Type,Industry Type,teollisuus tyyppi
 apps/erpnext/erpnext/templates/includes/cart.js +141,Something went wrong!,jokin meni pieleen!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +103,Warning: Leave application contains following block dates,varoitus: poistumissovellus sisältää seuraavat estopäivät
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,Warning: Leave application contains following block dates,varoitus: poistumissovellus sisältää seuraavat estopäivät
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,myyntilasku {0} on lähetetty
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Verovuoden {0} ei ole olemassa
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,katselmus päivä
 DocType: Purchase Invoice Item,Amount (Company Currency),arvomäärä (yrityksen valuutta)
 apps/erpnext/erpnext/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} yksikköä {1} tarvitaan {2} on {3} {4} varten {5} tapahtuman suorittamiseen.
-apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +13,Mandatory feild - Get Students From,Pakolliset feild - Get opiskelijaa
+apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,Pakolliset feild - Get opiskelijaa
 DocType: Announcement,Student,Opiskelija
 apps/erpnext/erpnext/config/hr.py +181,Organization unit (department) master.,"organisaatioyksikkö, osasto valvonta"
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Anna kelvolliset mobiili nos
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Anna viestin ennen lähettämistä
-apps/erpnext/erpnext/config/accounts.py +271,Point-of-Sale Profile,Point-of-Sale Profile
-apps/erpnext/erpnext/accounts/page/pos/pos.js +785,All records are synced.,Kaikki tiedot synkronoidaan.
+apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,Point-of-Sale Profile
+apps/erpnext/erpnext/accounts/page/pos/pos.js +793,All records are synced.,Kaikki tiedot synkronoidaan.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,päivitä teksiviestiasetukset
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,vakuudettomat lainat
 DocType: Cost Center,Cost Center Name,kustannuspaikan nimi
 DocType: Employee,B+,B +
+DocType: HR Settings,Max working hours against Timesheet,Max työaika vastaan Tuntilomakkeen
 DocType: Maintenance Schedule Detail,Scheduled Date,"aikataulutettu, päivä"
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.html +1,Total Paid Amt,"maksettu, pankkipääte yhteensä"
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Paid Amt,"maksettu, pankkipääte yhteensä"
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Viestit yli 160 merkkiä jaetaan useita viestejä
 DocType: Purchase Receipt Item,Received and Accepted,Saanut ja hyväksynyt
 ,Serial No Service Contract Expiry,palvelusopimuksen päättyminen sarjanumerolle
 DocType: Item,Unit of Measure Conversion,mittayksikön muunto
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +87,Employee can not be changed,työntekijää ei voi muuttaa
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,You cannot credit and debit same account at the same time,kredit / debet kirjausta ei voi tehdä samalle tilille yhtäaikaa
 DocType: Naming Series,Help HTML,"HTML, ohje"
 DocType: Student Group Creation Tool,Student Group Creation Tool,Student Group Creation Tool
@@ -3669,16 +3711,17 @@
 DocType: Address,Name of person or organization that this address belongs to.,henkilön- tai organisaation nimi kenelle tämä osoite kuuluu
 apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,omat toimittajat
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,ei voi asettaa hävityksi sillä myyntitilaus on tehty
-DocType: Student,Mother's Name,Äidin nimi
+DocType: Student Applicant,Mother's Name,Äidin nimi
 DocType: Request for Quotation Item,Supplier Part No,Toimittaja osanumero
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Received From,Saadut
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Ei voi vähentää, kun kategoria on &quot;arvostus&quot; tai &quot;Vaulation ja Total&quot;"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,Saadut
 DocType: Lead,Converted,muunnettu
 DocType: Item,Has Serial No,on sarjanumero
 DocType: Employee,Date of Issue,aiheen päivä
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: valitse {0} on {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},Rivi # {0}: Aseta toimittaja kohteen {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +85,Row {0}: Hours value must be greater than zero.,Rivi {0}: Tuntia arvon on oltava suurempi kuin nolla.
-apps/erpnext/erpnext/stock/doctype/item/item.py +168,Website Image {0} attached to Item {1} cannot be found,Website Kuva {0} kiinnitetty Tuote {1} ei löydy
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +93,Row {0}: Hours value must be greater than zero.,Rivi {0}: Tuntia arvon on oltava suurempi kuin nolla.
+apps/erpnext/erpnext/stock/doctype/item/item.py +171,Website Image {0} attached to Item {1} cannot be found,Website Kuva {0} kiinnitetty Tuote {1} ei löydy
 DocType: Issue,Content Type,sisällön tyyppi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,tietokone
 DocType: Item,List this Item in multiple groups on the website.,Listaa tästä Kohta useisiin ryhmiin verkkosivuilla.
@@ -3692,21 +3735,20 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,mitä tämä tekee?
 DocType: Delivery Note,To Warehouse,varastoon
 ,Average Commission Rate,keskimääräinen provisio taso
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,'Has Serial No' can not be 'Yes' for non-stock item,'Sarjanumero' ei voi olla kyllä ei-varastonimikkeelle
+apps/erpnext/erpnext/stock/doctype/item/item.py +415,'Has Serial No' can not be 'Yes' for non-stock item,'Sarjanumero' ei voi olla kyllä ei-varastonimikkeelle
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,osallistumisia ei voi merkitä tuleville päiville
 DocType: Pricing Rule,Pricing Rule Help,"hinnoittelusääntö, ohjeet"
 DocType: Purchase Taxes and Charges,Account Head,tilin otsikko
-apps/erpnext/erpnext/hooks.py +104,Examination Schedule,tutkiminen aikataulu
 apps/erpnext/erpnext/config/stock.py +163,Update additional costs to calculate landed cost of items,päivitä lisäkustannukset jotta tuotteisiin kohdistuneet kustannukset voidaan laskea
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,sähköinen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Electrical,sähköinen
 DocType: Stock Entry,Total Value Difference (Out - In),arvoero (ulos-sisään) yhteensä
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,Row {0}: Exchange Rate is mandatory,Rivi {0}: Vaihtokurssi on pakollinen
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},käyttäjätunnusta ei asetettu työntekijälle {0}
 DocType: Stock Entry,Default Source Warehouse,oletus lähde varasto
 DocType: Item,Customer Code,asiakkaan koodi
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +223,Birthday Reminder for {0},Syntymäpäivämuistutus {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,Birthday Reminder for {0},Syntymäpäivämuistutus {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,päivää edellisestä tilauksesta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +293,Debit To account must be a Balance Sheet account,Pankkikortti tilille on kuitenkin taseen tili
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +292,Debit To account must be a Balance Sheet account,Pankkikortti tilille on kuitenkin taseen tili
 DocType: Buying Settings,Naming Series,Nimeä sarjat
 DocType: Leave Block List,Leave Block List Name,"poistu estoluettelo, nimi"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,"varasto, vastaavat"
@@ -3718,24 +3760,22 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,lähetettä {0} ei saa lähettää
 DocType: Notification Control,Sales Invoice Message,"myyntilasku, viesti"
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Tilin sulkemisen {0} on oltava tyyppiä Vastuu / Oma pääoma
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +224,Salary Slip of employee {0} already created for time sheet {1},Palkka Slip työntekijöiden {0} on jo luotu kellokortti {1}
-DocType: Authorization Rule,Based On,perustuu
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +301,Salary Slip of employee {0} already created for time sheet {1},Palkka Slip työntekijöiden {0} on jo luotu kellokortti {1}
 DocType: Sales Order Item,Ordered Qty,tilattu yksikkömäärä
-apps/erpnext/erpnext/stock/doctype/item/item.py +670,Item {0} is disabled,Tuote {0} on poistettu käytöstä
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,Tuote {0} on poistettu käytöstä
 DocType: Stock Settings,Stock Frozen Upto,varasto jäädytetty asti
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +785,BOM does not contain any stock item,BOM ei sisällä varastotuote
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +838,BOM does not contain any stock item,BOM ei sisällä varastotuote
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Period From and Period To dates mandatory for recurring {0},Ajanjaksona ja AIKA Voit päivämäärät pakollinen toistuvia {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Hanketoimintaa / tehtävä.
-DocType: Examination,Exam Name,tentti Nimi
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,muodosta palkkalaskelmat
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}",osto tulee täpätä mikälisovellus on valittu {0}:na
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,alennus on oltava alle 100
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Last purchase rate not found,Viimeksi ostaa korko ei löytynyt
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Kirjoita Off Määrä (Yrityksen valuutta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +482,Row #{0}: Please set reorder quantity,Rivi # {0}: Aseta tilausrajaa
+apps/erpnext/erpnext/stock/doctype/item/item.py +485,Row #{0}: Please set reorder quantity,Rivi # {0}: Aseta tilausrajaa
 DocType: Fees,Program Enrollment,ohjelma Ilmoittautuminen
 DocType: Landed Cost Voucher,Landed Cost Voucher,"kohdistetut kustannukset, tosite"
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +53,Please set {0},Aseta {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +62,Please set {0},Aseta {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Toista päivä Kuukausi
 DocType: Employee,Health Details,"terveys, lisätiedot"
 DocType: Offer Letter,Offer Letter Terms,Tarjoa Kirje Ehdot
@@ -3774,7 +3814,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +23,New Account Name,nimeä uusi tili
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,raaka-aine toimitettu kustannus
 DocType: Selling Settings,Settings for Selling Module,myyntimoduulin asetukset
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,asiakaspalvelu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Customer Service,asiakaspalvelu
 DocType: Homepage Featured Product,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,tuote asiakas lisätyedot
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Tarjoa ehdokkaalle töitä
@@ -3783,7 +3823,8 @@
 DocType: Pricing Rule,Percentage,prosenttimäärä
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,tuote {0} tulee olla varastotuote
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Oletus Work In Progress Warehouse
-apps/erpnext/erpnext/config/accounts.py +246,Default settings for accounting transactions.,kirjanpidon tapahtumien oletusasetukset
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,Yhteensä nos sarjanumero ei vastaa määrää.
+apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,kirjanpidon tapahtumien oletusasetukset
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,odotettu päivä ei voi olla ennen materiaalipyynnön päiväystä
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,virhe: tunnus ei ole kelvollinen
 DocType: Naming Series,Update Series Number,päivitä sarjanumerot
@@ -3791,9 +3832,9 @@
 DocType: Sales Order,Printing Details,Tulostus Lisätiedot
 DocType: Task,Closing Date,sulkupäivä
 DocType: Sales Order Item,Produced Quantity,Tuotettu Määrä
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,insinööri
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Engineer,insinööri
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,haku alikokoonpanot
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Item Code required at Row No {0},tuotekoodi vaaditaan riville {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Item Code required at Row No {0},tuotekoodi vaaditaan riville {0}
 DocType: Sales Partner,Partner Type,kumppani tyyppi
 DocType: Purchase Taxes and Charges,Actual,todellinen
 DocType: Authorization Rule,Customerwise Discount,asiakaskohtainen alennus
@@ -3809,7 +3850,7 @@
 DocType: BOM,Raw Material Cost,raaka-ainekustannukset
 DocType: Item Reorder,Re-Order Level,Re-Order Level
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"syötä tuotteet ja suunniteltu yksikkömäärä, joille haluat lisätä tuotantotilauksia tai joista haluat ladata raaka-aine analyysin"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Osa-aikainen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,Osa-aikainen
 DocType: Employee,Applicable Holiday List,sovellettava lomalista
 DocType: Employee,Cheque,takaus/shekki
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,sarja päivitetty
@@ -3827,7 +3868,7 @@
 apps/erpnext/erpnext/config/stock.py +179,Where items are stored.,missä tuotteet varastoidaan
 DocType: Tax Rule,Validity,Voimassaolo
 DocType: Request for Quotation,Supplier Detail,Toimittaja Detail
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.html +1,Invoiced Amount,laskutettu arvomäärä
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,laskutettu arvomäärä
 DocType: Attendance,Attendance,osallistuminen
 DocType: BOM,Materials,materiaalit
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","ellei ole täpättynä luettelo on lisättävä jokaiseen osastoon, jossa sitä sovelletaan"
@@ -3851,7 +3892,7 @@
 DocType: Customer Group,Parent Customer Group,Parent Asiakasryhmä
 DocType: Purchase Invoice,Contact Email,"yhteystiedot, sähköposti"
 DocType: Appraisal Goal,Score Earned,ansaitut pisteet
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Notice Period,Irtisanomisaika
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,Irtisanomisaika
 DocType: Asset Category,Asset Category Name,Asset Luokan nimi
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,tämä on kanta-alue eikä sitä voi muokata
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +4,New Sales Person Name,New Sales Person Name
@@ -3864,9 +3905,10 @@
 DocType: Landed Cost Item,Landed Cost Item,"kohdistetut kustannukset, tuote"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,näytä nolla-arvot
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,tuotemääräarvio valmistuksen- / uudelleenpakkauksen jälkeen annetuista raaka-aineen määristä
+apps/erpnext/erpnext/public/js/setup_wizard.js +315,Setup a simple website for my organization,Asennus yksinkertainen sivusto organisaatiolleni
 DocType: Payment Reconciliation,Receivable / Payable Account,saatava / maksettava tili
 DocType: Delivery Note Item,Against Sales Order Item,myyntitilauksen kohdistus / tuote
-apps/erpnext/erpnext/stock/doctype/item/item.py +644,Please specify Attribute Value for attribute {0},Ilmoitathan Taito Vastinetta määrite {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +647,Please specify Attribute Value for attribute {0},Ilmoitathan Taito Vastinetta määrite {0}
 DocType: Item,Default Warehouse,oletus varasto
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,Budget cannot be assigned against Group Account {0},budjettia ei voi nimetä ryhmätiliin {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,syötä pääkustannuspaikka
@@ -3884,23 +3926,23 @@
 DocType: Journal Entry,Debit Note,debet viesti
 DocType: Stock Entry,As per Stock UOM,varasto UOM:ään
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,ei vanhentunut
+DocType: Student Log,Achievement,Saavutus
 DocType: Journal Entry,Total Debit,debet yhteensä
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Oletus Valmiiden Warehouse
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,myyjä
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,myyjä
 DocType: Sales Invoice,Cold Calling,kylmä pyyntö
 DocType: SMS Parameter,SMS Parameter,tekstiviesti parametri
-apps/erpnext/erpnext/config/accounts.py +191,Budget and Cost Center,Talousarvio ja Kustannuspaikka
+apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Talousarvio ja Kustannuspaikka
 DocType: Maintenance Schedule Item,Half Yearly,puolivuosittain
 DocType: Lead,Blog Subscriber,Blogi Subscriber
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,tee tapahtumien arvoon perustuvia rajoitussääntöjä
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",täpättäessä lomapäivät sisältyvät työpäiviin ja tämä lisää palkan avoa / päivä
 DocType: Purchase Invoice,Total Advance,"yhteensä, ennakko"
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +91,Row {0}: Completed Qty cannot be more than {0} for operation {1},Rivi {0}: Valmis Määrä voi olla enintään {0} käyttövalmis {1}
 apps/erpnext/erpnext/config/hr.py +253,Processing Payroll,Käsittely Payroll
 DocType: Opportunity Item,Basic Rate,perustaso
 DocType: GL Entry,Credit Amount,Luoton määrä
 DocType: Cheque Print Template,Signatory Position,allekirjoittaja Position
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +140,Set as Lost,aseta kadonneeksi
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,aseta kadonneeksi
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Maksukuitin Huomautus
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +5,This is based on transactions against this Customer. See timeline below for details,Tämä perustuu liiketoimien vastaan Asiakas. Katso aikajana lisätietoja alla
 DocType: Supplier,Credit Days Based On,"kredit päivää, perustuen"
@@ -3912,7 +3954,7 @@
 ,Items To Be Requested,tuotteet joita on pyydettävä
 DocType: Purchase Order,Get Last Purchase Rate,hae viimeisin ostotaso
 DocType: Company,Company Info,yrityksen tiedot
-apps/erpnext/erpnext/accounts/page/pos/pos.js +925,Select or add new customer,Valitse tai lisätä uuden asiakkaan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +941,Select or add new customer,Valitse tai lisätä uuden asiakkaan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),sovellus varat (vastaavat)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +5,This is based on the attendance of this Employee,Tämä perustuu läsnäolo tämän Työntekijän
 DocType: Sales Invoice,Frequency,Taajuus
@@ -3926,12 +3968,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,estä käyttäjiä tekemästä poistumissovelluksia seuraavina päivinä
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,osto Määrä
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +210,Supplier Quotation {0} created,Toimittaja noteeraus {0} luotu
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Employee Benefits,työntekijä etuudet
+apps/erpnext/erpnext/accounts/report/financial_statements.py +90,End Year cannot be before Start Year,Loppu vuosi voi olla ennen Aloitusvuosi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Employee Benefits,työntekijä etuudet
 DocType: Sales Invoice,Is POS,on POS
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},pakattujen määrä tulee olla kuin tuotteen {0} määrä rivillä {1}
 DocType: Production Order,Manufactured Qty,valmistettu yksikkömäärä
 DocType: Purchase Receipt Item,Accepted Quantity,hyväksytyt määrä
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +241,Please set a default Holiday List for Employee {0} or Company {1},Aseta oletus Holiday List Työntekijä {0} tai Company {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +228,Please set a default Holiday List for Employee {0} or Company {1},Aseta oletus Holiday List Työntekijä {0} tai Company {1}
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} ei löydy
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Laskut nostetaan asiakkaille.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekti Id
@@ -3941,33 +3984,35 @@
 DocType: Quality Inspection Reading,Reading 3,Reading 3
 ,Hub,hubi
 DocType: GL Entry,Voucher Type,tosite tyyppi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +991,Price List not found or disabled,hinnastoa ei löydy tai se on poistettu käytöstä
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1007,Price List not found or disabled,hinnastoa ei löydy tai se on poistettu käytöstä
 DocType: Expense Claim,Approved,hyväksytty
 DocType: Pricing Rule,Price,Hinta
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,Employee relieved on {0} must be set as 'Left',"työntekijä vapautettu {0} tulee asettaa ""vasemmalla"""
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,Employee relieved on {0} must be set as 'Left',"työntekijä vapautettu {0} tulee asettaa ""vasemmalla"""
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","valitsemalla ""kyllä"" tämän tuotteen varaston kirjaus antaa jokaiselle uniikin identiteetin joka näkyy sarjanumero valvonnassa"
+DocType: Guardian,Guardian,holhooja
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,työntekijälle {1} on tehty arviointi {0} ilmoitettuna päivänä
 DocType: Employee,Education,koulutus
 DocType: Selling Settings,Campaign Naming By,kampanja nimennyt
 DocType: Employee,Current Address Is,nykyinen osoite on
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,"Optional. Sets company's default currency, if not specified.","Vapaaehtoinen. Asettaa yhtiön oletusvaluuttaa, jos ei ole määritelty."
 DocType: Address,Office,Toimisto
-apps/erpnext/erpnext/config/accounts.py +55,Accounting journal entries.,"kirjanpito, päiväkirjakirjaukset"
+apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,"kirjanpito, päiväkirjakirjaukset"
 DocType: Delivery Note Item,Available Qty at From Warehouse,Available Kpl at varastosta
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +249,Please select Employee Record first.,valitse työntekijä tietue ensin
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +259,Please select Employee Record first.,valitse työntekijä tietue ensin
+DocType: POS Profile,Account for Change Amount,Tili Change Summa
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +190,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Rivi {0}: Party / Tili ei vastaa {1} / {2} ja {3} {4}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,Please enter Expense Account,syötä kulutili
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +235,Please enter Expense Account,syötä kulutili
 DocType: Account,Stock,varasto
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +666,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Rivi # {0}: Reference Document Type on yksi Ostotilaus, Ostolasku tai Päiväkirjakirjaus"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Rivi # {0}: Reference Document Type on yksi Ostotilaus, Ostolasku tai Päiväkirjakirjaus"
 DocType: Employee,Current Address,nykyinen osoite
 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","mikäli tuote on toisen tuotteen malli tulee tuotteen kuvaus, kuva, hinnoittelu, verot ja muut tiedot oletuksena mallipohjasta ellei oletusta ole erikseen poistettu"
 DocType: Serial No,Purchase / Manufacture Details,oston/valmistuksen lisätiedot
+DocType: Assessment,Assessment Group,Assessment Group
 apps/erpnext/erpnext/config/stock.py +309,Batch Inventory,Erä Inventory
 DocType: Employee,Contract End Date,sopimuksen päättymispäivä
 DocType: Sales Order,Track this Sales Order against any Project,seuraa tätä myyntitilausta projektissa
 DocType: Sales Invoice Item,Discount and Margin,Alennus ja marginaali
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,siillä myyntitilaukset (odottaa toimitusta) perustuen kriteereihin yllä
-DocType: Deduction Type,Deduction Type,vähennyksen tyyppi
 DocType: Attendance,Half Day,1/2 päivä
 DocType: Pricing Rule,Min Qty,min yksikkömäärä
 DocType: Asset Movement,Transaction Date,tapahtuma päivä
@@ -3992,17 +4037,17 @@
 DocType: Purchase Taxes and Charges,On Previous Row Amount,edellisen rivin arvomäärä
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,siirto Asset
 DocType: POS Profile,POS Profile,POS Profile
-apps/erpnext/erpnext/config/schools.py +29,Admission,sisäänpääsy
-apps/erpnext/erpnext/config/accounts.py +215,"Seasonality for setting budgets, targets etc.","kausivaihtelu asetukset esim, budjettiin, tavoitteisiin jne"
+apps/erpnext/erpnext/config/schools.py +33,Admission,sisäänpääsy
+apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","kausivaihtelu asetukset esim, budjettiin, tavoitteisiin jne"
 apps/erpnext/erpnext/stock/get_item_details.py +129,"Item {0} is a template, please select one of its variants","tuote {0} on mallipohja, valitse yksi sen malleista"
 DocType: Asset,Asset Category,Asset Luokka
 apps/erpnext/erpnext/public/js/setup_wizard.js +202,Purchaser,Ostaja
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +82,Net pay cannot be negative,Net palkkaa ei voi olla negatiivinen
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Net palkkaa ei voi olla negatiivinen
 DocType: SMS Settings,Static Parameters,staattinen parametri
-DocType: Course Schedule,Room,Huone
+DocType: Assessment,Room,Huone
 DocType: Purchase Order,Advance Paid,ennakkoon maksettu
 DocType: Item,Item Tax,tuote vero
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +712,Material to Supplier,Materiaalin Toimittaja
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +765,Material to Supplier,Materiaalin Toimittaja
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,Valmistevero Lasku
 DocType: Expense Claim,Employees Email Id,työntekijän sähköpostitunnus
 DocType: Employee Attendance Tool,Marked Attendance,Merkitty Läsnäolo
@@ -4013,7 +4058,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,Actual Qty is mandatory,todellinen yksikkömäärä on pakollinen arvo
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Student Groups luotu.
 DocType: Scheduling Tool,Scheduling Tool,ajoitustyökalun
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Credit Card,luottokortti
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +136,Credit Card,luottokortti
 DocType: BOM,Item to be manufactured or repacked,tuote joka valmistetaan- tai pakataan uudelleen
 apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,varaston tapahtumien oletusasetukset
 DocType: Purchase Invoice,Next Date,Seuraava päivä
@@ -4030,7 +4075,7 @@
 DocType: Item Attribute,Numeric Values,Numeroarvot
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Attach Logo,Kiinnitä Logo
 DocType: Customer,Commission Rate,provisio taso
-apps/erpnext/erpnext/stock/doctype/item/item.js +253,Make Variant,Tee Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,Tee Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,estä poistumissovellukset osastoittain
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +115,"Payment Type must be one of Receive, Pay and Internal Transfer","Maksu tyyppi on yksi vastaanottaminen, Pay ja sisäinen siirto"
 apps/erpnext/erpnext/config/selling.py +169,Analytics,Analytics
@@ -4047,7 +4092,7 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,Valitse csv tiedosto
 DocType: Purchase Order,To Receive and Bill,vastaanottoon ja laskutukseen
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Esittelyssä olevat tuotteet
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,suunnittelija
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Designer,suunnittelija
 apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,ehdot ja säännöt mallipohja
 DocType: Serial No,Delivery Details,"toimitus, lisätiedot"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},kustannuspaikka tarvitsee rivin {0} verokannan {1}
@@ -4056,22 +4101,22 @@
 DocType: Batch,Expiry Date,vanhenemis päivä
 ,Supplier Addresses and Contacts,toimittajien osoitteet ja yhteystiedot
 ,accounts-browser,tilit-selain
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +292,Please select Category first,Ole hyvä ja valitse Luokka ensin
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +334,Please select Category first,Ole hyvä ja valitse Luokka ensin
 apps/erpnext/erpnext/config/projects.py +13,Project master.,projekti valvonta
 apps/erpnext/erpnext/controllers/status_updater.py +174,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Sallia yli-laskutus tai over-tilaus, päivitä &quot;avustus&quot; varastossa Settings tai Item."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"älä käytä symbooleita,  $ jne valuuttojen vieressä"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (Half Day),(1/2 päivä)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +417, (Half Day),(1/2 päivä)
 DocType: Supplier,Credit Days,kredit päivää
 DocType: Leave Type,Is Carry Forward,siirretääkö
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +687,Get Items from BOM,hae tuotteita BOM:sta
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,hae tuotteita BOM:sta
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,"virtausaika, päivää"
 apps/erpnext/erpnext/controllers/accounts_controller.py +549,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Rivi # {0}: julkaisupäivä on oltava sama kuin ostopäivästä {1} asset {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Syötä Myyntitilaukset edellä olevasta taulukosta
 ,Stock Summary,Stock Yhteenveto
-apps/erpnext/erpnext/config/accounts.py +230,Transfer an asset from one warehouse to another,Luovuttaa omaisuuttaan yhdestä varastosta another
+apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,Luovuttaa omaisuuttaan yhdestä varastosta another
 apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,materiaalien lasku
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},rivi {0}: osapuolityyppi ja osapuoli vaaditaan saatava / maksettava tilille {1}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref Date
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref Date
 DocType: Employee,Reason for Leaving,poistumisen syy
 DocType: Expense Claim Detail,Sanctioned Amount,sanktioitujen arvomäärä
 DocType: GL Entry,Is Opening,on avaus