[translations]
diff --git a/erpnext/translations/et.csv b/erpnext/translations/et.csv
index 94aecd7..a2e9a27 100644
--- a/erpnext/translations/et.csv
+++ b/erpnext/translations/et.csv
@@ -33,7 +33,7 @@
 DocType: Purchase Order,% Billed,% Maksustatakse
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),"Vahetuskurss peab olema sama, {0} {1} ({2})"
 DocType: Sales Invoice,Customer Name,Kliendi nimi
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},Pangakonto ei saa nimeks {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Pangakonto ei saa nimeks {0}
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Kõik ekspordiga seotud valdkondades nagu valuuta, ümberarvestuskurss, eksport kokku, ekspordi grand kokku jne on saadaval saateleht, POS, tsitaat, müügiarve, Sales Order jms"
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Heads (või rühmad), mille vastu raamatupidamiskanded tehakse ja tasakaalu säilimine."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +173,Outstanding for {0} cannot be less than zero ({1}),Maksmata {0} ei saa olla väiksem kui null ({1})
@@ -47,7 +47,7 @@
 DocType: Quality Inspection Reading,Parameter,Parameeter
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Oodatud End Date saa olla oodatust väiksem Start Date
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Row # {0}: Rate peab olema sama, {1} {2} ({3} / {4})"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,New Leave Application,New Jäta ostusoov
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,New Leave Application,New Jäta ostusoov
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Pangaveksel
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Et säilitada kliendi tark objekti kood ning need otsingumootoriga põhineb nende koodi kasutavad seda võimalust
 DocType: Mode of Payment Account,Mode of Payment Account,Makseviis konto
@@ -82,7 +82,7 @@
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Logi tegevustel kasutajate vastu Ülesanded, mida saab kasutada jälgimise ajal arve."
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},New {0}: # {1}
 ,Sales Partners Commission,Müük Partnerid Komisjon
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Lühend ei saa olla rohkem kui 5 tähemärki
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Lühend ei saa olla rohkem kui 5 tähemärki
 DocType: Payment Request,Payment Request,Maksenõudekäsule
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
 						exist with this Attribute.",Omadus Value {0} ei saa eemaldada {1} kui toode variandid \ olemas selle Oskus.
@@ -195,6 +195,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Paigaldamise kuupäev ei saa olla enne tarnekuupäev Punkt {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Soodustused Hinnakiri Rate (%)
 DocType: Offer Letter,Select Terms and Conditions,Vali Tingimused
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,välja väärtus
 DocType: Production Planning Tool,Sales Orders,Müügitellimuste
 DocType: Purchase Taxes and Charges,Valuation,Väärtustamine
 ,Purchase Order Trends,Ostutellimuse Trends
@@ -207,6 +208,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televiisor
 DocType: Production Order Operation,Updated via 'Time Log',Uuendatud kaudu "Aeg Logi '
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Konto {0} ei kuulu Company {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},Advance summa ei saa olla suurem kui {0} {1}
 DocType: Naming Series,Series List for this Transaction,Seeria nimekiri selle Tehing
 DocType: Sales Invoice,Is Opening Entry,Avab Entry
 DocType: Customer Group,Mention if non-standard receivable account applicable,Nimetatakse mittestandardsete saadaoleva arvesse kohaldatavat
@@ -226,7 +228,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Loob palgaleht eespool nimetatud kriteeriume.
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,No kirjeldusest
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Küsi osta.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,Only the selected Leave Approver can submit this Leave Application,Ainult valitud Jäta Approver võib esitada selle Jäta ostusoov
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +193,Only the selected Leave Approver can submit this Leave Application,Ainult valitud Jäta Approver võib esitada selle Jäta ostusoov
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Leevendab kuupäev peab olema suurem kui Liitumis
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Lehed aastas
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Palun määra nimetamine Series {0} Setup> Seaded> nimetamine Series
@@ -235,8 +237,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Ladu {0} ei kuulu firma {1}
 DocType: Item Website Specification,Item Website Specification,Punkt Koduleht spetsifikatsioon
 DocType: Payment Tool,Reference No,Viitenumber
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Jäta blokeeritud
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,Item {0} has reached its end of life on {1},Punkt {0} on jõudnud oma elu lõppu kohta {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +418,Leave Blocked,Jäta blokeeritud
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,Item {0} has reached its end of life on {1},Punkt {0} on jõudnud oma elu lõppu kohta {1}
 apps/erpnext/erpnext/accounts/utils.py +341,Annual,Aastane
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock leppimise toode
 DocType: Stock Entry,Sales Invoice No,Müügiarve pole
@@ -248,7 +250,7 @@
 DocType: Pricing Rule,Supplier Type,Tarnija Type
 DocType: Item,Publish in Hub,Avaldab Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +606,Item {0} is cancelled,Punkt {0} on tühistatud
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,Punkt {0} on tühistatud
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,Materjal taotlus
 DocType: Bank Reconciliation,Update Clearance Date,Värskenda Kliirens kuupäev
 DocType: Item,Purchase Details,Ostu üksikasjad
@@ -296,7 +298,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,Toimetaja märkus
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Seadistamine maksud
 apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,"Makse Entry on muudetud pärast seda, kui tõmbasin. Palun tõmmake uuesti."
-apps/erpnext/erpnext/stock/doctype/item/item.py +387,{0} entered twice in Item Tax,{0} sisestatud kaks korda Punkt Maksu-
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{0} entered twice in Item Tax,{0} sisestatud kaks korda Punkt Maksu-
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Kokkuvõte sel nädalal ja kuni tegevusi
 DocType: Workstation,Rent Cost,Üürile Cost
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Palun valige kuu ja aasta
@@ -327,7 +329,7 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Sinu e-maili aadress
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +215,Please see attachment,Palun vt lisa
 DocType: Purchase Order,% Received,% Vastatud
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Setup juba valmis !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,Setup juba valmis !!
 ,Finished Goods,Valmistoodang
 DocType: Delivery Note,Instructions,Juhised
 DocType: Quality Inspection,Inspected By,Kontrollima
@@ -352,14 +354,13 @@
 ,Purchase Register,Ostu Registreeri
 DocType: Landed Cost Item,Applicable Charges,Kohaldatavate tasudega
 DocType: Workstation,Consumable Cost,Tarbekaubad Cost
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +169,{0} ({1}) must have role 'Leave Approver',{0} ({1}) peab olema roll "Leave Approver"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,{0} ({1}) must have role 'Leave Approver',{0} ({1}) peab olema roll "Leave Approver"
 DocType: Purchase Receipt,Vehicle Date,Sõidukite kuupäev
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Medical
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Põhjus kaotada
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation on suletud järgmistel kuupäevadel kohta Holiday nimekiri: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Võimalused
 DocType: Employee,Single,Single
-DocType: Issue,Attachment,Attachment
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Eelarve ei saa seada Group Cost Center
 DocType: Account,Cost of Goods Sold,Müüdud kaupade maksumus
 DocType: Purchase Invoice,Yearly,Iga-aastane
@@ -388,7 +389,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Global seaded kõik tootmisprotsessid.
 DocType: Accounts Settings,Accounts Frozen Upto,Kontod Külmutatud Upto
 DocType: SMS Log,Sent On,Saadetud
-apps/erpnext/erpnext/stock/doctype/item/item.py +564,Attribute {0} selected multiple times in Attributes Table,Oskus {0} valitakse mitu korda atribuudid Table
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Attribute {0} selected multiple times in Attributes Table,Oskus {0} valitakse mitu korda atribuudid Table
 DocType: HR Settings,Employee record is created using selected field. ,"Töötaja rekord on loodud, kasutades valitud valdkonnas."
 DocType: Sales Order,Not Applicable,Ei kasuta
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,Holiday kapten.
@@ -427,7 +428,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,"Palun sisestage Warehouse, mille materjal taotlus tõstetakse"
 DocType: Production Order,Additional Operating Cost,Täiendav töökulud
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmeetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"To merge, following properties must be same for both items","Ühendamine, järgmised omadused peavad olema ühesugused teemad"
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,"To merge, following properties must be same for both items","Ühendamine, järgmised omadused peavad olema ühesugused teemad"
 DocType: Shipping Rule,Net Weight,Netokaal
 DocType: Employee,Emergency Phone,Emergency Phone
 ,Serial No Warranty Expiry,Serial No Garantii lõppemine
@@ -438,7 +439,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Tegevjuht Alltöövõtt
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Mööblitööstuse
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Hinda kus Hinnakiri valuuta konverteeritakse ettevõtte baasvaluuta
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Konto {0} ei kuulu firma: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},Konto {0} ei kuulu firma: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,Lühend kasutatakse juba teise firma
 DocType: Selling Settings,Default Customer Group,Vaikimisi Kliendi Group
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Kui keelata, "Ümardatud Kokku väljale ei ole nähtav ühegi tehinguga"
 DocType: BOM,Operating Cost,Töökulud
@@ -471,6 +473,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,No records found in the Invoice table,Salvestusi ei leitud Arvel tabelis
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Palun valige Company Pidu ja Type esimene
 apps/erpnext/erpnext/config/accounts.py +89,Financial / accounting year.,Financial / eelarveaastal.
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,kogunenud väärtused
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Vabandame, Serial nr saa liita"
 DocType: Project Task,Project Task,Projekti töörühma
 ,Lead Id,Plii Id
@@ -492,7 +495,7 @@
 DocType: Quotation,Quotation To,Tsitaat
 DocType: Lead,Middle Income,Keskmise sissetulekuga
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Avamine (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,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.,"Vaikimisi mõõtühik Punkt {0} ei saa muuta otse, sest teil on juba mõned tehingu (te) teise UOM. Te peate looma uue Punkt kasutada erinevaid vaikimisi UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,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.,"Vaikimisi mõõtühik Punkt {0} ei saa muuta otse, sest teil on juba mõned tehingu (te) teise UOM. Te peate looma uue Punkt kasutada erinevaid vaikimisi UOM."
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Eraldatud summa ei saa olla negatiivne
 DocType: Purchase Order Item,Billed Amt,Arve Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Loogiline Warehouse mille vastu laos tehakse kandeid.
@@ -570,7 +573,7 @@
 DocType: Hub Settings,Seller City,Müüja City
 DocType: Email Digest,Next email will be sent on:,Järgmine email saadetakse edasi:
 DocType: Offer Letter Term,Offer Letter Term,Paku kiri Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item has variants.,Punkt on variante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item has variants.,Punkt on variante.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Punkt {0} ei leitud
 DocType: Bin,Stock Value,Stock Value
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
@@ -583,6 +586,7 @@
 DocType: Journal Entry,Credit Card Entry,Krediitkaart Entry
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Task Teema
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Tarnijatelt saadud kaupade.
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,väärtuse
 DocType: Lead,Campaign Name,Kampaania nimi
 ,Reserved,Reserveeritud
 DocType: Purchase Order,Supply Raw Materials,Supply tooraine
@@ -597,16 +601,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,Konto olemasolevate tehing ei ole ümber arvestusraamatust
 DocType: Delivery Note,Customer's Purchase Order No,Kliendi ostutellimuse pole
 DocType: Employee,Cell Number,Mobiilinumber
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Auto Material Taotlused Loodud
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,Auto Material Taotlused Loodud
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Kaotsi läinud
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,You can not enter current voucher in 'Against Journal Entry' column,Sa ei saa sisestada praegune voucher in "Against päevikusissekanne veerus
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energia
 DocType: Opportunity,Opportunity From,Opportunity From
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Kuupalga avalduse.
 DocType: Item Group,Website Specifications,Koduleht erisused
+apps/erpnext/erpnext/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Seal on viga teie Aadress malli {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,New Account,New Account
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: From {0} tüüpi {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Conversion Factor on kohustuslik
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Mitu Hind reeglid olemas samad kriteeriumid, palun lahendada konflikte, määrates prioriteet. Hind Reeglid: {0}"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Raamatupidamise kanded saab teha peale tipud. Sissekanded vastu grupid ei ole lubatud.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Ei saa deaktiveerida või tühistada Bom, sest see on seotud teiste BOMs"
 DocType: Opportunity,Maintenance,Hooldus
@@ -649,7 +655,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,Price List not selected,Hinnakiri ole valitud
 DocType: Employee,Family Background,Perekondlik taust
 DocType: Process Payroll,Send Email,Saada E-
-apps/erpnext/erpnext/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},Hoiatus: Vigane Attachment {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Hoiatus: Vigane Attachment {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Ei Luba
 DocType: Company,Default Bank Account,Vaikimisi Bank Account
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Filtreerida põhineb Party, Party Tüüp esimene"
@@ -679,13 +685,13 @@
 DocType: Production Planning Tool,Select Items,Vali kaubad
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} vastu Bill {1} dateeritud {2}
 DocType: Maintenance Visit,Completion Status,Lõpetamine staatus
-DocType: Sales Invoice Item,Target Warehouse,Target Warehouse
+DocType: Production Order,Target Warehouse,Target Warehouse
 DocType: Item,Allow over delivery or receipt upto this percent,Laske üle väljasaatmisel või vastuvõtmisel upto see protsenti
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +50,Expected Delivery Date cannot be before Sales Order Date,Oodatud Toimetaja kuupäev ei saa olla enne Sales Order Date
 DocType: Upload Attendance,Import Attendance,Import Osavõtt
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Kõik Punkt Groups
 DocType: Process Payroll,Activity Log,Activity Log
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Neto kasum / kahjum
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,Net Profit / Loss,Neto kasum / kahjum
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Automaatselt kirjutada sõnumi esitamise tehingud.
 DocType: Production Order,Item To Manufacture,Punkt toota
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} olek on {2}
@@ -693,7 +699,7 @@
 DocType: Sales Order Item,Projected Qty,Kavandatav Kogus
 DocType: Sales Invoice,Payment Due Date,Maksetähtpäevast
 DocType: Newsletter,Newsletter Manager,Uudiskiri Manager
-apps/erpnext/erpnext/stock/doctype/item/item.js +247,Item Variant {0} already exists with same attributes,Punkt Variant {0} on juba olemas sama atribuute
+apps/erpnext/erpnext/stock/doctype/item/item.js +240,Item Variant {0} already exists with same attributes,Punkt Variant {0} on juba olemas sama atribuute
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',"Avamine"
 DocType: Notification Control,Delivery Note Message,Toimetaja märkus Message
 DocType: Expense Claim,Expenses,Kulud
@@ -703,7 +709,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Teadus- ja arendustegevus
 ,Amount to Bill,Summa Bill
 DocType: Company,Registration Details,Registreerimine Üksikasjad
-DocType: Item,Re-Order Qty,Re-Order Kogus
+DocType: Item Reorder,Re-Order Qty,Re-Order Kogus
 DocType: Leave Block List Date,Leave Block List Date,Jäta Block loetelu kuupäev
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Planeeritud saata {0}
 DocType: Pricing Rule,Price or Discount,Hind või Soodus
@@ -746,7 +752,7 @@
 DocType: Bank Reconciliation,Total Amount,Kogu summa
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet kirjastamine
 DocType: Production Planning Tool,Production Orders,Tootmine Tellimused
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Bilansilise väärtuse
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,Bilansilise väärtuse
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Müük Hinnakiri
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Avalda sünkroonida esemed
 DocType: Bank Reconciliation,Account Currency,Konto Valuuta
@@ -755,7 +761,7 @@
 DocType: Supplier,Default Payable Accounts,Vaikimisi on tasulised kontod
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Töötaja {0} ei ole aktiivne või ei ole olemas
 DocType: Features Setup,Item Barcode,Punkt Triipkood
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,Item Variants {0} updated,Punkt variandid {0} uuendatud
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,Item Variants {0} updated,Punkt variandid {0} uuendatud
 DocType: Quality Inspection Reading,Reading 6,Lugemine 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Ostuarve Advance
 DocType: Address,Shop,Kauplus
@@ -832,7 +838,7 @@
 DocType: POS Profile,Cash/Bank Account,Raha / Bank Account
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Eemaldatud esemed ei muutu kogus või väärtus.
 DocType: Delivery Note,Delivery To,Toimetaja
-apps/erpnext/erpnext/stock/doctype/item/item.py +561,Attribute table is mandatory,Oskus tabelis on kohustuslik
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,Attribute table is mandatory,Oskus tabelis on kohustuslik
 DocType: Production Planning Tool,Get Sales Orders,Võta müügitellimuste
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} ei tohi olla negatiivne
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount,Soodus
@@ -860,7 +866,7 @@
 DocType: Tax Rule,Shipping State,Kohaletoimetamine riik
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Punkt tuleb lisada, kasutades "Võta Kirjed Ostutšekid" nuppu"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Müügikulud
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Buying,Standard ostmine
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Buying,Standard ostmine
 DocType: GL Entry,Against,Vastu
 DocType: Item,Default Selling Cost Center,Vaikimisi müügikulude Center
 DocType: Sales Partner,Implementation Partner,Rakendamine Partner
@@ -902,7 +908,7 @@
 DocType: Sales Partner,Distributor,Edasimüüja
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Ostukorv kohaletoimetamine reegel
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +210,Production Order {0} must be cancelled before cancelling this Sales Order,Tootmine Tellimus {0} tuleb tühistada enne tühistades selle Sales Order
-apps/erpnext/erpnext/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',Palun määra "Rakenda Täiendav soodustust"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',Palun määra "Rakenda Täiendav soodustust"
 ,Ordered Items To Be Billed,Tellitud esemed arve
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Siit Range peab olema väiksem kui levikuala
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Vali aeg kajakad ja esitab loo uus müügiarve.
@@ -970,9 +976,9 @@
 DocType: Contact,User ID,kasutaja ID
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,Vaata Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Esimesed
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"An Item Group exists with same name, please change the item name or rename the item group","Elemendi Group olemas sama nimega, siis muuda objekti nimi või ümber nimetada elemendi grupp"
+apps/erpnext/erpnext/stock/doctype/item/item.py +431,"An Item Group exists with same name, please change the item name or rename the item group","Elemendi Group olemas sama nimega, siis muuda objekti nimi või ümber nimetada elemendi grupp"
 DocType: Production Order,Manufacture against Sales Order,Tootmine vastu Sales Order
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,Ülejäänud maailm
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,Rest Of The World,Ülejäänud maailm
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Artiklite {0} ei ole partii
 ,Budget Variance Report,Eelarve Dispersioon aruanne
 DocType: Salary Slip,Gross Pay,Gross Pay
@@ -1002,7 +1008,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,Not authorized to edit frozen Account {0},Ei ole lubatud muuta külmutatud Konto {0}
 DocType: Journal Entry,Get Outstanding Invoices,Võta Tasumata arved
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Sales Order {0} ei ole kehtiv
-apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged","Vabandame, ettevõtted ei saa liita"
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Vabandame, ettevõtted ei saa liita"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Väike
 DocType: Employee,Employee Number,Töötaja number
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Case (te) juba kasutusel. Proovige kohtuasjas No {0}
@@ -1021,7 +1027,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Põllumajandus
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,Your Products or Services,Oma tooteid või teenuseid
 DocType: Mode of Payment,Mode of Payment,Makseviis
-apps/erpnext/erpnext/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,Koduleht Pilt peaks olema avalik faili või veebilehe URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Koduleht Pilt peaks olema avalik faili või veebilehe URL
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,See on ülemelemendile rühma ja seda ei saa muuta.
 DocType: Journal Entry Account,Purchase Order,Ostutellimuse
 DocType: Warehouse,Warehouse Contact Info,Ladu Kontakt
@@ -1093,6 +1099,7 @@
 DocType: Address,Utilities,Kommunaalteenused
 DocType: Purchase Invoice Item,Accounting,Raamatupidamine
 DocType: Features Setup,Features Setup,Omadused Setup
+DocType: Item,Is Service Item,Kas Service toode
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,Taotlemise tähtaeg ei tohi olla väljaspool puhkuse eraldamise ajavahemikul
 DocType: Activity Cost,Projects,Projektid
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Palun valige Fiscal Year
@@ -1123,7 +1130,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Kontoplaan
 DocType: Material Request,Terms and Conditions Content,Tingimused sisu
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +465,cannot be greater than 100,ei saa olla üle 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,Punkt {0} ei ole laos toode
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,Item {0} is not a stock Item,Punkt {0} ei ole laos toode
 DocType: Maintenance Visit,Unscheduled,Plaaniväline
 DocType: Employee,Owned,Omanik
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Oleneb palgata puhkust
@@ -1182,7 +1189,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Valitsus
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,Punkt variandid
 DocType: Company,Services,Teenused
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),Kokku ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,Total ({0}),Kokku ({0})
 DocType: Cost Center,Parent Cost Center,Parent Cost Center
 DocType: Sales Invoice,Source,Allikas
 DocType: Leave Type,Is Leave Without Pay,Kas palgata puhkust
@@ -1255,17 +1262,17 @@
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Kui soovite jälgida objekte kasutades vöötkoodi. Sul on võimalik siseneda punkte saateleht ja müügiarve skaneerimine vöötkoodi punkti.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Saada uuesti Makse Email
 DocType: Dependent Task,Dependent Task,Sõltub Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,Conversion factor for default Unit of Measure must be 1 in row {0},Muundustegurit Vaikemõõtühik peab olema 1 rida {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Leave of type {0} cannot be longer than {1},Jäta tüüpi {0} ei saa olla pikem kui {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Conversion factor for default Unit of Measure must be 1 in row {0},Muundustegurit Vaikemõõtühik peab olema 1 rida {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Leave of type {0} cannot be longer than {1},Jäta tüüpi {0} ei saa olla pikem kui {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Proovige plaanis operatsioonide X päeva ette.
 DocType: HR Settings,Stop Birthday Reminders,Stopp Sünnipäev meeldetuletused
 DocType: SMS Center,Receiver List,Vastuvõtja loetelu
 DocType: Payment Tool Detail,Payment Amount,Makse summa
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Tarbitud
 apps/erpnext/erpnext/public/js/pos/pos.js +512,{0} View,{0} Vaata
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,Net muutus Cash
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Net muutus Cash
 DocType: Salary Structure Deduction,Salary Structure Deduction,Palgastruktuur mahaarvamine
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mõõtühik {0} on kantud rohkem kui üks kord Conversion Factor tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +339,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mõõtühik {0} on kantud rohkem kui üks kord Conversion Factor tabel
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},Maksenõudekäsule juba olemas {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kulud Väljastatud Esemed
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Quantity must not be more than {0},Kogus ei tohi olla rohkem kui {0}
@@ -1327,7 +1334,7 @@
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Palun valige objekti kood
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Vähendada mahaarvamine eest palgata puhkust (LWP)
 DocType: Territory,Territory Manager,Territoorium Manager
-DocType: Delivery Note Item,To Warehouse (Optional),Et Warehouse (valikuline)
+DocType: Packed Item,To Warehouse (Optional),Et Warehouse (valikuline)
 DocType: Sales Invoice,Paid Amount (Company Currency),Paide summa (firma Valuuta)
 DocType: Purchase Invoice,Additional Discount,Täiendav Soodus
 DocType: Selling Settings,Selling Settings,Müük Seaded
@@ -1336,7 +1343,7 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Ettevõte, Kuu ja majandusaasta on kohustuslik"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Turundus kulud
 ,Item Shortage Report,Punkt Puuduse aruanne
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Kaal on mainitud, \ nKui mainida "Kaal UOM" liiga"
+apps/erpnext/erpnext/stock/doctype/item/item.js +194,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Kaal on mainitud, \ nKui mainida "Kaal UOM" liiga"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materjal taotlus kasutatakse selle Stock Entry
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Single üksuse objekt.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +217,Time Log Batch {0} must be 'Submitted',Aeg Logi Partii {0} tuleb "Esitatud"
@@ -1347,6 +1354,7 @@
 DocType: Employee,Date Of Retirement,Kuupäev pensionile
 DocType: Upload Attendance,Get Template,Võta Mall
 DocType: Address,Postal,Posti-
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,ERPNext Setup Complete!
 DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Kliendi Group olemas sama nimega siis muuta kliendi nimi või ümber Kliendi Group
 apps/erpnext/erpnext/public/js/pos/pos.js +155,Please select {0} first.,Palun valige {0} esimene.
@@ -1375,12 +1383,12 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Liiga palju veerge. Eksport aruande ja printida tabelarvutuse rakenduse.
 DocType: Sales Invoice Item,Batch No,Partii ei
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Laske mitu müügitellimuste vastu Kliendi ostutellimuse
-apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,Main
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,Main
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Määra eesliide numeratsiooni seeria oma tehingute
 DocType: Employee Attendance Tool,Employees HTML,Töötajad HTML
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,Stopped order cannot be cancelled. Unstop to cancel.,Tasuda tellimust ei ole võimalik tühistada. Ummistust tühistada.
-apps/erpnext/erpnext/stock/doctype/item/item.py +367,Default BOM ({0}) must be active for this item or its template,Vaikimisi Bom ({0}) peab olema aktiivne selle objekt või selle malli
+apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,Vaikimisi Bom ({0}) peab olema aktiivne selle objekt või selle malli
 DocType: Employee,Leave Encashed?,Jäta realiseeritakse?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity From väli on kohustuslik
 DocType: Item,Variants,Variante
@@ -1405,7 +1413,6 @@
 DocType: Sales Order,To Deliver and Bill,Pakkuda ja Bill
 DocType: GL Entry,Credit Amount in Account Currency,Krediidi Summa konto Valuuta
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Aeg kajakad tootmine.
-DocType: Item,Apply Warehouse-wise Reorder Level,Rakenda Warehouse tark Reorder Level
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,Bom {0} tuleb esitada
 DocType: Authorization Control,Authorization Control,Autoriseerimiskontroll
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: lükata Warehouse on kohustuslik vastu rahuldamata Punkt {1}
@@ -1503,6 +1510,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: Operation {1} ei ole lõpule {2} tk valmistoodangu tootmine Tellimus {3}. Palun uuendage töö staatusest kaudu Time Palgid
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investeeringud
 DocType: Issue,Resolution Details,Resolutsioon Üksikasjad
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,eraldised
 DocType: Quality Inspection Reading,Acceptance Criteria,Vastuvõetavuse kriteeriumid
 DocType: Item Attribute,Attribute Name,Atribuudi nimi
 DocType: Item Group,Show In Website,Show Website
@@ -1553,7 +1561,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,Expense Claim is pending approval. Only the Expense Approver can update status.,Kuluhüvitussüsteeme kinnituse ootel. Ainult Kulu Approver saab uuendada staatus.
 DocType: Purchase Invoice,Additional Discount Amount,Täiendav Allahindluse summa
 DocType: Leave Block List Allow,Leave Block List Allow,Jäta Block loetelu Laske
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,Lühend ei saa olla tühi või ruumi
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Lühend ei saa olla tühi või ruumi
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Grupi Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Spordi-
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Kokku Tegelik
@@ -1594,7 +1602,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Punkt {0} on juba tagasi
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiscal Year ** esindab majandusaastal. Kõik raamatupidamiskanded ja teiste suuremate tehingute jälgitakse vastu ** Fiscal Year **.
 DocType: Opportunity,Customer / Lead Address,Klienditeenindus / Plii Aadress
-apps/erpnext/erpnext/stock/doctype/item/item.py +152,Warning: Invalid SSL certificate on attachment {0},Hoiatus: Vigane SSL sertifikaat kinnitus {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Warning: Invalid SSL certificate on attachment {0},Hoiatus: Vigane SSL sertifikaat kinnitus {0}
 DocType: Production Order Operation,Actual Operation Time,Tegelik tööaeg
 DocType: Authorization Rule,Applicable To (User),Suhtes kohaldatava (Kasutaja)
 DocType: Purchase Taxes and Charges,Deduct,Maha arvama
@@ -1743,7 +1751,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Juhtum nr saa olla 0
 DocType: Features Setup,If you have Sales Team and Sale Partners (Channel Partners)  they can be tagged and maintain their contribution in the sales activity,Kui teil on meeskond ja müük Partners (Kanal Partnerid) neid saab kodeeritud ja säilitada oma panuse müügitegevus
 DocType: Item,Show a slideshow at the top of the page,Näita slaidiseansi ülaosas lehele
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,Kauplused
+DocType: Item,"Allow in Sales Order of type ""Service""",Luba Sales Order of type "Service"
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,Kauplused
 DocType: Time Log,Projects Manager,Projektijuhina
 DocType: Serial No,Delivery Time,Tarne aeg
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Vananemine Põhineb
@@ -1768,7 +1777,7 @@
 ,Financial Analytics,Financial Analytics
 DocType: Quality Inspection,Verified By,Kontrollitud
 DocType: Address,Subsidiary,Tütarettevõte
-apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Ei saa muuta ettevõtte default valuutat, sest seal on olemasolevate tehingud. Tehingud tuleb tühistada muuta default valuutat."
+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.","Ei saa muuta ettevõtte default valuutat, sest seal on olemasolevate tehingud. Tehingud tuleb tühistada muuta default valuutat."
 DocType: Quality Inspection,Purchase Receipt No,Ostutšekk pole
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Käsiraha
 DocType: Process Payroll,Create Salary Slip,Loo palgatõend
@@ -1816,7 +1825,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,Tooraine ei saa olla tühi.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","Ei uuendada laos, arve sisaldab tilk laevandus objekt."
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Nagu on olemasolevate varude tehingute selle objekt, \ sa ei saa muuta väärtused "Kas Serial No", "Kas Partii ei", "Kas Stock toode" ja "hindamismeetod""
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Quick päevikusissekanne
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,Sa ei saa muuta kiirust kui Bom mainitud agianst tahes kirje
@@ -1905,7 +1914,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Palun saateleht esimene
 DocType: Purchase Invoice,Currency and Price List,Valuuta ja hinnakiri
 DocType: Opportunity,Customer / Lead Name,Klienditeenindus / Plii nimi
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Kliirens kuupäev ei ole nimetatud
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,Kliirens kuupäev ei ole nimetatud
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Toodang
 DocType: Item,Allow Production Order,Laske Production Telli
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Row {0}: Start Date tuleb enne End Date
@@ -1915,7 +1924,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 DocType: Salary Structure,Total Earning,Kokku teenimine
 DocType: Purchase Receipt,Time at which materials were received,"Aeg, mil materjale ei laekunud"
-apps/erpnext/erpnext/utilities/doctype/address/address.py +118,My Addresses,Minu aadressid
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Minu aadressid
 DocType: Stock Ledger Entry,Outgoing Rate,Väljuv Rate
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,Organisatsiooni haru meister.
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,või
@@ -1984,7 +1993,7 @@
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Hallata klientide Group Tree.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,New Cost Center nimi
 DocType: Leave Control Panel,Leave Control Panel,Jäta Control Panel
-apps/erpnext/erpnext/utilities/doctype/address/address.py +95,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,No default Aadress Mall leitud. Palun loo uus Setup> Trükkimine ja Branding> Aadress Mall.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,No default Aadress Mall leitud. Palun loo uus Setup> Trükkimine ja Branding> Aadress Mall.
 DocType: Appraisal,HR User,HR Kasutaja
 DocType: Purchase Invoice,Taxes and Charges Deducted,Maksude ja tasude maha
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,Issues
@@ -2001,7 +2010,7 @@
 ,Sales Browser,Müük Browser
 DocType: Journal Entry,Total Credit,Kokku Credit
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},Hoiatus: Teine {0} # {1} on olemas vastu laos kirje {2}
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,Kohalik
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,Local,Kohalik
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Laenud ja ettemaksed (vara)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Võlgnikud
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Suur
@@ -2020,7 +2029,6 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Kõik müügitehingud saab kodeeritud vastu mitu ** Sales Isikud ** nii et saate määrata ja jälgida eesmärgid.
 ,S.O. No.,SO No.
 DocType: Production Order Operation,Make Time Log,Tee Time Logi
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,Palun määra reorganiseerima kogusest
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,Please create Customer from Lead {0},Palun luua Klienti Lead {0}
 DocType: Price List,Applicable for Countries,Rakendatav Riigid
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Arvutid
@@ -2095,7 +2103,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,Võta Vastavad kanded
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,Raamatupidamine kirjet Stock
 DocType: Sales Invoice,Sales Team1,Müük Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,Punkt {0} ei ole olemas
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Punkt {0} ei ole olemas
 DocType: Sales Invoice,Customer Address,Kliendi aadress
 DocType: Payment Request,Recipient and Message,Saaja ja Message
 DocType: Purchase Invoice,Apply Additional Discount On,Rakendada täiendavaid soodustust
@@ -2137,7 +2145,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Hindamine Rate
 apps/erpnext/erpnext/stock/get_item_details.py +274,Price List Currency not selected,Hinnakiri Valuuta ole valitud
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Punkt Row {0}: ostutšekk {1} ei eksisteeri üle "Ostutšekid" tabelis
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,Employee {0} has already applied for {1} between {2} and {3},Töötaja {0} on juba taotlenud {1} vahel {2} ja {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Employee {0} has already applied for {1} between {2} and {3},Töötaja {0} on juba taotlenud {1} vahel {2} ja {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekti alguskuupäev
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Kuni
 DocType: Rename Tool,Rename Log,Nimeta Logi
@@ -2175,7 +2183,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Palun sisestage leevendab kuupäeva.
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,Ainult Jäta rakendusi staatuse "Kinnitatud" saab esitada
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,Aadress Pealkiri on kohustuslik.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,Address Title is mandatory.,Aadress Pealkiri on kohustuslik.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Sisesta nimi kampaania kui allikas uurimine on kampaania
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Ajaleht Publishers
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Vali Fiscal Year
@@ -2199,6 +2207,7 @@
 DocType: UOM,Must be Whole Number,Peab olema täisarv
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Uus Lehed Eraldatud (päevades)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serial No {0} ei ole olemas
+DocType: Sales Invoice Item,Customer Warehouse (Optional),Kliendi Warehouse (valikuline)
 DocType: Pricing Rule,Discount Percentage,Allahindlusprotsendi
 DocType: Payment Reconciliation Invoice,Invoice Number,Arve number
 apps/erpnext/erpnext/hooks.py +55,Orders,Tellimused
@@ -2308,7 +2317,7 @@
 DocType: Appraisal,Appraisal,Hinnang
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Kuupäev korratakse
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Allkirjaõiguslik
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,Leave approver must be one of {0},Jäta heakskiitja peab olema üks {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +184,Leave approver must be one of {0},Jäta heakskiitja peab olema üks {0}
 DocType: Hub Settings,Seller Email,Müüja Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Kokku ostukulud (via ostuarve)
 DocType: Workstation Working Hour,Start Time,Algusaeg
@@ -2477,7 +2486,7 @@
 DocType: BOM Replace Tool,BOM Replace Tool,Bom Vahetage Tool
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Riik tark default Aadress Templates
 DocType: Sales Order Item,Supplier delivers to Customer,Tarnija tarnib Tellija
-apps/erpnext/erpnext/public/js/controllers/transaction.js +733,Show tax break-up,Näita maksu break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,Näita maksu break-up
 apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},Tänu / Viitekuupäev ei saa pärast {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Andmete impordi ja ekspordi
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Kui teil kaasata tootmistegevus. Võimaldab Punkt "toodetakse"
@@ -2526,7 +2535,7 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Enne leppimist
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Maksude ja tasude lisatud (firma Valuuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +384,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Punkt Maksu- Row {0} peab olema konto tüüpi Tax või tulu või kuluna või tasuline
+apps/erpnext/erpnext/stock/doctype/item/item.py +378,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Punkt Maksu- Row {0} peab olema konto tüüpi Tax või tulu või kuluna või tasuline
 DocType: Sales Order,Partly Billed,Osaliselt Maksustatakse
 DocType: Item,Default BOM,Vaikimisi Bom
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Palun ümber kirjutada firma nime kinnitamiseks
@@ -2553,8 +2562,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Viitenumber on kohustuslik, kui sisestatud Viitekuupäev"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Liitumis peab olema suurem kui Sünniaeg
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,Palgastruktuur
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"Multiple Price Rule exists with same criteria, please resolve \
-			conflict by assigning priority. Price Rules: {0}","Mitu Hind reegel olemas samad kriteeriumid, palun lahendada \ konflikti esmatähtsad. Hind Reeglid: {0}"
 DocType: Account,Bank,Pank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Lennukompanii
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,Väljaanne Material
@@ -2579,7 +2586,7 @@
 DocType: Issue,Opening Time,Avamine aeg
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Ja sealt soovitud vaja
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Väärtpaberite ja kaubabörsil
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Vaikimisi mõõtühik Variant "{0}" peab olema sama, Mall "{1}""
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Vaikimisi mõõtühik Variant "{0}" peab olema sama, Mall "{1}""
 DocType: Shipping Rule,Calculate Based On,Arvuta põhineb
 DocType: Delivery Note Item,From Warehouse,Siit Warehouse
 DocType: Purchase Taxes and Charges,Valuation and Total,Hindamine ja kokku
@@ -2588,7 +2595,7 @@
 DocType: Account,Purchase User,Ostu Kasutaja
 DocType: Notification Control,Customize the Notification,Kohanda teatamine
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Rahavoog äritegevusest
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Vaikimisi Aadress Mall ei saa kustutada
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,Vaikimisi Aadress Mall ei saa kustutada
 DocType: Sales Invoice,Shipping Rule,Kohaletoimetamine reegel
 DocType: Manufacturer,Limited to 12 characters,Üksnes 12 tähemärki
 DocType: Journal Entry,Print Heading,Prindi Rubriik
@@ -2681,7 +2688,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,Project-wise data is not available for Quotation,Projekti tark andmed ei ole kättesaadavad Tsitaat
 DocType: Project,Expected End Date,Oodatud End Date
 DocType: Appraisal Template,Appraisal Template Title,Hinnang Mall Pealkiri
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +373,Commercial,Kaubanduslik
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,Commercial,Kaubanduslik
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Parent Punkt {0} ei tohi olla laoartikkel
 DocType: Cost Center,Distribution Id,Distribution Id
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome Teenused
@@ -2700,7 +2707,7 @@
 DocType: Customer,Default Receivable Accounts,Vaikimisi võlgnevus konto
 DocType: Tax Rule,Billing State,Arved riik
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,Transfer
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),Tõmba plahvatas Bom (sh sõlmed)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,Fetch exploded BOM (including sub-assemblies),Tõmba plahvatas Bom (sh sõlmed)
 DocType: Authorization Rule,Applicable To (Employee),Suhtes kohaldatava (töötaja)
 apps/erpnext/erpnext/controllers/accounts_controller.py +95,Due Date is mandatory,Tähtaeg on kohustuslik
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Juurdekasv Oskus {0} ei saa olla 0
@@ -2733,7 +2740,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Negatiivne Hindamine Rate ei ole lubatud
 DocType: Holiday List,Weekly Off,Weekly Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13",Sest näiteks 2012. 2012-13
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),Ajutine kasum / kahjum (Credit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),Ajutine kasum / kahjum (Credit)
 DocType: Sales Invoice,Return Against Sales Invoice,Tagasi Against müügiarve
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Punkt 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Palun määra vaikeväärtus {0} Company {1}
@@ -2764,6 +2771,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Lisa Child
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Role lubatud kehtestada külmutatud kontode ja Edit Külmutatud kanded
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Ei saa teisendada Cost Center pearaamatu, sest see on tütartippu"
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,Seis
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Müügiprovisjon
 DocType: Offer Letter Term,Value / Description,Väärtus / Kirjeldus
@@ -2797,7 +2805,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,"Edukalt kustutatud kõik tehingud, mis on seotud selle firma!"
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Kuupäeva järgi
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Karistusest
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,Vaikimisi Warehouse on kohustuslik laos Punkt.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Palga kuu {0} ja aasta {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto sisestada Hinnakiri määra, kui puuduvad"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Kokku Paide summa
@@ -2833,7 +2840,7 @@
 DocType: Payment Tool,Set Matching Amounts,Määra Matching summad
 DocType: Purchase Invoice,Taxes and Charges Added,Maksude ja tasude lisatud
 ,Sales Funnel,Müügi lehtri
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,Lühend on kohustuslik
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,Lühend on kohustuslik
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Täname huvi tellides meie uuendused
 ,Qty to Transfer,Kogus Transfer
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Hinnapakkumisi Leads või klientidele.
@@ -2861,7 +2868,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,Supplier Quotation,Tarnija Tsitaat
 DocType: Quotation,In Words will be visible once you save the Quotation.,"Sõnades on nähtav, kui salvestate pakkumise."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} on peatunud
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},Lugu {0} on juba kasutatud Punkt {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,Barcode {0} already used in Item {1},Lugu {0} on juba kasutatud Punkt {1}
 DocType: Lead,Add to calendar on this date,Lisa kalendrisse selle kuupäeva
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Reeglid lisamiseks postikulud.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Sündmused
@@ -2883,7 +2890,7 @@
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Vali Fiscal Year ...
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +458,POS Profile required to make POS Entry,POS Profile vaja teha POS Entry
 DocType: Hub Settings,Name Token,Nimi Token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,Standard Selling
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,Standard Selling
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Atleast üks ladu on kohustuslik
 DocType: Serial No,Out of Warranty,Out of Garantii
 DocType: BOM Replace Tool,Replace,Vahetage
@@ -3006,7 +3013,7 @@
 DocType: Sales Invoice,Paid Amount,Paide summa
 ,Available Stock for Packing Items,Saadaval Stock jaoks asjade pakkimist
 DocType: Item Variant,Item Variant,Punkt Variant
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Kui määrata Aadress Mall vaikimisi kuna puudub muu default
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,Kui määrata Aadress Mall vaikimisi kuna puudub muu default
 apps/erpnext/erpnext/accounts/doctype/account/account.py +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Konto jääk juba Deebetkaart, sa ei tohi seada "Balance tuleb" nagu "Credit""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Kvaliteedijuhtimine
 DocType: Production Planning Tool,Filter based on customer,Filter põhineb kliendi
@@ -3107,7 +3114,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Et määrata selle Fiscal Year as Default, kliki "Set as Default""
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Setup sissetuleva serveri tuge e-posti id. (nt support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Puuduse Kogus
-apps/erpnext/erpnext/stock/doctype/item/item.py +578,Item variant {0} exists with same attributes,Punkt variant {0} on olemas sama atribuute
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,Punkt variant {0} on olemas sama atribuute
 DocType: Salary Slip,Salary Slip,Palgatõend
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,""Selleks, et kuupäev" on vajalik"
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Loo pakkimine libiseb paketid saadetakse. Kasutatud teatama paketi number, pakendi sisu ning selle kaalu."
@@ -3118,7 +3125,7 @@
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Kui mõni kontrollida tehinguid "Esitatud", talle pop-up automaatselt avada saata e-kiri seotud "kontakt", et tehing, mille tehing manusena. Kasutaja ei pruugi saata e."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Global Settings
 DocType: Employee Education,Employee Education,Töötajate haridus
-apps/erpnext/erpnext/public/js/controllers/transaction.js +749,It is needed to fetch Item Details.,"See on vajalik, et tõmbad Punkt Details."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,It is needed to fetch Item Details.,"See on vajalik, et tõmbad Punkt Details."
 DocType: Salary Slip,Net Pay,Netopalk
 DocType: Account,Account,Konto
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serial No {0} on juba saanud
@@ -3144,6 +3151,7 @@
 DocType: BOM,Manufacturing User,Tootmine Kasutaja
 DocType: Purchase Order,Raw Materials Supplied,Tarnitud tooraine
 DocType: Purchase Invoice,Recurring Print Format,Korduvad Prindi Formaat
+DocType: C-Form,Series,Sari
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,Expected Delivery Date cannot be before Purchase Order Date,Oodatud Toimetaja kuupäev ei saa olla enne Ostutellimuse kuupäev
 DocType: Appraisal,Appraisal Template,Hinnang Mall
 DocType: Item Group,Item Classification,Punkt klassifitseerimine
@@ -3219,7 +3227,7 @@
 DocType: Workstation,Operating Costs,Tegevuskulud
 DocType: Employee Leave Approver,Employee Leave Approver,Töötaja Jäta Approver
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} on edukalt lisatud meie uudiskiri nimekirja.
-apps/erpnext/erpnext/stock/doctype/item/item.py +434,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: an Reorder kirje on juba olemas selle lao {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +420,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: an Reorder kirje on juba olemas selle lao {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Ei saa kuulutada kadunud, sest Tsitaat on tehtud."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Ostu Master Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,Tootmine Tellimus {0} tuleb esitada
@@ -3227,7 +3235,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Peamised aruanded
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Praeguseks ei saa enne kuupäevast alates
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +194,Add / Edit Prices,Klienditeenindus Lisa / uuenda Hinnad
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,Add / Edit Prices,Klienditeenindus Lisa / uuenda Hinnad
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Graafik kulukeskuste
 ,Requested Items To Be Ordered,Taotlenud objekte tuleb tellida
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +315,My Orders,Minu Tellimused
@@ -3275,7 +3283,7 @@
 DocType: Employee,Date of Issue,Väljastamise kuupäev
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: From {0} ja {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +150,Row #{0}: Set Supplier for item {1},Row # {0}: Vali Tarnija kirje {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,Koduleht Pilt {0} juurde Punkt {1} ei leitud
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Koduleht Pilt {0} juurde Punkt {1} ei leitud
 DocType: Issue,Content Type,Sisu tüüp
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Arvuti
 DocType: Item,List this Item in multiple groups on the website.,Nimekiri see toode mitmes rühmade kodulehel.
@@ -3289,7 +3297,7 @@
 DocType: Delivery Note,To Warehouse,Et Warehouse
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Konto {0} on kantud rohkem kui üks kord majandusaasta {1}
 ,Average Commission Rate,Keskmine Komisjoni Rate
-apps/erpnext/erpnext/stock/doctype/item/item.py +357,'Has Serial No' can not be 'Yes' for non-stock item,"Kas Serial No" ei saa olla "Jah" mitte-laoartikkel
+apps/erpnext/erpnext/stock/doctype/item/item.py +351,'Has Serial No' can not be 'Yes' for non-stock item,"Kas Serial No" ei saa olla "Jah" mitte-laoartikkel
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Osavõtt märkida ei saa tulevikus kuupäev
 DocType: Pricing Rule,Pricing Rule Help,Hinnakujundus Reegel Abi
 DocType: Purchase Taxes and Charges,Account Head,Konto Head
@@ -3315,7 +3323,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Konto sulgemise {0} tüüp peab olema vastutus / Equity
 DocType: Authorization Rule,Based On,Põhineb
 DocType: Sales Order Item,Ordered Qty,Tellitud Kogus
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,Punkt {0} on keelatud
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,Item {0} is disabled,Punkt {0} on keelatud
 DocType: Stock Settings,Stock Frozen Upto,Stock Külmutatud Upto
 apps/erpnext/erpnext/controllers/recurring_document.py +168,Period From and Period To dates mandatory for recurring {0},Ajavahemikul ja periood soovitud kohustuslik korduvad {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projekti tegevus / ülesanne.
@@ -3323,7 +3331,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Ostmine tuleb kontrollida, kui need on kohaldatavad valitakse {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Soodustus peab olema väiksem kui 100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Kirjutage Off summa (firma Valuuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,Row # {0}: määrake reorganiseerima kogusest
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Row # {0}: määrake reorganiseerima kogusest
 DocType: Landed Cost Voucher,Landed Cost Voucher,Maandus Cost Voucher
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Palun määra {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Korda päev kuus
@@ -3395,7 +3403,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Vaata nüüd
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Vali mil arve genereeritakse automaatselt
 DocType: BOM,Raw Material Cost,Tooraine hind
-DocType: Item,Re-Order Level,Re-Order Level
+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.,"Sisesta esemed ja planeeritud Kogus, mille soovite tõsta tootmise tellimuste või laadida tooraine analüüsi."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Poole kohaga
 DocType: Employee,Applicable Holiday List,Rakendatav Holiday nimekiri
@@ -3450,7 +3458,7 @@
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Kogus punkti saadi pärast tootmise / pakkimise etteantud tooraine kogused
 DocType: Payment Reconciliation,Receivable / Payable Account,Laekumata / maksmata konto
 DocType: Delivery Note Item,Against Sales Order Item,Vastu Sales Order toode
-apps/erpnext/erpnext/stock/doctype/item/item.py +573,Please specify Attribute Value for attribute {0},Palun täpsustage omadus Väärtus atribuut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Please specify Attribute Value for attribute {0},Palun täpsustage omadus Väärtus atribuut {0}
 DocType: Item,Default Warehouse,Vaikimisi Warehouse
 DocType: Task,Actual End Date (via Time Logs),Tegelik End Date (via aeg kajakad)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Eelarve ei saa liigitada vastu Group Konto {0}
@@ -3529,7 +3537,7 @@
 DocType: Address,Office,Kontor
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Raamatupidamine päevikukirjete.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Saadaval Kogus kell laost
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,Please select Employee Record first.,Palun valige Töötaja Record esimene.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,Palun valige Töötaja Record esimene.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Pidu / konto ei ühti {1} / {2} on {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Et luua Maksu- konto
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Palun sisestage ärikohtumisteks
@@ -3604,7 +3612,7 @@
 DocType: Item Attribute,Numeric Values,Arvväärtuste
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,Kinnita Logo
 DocType: Customer,Commission Rate,Komisjonitasu määr
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,Tee Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Tee Variant
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,Block puhkuse taotluste osakonda.
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,Ostukorv on tühi
 DocType: Production Order,Actual Operating Cost,Tegelik töökulud
@@ -3621,15 +3629,14 @@
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Tingimused Mall
 DocType: Serial No,Delivery Details,Toimetaja detailid
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +380,Cost Center is required in row {0} in Taxes table for type {1},Cost Center on vaja järjest {0} maksude tabel tüüp {1}
-DocType: Item,Automatically create Material Request if quantity falls below this level,"Automaatselt luua Material taotluse, kui kogus langeb alla selle taseme"
 ,Item-wise Purchase Register,Punkt tark Ostu Registreeri
 DocType: Batch,Expiry Date,Aegumisaja
-apps/erpnext/erpnext/stock/doctype/item/item.py +419,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Et valida reorganiseerima tasandil, objekt peab olema Ostu toode või tootmine Punkt"
+apps/erpnext/erpnext/stock/doctype/item/item.py +408,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Et valida reorganiseerima tasandil, objekt peab olema Ostu toode või tootmine Punkt"
 ,Supplier Addresses and Contacts,Tarnija aadressid ja kontaktid
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Palun valige kategooria esimene
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Projekti kapten.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Ära näita tahes sümbol nagu $ jne kõrval valuutades.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +380, (Half Day),(Pool päeva)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (Half Day),(Pool päeva)
 DocType: Supplier,Credit Days,Krediidi päeva
 DocType: Leave Type,Is Carry Forward,Kas kanda
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +566,Get Items from BOM,Võta Kirjed Bom